--- a/accessible/atk/AccessibleWrap.cpp
+++ b/accessible/atk/AccessibleWrap.cpp
@@ -795,17 +795,21 @@ getParentCB(AtkObject *aAtkObj)
     return aAtkObj->accessible_parent;
 
   AtkObject* atkParent = nullptr;
   if (AccessibleWrap* wrapper = GetAccessibleWrap(aAtkObj)) {
     Accessible* parent = wrapper->Parent();
     atkParent = parent ? AccessibleWrap::GetAtkObject(parent) : nullptr;
   } else if (ProxyAccessible* proxy = GetProxy(aAtkObj)) {
     ProxyAccessible* parent = proxy->Parent();
-    atkParent = parent ? GetWrapperFor(parent) : nullptr;
+    if (parent)
+      atkParent = GetWrapperFor(parent);
+
+    // Otherwise this should be the proxy for the tab's top level document.
+    atkParent = AccessibleWrap::GetAtkObject(proxy->OuterDocOfRemoteBrowser());
   }
 
   if (atkParent)
     atk_object_set_parent(aAtkObj, atkParent);
 
   return aAtkObj->accessible_parent;
 }
 
@@ -854,16 +858,19 @@ gint
 getIndexInParentCB(AtkObject* aAtkObj)
 {
   // We don't use Accessible::IndexInParent() because we don't include text
   // leaf nodes as children in ATK.
   if (ProxyAccessible* proxy = GetProxy(aAtkObj)) {
     if (ProxyAccessible* parent = proxy->Parent())
       return parent->IndexOfEmbeddedChild(proxy);
 
+    if (proxy->OuterDocOfRemoteBrowser())
+      return 0;
+
     return -1;
   }
 
     AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
     if (!accWrap) {
         return -1;
     }
 

--- a/accessible/ipc/ProxyAccessible.cpp
+++ b/accessible/ipc/ProxyAccessible.cpp
@@ -1,16 +1,20 @@
 /* -*- 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 "ProxyAccessible.h"
 #include "DocAccessibleParent.h"
+#include "DocAccessible.h"
+#include "mozilla/a11y/DocManager.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/TabParent.h"
 #include "mozilla/unused.h"
 #include "mozilla/a11y/Platform.h"
 #include "RelationType.h"
 #include "mozilla/a11y/Role.h"
 
 namespace mozilla {
 namespace a11y {
 
@@ -958,10 +962,24 @@ ProxyAccessible::MimeType(nsString aMime
 
 void
 ProxyAccessible::URLDocTypeMimeType(nsString& aURL, nsString& aDocType,
                                     nsString& aMimeType)
 {
   unused << mDoc->SendURLDocTypeMimeType(mID, &aURL, &aDocType, &aMimeType);
 }
 
+Accessible*
+ProxyAccessible::OuterDocOfRemoteBrowser() const
+{
+  auto tab = static_cast<dom::TabParent*>(mDoc->Manager());
+  dom::Element* frame = tab->GetOwnerElement();
+  NS_ASSERTION(frame, "why isn't the tab in a frame!");
+  if (!frame)
+    return nullptr;
+
+  DocAccessible* chromeDoc = GetExistingDocAccessible(frame->OwnerDoc());
+  NS_ASSERTION(chromeDoc, "accessible tab in not accessible chromeDocument");
+
+  return chromeDoc ? chromeDoc->GetAccessible(frame) : nullptr;
 }
 }
+}

--- a/accessible/ipc/ProxyAccessible.h
+++ b/accessible/ipc/ProxyAccessible.h
@@ -13,16 +13,17 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsRect.h"
 #include "Accessible.h"
 
 namespace mozilla {
 namespace a11y {
 
+class Accessible;
 class Attribute;
 class DocAccessibleParent;
 enum class RelationType;
 
 class ProxyAccessible
 {
 public:
 
@@ -60,16 +61,18 @@ public:
   void RemoveChild(ProxyAccessible* aChild)
     { mChildren.RemoveElement(aChild); }
 
   /**
    * Return the proxy for the parent of the wrapped accessible.
    */
   ProxyAccessible* Parent() const { return mParent; }
 
+  Accessible* OuterDocOfRemoteBrowser() const;
+
   /**
    * Get the role of the accessible we're proxying.
    */
   role Role() const { return mRole; }
 
   /*
    * Return the states for the proxied accessible.
    */

--- a/accessible/mac/AccessibleWrap.h
+++ b/accessible/mac/AccessibleWrap.h
@@ -54,20 +54,17 @@ public: // construction, destruction
   virtual nsresult HandleAccEvent(AccEvent* aEvent) override;
 
   /**
    * Ignored means that the accessible might still have children, but is not
    * displayed to the user. it also has no native accessible object represented
    * for it.
    */
   bool IsIgnored();
-  
-  inline bool HasPopup () 
-    { return (NativeState() & mozilla::a11y::states::HASPOPUP); }
-  
+
   /**
    * Returns this accessible's all children, adhering to "flat" accessibles by 
    * not returning their children.
    */
   void GetUnignoredChildren(nsTArray<Accessible*>* aChildrenArray);
   Accessible* GetUnignoredParent() const;
 
 protected:
@@ -103,12 +100,14 @@ private:
   /**
    * We have created our native. This does not mean there is one.
    * This can never go back to false.
    * We need it because checking whether we need a native object cost time.
    */
   bool mNativeInited;  
 };
 
+Class GetTypeFromRole(roles::Role aRole);
+
 } // namespace a11y
 } // namespace mozilla
 
 #endif

--- a/accessible/mac/AccessibleWrap.mm
+++ b/accessible/mac/AccessibleWrap.mm
@@ -10,16 +10,17 @@
 #include "nsAccUtils.h"
 #include "Role.h"
 
 #import "mozAccessible.h"
 #import "mozActionElements.h"
 #import "mozHTMLAccessible.h"
 #import "mozTextAccessible.h"
 
+using namespace mozilla;
 using namespace mozilla::a11y;
 
 AccessibleWrap::
   AccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
   Accessible(aContent, aDoc), mNativeObject(nil),  
   mNativeInited(false)
 {
 }
@@ -28,18 +29,20 @@ AccessibleWrap::~AccessibleWrap()
 {
 }
 
 mozAccessible* 
 AccessibleWrap::GetNativeObject()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
   
-  if (!mNativeInited && !mNativeObject && !IsDefunct() && !AncestorIsFlat())
-    mNativeObject = [[GetNativeType() alloc] initWithAccessible:this];
+  if (!mNativeInited && !mNativeObject && !IsDefunct() && !AncestorIsFlat()) {
+    uintptr_t accWrap = reinterpret_cast<uintptr_t>(this);
+    mNativeObject = [[GetNativeType() alloc] initWithAccessible:accWrap];
+  }
   
   mNativeInited = true;
   
   return mNativeObject;
   
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
@@ -54,61 +57,17 @@ AccessibleWrap::GetNativeInterface(void*
 Class
 AccessibleWrap::GetNativeType () 
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   if (IsXULTabpanels())
     return [mozPaneAccessible class];
 
-  roles::Role role = Role();
-  switch (role) {
-    case roles::PUSHBUTTON:
-    case roles::SPLITBUTTON:
-    case roles::TOGGLE_BUTTON:
-    {
-      // if this button may show a popup, let's make it of the popupbutton type.
-      return HasPopup() ? [mozPopupButtonAccessible class] : 
-             [mozButtonAccessible class];
-    }
-    
-    case roles::PAGETAB:
-      return [mozButtonAccessible class];
-
-    case roles::CHECKBUTTON:
-      return [mozCheckboxAccessible class];
-      
-    case roles::HEADING:
-      return [mozHeadingAccessible class];
-
-    case roles::PAGETABLIST:
-      return [mozTabsAccessible class];
-
-    case roles::ENTRY:
-    case roles::STATICTEXT:
-    case roles::CAPTION:
-    case roles::ACCEL_LABEL:
-    case roles::PASSWORD_TEXT:
-      // normal textfield (static or editable)
-      return [mozTextAccessible class];
-
-    case roles::TEXT_LEAF:
-      return [mozTextLeafAccessible class];
-
-    case roles::LINK:
-      return [mozLinkAccessible class];
-
-    case roles::COMBOBOX:
-      return [mozPopupButtonAccessible class];
-      
-    default:
-      return [mozAccessible class];
-  }
-  
-  return nil;
+  return GetTypeFromRole(Role());
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
 // this method is very important. it is fired when an accessible object "dies". after this point
 // the object might still be around (because some 3rd party still has a ref to it), but it is
 // in fact 'dead'.
 void
@@ -269,8 +228,57 @@ AccessibleWrap::AncestorIsFlat()
     if (nsAccUtils::MustPrune(parent))
       return true;
 
     parent = parent->Parent();
   }
   // no parent was flat
   return false;
 }
+
+Class
+a11y::GetTypeFromRole(roles::Role aRole) 
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
+
+  switch (aRole) {
+    case roles::COMBOBOX:
+    case roles::PUSHBUTTON:
+    case roles::SPLITBUTTON:
+    case roles::TOGGLE_BUTTON:
+    {
+        return [mozButtonAccessible class];
+    }
+    
+    case roles::PAGETAB:
+      return [mozButtonAccessible class];
+
+    case roles::CHECKBUTTON:
+      return [mozCheckboxAccessible class];
+      
+    case roles::HEADING:
+      return [mozHeadingAccessible class];
+
+    case roles::PAGETABLIST:
+      return [mozTabsAccessible class];
+
+    case roles::ENTRY:
+    case roles::STATICTEXT:
+    case roles::CAPTION:
+    case roles::ACCEL_LABEL:
+    case roles::PASSWORD_TEXT:
+      // normal textfield (static or editable)
+      return [mozTextAccessible class];
+
+    case roles::TEXT_LEAF:
+      return [mozTextLeafAccessible class];
+
+    case roles::LINK:
+      return [mozLinkAccessible class];
+      
+    default:
+      return [mozAccessible class];
+  }
+  
+  return nil;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
+}

--- a/accessible/mac/Platform.mm
+++ b/accessible/mac/Platform.mm
@@ -2,16 +2,17 @@
 /* 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/. */
 
 #import <Cocoa/Cocoa.h>
 
 #include "Platform.h"
+#include "ProxyAccessible.h"
 
 #include "nsAppShell.h"
 
 namespace mozilla {
 namespace a11y {
 
 // Mac a11y whitelisting
 static bool sA11yShouldBeEnabled = false;
@@ -29,23 +30,33 @@ PlatformInit()
 }
 
 void
 PlatformShutdown()
 {
 }
 
 void
-ProxyCreated(ProxyAccessible*, uint32_t)
+ProxyCreated(ProxyAccessible* aProxy, uint32_t)
 {
+  // Pass in dummy state for now as retrieving proxy state requires IPC.
+  Class type = GetTypeFromRole(aProxy->Role());
+  uintptr_t accWrap = reinterpret_cast<uintptr_t>(aProxy) | IS_PROXY;
+  mozAccessible* mozWrapper = [[type alloc] initWithAccessible:accWrap];
+  aProxy->SetWrapper(reinterpret_cast<uintptr_t>(mozWrapper));
 }
 
 void
-ProxyDestroyed(ProxyAccessible*)
+ProxyDestroyed(ProxyAccessible* aProxy)
 {
+  mozAccessible* wrapper =
+    reinterpret_cast<mozAccessible*>(aProxy->GetWrapper());
+  [wrapper expire];
+  [wrapper release];
+  aProxy->SetWrapper(0);
 }
 
 void
 ProxyEvent(ProxyAccessible*, uint32_t)
 {
 }
 
 void

--- a/accessible/mac/moz.build
+++ b/accessible/mac/moz.build
@@ -25,16 +25,17 @@ UNIFIED_SOURCES += [
     'Platform.mm',
     'RootAccessibleWrap.mm',
 ]
 
 LOCAL_INCLUDES += [
     '/accessible/base',
     '/accessible/generic',
     '/accessible/html',
+    '/accessible/ipc',
     '/accessible/xul',
     '/layout/generic',
     '/layout/xul',
     '/widget',
     '/widget/cocoa',
 ]
 
 FINAL_LIBRARY = 'xul'

--- a/accessible/mac/mozAccessible.h
+++ b/accessible/mac/mozAccessible.h
@@ -52,21 +52,24 @@ static const uintptr_t IS_PROXY = 1;
   mozAccessible* mParent;
 
   /**
    * The role of our gecko accessible.
    */
   mozilla::a11y::role        mRole;
 }
 
-// return the Accessible for this mozAccessible.
-- (mozilla::a11y::AccessibleWrap*) getGeckoAccessible;
+// return the Accessible for this mozAccessible if it exists.
+- (mozilla::a11y::AccessibleWrap*)getGeckoAccessible;
+
+// return the ProxyAccessible for this mozAccessible if it exists.
+- (mozilla::a11y::ProxyAccessible*)getProxyAccessible;
 
 // inits with the gecko owner.
-- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)geckoParent;
+- (id)initWithAccessible:(uintptr_t)aGeckoObj;
 
 // our accessible parent (AXParent)
 - (id <mozAccessible>)parent;
 
 // a lazy cache of our accessible children (AXChildren). updated
 - (NSArray*)children;
 
 // returns the size of this accessible.

--- a/accessible/mac/mozAccessible.mm
+++ b/accessible/mac/mozAccessible.mm
@@ -55,25 +55,28 @@ GetClosestInterestingAccessible(id anObj
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
 #pragma mark -
 
 @implementation mozAccessible
  
-- (id)initWithAccessible:(AccessibleWrap*)geckoAccessible
+- (id)initWithAccessible:(uintptr_t)aGeckoAccessible
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   if ((self = [super init])) {
-    mGeckoAccessible = reinterpret_cast<uintptr_t>(geckoAccessible);
-    mRole = geckoAccessible->Role();
+    mGeckoAccessible = aGeckoAccessible;
+    if (aGeckoAccessible & IS_PROXY)
+      mRole = [self getProxyAccessible]->Role();
+    else
+      mRole = [self getGeckoAccessible]->Role();
   }
-   
+
   return self;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
 - (void)dealloc
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
@@ -87,16 +90,25 @@ GetClosestInterestingAccessible(id anObj
 - (mozilla::a11y::AccessibleWrap*)getGeckoAccessible
 {
   // Check if mGeckoAccessible points at a proxy
   if (mGeckoAccessible & IS_PROXY)
     return nil;
 
   return reinterpret_cast<AccessibleWrap*>(mGeckoAccessible);
 }
+
+- (mozilla::a11y::ProxyAccessible*)getProxyAccessible
+{
+  // Check if mGeckoAccessible points at a proxy
+  if (!(mGeckoAccessible & IS_PROXY))
+    return nil;
+
+  return reinterpret_cast<ProxyAccessible*>(mGeckoAccessible & ~IS_PROXY);
+}
  
 #pragma mark -
 
 - (BOOL)accessibilityIsIgnored
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   // unknown (either unimplemented, or irrelevant) elements are marked as ignored

--- a/accessible/mac/mozActionElements.h
+++ b/accessible/mac/mozActionElements.h
@@ -4,29 +4,28 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #import <Cocoa/Cocoa.h>
 #import "mozAccessible.h"
 
 /* Simple subclasses for things like checkboxes, buttons, etc. */
 
 @interface mozButtonAccessible : mozAccessible
+ {
+ }
+- (BOOL)hasPopup;
 - (void)click;
 - (BOOL)isTab;
 @end
 
 @interface mozCheckboxAccessible : mozButtonAccessible
 // returns one of the constants defined in CheckboxValue
 - (int)isChecked;
 @end
 
-/* Used for buttons that may pop up a menu. */
-@interface mozPopupButtonAccessible : mozButtonAccessible
-@end
-
 /* Class for tabs - not individual tabs */
 @interface mozTabsAccessible : mozAccessible
 {
   NSMutableArray* mTabs;
 }
 -(id)tabs;
 @end
 

--- a/accessible/mac/mozActionElements.mm
+++ b/accessible/mac/mozActionElements.mm
@@ -37,84 +37,102 @@ enum CheckboxValue {
                                                   NSAccessibilitySizeAttribute, // required
                                                   NSAccessibilityWindowAttribute, // required
                                                   NSAccessibilityPositionAttribute, // required
                                                   NSAccessibilityTopLevelUIElementAttribute, // required
                                                   NSAccessibilityHelpAttribute,
                                                   NSAccessibilityEnabledAttribute, // required
                                                   NSAccessibilityFocusedAttribute, // required
                                                   NSAccessibilityTitleAttribute, // required
+                                                  NSAccessibilityChildrenAttribute,
                                                   NSAccessibilityDescriptionAttribute,
 #if DEBUG
                                                   @"AXMozDescription",
 #endif
                                                   nil];
   }
   return attributes;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
 - (id)accessibilityAttributeValue:(NSString *)attribute
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
+  if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
+    if ([self hasPopup])
+      return [self children];
     return nil;
+  }
+
   if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
     if ([self isTab])
       return utils::LocalizedString(NS_LITERAL_STRING("tab"));
-    
+
     return NSAccessibilityRoleDescription([self role], nil);
   }
-  
+
   return [super accessibilityAttributeValue:attribute];
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
 - (BOOL)accessibilityIsIgnored
 {
   return ![self getGeckoAccessible];
 }
 
 - (NSArray*)accessibilityActionNames
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if ([self isEnabled])
+  if ([self isEnabled]) {
+    if ([self hasPopup])
+      return [NSArray arrayWithObjects:NSAccessibilityPressAction,
+              NSAccessibilityShowMenuAction,
+              nil];
     return [NSArray arrayWithObject:NSAccessibilityPressAction];
-    
+  }
   return nil;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
-- (NSString*)accessibilityActionDescription:(NSString*)action 
+- (NSString*)accessibilityActionDescription:(NSString*)action
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   if ([action isEqualToString:NSAccessibilityPressAction]) {
     if ([self isTab])
       return utils::LocalizedString(NS_LITERAL_STRING("switch"));
-  
+
     return @"press button"; // XXX: localize this later?
   }
-  
+
+  if ([self hasPopup]) {
+    if ([action isEqualToString:NSAccessibilityShowMenuAction])
+      return @"show menu";
+  }
+
   return nil;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
-- (void)accessibilityPerformAction:(NSString*)action 
+- (void)accessibilityPerformAction:(NSString*)action
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  if ([action isEqualToString:NSAccessibilityPressAction])
+  if ([self isEnabled] && [action isEqualToString:NSAccessibilityPressAction]) {
+    // TODO: this should bring up the menu, but currently doesn't.
+    //       once msaa and atk have merged better, they will implement
+    //       the action needed to show the menu.
     [self click];
+  }
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
 - (void)click
 {
   // both buttons and checkboxes have only one action. we should really stop using arbitrary
   // arrays with actions, and define constants for these actions.
@@ -122,16 +140,22 @@ enum CheckboxValue {
 }
 
 - (BOOL)isTab
 {
   AccessibleWrap* accWrap = [self getGeckoAccessible];
   return (accWrap && (accWrap->Role() == roles::PAGETAB));
 }
 
+- (BOOL)hasPopup
+{
+  AccessibleWrap* accWrap = [self getGeckoAccessible];
+  return accWrap && (accWrap->NativeState() & mozilla::a11y::states::HASPOPUP);
+}
+
 @end
 
 @implementation mozCheckboxAccessible
 
 - (NSString*)accessibilityActionDescription:(NSString*)action 
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
@@ -165,101 +189,16 @@ enum CheckboxValue {
 
   return [NSNumber numberWithInt:[self isChecked]];
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
 @end
 
-@implementation mozPopupButtonAccessible
-
-- (NSArray *)accessibilityAttributeNames
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  static NSArray *attributes = nil;
-  
-  if (!attributes) {
-    attributes = [[NSArray alloc] initWithObjects:NSAccessibilityParentAttribute, // required
-                                                  NSAccessibilityPositionAttribute, // required
-                                                  NSAccessibilityRoleAttribute, // required
-                                                  NSAccessibilitySizeAttribute, // required
-                                                  NSAccessibilityWindowAttribute, // required
-                                                  NSAccessibilityTopLevelUIElementAttribute, // required
-                                                  NSAccessibilityHelpAttribute,
-                                                  NSAccessibilityEnabledAttribute, // required
-                                                  NSAccessibilityFocusedAttribute, // required
-                                                  NSAccessibilityTitleAttribute, // required for popupmenus, and for menubuttons with a title
-                                                  NSAccessibilityChildrenAttribute, // required
-                                                  NSAccessibilityDescriptionAttribute, // required if it has no title attr
-#if DEBUG
-                                                  @"AXMozDescription",
-#endif
-                                                  nil];
-  }
-  return attributes;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
-    return [super children];
-  }
-  return [super accessibilityAttributeValue:attribute];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (NSArray *)accessibilityActionNames
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ([self isEnabled]) {
-    return [NSArray arrayWithObjects:NSAccessibilityPressAction,
-                                     NSAccessibilityShowMenuAction,
-                                     nil];
-  }
-  return nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (NSString *)accessibilityActionDescription:(NSString *)action
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ([action isEqualToString:NSAccessibilityShowMenuAction])
-    return @"show menu";
-  return [super accessibilityActionDescription:action];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)accessibilityPerformAction:(NSString *)action
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // both the ShowMenu and Click action do the same thing.
-  if ([self isEnabled]) {
-    // TODO: this should bring up the menu, but currently doesn't.
-    //       once msaa and atk have merged better, they will implement
-    //       the action needed to show the menu.
-    [super click];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
-
 @implementation mozTabsAccessible
 
 - (void)dealloc
 {
   [mTabs release];
 
   [super dealloc];
 }

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -267,16 +267,17 @@ pref("general.smoothScroll", true);
 pref("general.autoScroll", false);
 #else
 pref("general.autoScroll", true);
 #endif
 
 // At startup, check if we're the default browser and prompt user if not.
 pref("browser.shell.checkDefaultBrowser", true);
 pref("browser.shell.shortcutFavicons",true);
+pref("browser.shell.isSetAsDefaultBrowser", false);
 
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
 // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
 pref("browser.startup.page",                1);
 pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
 
 pref("browser.slowStartup.notificationDisabled", false);
 pref("browser.slowStartup.timeThreshold", 40000);

--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -43,17 +43,17 @@
 }
 
 searchbar {
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar");
 }
 
 /* Prevent shrinking the page content to 0 height and width */
 .browserStack > browser {
-  min-height: 25px;
+  min-height: 100px;
   min-width: 25px;
 }
 
 .browserStack > browser {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-browser");
 }
 
 .browserStack > browser[remote="true"] {

--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -40,17 +40,19 @@ skip-if = os == "linux"
 
 [browser_914138_widget_API_overflowable_toolbar.js]
 skip-if = os == "linux"
 
 [browser_914863_disabled_help_quit_buttons.js]
 [browser_918049_skipintoolbarset_dnd.js]
 [browser_923857_customize_mode_event_wrapping_during_reset.js]
 [browser_927717_customize_drag_empty_toolbar.js]
-[browser_932928_show_notice_when_palette_empty.js]
+
+# Bug 1163231 - Causes failures on Developer Edition on Windows 7.
+# [browser_932928_show_notice_when_palette_empty.js]
 
 [browser_934113_menubar_removable.js]
 # Because this test is about the menubar, it can't be run on mac
 skip-if = os == "mac"
 
 [browser_946320_tabs_from_other_computers.js]
 skip-if = os == "linux"
 

--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1108,16 +1108,18 @@ BrowserGlue.prototype = {
       try {
         // Report default browser status on startup to telemetry
         // so we can track whether we are the default.
         Services.telemetry.getHistogramById("BROWSER_IS_USER_DEFAULT")
                           .add(isDefault);
       }
       catch (ex) { /* Don't break the default prompt if telemetry is broken. */ }
 
+      Services.setBoolPref("browser.shell.isSetAsDefaultBrowser", isDefault);
+
       if (shouldCheck && !isDefault && !willRecoverSession) {
         Services.tm.mainThread.dispatch(function() {
           DefaultBrowserCheck.prompt(RecentWindow.getMostRecentBrowserWindow());
         }.bind(this), Ci.nsIThread.DISPATCH_NORMAL);
       }
     }
 
 #ifdef E10S_TESTING_ONLY

--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -199,16 +199,18 @@ skip-if = e10s && debug
 [browser_dbg_conditional-breakpoints-03.js]
 skip-if = e10s && debug
 [browser_dbg_conditional-breakpoints-04.js]
 skip-if = e10s && debug
 [browser_dbg_conditional-breakpoints-05.js]
 skip-if = e10s && debug
 [browser_dbg_console-eval.js]
 skip-if = e10s && debug
+[browser_dbg_console-named-eval.js]
+skip-if = e10s && debug
 [browser_dbg_server-conditional-bp-01.js]
 skip-if = e10s && debug
 [browser_dbg_server-conditional-bp-02.js]
 skip-if = e10s && debug
 [browser_dbg_server-conditional-bp-03.js]
 skip-if = e10s && debug
 [browser_dbg_server-conditional-bp-04.js]
 skip-if = e10s && debug

new file mode 100644
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_console-named-eval.js
@@ -0,0 +1,40 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Breaking in the middle of a named eval script created by the
+ * console should work
+ */
+
+function test() {
+  Task.spawn(runTests);
+}
+
+function* runTests() {
+  let TAB_URL = EXAMPLE_URL + "doc_empty-tab-01.html";
+  let [,, panel] = yield initDebugger(TAB_URL);
+  let dbgWin = panel.panelWin;
+  let sources = dbgWin.DebuggerView.Sources;
+  let frames = dbgWin.DebuggerView.StackFrames;
+  let editor = dbgWin.DebuggerView.editor;
+  let toolbox = gDevTools.getToolbox(panel.target);
+
+  let paused = waitForSourceAndCaretAndScopes(panel, "foo.js", 1);
+
+  toolbox.once("webconsole-ready", () => {
+    ok(toolbox.splitConsole, "Split console is shown.");
+    let jsterm = toolbox.getPanel("webconsole").hud.jsterm;
+    jsterm.execute("eval('debugger; //# sourceURL=foo.js')");
+  });
+  EventUtils.synthesizeKey("VK_ESCAPE", {}, dbgWin);
+
+  yield paused;
+  is(sources.selectedItem.attachment.label, 'foo.js',
+     'New source is selected in sources');
+  is(sources.selectedItem.attachment.group, 'http://example.com',
+     'New source is in the right group');
+  ok(editor.getText() === 'debugger; //# sourceURL=foo.js', 'Editor has correct text');
+
+  yield toolbox.closeSplitConsole();
+  yield resumeDebuggerThenCloseAndFinish(panel);
+}

--- a/browser/devtools/framework/test/browser_toolbox_hosts_size.js
+++ b/browser/devtools/framework/test/browser_toolbox_hosts_size.js
@@ -15,27 +15,28 @@ add_task(function*() {
   // to be clamped to fit into the browser window.
   Services.prefs.setIntPref("devtools.toolbox.footer.height", 10000);
   Services.prefs.setIntPref("devtools.toolbox.sidebar.width", 10000);
 
   let tab = yield addTab(URL);
   let nbox = gBrowser.getNotificationBox();
   let {clientHeight: nboxHeight, clientWidth: nboxWidth} = nbox;
   let toolbox = yield gDevTools.showToolbox(TargetFactory.forTab(tab));
+  let {MIN_PAGE_SIZE} = devtools.require("devtools/framework/toolbox-hosts");
 
   is (nbox.clientHeight, nboxHeight, "Opening the toolbox hasn't changed the height of the nbox");
   is (nbox.clientWidth, nboxWidth, "Opening the toolbox hasn't changed the width of the nbox");
 
   let iframe = document.getAnonymousElementByAttribute(nbox, "class", "devtools-toolbox-bottom-iframe");
-  is (iframe.clientHeight, nboxHeight - 25, "The iframe fits within the available space");
+  is (iframe.clientHeight, nboxHeight - MIN_PAGE_SIZE, "The iframe fits within the available space");
 
   yield toolbox.switchHost(devtools.Toolbox.HostType.SIDE);
   iframe = document.getAnonymousElementByAttribute(nbox, "class", "devtools-toolbox-side-iframe");
   iframe.style.minWidth = "1px"; // Disable the min width set in css
-  is (iframe.clientWidth, nboxWidth - 25, "The iframe fits within the available space");
+  is (iframe.clientWidth, nboxWidth - MIN_PAGE_SIZE, "The iframe fits within the available space");
 
   yield cleanup(toolbox);
 });
 
 add_task(function*() {
   // Set size prefs to something reasonable, so we can check to make sure
   // they are being set properly.
   Services.prefs.setIntPref("devtools.toolbox.footer.height", 100);

--- a/browser/devtools/framework/toolbox-hosts.js
+++ b/browser/devtools/framework/toolbox-hosts.js
@@ -9,17 +9,17 @@ const EventEmitter = require("devtools/t
 const {Promise: promise} = require("resource://gre/modules/Promise.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
 
 /* A host should always allow this much space for the page to be displayed.
  * There is also a min-height on the browser, but we still don't want to set
  * frame.height to be larger than that, since it can cause problems with
  * resizing the toolbox and panel layout. */
-const MIN_PAGE_SIZE = 25;
+const MIN_PAGE_SIZE = exports.MIN_PAGE_SIZE = 100;
 
 /**
  * A toolbox host represents an object that contains a toolbox (e.g. the
  * sidebar or a separate window). Any host object should implement the
  * following functions:
  *
  * create() - create the UI and emit a 'ready' event when the UI is ready to use
  * destroy() - destroy the host's UI

--- a/browser/devtools/performance/modules/global.js
+++ b/browser/devtools/performance/modules/global.js
@@ -1,19 +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/. */
 "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"
 ]);
@@ -83,317 +79,16 @@ const CATEGORY_MAPPINGS = {
   "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
- * - collapseFunc: A function determining how markers are collapsed together.
- *                 Invoked with 3 arguments: the current parent marker, the
- *                 current marker and a method for peeking i markers ahead. If
- *                 nothing is returned, the marker is added as a standalone entry
- *                 in the waterfall. Otherwise, an object needs to be returned
- *                 with the following properties:
- *                 - toParent: The parent marker name (needs to be an entry in
- *                             the `TIMELINE_BLUEPRINT` itself).
- *                 - withData: An object containing some properties to staple
- *                             on the parent marker.
- *                 - forceNew: True if a new parent marker needs to be created
- *                             even though there is one currently available
- *                             with the same name.
- *                 - forceEnd: True if the current parent marker is full after
- *                             this collapse operation and should be finalized.
- * - 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",
-    collapseFunc: collapseConsecutiveIdentical,
-    label: L10N.getStr("timeline.label.styles2"),
-    fields: getStylesFields,
-  },
-  "Reflow": {
-    group: 0,
-    colorName: "graphs-purple",
-    collapseFunc: collapseConsecutiveIdentical,
-    label: L10N.getStr("timeline.label.reflow2"),
-  },
-  "Paint": {
-    group: 0,
-    colorName: "graphs-green",
-    collapseFunc: collapseConsecutiveIdentical,
-    label: L10N.getStr("timeline.label.paint"),
-  },
-
-  /* Group 1 - JS */
-  "DOMEvent": {
-    group: 1,
-    colorName: "graphs-yellow",
-    collapseFunc: collapseDOMIntoDOMJS,
-    label: L10N.getStr("timeline.label.domevent"),
-    fields: getDOMEventFields,
-  },
-  "Javascript": {
-    group: 1,
-    colorName: "graphs-yellow",
-    collapseFunc: either(collapseJSIntoDOMJS, collapseConsecutiveIdentical),
-    label: getJSLabel,
-    fields: getJSFields,
-  },
-  "meta::DOMEvent+JS": {
-    colorName: "graphs-yellow",
-    label: getDOMJSLabel,
-    fields: getDOMEventFields,
-  },
-  "Parse HTML": {
-    group: 1,
-    colorName: "graphs-yellow",
-    collapseFunc: collapseConsecutiveIdentical,
-    label: L10N.getStr("timeline.label.parseHTML"),
-  },
-  "Parse XML": {
-    group: 1,
-    colorName: "graphs-yellow",
-    collapseFunc: collapseConsecutiveIdentical,
-    label: L10N.getStr("timeline.label.parseXML"),
-  },
-  "GarbageCollection": {
-    group: 1,
-    colorName: "graphs-red",
-    collapseFunc: collapseAdjacentGC,
-    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:"
-    }],
-  },
-};
-
-/**
- * Helper for creating a function that returns the first defined result from
- * a list of functions passed in as params, in order.
- * @param ...function fun
- * @return any
- */
-function either(...fun) {
-  return function() {
-    for (let f of fun) {
-      let result = f.apply(null, arguments);
-      if (result !== undefined) return result;
-    }
-  }
-}
-
-/**
- * A series of collapsers used by the blueprint. These functions are
- * consecutively invoked on a moving window of two markers.
- */
-
-function collapseConsecutiveIdentical(parent, curr, peek) {
-  // If there is a parent marker currently being filled and the current marker
-  // should go into the parent marker, make it so.
-  if (parent && parent.name == curr.name) {
-    return { toParent: parent.name };
-  }
-  // Otherwise if the current marker is the same type as the next marker type,
-  // create a new parent marker containing the current marker.
-  let next = peek(1);
-  if (next && curr.name == next.name) {
-    return { toParent: curr.name };
-  }
-}
-
-function collapseAdjacentGC(parent, curr, peek) {
-  let next = peek(1);
-  if (next && (next.start < curr.end || next.start - curr.end <= 10 /* ms */)) {
-    return collapseConsecutiveIdentical(parent, curr, peek);
-  }
-}
-
-function collapseDOMIntoDOMJS(parent, curr, peek) {
-  // If the next marker is a JavaScript marker, create a new meta parent marker
-  // containing the current marker.
-  let next = peek(1);
-  if (next && next.name == "Javascript") {
-    return {
-      forceNew: true,
-      toParent: "meta::DOMEvent+JS",
-      withData: {
-        type: curr.type,
-        eventPhase: curr.eventPhase
-      },
-    };
-  }
-}
-
-function collapseJSIntoDOMJS(parent, curr, peek) {
-  // If there is a parent marker currently being filled, and it's the one
-  // created from a `DOMEvent` via `collapseDOMIntoDOMJS`, then the current
-  // marker has to go into that one.
-  if (parent && parent.name == "meta::DOMEvent+JS") {
-    return {
-      forceEnd: true,
-      toParent: "meta::DOMEvent+JS",
-      withData: {
-        stack: curr.stack,
-        endStack: curr.endStack
-      },
-    };
-  }
-}
-
-/**
- * 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;
-}
-
-function getDOMJSLabel (marker={}) {
-  return `Event (${marker.type})`;
-}
-
-/**
- * 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).
  */
@@ -444,15 +139,14 @@ const CATEGORY_OTHER = CATEGORY_MASK('ot
 
 // 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;

--- a/browser/devtools/performance/modules/logic/marker-utils.js
+++ b/browser/devtools/performance/modules/logic/marker-utils.js
@@ -3,23 +3,30 @@
  * 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.
  */
 
+const { Ci } = require("chrome");
+
 loader.lazyRequireGetter(this, "L10N",
   "devtools/performance/global", true);
+loader.lazyRequireGetter(this, "PREFS",
+  "devtools/performance/global", true);
 loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
-  "devtools/performance/global", true);
+  "devtools/performance/markers", true);
 loader.lazyRequireGetter(this, "WebConsoleUtils",
   "devtools/toolkit/webconsole/utils");
 
+// String used to fill in platform data when it should be hidden.
+const GECKO_SYMBOL = "(Gecko)";
+
 /**
  * Returns the correct label to display for passed in marker, based
  * off of the blueprints.
  *
  * @param {ProfileTimelineMarker} marker
  * @return {string}
  */
 function getMarkerLabel (marker) {
@@ -265,12 +272,157 @@ const DOM = {
         frameIndex = frame.parent;
       }
     }
 
     return container;
   }
 };
 
+/**
+ * A series of collapsers used by the blueprint. These functions are
+ * invoked on a moving window of two markers.
+ */
+
+const CollapseFunctions = {
+  identical: function (parent, curr, peek) {
+    // If there is a parent marker currently being filled and the current marker
+    // should go into the parent marker, make it so.
+    if (parent && parent.name == curr.name) {
+      return { toParent: parent.name };
+    }
+    // Otherwise if the current marker is the same type as the next marker type,
+    // create a new parent marker containing the current marker.
+    let next = peek(1);
+    if (next && curr.name == next.name) {
+      return { toParent: curr.name };
+    }
+  },
+
+  adjacent: function (parent, curr, peek) {
+    let next = peek(1);
+    if (next && (next.start < curr.end || next.start - curr.end <= 10 /* ms */)) {
+      return CollapseFunctions.identical(parent, curr, peek);
+    }
+  },
+
+  DOMtoDOMJS: function (parent, curr, peek) {
+    // If the next marker is a JavaScript marker, create a new meta parent marker
+    // containing the current marker.
+    let next = peek(1);
+    if (next && next.name == "Javascript") {
+      return {
+        forceNew: true,
+        toParent: "meta::DOMEvent+JS",
+        withData: {
+          type: curr.type,
+          eventPhase: curr.eventPhase
+        },
+      };
+    }
+  },
+
+  JStoDOMJS: function (parent, curr, peek) {
+    // If there is a parent marker currently being filled, and it's the one
+    // created from a `DOMEvent` via `collapseDOMIntoDOMJS`, then the current
+    // marker has to go into that one.
+    if (parent && parent.name == "meta::DOMEvent+JS") {
+      return {
+        forceEnd: true,
+        toParent: "meta::DOMEvent+JS",
+        withData: {
+          stack: curr.stack,
+          endStack: curr.endStack
+        },
+      };
+    }
+  },
+};
+
+/**
+ * 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",
+};
+
+/**
+ * A series of formatters used by the blueprint.
+ */
+const Formatters = {
+  GCLabel: function (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;
+  },
+
+  JSLabel: function (marker={}) {
+    let generic = L10N.getStr("timeline.label.javascript2");
+    if ("causeName" in marker) {
+      return JS_MARKER_MAP[marker.causeName] || generic;
+    }
+    return generic;
+  },
+
+  DOMJSLabel: function (marker={}) {
+    return `Event (${marker.type})`;
+  },
+
+  /**
+   * 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.
+   */
+  JSFields: function (marker) {
+    if ("causeName" in marker && !JS_MARKER_MAP[marker.causeName]) {
+      return { Reason: PREFS["show-platform-data"] ? marker.causeName : GECKO_SYMBOL };
+    }
+  },
+
+  DOMEventFields: function (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;
+  },
+
+  StylesFields: function (marker) {
+    if ("restyleHint" in marker) {
+      return { "Restyle Hint": marker.restyleHint.replace(/eRestyle_/g, "") };
+    }
+  },
+};
+
 exports.getMarkerLabel = getMarkerLabel;
 exports.getMarkerClassName = getMarkerClassName;
 exports.getMarkerFields = getMarkerFields;
 exports.DOM = DOM;
+exports.CollapseFunctions = CollapseFunctions;
+exports.Formatters = Formatters;

--- a/browser/devtools/performance/modules/logic/recording-model.js
+++ b/browser/devtools/performance/modules/logic/recording-model.js
@@ -128,18 +128,21 @@ RecordingModel.prototype = {
     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;
+  _onStopRecording: Task.async(function *({ profilerEndTime, profile }) {
+    // Update the duration with the accurate profilerEndTime, so we don't have
+    // samples outside of the approximate duration set in `_onStoppingRecording`.
+    this._duration = profilerEndTime - this._profilerStartTime;
+    this._profile = 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);

--- a/browser/devtools/performance/modules/logic/waterfall-utils.js
+++ b/browser/devtools/performance/modules/logic/waterfall-utils.js
@@ -3,17 +3,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 /**
  * Utility functions for collapsing markers into a waterfall.
  */
 
 loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
-  "devtools/performance/global", true);
+  "devtools/performance/markers", true);
 
 /**
  * Collapses markers into a tree-like structure. Currently, this only goes
  * one level deep.
  * @param object markerNode
  * @param array markersList
  */
 function collapseMarkersIntoNode({ markerNode, markersList }) {

new file mode 100644
--- /dev/null
+++ b/browser/devtools/performance/modules/markers.js
@@ -0,0 +1,171 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { L10N } = require("devtools/performance/global");
+const { Formatters, CollapseFunctions } = require("devtools/performance/marker-utils");
+
+/**
+ * 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
+ * - collapseFunc: A function determining how markers are collapsed together.
+ *                 Invoked with 3 arguments: the current parent marker, the
+ *                 current marker and a method for peeking i markers ahead. If
+ *                 nothing is returned, the marker is added as a standalone entry
+ *                 in the waterfall. Otherwise, an object needs to be returned
+ *                 with the following properties:
+ *                 - toParent: The parent marker name (needs to be an entry in
+ *                             the `TIMELINE_BLUEPRINT` itself).
+ *                 - withData: An object containing some properties to staple
+ *                             on the parent marker.
+ *                 - forceNew: True if a new parent marker needs to be created
+ *                             even though there is one currently available
+ *                             with the same name.
+ *                 - forceEnd: True if the current parent marker is full after
+ *                             this collapse operation and should be finalized.
+ * - 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",
+    collapseFunc: CollapseFunctions.identical,
+    label: L10N.getStr("timeline.label.styles2"),
+    fields: Formatters.StylesFields,
+  },
+  "Reflow": {
+    group: 0,
+    colorName: "graphs-purple",
+    collapseFunc: CollapseFunctions.identical,
+    label: L10N.getStr("timeline.label.reflow2"),
+  },
+  "Paint": {
+    group: 0,
+    colorName: "graphs-green",
+    collapseFunc: CollapseFunctions.identical,
+    label: L10N.getStr("timeline.label.paint"),
+  },
+
+  /* Group 1 - JS */
+  "DOMEvent": {
+    group: 1,
+    colorName: "graphs-yellow",
+    collapseFunc: CollapseFunctions.DOMtoDOMJS,
+    label: L10N.getStr("timeline.label.domevent"),
+    fields: Formatters.DOMEventFields,
+  },
+  "Javascript": {
+    group: 1,
+    colorName: "graphs-yellow",
+    collapseFunc: either(CollapseFunctions.JStoDOMJS, CollapseFunctions.identical),
+    label: Formatters.JSLabel,
+    fields: Formatters.JSFields
+  },
+  "meta::DOMEvent+JS": {
+    colorName: "graphs-yellow",
+    label: Formatters.DOMJSLabel,
+    fields: Formatters.DOMJSFields,
+  },
+  "Parse HTML": {
+    group: 1,
+    colorName: "graphs-yellow",
+    collapseFunc: CollapseFunctions.identical,
+    label: L10N.getStr("timeline.label.parseHTML"),
+  },
+  "Parse XML": {
+    group: 1,
+    colorName: "graphs-yellow",
+    collapseFunc: CollapseFunctions.identical,
+    label: L10N.getStr("timeline.label.parseXML"),
+  },
+  "GarbageCollection": {
+    group: 1,
+    colorName: "graphs-red",
+    collapseFunc: CollapseFunctions.adjacent,
+    label: Formatters.GCLabel,
+    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:"
+    }],
+  },
+};
+
+/**
+ * Helper for creating a function that returns the first defined result from
+ * a list of functions passed in as params, in order.
+ * @param ...function fun
+ * @return any
+ */
+function either(...fun) {
+  return function() {
+    for (let f of fun) {
+      let result = f.apply(null, arguments);
+      if (result !== undefined) return result;
+    }
+  }
+}
+
+/**
+ * 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;
+}
+
+// Exported symbols.
+exports.TIMELINE_BLUEPRINT = TIMELINE_BLUEPRINT;

--- a/browser/devtools/performance/modules/widgets/marker-details.js
+++ b/browser/devtools/performance/modules/widgets/marker-details.js
@@ -9,17 +9,17 @@
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
 
 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);
+  "devtools/performance/markers", 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.

--- a/browser/devtools/performance/modules/widgets/marker-view.js
+++ b/browser/devtools/performance/modules/widgets/marker-view.js
@@ -6,17 +6,17 @@
 /**
  * This file contains the "marker" view, essentially a detailed list
  * of all the markers in the timeline data.
  */
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const { Heritage } = require("resource:///modules/devtools/ViewHelpers.jsm");
 const { AbstractTreeItem } = require("resource:///modules/devtools/AbstractTreeItem.jsm");
-const { TIMELINE_BLUEPRINT: ORIGINAL_BP } = require("devtools/performance/global");
+const { TIMELINE_BLUEPRINT: ORIGINAL_BP } = require("devtools/performance/markers");
 
 loader.lazyRequireGetter(this, "MarkerUtils",
   "devtools/performance/marker-utils");
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 
 const LEVEL_INDENT = 10; // px
 const ARROW_NODE_OFFSET = -15; // px

--- a/browser/devtools/performance/moz.build
+++ b/browser/devtools/performance/moz.build
@@ -11,18 +11,20 @@ EXTRA_JS_MODULES.devtools.performance +=
     '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/logic/waterfall-utils.js',
+    'modules/markers.js',
     'modules/widgets/graphs.js',
     'modules/widgets/marker-details.js',
     'modules/widgets/marker-view.js',
     'modules/widgets/markers-overview.js',
     'modules/widgets/tree-view.js',
     'modules/widgets/waterfall-ticks.js',
     'panel.js'
 ]
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

--- a/browser/devtools/performance/performance-controller.js
+++ b/browser/devtools/performance/performance-controller.js
@@ -13,17 +13,17 @@ loader.lazyRequireGetter(this, "EventEmi
 loader.lazyRequireGetter(this, "DevToolsUtils",
   "devtools/toolkit/DevToolsUtils");
 
 // Logic modules
 
 loader.lazyRequireGetter(this, "L10N",
   "devtools/performance/global", true);
 loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
-  "devtools/performance/global", true);
+  "devtools/performance/markers", true);
 loader.lazyRequireGetter(this, "RecordingUtils",
   "devtools/performance/recording-utils");
 loader.lazyRequireGetter(this, "RecordingModel",
   "devtools/performance/recording-model", true);
 loader.lazyRequireGetter(this, "GraphsController",
   "devtools/performance/graphs", true);
 loader.lazyRequireGetter(this, "WaterfallHeader",
   "devtools/performance/waterfall-ticks", true);

--- a/browser/devtools/performance/test/browser.ini
+++ b/browser/devtools/performance/test/browser.ini
@@ -118,35 +118,26 @@ skip-if = e10s # GC events seem unreliab
 [browser_perf-recording-selected-04.js]
 [browser_perf-theme-toggle-01.js]
 [browser_profiler_categories.js]
 [browser_profiler_content-check.js]
 [browser_profiler_tree-abstract-01.js]
 [browser_profiler_tree-abstract-02.js]
 [browser_profiler_tree-abstract-03.js]
 [browser_profiler_tree-abstract-04.js]
-[browser_profiler_tree-frame-node.js]
-[browser_profiler_tree-model-01.js]
-[browser_profiler_tree-model-02.js]
-[browser_profiler_tree-model-03.js]
-[browser_profiler_tree-model-04.js]
-[browser_profiler_tree-model-05.js]
-[browser_profiler_tree-model-06.js]
-[browser_profiler_tree-model-07.js]
 [browser_profiler_tree-view-01.js]
 [browser_profiler_tree-view-02.js]
 [browser_profiler_tree-view-03.js]
 [browser_profiler_tree-view-04.js]
 [browser_profiler_tree-view-05.js]
 [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_tree-view-10.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-rerender.js]
 [browser_timeline-waterfall-sidebar.js]
 skip-if = os == 'linux' # Bug 1161817
 [browser_waterfall-collapse.js]

--- a/browser/devtools/performance/test/browser_marker-utils.js
+++ b/browser/devtools/performance/test/browser_marker-utils.js
@@ -1,17 +1,17 @@
 /* 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 { TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/markers");
   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");

deleted file mode 100644
--- a/browser/devtools/performance/test/browser_profiler_tree-frame-node.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Verifies if FrameNodes retain and parse their data appropriately.
- */
-
-function test() {
-  let FrameUtils = devtools.require("devtools/performance/frame-utils");
-  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)",
-    line: 456,
-    isContent: FrameUtils.isContent({
-      location: "hello/<.world (http://foo/bar.js:123:987)"
-    })
-  }, false);
-
-  is(frame1.getInfo().nodeType, "Frame",
-    "The first frame node has the correct type.");
-  is(frame1.getInfo().functionName, "hello/<.world",
-    "The first frame node has the correct function name.");
-  is(frame1.getInfo().fileName, "bar.js",
-    "The first frame node has the correct file name.");
-  is(frame1.getInfo().hostName, "foo",
-    "The first frame node has the correct host name.");
-  is(frame1.getInfo().url, "http://foo/bar.js",
-    "The first frame node has the correct url.");
-  is(frame1.getInfo().line, 123,
-    "The first frame node has the correct line.");
-  is(frame1.getInfo().column, 987,
-    "The first frame node has the correct column.");
-  is(frame1.getInfo().categoryData.toSource(), "({})",
-    "The first frame node has the correct category data.");
-  is(frame1.getInfo().isContent, true,
-    "The first frame node has the correct content flag.");
-
-  let frame2 = new FrameNode("hello/<.world (http://foo/bar.js#baz:123:987)", {
-    location: "hello/<.world (http://foo/bar.js#baz:123:987)",
-    line: 456,
-    isContent: FrameUtils.isContent({
-      location: "hello/<.world (http://foo/bar.js#baz:123:987)"
-    })
-  }, false);
-
-  is(frame2.getInfo().nodeType, "Frame",
-    "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",
-    "The second frame node has the correct file name.");
-  is(frame2.getInfo().hostName, "foo",
-    "The second frame node has the correct host name.");
-  is(frame2.getInfo().url, "http://foo/bar.js#baz",
-    "The second frame node has the correct url.");
-  is(frame2.getInfo().line, 123,
-    "The second frame node has the correct line.");
-  is(frame2.getInfo().column, 987,
-    "The second frame node has the correct column.");
-  is(frame2.getInfo().categoryData.toSource(), "({})",
-    "The second frame node has the correct category data.");
-  is(frame2.getInfo().isContent, true,
-    "The second frame node has the correct content flag.");
-
-  let frame3 = new FrameNode("hello/<.world (http://foo/#bar:123:987)", {
-    location: "hello/<.world (http://foo/#bar:123:987)",
-    line: 456,
-    isContent: FrameUtils.isContent({
-      location: "hello/<.world (http://foo/#bar:123:987)"
-    })
-  }, false);
-
-  is(frame3.getInfo().nodeType, "Frame",
-    "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, "/",
-    "The third frame node has the correct file name.");
-  is(frame3.getInfo().hostName, "foo",
-    "The third frame node has the correct host name.");
-  is(frame3.getInfo().url, "http://foo/#bar",
-    "The third frame node has the correct url.");
-  is(frame3.getInfo().line, 123,
-    "The third frame node has the correct line.");
-  is(frame3.getInfo().column, 987,
-    "The third frame node has the correct column.");
-  is(frame3.getInfo().categoryData.toSource(), "({})",
-    "The third frame node has the correct category data.");
-  is(frame3.getInfo().isContent, true,
-    "The third frame node has the correct content flag.");
-
-  let frame4 = new FrameNode("hello/<.world (http://foo/:123:987)", {
-    location: "hello/<.world (http://foo/:123:987)",
-    line: 456,
-    isContent: FrameUtils.isContent({
-      location: "hello/<.world (http://foo/:123:987)"
-    })
-  }, false);
-
-  is(frame4.getInfo().nodeType, "Frame",
-    "The fourth frame node has the correct type.");
-  is(frame4.getInfo().functionName, "hello/<.world",
-    "The fourth frame node has the correct function name.");
-  is(frame4.getInfo().fileName, "/",
-    "The fourth frame node has the correct file name.");
-  is(frame4.getInfo().hostName, "foo",
-    "The fourth frame node has the correct host name.");
-  is(frame4.getInfo().url, "http://foo/",
-    "The fourth frame node has the correct url.");
-  is(frame4.getInfo().line, 123,
-    "The fourth frame node has the correct line.");
-  is(frame4.getInfo().column, 987,
-    "The fourth frame node has the correct column.");
-  is(frame4.getInfo().categoryData.toSource(), "({})",
-    "The fourth frame node has the correct category data.");
-  is(frame4.getInfo().isContent, true,
-    "The fourth frame node has the correct content flag.");
-
-  let frame5 = new FrameNode("hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)", {
-    location: "hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)",
-    line: 456,
-    isContent: FrameUtils.isContent({
-      location: "hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)"
-    })
-  }, false);
-
-  is(frame5.getInfo().nodeType, "Frame",
-    "The fifth frame node has the correct type.");
-  is(frame5.getInfo().functionName, "hello/<.world",
-    "The fifth frame node has the correct function name.");
-  is(frame5.getInfo().fileName, "baz.js",
-    "The fifth frame node has the correct file name.");
-  is(frame5.getInfo().hostName, "bar",
-    "The fifth frame node has the correct host name.");
-  is(frame5.getInfo().url, "http://bar/baz.js",
-    "The fifth frame node has the correct url.");
-  is(frame5.getInfo().line, 123,
-    "The fifth frame node has the correct line.");
-  is(frame5.getInfo().column, 987,
-    "The fifth frame node has the correct column.");
-  is(frame5.getInfo().categoryData.toSource(), "({})",
-    "The fifth frame node has the correct category data.");
-  is(frame5.getInfo().isContent, false,
-    "The fifth frame node has the correct content flag.");
-
-  let frame6 = new FrameNode("Foo::Bar::Baz", {
-    location: "Foo::Bar::Baz",
-    line: 456,
-    category: CATEGORY_OTHER,
-    isContent: FrameUtils.isContent({
-      location: "Foo::Bar::Baz",
-      category: CATEGORY_OTHER
-    })
-  }, false);
-
-  is(frame6.getInfo().nodeType, "Frame",
-    "The sixth frame node has the correct type.");
-  is(frame6.getInfo().functionName, "Foo::Bar::Baz",
-    "The sixth frame node has the correct function name.");
-  is(frame6.getInfo().fileName, null,
-    "The sixth frame node has the correct file name.");
-  is(frame6.getInfo().hostName, null,
-    "The sixth frame node has the correct host name.");
-  is(frame6.getInfo().url, null,
-    "The sixth frame node has the correct url.");
-  is(frame6.getInfo().line, 456,
-    "The sixth frame node has the correct line.");
-  is(frame6.getInfo().categoryData.abbrev, "other",
-    "The sixth frame node has the correct category data.");
-  is(frame6.getInfo().isContent, false,
-    "The sixth frame node has the correct content flag.");
-
-  let frame7 = new FrameNode("EnterJIT", {
-    location: "EnterJIT",
-    isContent: FrameUtils.isContent({
-      location: "EnterJIT"
-    })
-  }, false);
-
-  is(frame7.getInfo().nodeType, "Frame",
-    "The seventh frame node has the correct type.");
-  is(frame7.getInfo().functionName, "EnterJIT",
-    "The seventh frame node has the correct function name.");
-  is(frame7.getInfo().fileName, null,
-    "The seventh frame node has the correct file name.");
-  is(frame7.getInfo().hostName, null,
-    "The seventh frame node has the correct host name.");
-  is(frame7.getInfo().url, null,
-    "The seventh frame node has the correct url.");
-  is(frame7.getInfo().line, null,
-    "The seventh frame node has the correct line.");
-  is(frame7.getInfo().column, null,
-    "The seventh frame node has the correct column.");
-  is(frame7.getInfo().categoryData.abbrev, "js",
-    "The seventh frame node has the correct category data.");
-  is(frame7.getInfo().isContent, false,
-    "The seventh frame node has the correct content flag.");
-
-  let frame8 = new FrameNode("chrome://browser/content/content.js", {
-    location: "chrome://browser/content/content.js",
-    line: 456,
-    column: 123
-  }, false);
-
-  is(frame8.getInfo().hostName, null,
-    "The eighth frame node has the correct host name.");
-
-  let frame9 = new FrameNode("hello/<.world (resource://gre/foo.js:123:434)", {
-    location: "hello/<.world (resource://gre/foo.js:123:434)",
-    line: 456
-  }, false);
-
-  is(frame9.getInfo().hostName, null,
-    "The ninth frame node has the correct host name.");
-
-  let frame10 = new FrameNode("main (http://localhost:8888/file.js:123:987)", {
-    location: "main (http://localhost:8888/file.js:123:987)",
-    line: 123,
-    isContent: FrameUtils.isContent({
-      location: "main (http://localhost:8888/file.js:123:987)"
-    })
-  }, false);
-
-  is(frame10.getInfo().nodeType, "Frame",
-    "The tenth frame node has the correct type.");
-  is(frame10.getInfo().functionName, "main",
-    "The tenth frame node has the correct function name.");
-  is(frame10.getInfo().fileName, "file.js",
-    "The tenth frame node has the correct file name.");
-  is(frame10.getInfo().hostName, "localhost",
-    "The tenth frame node has the correct host name.");
-  is(frame10.getInfo().url, "http://localhost:8888/file.js",
-    "The tenth frame node has the correct url.");
-  is(frame10.getInfo().line, 123,
-    "The tenth frame node has the correct line.");
-  is(frame10.getInfo().column, 987,
-    "The tenth frame node has the correct column.");
-  is(frame10.getInfo().isContent, true,
-    "The tenth frame node has the correct content flag.");
-  is(frame10.getInfo().host, "localhost:8888",
-    "The tenth frame node has the correct host.");
-  is(frame10.getInfo().port, 8888,
-    "The tenth frame node has the correct port.");
-
-  finish();
-}

--- a/browser/devtools/performance/test/browser_timeline-blueprint.js
+++ b/browser/devtools/performance/test/browser_timeline-blueprint.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests if the timeline blueprint has a correct structure.
  */
 
 function* spawnTest() {
-  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/global");
+  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/markers");
 
   ok(TIMELINE_BLUEPRINT,
     "A timeline blueprint should be available.");
 
   ok(Object.keys(TIMELINE_BLUEPRINT).length,
     "The timeline blueprint has at least one entry.");
 
   for (let [key, value] of Iterator(TIMELINE_BLUEPRINT)) {

--- a/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
@@ -3,17 +3,18 @@
 
 /**
  * Tests if the sidebar is properly updated when a marker is selected.
  */
 
 function* spawnTest() {
   let { target, panel } = yield initPerformance(SIMPLE_URL);
   let { $, $$, EVENTS, PerformanceController, OverviewView, WaterfallView } = panel.panelWin;
-  let { L10N, TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/global");
+  let { L10N } = devtools.require("devtools/performance/global");
+  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/performance/markers");
   let { getMarkerLabel } = devtools.require("devtools/performance/marker-utils");
 
   // Hijack the markers massaging part of creating the waterfall view,
   // to prevent collapsing markers and allowing this test to verify
   // everything individually. A better solution would be to just expand
   // all markers first and then skip the meta nodes, but I'm lazy.
   WaterfallView._prepareWaterfallTree = markers => {
     return { submarkers: markers };

--- a/browser/devtools/performance/test/head.js
+++ b/browser/devtools/performance/test/head.js
@@ -533,32 +533,16 @@ function getInflatedStackLocations(threa
     stackIndex = stackEntry[STACK_PREFIX_SLOT];
   }
 
   // The profiler tree is inverted, so reverse the array.
   return locations.reverse();
 }
 
 /**
- * Get a path in a FrameNode call tree.
- */
-function getFrameNodePath(root, path) {
-  let calls = root.calls;
-  let node;
-  for (let key of path.split(" > ")) {
-    node = calls.find((node) => node.key == key);
-    if (!node) {
-      break;
-    }
-    calls = node.calls;
-  }
-  return node;
-}
-
-/**
  * Synthesize a profile for testing.
  */
 function synthesizeProfileForTest(samples) {
   const RecordingUtils = devtools.require("devtools/performance/recording-utils");
 
   samples.unshift({
     time: 0,
     frames: [

new file mode 100644
--- /dev/null
+++ b/browser/devtools/performance/test/unit/head.js
@@ -0,0 +1,42 @@
+/* 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 { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const RecordingUtils = devtools.require("devtools/performance/recording-utils");
+
+/**
+ * Get a path in a FrameNode call tree.
+ */
+function getFrameNodePath(root, path) {
+  let calls = root.calls;
+  let node;
+  for (let key of path.split(" > ")) {
+    node = calls.find((node) => node.key == key);
+    if (!node) {
+      break;
+    }
+    calls = node.calls;
+  }
+  return node;
+}
+
+/**
+ * Synthesize a profile for testing.
+ */
+function synthesizeProfileForTest(samples) {
+  samples.unshift({
+    time: 0,
+    frames: [
+      { location: "(root)" }
+    ]
+  });
+
+  let uniqueStacks = new RecordingUtils.UniqueStacks();
+  return RecordingUtils.deflateThread({
+    samples: samples,
+    markers: []
+  }, uniqueStacks);
+}

rename from browser/devtools/performance/test/browser_profiler-frame-utils-01.js
rename to browser/devtools/performance/test/unit/test_frame-utils-01.js
--- a/browser/devtools/performance/test/browser_profiler-frame-utils-01.js
+++ b/browser/devtools/performance/test/unit/test_frame-utils-01.js
@@ -30,17 +30,21 @@ const CHROME_LOCATIONS = [
   { location: "Startup::XRE_InitChildProcess", line: 456, column: 123 },
   { location: "chrome://browser/content/content.js", line: 456, column: 123 },
   "setTimeout_timer (resource://gre/foo.js:123:434)",
   "hello/<.world (jar:file://Users/mcurie/Dev/jetpacks.js)",
   "hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)",
   "EnterJIT",
 ].map(argify);
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function () {
   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.`);
   }
 
   for (let frame of CHROME_LOCATIONS) {
     ok(!isContent.apply(null, frameify(frame)), `${frame[0]} should not be considered a content frame.`);
@@ -61,38 +65,36 @@ function test() {
     ["hello/<.world", "file.js", "localhost", "http://localhost:8888/file.js", 100, null, "localhost:8888", 8888],
     ["hello/<.world", "/", "localhost", "http://localhost:8888/", 1, null, "localhost:8888", 8888],
     ["hello/<.world", "/", "localhost", "http://localhost:8888/", 100, 50, "localhost:8888", 8888],
   ];
 
   for (let i = 0; i < PARSED_CONTENT.length; i++) {
     let parsed = parseLocation.apply(null, CONTENT_LOCATIONS[i]);
     for (let j = 0; j < FIELDS.length; j++) {
-      is(parsed[FIELDS[j]], PARSED_CONTENT[i][j], `${CONTENT_LOCATIONS[i]} was parsed to correct ${FIELDS[j]}`);
+      equal(parsed[FIELDS[j]], PARSED_CONTENT[i][j], `${CONTENT_LOCATIONS[i]} was parsed to correct ${FIELDS[j]}`);
     }
   }
 
   const PARSED_CHROME = [
     ["Startup::XRE_InitChildProcess", null, null, null, 456, 123, null, null],
     ["chrome://browser/content/content.js", null, null, null, 456, 123, null, null],
     ["setTimeout_timer", "foo.js", null, "resource://gre/foo.js", 123, 434, null, null],
     ["hello/<.world (jar:file://Users/mcurie/Dev/jetpacks.js)", null, null, null, null, null, null, null],
     ["hello/<.world", "baz.js", "bar", "http://bar/baz.js", 123, 987, "bar", null],
     ["EnterJIT", null, null, null, null, null, null, null],
   ];
 
   for (let i = 0; i < PARSED_CHROME.length; i++) {
     let parsed = parseLocation.apply(null, CHROME_LOCATIONS[i]);
     for (let j = 0; j < FIELDS.length; j++) {
-      is(parsed[FIELDS[j]], PARSED_CHROME[i][j], `${CHROME_LOCATIONS[i]} was parsed to correct ${FIELDS[j]}`);
+      equal(parsed[FIELDS[j]], PARSED_CHROME[i][j], `${CHROME_LOCATIONS[i]} was parsed to correct ${FIELDS[j]}`);
     }
   }
-
-  finish();
-}
+});
 
 /**
  * Takes either a string or an object and turns it into an array that
  * parseLocation.apply expects.
  */
 function argify (val) {
   if (typeof val === "string") {
     return [val];

rename from browser/devtools/performance/test/browser_profiler_tree-model-01.js
rename to browser/devtools/performance/test/unit/test_tree-model-01.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-01.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-01.js
@@ -1,117 +1,119 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests if a call tree model can be correctly computed from a samples array.
  */
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   const { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array.
 
   let threadNode = new ThreadNode(gThread);
   let root = getFrameNodePath(threadNode, "(root)");
 
   // Test the root node.
 
-  is(threadNode.getInfo().nodeType, "Thread",
+  equal(threadNode.getInfo().nodeType, "Thread",
     "The correct node type was retrieved for the root node.");
 
-  is(root.duration, 20,
+  equal(root.duration, 20,
     "The correct duration was calculated for the root node.");
-  is(root.getInfo().functionName, "(root)",
+  equal(root.getInfo().functionName, "(root)",
     "The correct function name was retrieved for the root node.");
-  is(root.getInfo().categoryData.toSource(), "({})",
+  equal(root.getInfo().categoryData.toSource(), "({})",
     "The correct empty category data was retrieved for the root node.");
 
-  is(root.calls.length, 1,
+  equal(root.calls.length, 1,
     "The correct number of child calls were calculated for the root node.");
   ok(getFrameNodePath(root, "A"),
     "The root node's only child call is correct.");
 
   // Test all the descendant nodes.
 
-  is(getFrameNodePath(root, "A").calls.length, 2,
+  equal(getFrameNodePath(root, "A").calls.length, 2,
     "The correct number of child calls were calculated for the 'A' node.");
   ok(getFrameNodePath(root, "A > B"),
     "The 'A' node has a 'B' child call.");
   ok(getFrameNodePath(root, "A > E"),
     "The 'A' node has a 'E' child call.");
 
-  is(getFrameNodePath(root, "A > B").calls.length, 2,
+  equal(getFrameNodePath(root, "A > B").calls.length, 2,
     "The correct number of child calls were calculated for the 'A > B' node.");
   ok(getFrameNodePath(root, "A > B > C"),
     "The 'A > B' node has a 'C' child call.");
   ok(getFrameNodePath(root, "A > B > D"),
     "The 'A > B' node has a 'D' child call.");
 
-  is(getFrameNodePath(root, "A > E").calls.length, 1,
+  equal(getFrameNodePath(root, "A > E").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > E' node.");
   ok(getFrameNodePath(root, "A > E > F"),
     "The 'A > E' node has a 'F' child call.");
 
-  is(getFrameNodePath(root, "A > B > C").calls.length, 1,
+  equal(getFrameNodePath(root, "A > B > C").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > B > C' node.");
   ok(getFrameNodePath(root, "A > B > C > D"),
     "The 'A > B > C' node has a 'D' child call.");
 
-  is(getFrameNodePath(root, "A > B > C > D").calls.length, 1,
+  equal(getFrameNodePath(root, "A > B > C > D").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > B > C > D' node.");
   ok(getFrameNodePath(root, "A > B > C > D > E"),
     "The 'A > B > C > D' node has a 'E' child call.");
 
-  is(getFrameNodePath(root, "A > B > C > D > E").calls.length, 1,
+  equal(getFrameNodePath(root, "A > B > C > D > E").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > B > C > D > E' node.");
   ok(getFrameNodePath(root, "A > B > C > D > E > F"),
     "The 'A > B > C > D > E' node has a 'F' child call.");
 
-  is(getFrameNodePath(root, "A > B > C > D > E > F").calls.length, 1,
+  equal(getFrameNodePath(root, "A > B > C > D > E > F").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > B > C > D > E > F' node.");
   ok(getFrameNodePath(root, "A > B > C > D > E > F > G"),
     "The 'A > B > C > D > E > F' node has a 'G' child call.");
 
-  is(getFrameNodePath(root, "A > B > C > D > E > F > G").calls.length, 0,
+  equal(getFrameNodePath(root, "A > B > C > D > E > F > G").calls.length, 0,
     "The correct number of child calls were calculated for the 'A > B > C > D > E > F > G' node.");
-  is(getFrameNodePath(root, "A > B > D").calls.length, 0,
+  equal(getFrameNodePath(root, "A > B > D").calls.length, 0,
     "The correct number of child calls were calculated for the 'A > B > D' node.");
-  is(getFrameNodePath(root, "A > E > F").calls.length, 0,
+  equal(getFrameNodePath(root, "A > E > F").calls.length, 0,
     "The correct number of child calls were calculated for the 'A > E > F' node.");
 
   // Check the location, sample times, duration and samples of the root.
 
-  is(getFrameNodePath(root, "A").location, "A",
+  equal(getFrameNodePath(root, "A").location, "A",
     "The 'A' node has the correct location.");
-  is(getFrameNodePath(root, "A").duration, 20,
+  equal(getFrameNodePath(root, "A").duration, 20,
     "The 'A' node has the correct duration in milliseconds.");
-  is(getFrameNodePath(root, "A").samples, 4,
+  equal(getFrameNodePath(root, "A").samples, 4,
     "The 'A' node has the correct number of samples.");
 
   // ...and the rightmost leaf.
 
-  is(getFrameNodePath(root, "A > E > F").location, "F",
+  equal(getFrameNodePath(root, "A > E > F").location, "F",
     "The 'A > E > F' node has the correct location.");
-  is(getFrameNodePath(root, "A > E > F").duration, 7,
+  equal(getFrameNodePath(root, "A > E > F").duration, 7,
     "The 'A > E > F' node has the correct duration in milliseconds.");
-  is(getFrameNodePath(root, "A > E > F").samples, 1,
+  equal(getFrameNodePath(root, "A > E > F").samples, 1,
     "The 'A > E > F' node has the correct number of samples.");
 
   // ...and the leftmost leaf.
 
-  is(getFrameNodePath(root, "A > B > C > D > E > F > G").location, "G",
+  equal(getFrameNodePath(root, "A > B > C > D > E > F > G").location, "G",
     "The 'A > B > C > D > E > F > G' node has the correct location.");
-  is(getFrameNodePath(root, "A > B > C > D > E > F > G").duration, 2,
+  equal(getFrameNodePath(root, "A > B > C > D > E > F > G").duration, 2,
     "The 'A > B > C > D > E > F > G' node has the correct duration in milliseconds.");
-  is(getFrameNodePath(root, "A > B > C > D > E > F > G").samples, 1,
+  equal(getFrameNodePath(root, "A > B > C > D > E > F > G").samples, 1,
     "The 'A > B > C > D > E > F > G' node has the correct number of samples.");
-
-  finish();
-}
+});
 
 let gThread = synthesizeProfileForTest([{
   time: 5,
   frames: [
     { location: "(root)" },
     { location: "A" },
     { location: "B" },
     { location: "C" }

rename from browser/devtools/performance/test/browser_profiler_tree-model-02.js
rename to browser/devtools/performance/test/unit/test_tree-model-02.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-02.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-02.js
@@ -1,49 +1,51 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests if a call tree model ignores samples with no timing information.
  */
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array.
 
   let root = getFrameNodePath(new ThreadNode(gThread), "(root)");
 
   // Test the root node.
 
-  is(root.duration, 5,
+  equal(root.duration, 5,
     "The correct duration was calculated for the root node.");
 
-  is(root.calls.length, 1,
+  equal(root.calls.length, 1,
     "The correct number of child calls were calculated for the root node.");
   ok(getFrameNodePath(root, "A"),
     "The root node's only child call is correct.");
 
   // Test all the descendant nodes.
 
-  is(getFrameNodePath(root, "A").calls.length, 1,
+  equal(getFrameNodePath(root, "A").calls.length, 1,
     "The correct number of child calls were calculated for the 'A' node.");
   ok(getFrameNodePath(root, "A > B"),
     "The 'A' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "A > B").calls.length, 1,
+  equal(getFrameNodePath(root, "A > B").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > B' node.");
   ok(getFrameNodePath(root, "A > B > C"),
     "The 'A > B' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "A > B > C").calls.length, 0,
+  equal(getFrameNodePath(root, "A > B > C").calls.length, 0,
     "The correct number of child calls were calculated for the 'A > B > C' node.");
-
-  finish();
-}
+});
 
 let gThread = synthesizeProfileForTest([{
   time: 5,
   frames: [
     { location: "(root)" },
     { location: "A" },
     { location: "B" },
     { location: "C" }

rename from browser/devtools/performance/test/browser_profiler_tree-model-03.js
rename to browser/devtools/performance/test/unit/test_tree-model-03.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-03.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-03.js
@@ -1,64 +1,66 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests if a call tree model can be correctly computed from a samples array,
  * while at the same time filtering by duration.
  */
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array, filtering by time.
   //
   // Filtering from 5 to 18 includes the 2nd and 3rd samples. The 2nd sample
   // starts exactly on 5 and ends at 11. The 3rd sample starts at 11 and ends
   // exactly at 18.
   let startTime = 5;
   let endTime = 18;
   let root = getFrameNodePath(new ThreadNode(gThread, { startTime, endTime }), "(root)");
 
   // Test the root node.
 
-  is(root.duration, endTime - startTime,
+  equal(root.duration, endTime - startTime,
     "The correct duration was calculated for the root node.");
 
-  is(root.calls.length, 1,
+  equal(root.calls.length, 1,
     "The correct number of child calls were calculated for the root node.");
   ok(getFrameNodePath(root, "A"),
     "The root node's only child call is correct.");
 
   // Test all the descendant nodes.
 
-  is(getFrameNodePath(root, "A").calls.length, 2,
+  equal(getFrameNodePath(root, "A").calls.length, 2,
     "The correct number of child calls were calculated for the 'A' node.");
   ok(getFrameNodePath(root, "A > B"),
     "The 'A' node has a 'B' child call.");
   ok(getFrameNodePath(root, "A > E"),
     "The 'A' node has a 'E' child call.");
 
-  is(getFrameNodePath(root, "A > B").calls.length, 1,
+  equal(getFrameNodePath(root, "A > B").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > B' node.");
   ok(getFrameNodePath(root, "A > B > D"),
     "The 'A > B' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "A > E").calls.length, 1,
+  equal(getFrameNodePath(root, "A > E").calls.length, 1,
     "The correct number of child calls were calculated for the 'A > E' node.");
   ok(getFrameNodePath(root, "A > E > F"),
     "The 'A > E' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "A > B > D").calls.length, 0,
+  equal(getFrameNodePath(root, "A > B > D").calls.length, 0,
     "The correct number of child calls were calculated for the 'A > B > D' node.");
-  is(getFrameNodePath(root, "A > E > F").calls.length, 0,
+  equal(getFrameNodePath(root, "A > E > F").calls.length, 0,
     "The correct number of child calls were calculated for the 'A > E > F' node.");
-
-  finish();
-}
+});
 
 let gThread = synthesizeProfileForTest([{
   time: 5,
   frames: [
     { location: "(root)" },
     { location: "A" },
     { location: "B" },
     { location: "C" }

rename from browser/devtools/performance/test/browser_profiler_tree-model-04.js
rename to browser/devtools/performance/test/unit/test_tree-model-04.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-04.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-04.js
@@ -1,59 +1,61 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests if a call tree model can be correctly computed from a samples array,
  * while at the same time filtering by duration and content-only frames.
  */
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   // Create a root node from a given samples array, filtering by time.
 
   let startTime = 5;
   let endTime = 18;
   let root = getFrameNodePath(new ThreadNode(gThread, { startTime: startTime, endTime: endTime, contentOnly: true }), "(root)");
 
   // Test the root node.
 
-  is(root.duration, endTime - startTime,
+  equal(root.duration, endTime - startTime,
     "The correct duration was calculated for the root node.");
 
-  is(root.calls.length, 2,
+  equal(root.calls.length, 2,
     "The correct number of child calls were calculated for the root node.");
   ok(getFrameNodePath(root, "http://D"),
     "The root has a 'http://D' child call.");
   ok(getFrameNodePath(root, "http://A"),
     "The root has a 'http://A' child call.");
 
   // Test all the descendant nodes.
 
-  is(getFrameNodePath(root, "http://A").calls.length, 1,
+  equal(getFrameNodePath(root, "http://A").calls.length, 1,
     "The correct number of child calls were calculated for the 'http://A' node.");
   ok(getFrameNodePath(root, "http://A > https://E"),
     "The 'http://A' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "http://A > https://E").calls.length, 1,
+  equal(getFrameNodePath(root, "http://A > https://E").calls.length, 1,
     "The correct number of child calls were calculated for the 'http://A > http://E' node.");
   ok(getFrameNodePath(root, "http://A > https://E > file://F"),
     "The 'http://A > https://E' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "http://A > https://E > file://F").calls.length, 1,
+  equal(getFrameNodePath(root, "http://A > https://E > file://F").calls.length, 1,
     "The correct number of child calls were calculated for the 'http://A > https://E >> file://F' node.");
   ok(getFrameNodePath(root, "http://A > https://E > file://F > app://H"),
     "The 'http://A > https://E >> file://F' node's only child call is correct.");
 
-  is(getFrameNodePath(root, "http://D").calls.length, 0,
+  equal(getFrameNodePath(root, "http://D").calls.length, 0,
     "The correct number of child calls were calculated for the 'http://D' node.");
-
-  finish();
-}
+});
 
 let gThread = synthesizeProfileForTest([{
   time: 5,
   frames: [
     { location: "(root)" },
     { location: "http://A" },
     { location: "http://B" },
     { location: "http://C" }

rename from browser/devtools/performance/test/browser_profiler_tree-model-05.js
rename to browser/devtools/performance/test/unit/test_tree-model-05.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-05.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-05.js
@@ -37,43 +37,45 @@ let gThread = synthesizeProfileForTest([
   frames: [
     { location: "(root)" },
     { location: "A" },
     { location: "B" },
     { location: "F" }
   ]
 }]);
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   let root = new ThreadNode(gThread, { invertTree: true });
 
-  is(root.calls.length, 2,
+  equal(root.calls.length, 2,
      "Should get the 2 youngest frames, not the 1 oldest frame");
 
   let C = getFrameNodePath(root, "C");
   ok(C, "Should have C as a child of the root.");
 
-  is(C.calls.length, 3,
+  equal(C.calls.length, 3,
      "Should have 3 frames that called C.");
   ok(getFrameNodePath(C, "B"), "B called C.");
   ok(getFrameNodePath(C, "D"), "D called C.");
   ok(getFrameNodePath(C, "E"), "E called C.");
 
-  is(getFrameNodePath(C, "B").calls.length, 1);
+  equal(getFrameNodePath(C, "B").calls.length, 1);
   ok(getFrameNodePath(C, "B > A"), "A called B called C");
-  is(getFrameNodePath(C, "D").calls.length, 1);
+  equal(getFrameNodePath(C, "D").calls.length, 1);
   ok(getFrameNodePath(C, "D > A"), "A called D called C");
-  is(getFrameNodePath(C, "E").calls.length, 1);
+  equal(getFrameNodePath(C, "E").calls.length, 1);
   ok(getFrameNodePath(C, "E > A"), "A called E called C");
 
   let F = getFrameNodePath(root, "F");
   ok(F, "Should have F as a child of the root.");
 
-  is(F.calls.length, 1);
+  equal(F.calls.length, 1);
   ok(getFrameNodePath(F, "B"), "B called F");
 
-  is(getFrameNodePath(F, "B").calls.length, 1);
+  equal(getFrameNodePath(F, "B").calls.length, 1);
   ok(getFrameNodePath(F, "B > A"), "A called B called F");
-
-  finish();
-}
+});

rename from browser/devtools/performance/test/browser_profiler_tree-model-06.js
rename to browser/devtools/performance/test/unit/test_tree-model-06.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-06.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-06.js
@@ -1,18 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that when constructing FrameNodes, if optimization data is available,
  * the FrameNodes have the correct optimization data after iterating over samples.
  */
 
-const RecordingUtils = devtools.require("devtools/performance/recording-utils");
-
 let gUniqueStacks = new RecordingUtils.UniqueStacks();
 
 function uniqStr(s) {
   return gUniqueStacks.getOrAddStringIndex(s);
 }
 
 let time = 1;
 
@@ -149,33 +147,35 @@ gThread.frameTable.data.forEach((frame) 
     break;
   case "E_O3":
     frame[LOCATION_SLOT] = uniqStr("E");
     frame[OPTIMIZATIONS_SLOT] = gRawSite3;
     break;
   }
 });
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   let { ThreadNode } = devtools.require("devtools/performance/tree-model");
 
   let root = new ThreadNode(gThread);
 
   let A = getFrameNodePath(root, "(root) > A");
 
   let opts = A.getOptimizations();
   let sites = opts.optimizationSites;
-  is(sites.length, 2, "Frame A has two optimization sites.");
-  is(sites[0].samples, 2, "first opt site has 2 samples.");
-  is(sites[1].samples, 1, "second opt site has 1 sample.");
+  equal(sites.length, 2, "Frame A has two optimization sites.");
+  equal(sites[0].samples, 2, "first opt site has 2 samples.");
+  equal(sites[1].samples, 1, "second opt site has 1 sample.");
 
   let E = getFrameNodePath(A, "E");
   opts = E.getOptimizations();
   sites = opts.optimizationSites;
-  is(sites.length, 1, "Frame E has one optimization site.");
-  is(sites[0].samples, 1, "first opt site has 1 samples.");
+  equal(sites.length, 1, "Frame E has one optimization site.");
+  equal(sites[0].samples, 1, "first opt site has 1 samples.");
 
   let D = getFrameNodePath(A, "D");
   ok(!D.getOptimizations(),
     "frames that do not have any opts data do not have JITOptimizations instances.");
-
-  finish();
-}
+});

rename from browser/devtools/performance/test/browser_profiler_tree-model-07.js
rename to browser/devtools/performance/test/unit/test_tree-model-07.js
--- a/browser/devtools/performance/test/browser_profiler_tree-model-07.js
+++ b/browser/devtools/performance/test/unit/test_tree-model-07.js
@@ -2,17 +2,21 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that when displaying only content nodes, platform nodes are generalized.
  */
 
 let { CATEGORY_MASK } = devtools.require("devtools/performance/global");
 
-function test() {
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
   let { ThreadNode } = devtools.require("devtools/performance/tree-model");
   let url = (n) => `http://content/${n}`;
 
   // Create a root node from a given samples array.
 
   let root = getFrameNodePath(new ThreadNode(gThread, { contentOnly: true }), "(root)");
 
   /*
@@ -26,34 +30,32 @@ function test() {
    *       - D
    *     - E
    *       - F
    *         - (JS)
    */
 
   // Test the root node.
 
-  is(root.calls.length, 2, "root has 2 children");
+  equal(root.calls.length, 2, "root has 2 children");
   ok(getFrameNodePath(root, url("A")), "root has content child");
   ok(getFrameNodePath(root, "64"), "root has platform generalized child");
-  is(getFrameNodePath(root, "64").calls.length, 0, "platform generalized child is a leaf.");
+  equal(getFrameNodePath(root, "64").calls.length, 0, "platform generalized child is a leaf.");
 
   ok(getFrameNodePath(root, `${url("A")} > 128`), "A has platform generalized child of another type");
-  is(getFrameNodePath(root, `${url("A")} > 128`).calls.length, 0, "second generalized type is a leaf.");
+  equal(getFrameNodePath(root, `${url("A")} > 128`).calls.length, 0, "second generalized type is a leaf.");
 
   ok(getFrameNodePath(root, `${url("A")} > ${url("E")} > ${url("F")} > 64`),
      "a second leaf of the first generalized type exists deep in the tree.");
   ok(getFrameNodePath(root, `${url("A")} > 128`), "A has platform generalized child of another type");
 
-  is(getFrameNodePath(root, "64").category,
+  equal(getFrameNodePath(root, "64").category,
      getFrameNodePath(root, `${url("A")} > ${url("E")} > ${url("F")} > 64`).category,
      "generalized frames of same type are duplicated in top-down view");
-
-  finish();
-}
+});
 
 let gThread = synthesizeProfileForTest([{
   time: 5,
   frames: [
     { location: "(root)" },
     { location: "http://content/A" },
     { location: "http://content/B" },
     { location: "http://content/C" }

new file mode 100644
--- /dev/null
+++ b/browser/devtools/performance/test/unit/test_tree-model-08.js
@@ -0,0 +1,250 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Verifies if FrameNodes retain and parse their data appropriately.
+ */
+
+function run_test() {
+  run_next_test();
+}
+
+add_task(function test() {
+  let FrameUtils = devtools.require("devtools/performance/frame-utils");
+  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)",
+    line: 456,
+    isContent: FrameUtils.isContent({
+      location: "hello/<.world (http://foo/bar.js:123:987)"
+    })
+  }, false);
+
+  equal(frame1.getInfo().nodeType, "Frame",
+    "The first frame node has the correct type.");
+  equal(frame1.getInfo().functionName, "hello/<.world",
+    "The first frame node has the correct function name.");
+  equal(frame1.getInfo().fileName, "bar.js",
+    "The first frame node has the correct file name.");
+  equal(frame1.getInfo().hostName, "foo",
+    "The first frame node has the correct host name.");
+  equal(frame1.getInfo().url, "http://foo/bar.js",
+    "The first frame node has the correct url.");
+  equal(frame1.getInfo().line, 123,
+    "The first frame node has the correct line.");
+  equal(frame1.getInfo().column, 987,
+    "The first frame node has the correct column.");
+  equal(frame1.getInfo().categoryData.toSource(), "({})",
+    "The first frame node has the correct category data.");
+  equal(frame1.getInfo().isContent, true,
+    "The first frame node has the correct content flag.");
+
+  let frame2 = new FrameNode("hello/<.world (http://foo/bar.js#baz:123:987)", {
+    location: "hello/<.world (http://foo/bar.js#baz:123:987)",
+    line: 456,
+    isContent: FrameUtils.isContent({
+      location: "hello/<.world (http://foo/bar.js#baz:123:987)"
+    })
+  }, false);
+
+  equal(frame2.getInfo().nodeType, "Frame",
+    "The second frame node has the correct type.");
+  equal(frame2.getInfo().functionName, "hello/<.world",
+    "The second frame node has the correct function name.");
+  equal(frame2.getInfo().fileName, "bar.js",
+    "The second frame node has the correct file name.");
+  equal(frame2.getInfo().hostName, "foo",
+    "The second frame node has the correct host name.");
+  equal(frame2.getInfo().url, "http://foo/bar.js#baz",
+    "The second frame node has the correct url.");
+  equal(frame2.getInfo().line, 123,
+    "The second frame node has the correct line.");
+  equal(frame2.getInfo().column, 987,
+    "The second frame node has the correct column.");
+  equal(frame2.getInfo().categoryData.toSource(), "({})",
+    "The second frame node has the correct category data.");
+  equal(frame2.getInfo().isContent, true,
+    "The second frame node has the correct content flag.");
+
+  let frame3 = new FrameNode("hello/<.world (http://foo/#bar:123:987)", {
+    location: "hello/<.world (http://foo/#bar:123:987)",
+    line: 456,
+    isContent: FrameUtils.isContent({
+      location: "hello/<.world (http://foo/#bar:123:987)"
+    })
+  }, false);
+
+  equal(frame3.getInfo().nodeType, "Frame",
+    "The third frame node has the correct type.");
+  equal(frame3.getInfo().functionName, "hello/<.world",
+    "The third frame node has the correct function name.");
+  equal(frame3.getInfo().fileName, "/",
+    "The third frame node has the correct file name.");
+  equal(frame3.getInfo().hostName, "foo",
+    "The third frame node has the correct host name.");
+  equal(frame3.getInfo().url, "http://foo/#bar",
+    "The third frame node has the correct url.");
+  equal(frame3.getInfo().line, 123,
+    "The third frame node has the correct line.");
+  equal(frame3.getInfo().column, 987,
+    "The third frame node has the correct column.");
+  equal(frame3.getInfo().categoryData.toSource(), "({})",
+    "The third frame node has the correct category data.");
+  equal(frame3.getInfo().isContent, true,
+    "The third frame node has the correct content flag.");
+
+  let frame4 = new FrameNode("hello/<.world (http://foo/:123:987)", {
+    location: "hello/<.world (http://foo/:123:987)",
+    line: 456,
+    isContent: FrameUtils.isContent({
+      location: "hello/<.world (http://foo/:123:987)"
+    })
+  }, false);
+
+  equal(frame4.getInfo().nodeType, "Frame",
+    "The fourth frame node has the correct type.");
+  equal(frame4.getInfo().functionName, "hello/<.world",
+    "The fourth frame node has the correct function name.");
+  equal(frame4.getInfo().fileName, "/",
+    "The fourth frame node has the correct file name.");
+  equal(frame4.getInfo().hostName, "foo",
+    "The fourth frame node has the correct host name.");
+  equal(frame4.getInfo().url, "http://foo/",
+    "The fourth frame node has the correct url.");
+  equal(frame4.getInfo().line, 123,
+    "The fourth frame node has the correct line.");
+  equal(frame4.getInfo().column, 987,
+    "The fourth frame node has the correct column.");
+  equal(frame4.getInfo().categoryData.toSource(), "({})",
+    "The fourth frame node has the correct category data.");
+  equal(frame4.getInfo().isContent, true,
+    "The fourth frame node has the correct content flag.");
+
+  let frame5 = new FrameNode("hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)", {
+    location: "hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)",
+    line: 456,
+    isContent: FrameUtils.isContent({
+      location: "hello/<.world (resource://foo.js -> http://bar/baz.js:123:987)"
+    })
+  }, false);
+
+  equal(frame5.getInfo().nodeType, "Frame",
+    "The fifth frame node has the correct type.");
+  equal(frame5.getInfo().functionName, "hello/<.world",
+    "The fifth frame node has the correct function name.");
+  equal(frame5.getInfo().fileName, "baz.js",
+    "The fifth frame node has the correct file name.");
+  equal(frame5.getInfo().hostName, "bar",
+    "The fifth frame node has the correct host name.");
+  equal(frame5.getInfo().url, "http://bar/baz.js",
+    "The fifth frame node has the correct url.");
+  equal(frame5.getInfo().line, 123,
+    "The fifth frame node has the correct line.");
+  equal(frame5.getInfo().column, 987,
+    "The fifth frame node has the correct column.");
+  equal(frame5.getInfo().categoryData.toSource(), "({})",
+    "The fifth frame node has the correct category data.");
+  equal(frame5.getInfo().isContent, false,
+    "The fifth frame node has the correct content flag.");
+
+  let frame6 = new FrameNode("Foo::Bar::Baz", {
+    location: "Foo::Bar::Baz",
+    line: 456,
+    category: CATEGORY_OTHER,
+    isContent: FrameUtils.isContent({
+      location: "Foo::Bar::Baz",
+      category: CATEGORY_OTHER
+    })
+  }, false);
+
+  equal(frame6.getInfo().nodeType, "Frame",
+    "The sixth frame node has the correct type.");
+  equal(frame6.getInfo().functionName, "Foo::Bar::Baz",
+    "The sixth frame node has the correct function name.");
+  equal(frame6.getInfo().fileName, null,
+    "The sixth frame node has the correct file name.");
+  equal(frame6.getInfo().hostName, null,
+    "The sixth frame node has the correct host name.");
+  equal(frame6.getInfo().url, null,
+    "The sixth frame node has the correct url.");
+  equal(frame6.getInfo().line, 456,
+    "The sixth frame node has the correct line.");
+  equal(frame6.getInfo().categoryData.abbrev, "other",
+    "The sixth frame node has the correct category data.");
+  equal(frame6.getInfo().isContent, false,
+    "The sixth frame node has the correct content flag.");
+
+  let frame7 = new FrameNode("EnterJIT", {
+    location: "EnterJIT",
+    isContent: FrameUtils.isContent({
+      location: "EnterJIT"
+    })
+  }, false);
+
+  equal(frame7.getInfo().nodeType, "Frame",
+    "The seventh frame node has the correct type.");
+  equal(frame7.getInfo().functionName, "EnterJIT",
+    "The seventh frame node has the correct function name.");
+  equal(frame7.getInfo().fileName, null,
+    "The seventh frame node has the correct file name.");
+  equal(frame7.getInfo().hostName, null,
+    "The seventh frame node has the correct host name.");
+  equal(frame7.getInfo().url, null,
+    "The seventh frame node has the correct url.");
+  equal(frame7.getInfo().line, null,
+    "The seventh frame node has the correct line.");
+  equal(frame7.getInfo().column, null,
+    "The seventh frame node has the correct column.");
+  equal(frame7.getInfo().categoryData.abbrev, "js",
+    "The seventh frame node has the correct category data.");
+  equal(frame7.getInfo().isContent, false,
+    "The seventh frame node has the correct content flag.");
+
+  let frame8 = new FrameNode("chrome://browser/content/content.js", {
+    location: "chrome://browser/content/content.js",
+    line: 456,
+    column: 123
+  }, false);
+
+  equal(frame8.getInfo().hostName, null,
+    "The eighth frame node has the correct host name.");
+
+  let frame9 = new FrameNode("hello/<.world (resource://gre/foo.js:123:434)", {
+    location: "hello/<.world (resource://gre/foo.js:123:434)",
+    line: 456
+  }, false);
+
+  equal(frame9.getInfo().hostName, null,
+    "The ninth frame node has the correct host name.");
+
+  let frame10 = new FrameNode("main (http://localhost:8888/file.js:123:987)", {
+    location: "main (http://localhost:8888/file.js:123:987)",
+    line: 123,
+    isContent: FrameUtils.isContent({
+      location: "main (http://localhost:8888/file.js:123:987)"
+    })
+  }, false);
+
+  equal(frame10.getInfo().nodeType, "Frame",
+    "The tenth frame node has the correct type.");
+  equal(frame10.getInfo().functionName, "main",
+    "The tenth frame node has the correct function name.");
+  equal(frame10.getInfo().fileName, "file.js",
+    "The tenth frame node has the correct file name.");
+  equal(frame10.getInfo().hostName, "localhost",
+    "The tenth frame node has the correct host name.");
+  equal(frame10.getInfo().url, "http://localhost:8888/file.js",
+    "The tenth frame node has the correct url.");
+  equal(frame10.getInfo().line, 123,
+    "The tenth frame node has the correct line.");
+  equal(frame10.getInfo().column, 987,
+    "The tenth frame node has the correct column.");
+  equal(frame10.getInfo().isContent, true,
+    "The tenth frame node has the correct content flag.");
+  equal(frame10.getInfo().host, "localhost:8888",
+    "The tenth frame node has the correct host.");
+  equal(frame10.getInfo().port, 8888,
+    "The tenth frame node has the correct port.");
+});

new file mode 100644
--- /dev/null
+++ b/browser/devtools/performance/test/unit/xpcshell.ini
@@ -0,0 +1,16 @@
+[DEFAULT]
+tags = devtools
+head = head.js
+tail =
+firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
+
+[test_frame-utils-01.js]
+[test_tree-model-01.js]
+[test_tree-model-02.js]
+[test_tree-model-03.js]
+[test_tree-model-04.js]
+[test_tree-model-05.js]
+[test_tree-model-06.js]
+[test_tree-model-07.js]
+[test_tree-model-08.js]

--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -32,16 +32,17 @@ SEARCH_PATHS = [
     'python/blessings',
     'python/compare-locales',
     'python/configobj',
     'python/jsmin',
     'python/psutil',
     'python/which',
     'python/pystache',
     'python/pyyaml/lib',
+    'python/requests',
     'build',
     'build/pymake',
     'config',
     'dom/bindings',
     'dom/bindings/parser',
     'layout/tools/reftest',
     'other-licenses/ply',
     'xpcom/idl-parser',

--- a/build/mobile/sutagent/android/fencp/FileCursor.java
+++ b/build/mobile/sutagent/android/fencp/FileCursor.java
@@ -60,17 +60,16 @@ public class FileCursor extends Abstract
                 if (lLength != 0) {
                     nCount = (int) (lFileSize / BUFSIZE);
                     if ((lFileSize % BUFSIZE) > 0)
                         nCount++;
                 } else {
                     nCount = 1;
                 }
 
-                mRowIdColumnIndex = 0;
             }
         }
     }
 
     public String getColumnName (int columnIndex) {
         return theColumns[columnIndex];
     }
 

--- a/build/mobile/sutagent/android/ffxcp/FileCursor.java
+++ b/build/mobile/sutagent/android/ffxcp/FileCursor.java
@@ -61,17 +61,16 @@ public class FileCursor extends Abstract
                 if (lLength != 0) {
                     nCount = (int) (lFileSize / BUFSIZE);
                     if ((lFileSize % BUFSIZE) > 0)
                         nCount++;
                 } else {
                     nCount = 1;
                 }
 
-                mRowIdColumnIndex = 0;
             }
         }
     }
 
     public String getColumnName (int columnIndex) {
         return theColumns[columnIndex];
     }
 

--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -2223,17 +2223,17 @@ DOMGCSliceCallback(JSRuntime *aRt, JS::G
     }
 
     case JS::GC_CYCLE_END: {
       PRTime delta = GetCollectionTimeDelta();
 
       if (sPostGCEventsToConsole) {
         NS_NAMED_LITERAL_STRING(kFmt, "GC(T+%.1f) ");
         nsString prefix, gcstats;
-        gcstats.Adopt(aDesc.formatMessage(aRt));
+        gcstats.Adopt(aDesc.formatSummaryMessage(aRt));
         prefix.Adopt(nsTextFormatter::smprintf(kFmt.get(),
                                              double(delta) / PR_USEC_PER_SEC));
         nsString msg = prefix + gcstats;
         nsCOMPtr<nsIConsoleService> cs = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
         if (cs) {
           cs->LogStringMessage(msg.get());
         }
       }
@@ -2299,16 +2299,25 @@ DOMGCSliceCallback(JSRuntime *aRt, JS::G
                                                  NS_INTERSLICE_GC_DELAY,
                                                  nsITimer::TYPE_ONE_SHOT);
       }
 
       if (ShouldTriggerCC(nsCycleCollector_suspectedCount())) {
         nsCycleCollector_dispatchDeferredDeletion();
       }
 
+      if (sPostGCEventsToConsole) {
+        nsString gcstats;
+        gcstats.Adopt(aDesc.formatSliceMessage(aRt));
+        nsCOMPtr<nsIConsoleService> cs = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
+        if (cs) {
+          cs->LogStringMessage(gcstats.get());
+        }
+      }
+
       break;
 
     default:
       MOZ_CRASH("Unexpected GCProgress value");
   }
 
   if (sPrevGCSliceCallback) {
     (*sPrevGCSliceCallback)(aRt, aProgress, aDesc);

--- a/dom/base/nsXMLHttpRequest.cpp
+++ b/dom/base/nsXMLHttpRequest.cpp
@@ -5,16 +5,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsXMLHttpRequest.h"
 
 #ifndef XP_WIN
 #include <unistd.h>
 #endif
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/CheckedInt.h"
 #include "mozilla/dom/BlobSet.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/XMLHttpRequestUploadBinding.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/MemoryReporting.h"
 #include "nsIDOMDocument.h"
@@ -3988,36 +3989,40 @@ ArrayBufferBuilder::setCapacity(uint32_t
 }
 
 bool
 ArrayBufferBuilder::append(const uint8_t *aNewData, uint32_t aDataLen,
                            uint32_t aMaxGrowth)
 {
   MOZ_ASSERT(!mMapPtr);
 
+  CheckedUint32 neededCapacity = mLength;
+  neededCapacity += aDataLen;
+  if (!neededCapacity.isValid()) {
+    return false;
+  }
   if (mLength + aDataLen > mCapacity) {
-    uint32_t newcap;
+    CheckedUint32 newcap = mCapacity;
     // Double while under aMaxGrowth or if not specified.
     if (!aMaxGrowth || mCapacity < aMaxGrowth) {
-      newcap = mCapacity * 2;
+      newcap *= 2;
     } else {
-      newcap = mCapacity + aMaxGrowth;
+      newcap += aMaxGrowth;
+    }
+
+    if (!newcap.isValid()) {
+      return false;
     }
 
     // But make sure there's always enough to satisfy our request.
-    if (newcap < mLength + aDataLen) {
-      newcap = mLength + aDataLen;
+    if (newcap.value() < neededCapacity.value()) {
+      newcap = neededCapacity;
     }
 
-    // Did we overflow?
-    if (newcap < mCapacity) {
-      return false;
-    }
-
-    if (!setCapacity(newcap)) {
+    if (!setCapacity(newcap.value())) {
       return false;
     }
   }
 
   // Assert that the region isn't overlapping so we can memcpy.
   MOZ_ASSERT(!areOverlappingRegions(aNewData, aDataLen, mDataPtr + mLength,
                                     aDataLen));
 

--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -3449,27 +3449,31 @@ struct MOZ_STACK_CLASS CanvasBidiProcess
         }
 
         if (!glyphs[i].GetGlyphCount()) {
           continue;
         }
 
         const gfxTextRun::DetailedGlyph *d = mTextRun->GetDetailedGlyphs(i);
 
-        if (glyphs[i].IsMissing() && d->mAdvance > 0) {
-          newGlyph.mIndex = 0;
-          if (rtl) {
-            inlinePos = baselineOriginInline - advanceSum -
-              d->mAdvance * devUnitsPerAppUnit;
-          } else {
-            inlinePos = baselineOriginInline + advanceSum;
+        if (glyphs[i].IsMissing()) {
+          if (d->mAdvance > 0) {
+            // Perhaps we should render a hexbox here, but for now
+            // we just draw the font's .notdef glyph. (See bug 808288.)
+            newGlyph.mIndex = 0;
+            if (rtl) {
+              inlinePos = baselineOriginInline - advanceSum -
+                d->mAdvance * devUnitsPerAppUnit;
+            } else {
+              inlinePos = baselineOriginInline + advanceSum;
+            }
+            blockPos = baselineOriginBlock;
+            advanceSum += d->mAdvance * devUnitsPerAppUnit;
+            glyphBuf.push_back(newGlyph);
           }
-          blockPos = baselineOriginBlock;
-          advanceSum += d->mAdvance * devUnitsPerAppUnit;
-          glyphBuf.push_back(newGlyph);
           continue;
         }
 
         for (uint32_t c = 0; c < glyphs[i].GetGlyphCount(); c++, d++) {
           newGlyph.mIndex = d->mGlyphID;
           if (rtl) {
             inlinePos = baselineOriginInline - advanceSum -
               d->mAdvance * devUnitsPerAppUnit;

--- a/dom/smil/nsSMILAnimationFunction.cpp
+++ b/dom/smil/nsSMILAnimationFunction.cpp
@@ -1,16 +1,18 @@
 /* -*- 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 "nsSMILAnimationFunction.h"
+
 #include "mozilla/dom/SVGAnimationElement.h"
-#include "nsSMILAnimationFunction.h"
+#include "mozilla/Move.h"
 #include "nsISMILAttr.h"
 #include "nsSMILParserUtils.h"
 #include "nsSMILNullType.h"
 #include "nsSMILTimedElement.h"
 #include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
@@ -262,19 +264,17 @@ nsSMILAnimationFunction::ComposeResult(c
       return;
 
     if (NS_FAILED(AccumulateResult(values, result)))
       return;
   }
 
   // If additive animation isn't required or isn't supported, set the value.
   if (!isAdditive || NS_FAILED(aResult.SandwichAdd(result))) {
-    aResult.Swap(result);
-    // Note: The old value of aResult is now in |result|, and it will get
-    // cleaned up when |result| goes out of scope, when this function returns.
+    aResult = Move(result);
   }
 }
 
 int8_t
 nsSMILAnimationFunction::CompareTo(const nsSMILAnimationFunction* aOther) const
 {
   NS_ENSURE_TRUE(aOther, 0);
 

--- a/dom/smil/nsSMILCSSProperty.cpp
+++ b/dom/smil/nsSMILCSSProperty.cpp
@@ -2,21 +2,23 @@
 /* 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/. */
 
 /* representation of a SMIL-animatable CSS property on an element */
 
 #include "nsSMILCSSProperty.h"
+
+#include "mozilla/dom/Element.h"
+#include "mozilla/Move.h"
 #include "nsSMILCSSValueType.h"
 #include "nsSMILValue.h"
 #include "nsComputedDOMStyle.h"
 #include "nsCSSProps.h"
-#include "mozilla/dom/Element.h"
 #include "nsIDOMElement.h"
 #include "nsIDocument.h"
 
 using namespace mozilla::dom;
 
 // Helper function
 static bool
 GetCSSComputedValue(Element* aElem,
@@ -76,17 +78,17 @@ nsSMILCSSProperty::GetBaseValue() const
     //
     // Also, although we can look up the base value of the display property,
     // doing so involves clearing and resetting the property which can cause
     // frames to be recreated which we'd like to avoid.
     //
     // In either case, just return a dummy value (initialized with the right
     // type, so as not to indicate failure).
     nsSMILValue tmpVal(&nsSMILCSSValueType::sSingleton);
-    baseValue.Swap(tmpVal);
+    Swap(baseValue, tmpVal);
     return baseValue;
   }
 
   // GENERAL CASE: Non-Shorthands
   // (1) Put empty string in override style for property mPropID
   // (saving old override style value, so we can set it again when we're done)
   nsICSSDeclaration* overrideDecl = mElement->GetSMILOverrideStyle();
   nsAutoString cachedOverrideStyleVal;

--- a/dom/smil/nsSMILValue.cpp
+++ b/dom/smil/nsSMILValue.cpp
@@ -39,38 +39,54 @@ nsSMILValue::operator=(const nsSMILValue
     DestroyAndReinit(aVal.mType);
   }
 
   mType->Assign(*this, aVal);
 
   return *this;
 }
 
+// Move constructor / reassignment operator:
+nsSMILValue::nsSMILValue(nsSMILValue&& aVal)
+  : mU(aVal.mU), // Copying union is only OK because we clear aVal.mType below.
+    mType(aVal.mType)
+{
+  // Leave aVal with a null type, so that it's safely destructible (and won't
+  // mess with anything referenced by its union, which we've copied).
+  aVal.mType = nsSMILNullType::Singleton();
+}
+
+nsSMILValue&
+nsSMILValue::operator=(nsSMILValue&& aVal)
+{
+  if (!IsNull()) {
+    // Clean up any data we're currently tracking.
+    DestroyAndCheckPostcondition();
+  }
+
+  // Copy the union (which could include a pointer to external memory) & mType:
+  mU = aVal.mU;
+  mType = aVal.mType;
+
+  // Leave aVal with a null type, so that it's safely destructible (and won't
+  // mess with anything referenced by its union, which we've now copied).
+  aVal.mType = nsSMILNullType::Singleton();
+
+  return *this;
+}
+
 bool
 nsSMILValue::operator==(const nsSMILValue& aVal) const
 {
   if (&aVal == this)
     return true;
 
   return mType == aVal.mType && mType->IsEqual(*this, aVal);
 }
 
-void
-nsSMILValue::Swap(nsSMILValue& aOther)
-{
-  nsSMILValue tmp;
-  memcpy(&tmp,    &aOther, sizeof(nsSMILValue));  // tmp    = aOther
-  memcpy(&aOther, this,    sizeof(nsSMILValue));  // aOther = this
-  memcpy(this,    &tmp,    sizeof(nsSMILValue));  // this   = tmp
-
-  // |tmp| is about to die -- we need to clear its mType, so that its
-  // destructor doesn't muck with the data we just transferred out of it.
-  tmp.mType = nsSMILNullType::Singleton();
-}
-
 nsresult
 nsSMILValue::Add(const nsSMILValue& aValueToAdd, uint32_t aCount)
 {
   if (aValueToAdd.mType != mType) {
     NS_ERROR("Trying to add incompatible types");
     return NS_ERROR_FAILURE;
   }
 

--- a/dom/smil/nsSMILValue.h
+++ b/dom/smil/nsSMILValue.h
@@ -28,31 +28,32 @@ public:
 
   ~nsSMILValue()
   {
     mType->Destroy(*this);
   }
 
   const nsSMILValue& operator=(const nsSMILValue& aVal);
 
+  // Move constructor / reassignment operator:
+  nsSMILValue(nsSMILValue&& aVal);
+  nsSMILValue& operator=(nsSMILValue&& aVal);
+
   // Equality operators. These are allowed to be conservative (return false
   // more than you'd expect) - see comment above nsISMILType::IsEqual.
   bool operator==(const nsSMILValue& aVal) const;
   bool operator!=(const nsSMILValue& aVal) const {
     return !(*this == aVal);
   }
 
   bool IsNull() const
   {
     return (mType == nsSMILNullType::Singleton());
   }
 
-  // Swaps the member data (mU & mPtr) of |this| with |aOther|
-  void     Swap(nsSMILValue& aOther);
-
   nsresult Add(const nsSMILValue& aValueToAdd, uint32_t aCount = 1);
   nsresult SandwichAdd(const nsSMILValue& aValueToAdd);
   nsresult ComputeDistance(const nsSMILValue& aTo, double& aDistance) const;
   nsresult Interpolate(const nsSMILValue& aEndVal,
                        double aUnitDistance,
                        nsSMILValue& aResult) const;
 
   union {

--- a/dom/svg/SVGAnimatedLengthList.cpp
+++ b/dom/svg/SVGAnimatedLengthList.cpp
@@ -1,16 +1,18 @@
 /* -*- 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 "SVGAnimatedLengthList.h"
+
 #include "DOMSVGAnimatedLengthList.h"
+#include "mozilla/Move.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "nsSMILValue.h"
 #include "SVGLengthListSMILType.h"
 
 namespace mozilla {
 
 nsresult
@@ -133,17 +135,17 @@ SVGAnimatedLengthList::
                                nsSMILValue& aValue,
                                bool& aPreventCachingOfSandwich) const
 {
   nsSMILValue val(&SVGLengthListSMILType::sSingleton);
   SVGLengthListAndInfo *llai = static_cast<SVGLengthListAndInfo*>(val.mU.mPtr);
   nsresult rv = llai->SetValueFromString(aStr);
   if (NS_SUCCEEDED(rv)) {
     llai->SetInfo(mElement, mAxis, mCanZeroPadList);
-    aValue.Swap(val);
+    aValue = Move(val);
 
     // If any of the lengths in the list depend on their context, then we must
     // prevent caching of the entire animation sandwich. This is because the
     // units of a length at a given index can change from sandwich layer to
     // layer, and indeed even be different within a single sandwich layer. If
     // any length in the result of an animation sandwich is the result of the
     // addition of lengths where one or more of those lengths is context
     // dependent, then naturally the resultant length is also context
@@ -176,17 +178,17 @@ SVGAnimatedLengthList::SMILAnimatedLengt
   // from ALL return points. This function must only return THIS variable:
   nsSMILValue val;
 
   nsSMILValue tmp(&SVGLengthListSMILType::sSingleton);
   SVGLengthListAndInfo *llai = static_cast<SVGLengthListAndInfo*>(tmp.mU.mPtr);
   nsresult rv = llai->CopyFrom(mVal->mBaseVal);
   if (NS_SUCCEEDED(rv)) {
     llai->SetInfo(mElement, mAxis, mCanZeroPadList);
-    val.Swap(tmp);
+    val = Move(tmp);
   }
   return val;
 }
 
 nsresult
 SVGAnimatedLengthList::SMILAnimatedLengthList::SetAnimValue(const nsSMILValue& aValue)
 {
   NS_ASSERTION(aValue.mType == &SVGLengthListSMILType::sSingleton,

--- a/dom/svg/SVGAnimatedNumberList.cpp
+++ b/dom/svg/SVGAnimatedNumberList.cpp
@@ -1,16 +1,18 @@
 /* -*- 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 "SVGAnimatedNumberList.h"
+
 #include "DOMSVGAnimatedNumberList.h"
+#include "mozilla/Move.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "nsSMILValue.h"
 #include "SVGNumberListSMILType.h"
 
 namespace mozilla {
 
 nsresult
@@ -133,17 +135,17 @@ SVGAnimatedNumberList::
                                nsSMILValue& aValue,
                                bool& aPreventCachingOfSandwich) const
 {
   nsSMILValue val(&SVGNumberListSMILType::sSingleton);
   SVGNumberListAndInfo *nlai = static_cast<SVGNumberListAndInfo*>(val.mU.mPtr);
   nsresult rv = nlai->SetValueFromString(aStr);
   if (NS_SUCCEEDED(rv)) {
     nlai->SetInfo(mElement);
-    aValue.Swap(val);
+    aValue = Move(val);
   }
   aPreventCachingOfSandwich = false;
   return rv;
 }
 
 nsSMILValue
 SVGAnimatedNumberList::SMILAnimatedNumberList::GetBaseValue() const
 {
@@ -152,17 +154,17 @@ SVGAnimatedNumberList::SMILAnimatedNumbe
   // from ALL return points. This function must only return THIS variable:
   nsSMILValue val;
 
   nsSMILValue tmp(&SVGNumberListSMILType::sSingleton);
   SVGNumberListAndInfo *nlai = static_cast<SVGNumberListAndInfo*>(tmp.mU.mPtr);
   nsresult rv = nlai->CopyFrom(mVal->mBaseVal);
   if (NS_SUCCEEDED(rv)) {
     nlai->SetInfo(mElement);
-    val.Swap(tmp);
+    Swap(val, tmp);
   }
   return val;
 }
 
 nsresult
 SVGAnimatedNumberList::SMILAnimatedNumberList::SetAnimValue(const nsSMILValue& aValue)
 {
   NS_ASSERTION(aValue.mType == &SVGNumberListSMILType::sSingleton,

--- a/dom/svg/SVGAnimatedPathSegList.cpp
+++ b/dom/svg/SVGAnimatedPathSegList.cpp
@@ -1,16 +1,18 @@
 /* -*- 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 "SVGAnimatedPathSegList.h"
+
 #include "DOMSVGPathSegList.h"
+#include "mozilla/Move.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "nsSMILValue.h"
 #include "SVGPathSegListSMILType.h"
 
 // See the comments in this file's header!
 
 namespace mozilla {
@@ -155,17 +157,17 @@ SVGAnimatedPathSegList::
                                nsSMILValue& aValue,
                                bool& aPreventCachingOfSandwich) const
 {
   nsSMILValue val(SVGPathSegListSMILType::Singleton());
   SVGPathDataAndInfo *list = static_cast<SVGPathDataAndInfo*>(val.mU.mPtr);
   nsresult rv = list->SetValueFromString(aStr);
   if (NS_SUCCEEDED(rv)) {
     list->SetElement(mElement);
-    aValue.Swap(val);
+    aValue = Move(val);
   }
   aPreventCachingOfSandwich = false;
   return rv;
 }
 
 nsSMILValue
 SVGAnimatedPathSegList::SMILAnimatedPathSegList::GetBaseValue() const
 {
@@ -174,17 +176,17 @@ SVGAnimatedPathSegList::SMILAnimatedPath
   // from ALL return points. This function must only return THIS variable:
   nsSMILValue val;
 
   nsSMILValue tmp(SVGPathSegListSMILType::Singleton());
   SVGPathDataAndInfo *list = static_cast<SVGPathDataAndInfo*>(tmp.mU.mPtr);
   nsresult rv = list->CopyFrom(mVal->mBaseVal);
   if (NS_SUCCEEDED(rv)) {
     list->SetElement(mElement);
-    val.Swap(tmp);
+    val = Move(tmp);
   }
   return val;
 }
 
 nsresult
 SVGAnimatedPathSegList::SMILAnimatedPathSegList::SetAnimValue(const nsSMILValue& aValue)
 {
   NS_ASSERTION(aValue.mType == SVGPathSegListSMILType::Singleton(),

--- a/dom/svg/SVGAnimatedPointList.cpp
+++ b/dom/svg/SVGAnimatedPointList.cpp
@@ -1,16 +1,18 @@
 /* -*- 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 "SVGAnimatedPointList.h"
+
 #include "DOMSVGPointList.h"
+#include "mozilla/Move.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "nsSMILValue.h"
 #include "SVGPointListSMILType.h"
 
 // See the comments in this file's header!
 
 namespace mozilla {
@@ -158,17 +160,17 @@ SVGAnimatedPointList::
                                nsSMILValue& aValue,
                                bool& aPreventCachingOfSandwich) const
 {
   nsSMILValue val(&SVGPointListSMILType::sSingleton);
   SVGPointListAndInfo *list = static_cast<SVGPointListAndInfo*>(val.mU.mPtr);
   nsresult rv = list->SetValueFromString(aStr);
   if (NS_SUCCEEDED(rv)) {
     list->SetInfo(mElement);
-    aValue.Swap(val);
+    aValue = Move(val);
   }
   aPreventCachingOfSandwich = false;
   return rv;
 }
 
 nsSMILValue
 SVGAnimatedPointList::SMILAnimatedPointList::GetBaseValue() const
 {
@@ -177,17 +179,17 @@ SVGAnimatedPointList::SMILAnimatedPointL
   // from ALL return points. This function must only return THIS variable:
   nsSMILValue val;
 
   nsSMILValue tmp(&SVGPointListSMILType::sSingleton);
   SVGPointListAndInfo *list = static_cast<SVGPointListAndInfo*>(tmp.mU.mPtr);
   nsresult rv = list->CopyFrom(mVal->mBaseVal);
   if (NS_SUCCEEDED(rv)) {
     list->SetInfo(mElement);
-    val.Swap(tmp);
+    Swap(val, tmp);
   }
   return val;
 }
 
 nsresult
 SVGAnimatedPointList::SMILAnimatedPointList::SetAnimValue(const nsSMILValue& aValue)
 {
   NS_ASSERTION(aValue.mType == &SVGPointListSMILType::sSingleton,