From 4fcb9e782d755f03860b10cdb99fa37e2e966024 Mon Sep 17 00:00:00 2001
From: Simon Montagu <smontagu@smontagu.org>
Date: Sun, 30 Sep 2012 07:17:42 -0700
Subject: [PATCH 01/64] Change :dir selectors to :-moz-dir in css files. Bug
 562169, r=dbaron

---
 browser/base/content/abouthome/aboutHome.css           | 10 +++++-----
 browser/devtools/layoutview/view.css                   |  4 ++--
 browser/themes/gnomestripe/aboutCertError.css          |  6 +++---
 browser/themes/gnomestripe/aboutPrivateBrowsing.css    |  2 +-
 browser/themes/pinstripe/aboutCertError.css            |  6 +++---
 browser/themes/pinstripe/aboutPrivateBrowsing.css      |  2 +-
 browser/themes/winstripe/aboutCertError.css            |  6 +++---
 browser/themes/winstripe/aboutPrivateBrowsing.css      |  2 +-
 toolkit/themes/gnomestripe/global/netError.css         |  4 ++--
 .../themes/pinstripe/global/dirListing/dirListing.css  |  4 ++--
 toolkit/themes/pinstripe/global/netError.css           |  4 ++--
 toolkit/themes/winstripe/global/aboutSupport.css       |  2 +-
 .../themes/winstripe/global/dirListing/dirListing.css  |  4 ++--
 toolkit/themes/winstripe/global/netError.css           |  4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
index f877352896f1..c773738efa67 100644
--- a/browser/base/content/abouthome/aboutHome.css
+++ b/browser/base/content/abouthome/aboutHome.css
@@ -81,7 +81,7 @@ a {
   border-radius: 2.5px 0 0 2.5px;
 }
 
-#searchText:dir(rtl) {
+#searchText:-moz-dir(rtl) {
   border-radius: 0 2.5px 2.5px 0;
 }
 
@@ -105,7 +105,7 @@ a {
   transition-duration: 150ms;
 }
 
-#searchSubmit:dir(rtl) {
+#searchSubmit:-moz-dir(rtl) {
   border-radius: 2.5px 0 0 2.5px;
 }
 
@@ -147,8 +147,8 @@ a {
   -moz-padding-start: 79px;
 }
 
-#defaultSnippet1:dir(rtl),
-#defaultSnippet2:dir(rtl) {
+#defaultSnippet1:-moz-dir(rtl),
+#defaultSnippet2:-moz-dir(rtl) {
   background-position: right 30px center;
 }
 
@@ -312,7 +312,7 @@ body[narrow] #restorePreviousSession {
   -moz-margin-end: 8px;
 }
 
-#restorePreviousSession:dir(rtl)::before {
+#restorePreviousSession:-moz-dir(rtl)::before {
   transform: scaleX(-1);
 }
 
diff --git a/browser/devtools/layoutview/view.css b/browser/devtools/layoutview/view.css
index fca0c0804e22..a8e9d2861b0f 100644
--- a/browser/devtools/layoutview/view.css
+++ b/browser/devtools/layoutview/view.css
@@ -22,7 +22,7 @@ body {
   vertical-align: top;
 }
 
-#header:dir(rtl) {
+#header:-moz-dir(rtl) {
   -moz-box-direction: reverse;
 }
 
@@ -34,7 +34,7 @@ body {
   -moz-box-flex: 1;
 }
 
-#element-size:dir(rtl) {
+#element-size:-moz-dir(rtl) {
   -moz-box-pack: end;
 }
 
diff --git a/browser/themes/gnomestripe/aboutCertError.css b/browser/themes/gnomestripe/aboutCertError.css
index 9b4612916e1a..c7caf531e875 100644
--- a/browser/themes/gnomestripe/aboutCertError.css
+++ b/browser/themes/gnomestripe/aboutCertError.css
@@ -37,7 +37,7 @@ h2 {
   background-origin: content-box;
 }
 
-#errorPageContainer:dir(rtl) {
+#errorPageContainer:-moz-dir(rtl) {
   background-position: right 0;
 }
 
@@ -59,7 +59,7 @@ h2 {
   cursor: pointer;
 }
 
-.expander > button:dir(rtl) {
+.expander > button:-moz-dir(rtl) {
   background-position: right center;
 }
 
@@ -67,6 +67,6 @@ h2 {
   background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
 }
 
-.expander[collapsed] > button:dir(rtl) {
+.expander[collapsed] > button:-moz-dir(rtl) {
   background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
 }
diff --git a/browser/themes/gnomestripe/aboutPrivateBrowsing.css b/browser/themes/gnomestripe/aboutPrivateBrowsing.css
index fde7496a7b93..2bb39d295073 100644
--- a/browser/themes/gnomestripe/aboutPrivateBrowsing.css
+++ b/browser/themes/gnomestripe/aboutPrivateBrowsing.css
@@ -34,7 +34,7 @@ body.normal > #errorPageContainer {
   background: url("moz-icon://stock/gtk-dialog-info?size=menu") no-repeat top left;
 }
 
-#moreInfo:dir(rtl) {
+#moreInfo:-moz-dir(rtl) {
   background-position: top right;
 }
 
diff --git a/browser/themes/pinstripe/aboutCertError.css b/browser/themes/pinstripe/aboutCertError.css
index 9b4612916e1a..c7caf531e875 100644
--- a/browser/themes/pinstripe/aboutCertError.css
+++ b/browser/themes/pinstripe/aboutCertError.css
@@ -37,7 +37,7 @@ h2 {
   background-origin: content-box;
 }
 
-#errorPageContainer:dir(rtl) {
+#errorPageContainer:-moz-dir(rtl) {
   background-position: right 0;
 }
 
@@ -59,7 +59,7 @@ h2 {
   cursor: pointer;
 }
 
-.expander > button:dir(rtl) {
+.expander > button:-moz-dir(rtl) {
   background-position: right center;
 }
 
@@ -67,6 +67,6 @@ h2 {
   background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
 }
 
-.expander[collapsed] > button:dir(rtl) {
+.expander[collapsed] > button:-moz-dir(rtl) {
   background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
 }
diff --git a/browser/themes/pinstripe/aboutPrivateBrowsing.css b/browser/themes/pinstripe/aboutPrivateBrowsing.css
index 7dc446a8b0c1..b97093f4458b 100644
--- a/browser/themes/pinstripe/aboutPrivateBrowsing.css
+++ b/browser/themes/pinstripe/aboutPrivateBrowsing.css
@@ -34,7 +34,7 @@ body.normal > #errorPageContainer {
   background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
 }
 
-#moreInfo:dir(rtl) {
+#moreInfo:-moz-dir(rtl) {
   background-position: top right;
 }
 
diff --git a/browser/themes/winstripe/aboutCertError.css b/browser/themes/winstripe/aboutCertError.css
index 9b4612916e1a..c7caf531e875 100644
--- a/browser/themes/winstripe/aboutCertError.css
+++ b/browser/themes/winstripe/aboutCertError.css
@@ -37,7 +37,7 @@ h2 {
   background-origin: content-box;
 }
 
-#errorPageContainer:dir(rtl) {
+#errorPageContainer:-moz-dir(rtl) {
   background-position: right 0;
 }
 
@@ -59,7 +59,7 @@ h2 {
   cursor: pointer;
 }
 
-.expander > button:dir(rtl) {
+.expander > button:-moz-dir(rtl) {
   background-position: right center;
 }
 
@@ -67,6 +67,6 @@ h2 {
   background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
 }
 
-.expander[collapsed] > button:dir(rtl) {
+.expander[collapsed] > button:-moz-dir(rtl) {
   background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
 }
diff --git a/browser/themes/winstripe/aboutPrivateBrowsing.css b/browser/themes/winstripe/aboutPrivateBrowsing.css
index 77228d1c89cf..cd6026b8eab8 100644
--- a/browser/themes/winstripe/aboutPrivateBrowsing.css
+++ b/browser/themes/winstripe/aboutPrivateBrowsing.css
@@ -34,7 +34,7 @@ body.normal > #errorPageContainer {
   background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
 }
 
-#moreInfo:dir(rtl) {
+#moreInfo:-moz-dir(rtl) {
   background-position: top right;
 }
 
diff --git a/toolkit/themes/gnomestripe/global/netError.css b/toolkit/themes/gnomestripe/global/netError.css
index fac4138a20d1..77e3cea88381 100644
--- a/toolkit/themes/gnomestripe/global/netError.css
+++ b/toolkit/themes/gnomestripe/global/netError.css
@@ -58,7 +58,7 @@ ul {
   background-image: url("chrome://global/skin/icons/sslWarning.png");
 }
 
-#errorPageContainer:dir(rtl) {
+#errorPageContainer:-moz-dir(rtl) {
   background-position: right 0;
 }
 
@@ -99,7 +99,7 @@ ul {
   opacity: .4;
 }
 
-#brand:dir(rtl) {
+#brand:-moz-dir(rtl) {
   right: auto;
   left: 0;
 }
diff --git a/toolkit/themes/pinstripe/global/dirListing/dirListing.css b/toolkit/themes/pinstripe/global/dirListing/dirListing.css
index db2d49ccd7f0..d89752db13c4 100644
--- a/toolkit/themes/pinstripe/global/dirListing/dirListing.css
+++ b/toolkit/themes/pinstripe/global/dirListing/dirListing.css
@@ -45,7 +45,7 @@ p {
   float: left;
 }
 
-#UI_goUp:dir(rtl) {
+#UI_goUp:-moz-dir(rtl) {
   float: right;
 }
 
@@ -54,7 +54,7 @@ p {
   float: right;
 }
 
-#UI_showHidden:dir(rtl) {
+#UI_showHidden:-moz-dir(rtl) {
   float: left;
 }
 
diff --git a/toolkit/themes/pinstripe/global/netError.css b/toolkit/themes/pinstripe/global/netError.css
index 9f37a3df8fa9..206f522116b4 100644
--- a/toolkit/themes/pinstripe/global/netError.css
+++ b/toolkit/themes/pinstripe/global/netError.css
@@ -59,7 +59,7 @@ ul {
   background-image: url("chrome://global/skin/icons/sslWarning.png");
 }
 
-#errorPageContainer:dir(rtl) {
+#errorPageContainer:-moz-dir(rtl) {
   background-position: right 0;
 }
 
@@ -100,7 +100,7 @@ ul {
   opacity: .4;
 }
 
-#brand:dir(rtl) {
+#brand:-moz-dir(rtl) {
   right: auto;
   left: 0;
 }
diff --git a/toolkit/themes/winstripe/global/aboutSupport.css b/toolkit/themes/winstripe/global/aboutSupport.css
index b9da92587cbe..38c9b82f9d3a 100644
--- a/toolkit/themes/winstripe/global/aboutSupport.css
+++ b/toolkit/themes/winstripe/global/aboutSupport.css
@@ -91,7 +91,7 @@ td {
   width: 30%;
 }
 
-#reset-box:dir(rtl) {
+#reset-box:-moz-dir(rtl) {
   float: left;
 }
 
diff --git a/toolkit/themes/winstripe/global/dirListing/dirListing.css b/toolkit/themes/winstripe/global/dirListing/dirListing.css
index 2052b67342ae..35dab890a87a 100644
--- a/toolkit/themes/winstripe/global/dirListing/dirListing.css
+++ b/toolkit/themes/winstripe/global/dirListing/dirListing.css
@@ -45,7 +45,7 @@ p {
   float: left;
 }
 
-#UI_goUp:dir(rtl) {
+#UI_goUp:-moz-dir(rtl) {
   float: right;
 }
 
@@ -54,7 +54,7 @@ p {
   float: right;
 }
 
-#UI_showHidden:dir(rtl) {
+#UI_showHidden:-moz-dir(rtl) {
   float: left;
 }
 
diff --git a/toolkit/themes/winstripe/global/netError.css b/toolkit/themes/winstripe/global/netError.css
index b88aa68a2b28..5504a0e02e25 100644
--- a/toolkit/themes/winstripe/global/netError.css
+++ b/toolkit/themes/winstripe/global/netError.css
@@ -59,7 +59,7 @@ ul {
   background-image: url("chrome://global/skin/icons/sslWarning.png");
 }
 
-#errorPageContainer:dir(rtl) {
+#errorPageContainer:-moz-dir(rtl) {
   background-position: right 0;
 }
 
@@ -100,7 +100,7 @@ ul {
   opacity: .4;
 }
 
-#brand:dir(rtl) {
+#brand:-moz-dir(rtl) {
   right: auto;
   left: 0;
 }

From 8b69632999d4614349a93b0e32a9260dcca8b6d4 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Sun, 30 Sep 2012 14:47:48 +0100
Subject: [PATCH 02/64] Bug 795136 - 1/2 - Add events notifying the window if
 upload/download happen on the system. r=smaug sr=sicking

---
 content/base/src/nsGkAtomList.h               |  2 +
 content/events/public/nsEventNameList.h       |  8 ++
 content/events/src/nsEventListenerManager.cpp | 31 ++++++-
 content/events/src/nsEventListenerManager.h   |  1 +
 dom/base/nsGlobalWindow.cpp                   | 80 ++++++++++++++++++-
 dom/base/nsGlobalWindow.h                     |  8 ++
 dom/base/nsPIDOMWindow.h                      | 16 +++-
 dom/interfaces/base/nsIDOMWindow.idl          |  5 +-
 dom/tests/mochitest/general/Makefile.in       |  1 +
 .../general/test_network_events.html          | 68 ++++++++++++++++
 widget/nsGUIEvent.h                           |  5 ++
 11 files changed, 220 insertions(+), 5 deletions(-)
 create mode 100644 dom/tests/mochitest/general/test_network_events.html

diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index 10bf12943d7c..d1c2afa9e328 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -727,6 +727,8 @@ GK_ATOM(onmozpointerlockerror, "onmozpointerlockerror")
 GK_ATOM(onmoztimechange, "onmoztimechange")
 GK_ATOM(onMozMousePixelScroll, "onMozMousePixelScroll")
 GK_ATOM(onMozScrolledAreaChanged, "onMozScrolledAreaChanged")
+GK_ATOM(onmoznetworkupload, "onmoznetworkupload")
+GK_ATOM(onmoznetworkdownload, "onmoznetworkdownload")
 GK_ATOM(onnoupdate, "onnoupdate")
 GK_ATOM(onobsolete, "onobsolete")
 GK_ATOM(ononline, "ononline")
diff --git a/content/events/public/nsEventNameList.h b/content/events/public/nsEventNameList.h
index 88df83caf5ab..51487e098ef5 100644
--- a/content/events/public/nsEventNameList.h
+++ b/content/events/public/nsEventNameList.h
@@ -467,6 +467,14 @@ WINDOW_ONLY_EVENT(moztimechange,
                   NS_MOZ_TIME_CHANGE_EVENT,
                   EventNameType_None,
                   NS_EVENT)
+WINDOW_ONLY_EVENT(moznetworkupload,
+                  NS_NETWORK_UPLOAD_EVENT,
+                  EventNameType_None,
+                  NS_EVENT)
+WINDOW_ONLY_EVENT(moznetworkdownload,
+                  NS_NETWORK_DOWNLOAD_EVENT,
+                  EventNameType_None,
+                  NS_EVENT)
 
 TOUCH_EVENT(touchstart,
             NS_TOUCH_START,
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 110fb490c013..bab91e8d1baa 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -182,6 +182,18 @@ nsEventListenerManager::GetInnerWindowForTarget()
   return nullptr;
 }
 
+already_AddRefed<nsPIDOMWindow>
+nsEventListenerManager::GetTargetAsInnerWindow() const
+{
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
+  if (!window) {
+    return nullptr;
+  }
+
+  NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
+  return window.forget();
+}
+
 void
 nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
                                          uint32_t aType,
@@ -279,6 +291,16 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
     EnableDevice(NS_DEVICE_MOTION);
   } else if (aTypeAtom == nsGkAtoms::onmoztimechange) {
     EnableTimeChangeNotifications();
+  } else if (aTypeAtom == nsGkAtoms::onmoznetworkupload) {
+    nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
+    if (window) {
+      window->EnableNetworkEvent(NS_NETWORK_UPLOAD_EVENT);
+    }
+  } else if (aTypeAtom == nsGkAtoms::onmoznetworkdownload) {
+    nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
+    if (window) {
+      window->EnableNetworkEvent(NS_NETWORK_DOWNLOAD_EVENT);
+    }
   } else if (aTypeAtom == nsGkAtoms::ontouchstart ||
              aTypeAtom == nsGkAtoms::ontouchend ||
              aTypeAtom == nsGkAtoms::ontouchmove ||
@@ -404,6 +426,8 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
   uint32_t typeCount = 0;
   bool deviceType = IsDeviceType(aType);
   bool timeChangeEvent = (aType == NS_MOZ_TIME_CHANGE_EVENT);
+  bool networkEvent = (aType == NS_NETWORK_UPLOAD_EVENT ||
+                       aType == NS_NETWORK_DOWNLOAD_EVENT);
 
   for (uint32_t i = 0; i < count; ++i) {
     ls = &mListeners.ElementAt(i);
@@ -417,7 +441,7 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
         mNoListenerForEvent = NS_EVENT_TYPE_NULL;
         mNoListenerForEventAtom = nullptr;
 
-        if (!deviceType && !timeChangeEvent) {
+        if (!deviceType && !timeChangeEvent && !networkEvent) {
           return;
         }
         --typeCount;
@@ -429,6 +453,11 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
     DisableDevice(aType);
   } else if (timeChangeEvent && typeCount == 0) {
     DisableTimeChangeNotifications();
+  } else if (networkEvent && typeCount == 0) {
+    nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
+    if (window) {
+      window->DisableNetworkEvent(aType);
+    }
   }
 }
 
diff --git a/content/events/src/nsEventListenerManager.h b/content/events/src/nsEventListenerManager.h
index 15c7a63dcb62..e6409a636e21 100644
--- a/content/events/src/nsEventListenerManager.h
+++ b/content/events/src/nsEventListenerManager.h
@@ -304,6 +304,7 @@ protected:
   const EventTypeData* GetTypeDataForIID(const nsIID& aIID);
   const EventTypeData* GetTypeDataForEventName(nsIAtom* aName);
   nsPIDOMWindow* GetInnerWindowForTarget();
+  already_AddRefed<nsPIDOMWindow> GetTargetAsInnerWindow() const;
 
   uint32_t mMayHavePaintEventListener : 1;
   uint32_t mMayHaveMutationListeners : 1;
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 811a556df6d3..f14ff2b36681 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -222,6 +222,7 @@
 #include "prrng.h"
 #include "nsSandboxFlags.h"
 #include "TimeChangeObserver.h"
+#include "nsPISocketTransportService.h"
 
 #ifdef ANDROID
 #include <android/log.h>
@@ -416,6 +417,9 @@ static const char kPkcs11ContractID[] = NS_PKCS11_CONTRACTID;
 #endif
 static const char sPopStatePrefStr[] = "browser.history.allowPopState";
 
+#define NETWORK_UPLOAD_EVENT_NAME     NS_LITERAL_STRING("moznetworkupload")
+#define NETWORK_DOWNLOAD_EVENT_NAME   NS_LITERAL_STRING("moznetworkdownload")
+
 /**
  * An object implementing the window.URL property.
  */
@@ -686,7 +690,9 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
     mCallCleanUpAfterModalDialogCloses(false),
     mDialogAbuseCount(0),
     mStopAbuseDialogs(false),
-    mDialogsPermanentlyDisabled(false)
+    mDialogsPermanentlyDisabled(false),
+    mObservingNetworkUpload(false),
+    mObservingNetworkDownload(false)
 {
   nsLayoutStatics::AddRef();
 
@@ -990,6 +996,9 @@ nsGlobalWindow::CleanUp(bool aIgnoreModalDialog)
       os->RemoveObserver(mObserver, "dom-storage2-changed");
     }
 
+    DisableNetworkEvent(NS_NETWORK_UPLOAD_EVENT);
+    DisableNetworkEvent(NS_NETWORK_DOWNLOAD_EVENT);
+
     if (mIdleService) {
       mIdleService->RemoveIdleObserver(mObserver, MIN_IDLE_NOTIFICATION_TIME_S);
     }
@@ -9050,6 +9059,23 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
     return NS_OK;
   }
 
+  if (!nsCRT::strcmp(aTopic, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC) ||
+      !nsCRT::strcmp(aTopic, NS_NETWORK_ACTIVITY_BLIP_DOWNLOAD_TOPIC)) {
+    nsRefPtr<nsDOMEvent> event = new nsDOMEvent(nullptr, nullptr);
+    nsresult rv = event->InitEvent(
+      !nsCRT::strcmp(aTopic, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC)
+        ? NETWORK_UPLOAD_EVENT_NAME
+        : NETWORK_DOWNLOAD_EVENT_NAME,
+      false, false);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = event->SetTrusted(true);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool dummy;
+    return DispatchEvent(event, &dummy);
+  }
+
   NS_WARNING("unrecognized topic in nsGlobalWindow::Observe");
   return NS_ERROR_FAILURE;
 }
@@ -11102,6 +11128,58 @@ nsGlobalWindow::SetHasAudioAvailableEventListeners()
   }
 }
 
+void
+nsGlobalWindow::EnableNetworkEvent(uint32_t aType)
+{
+  if ((mObservingNetworkUpload && aType == NS_NETWORK_UPLOAD_EVENT) ||
+      (mObservingNetworkDownload && aType == NS_NETWORK_DOWNLOAD_EVENT)) {
+    return;
+  }
+
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (!os) {
+    NS_ERROR("ObserverService should be available!");
+    return;
+  }
+
+  switch (aType) {
+    case NS_NETWORK_UPLOAD_EVENT:
+      os->AddObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC, false);
+      mObservingNetworkUpload = true;
+      break;
+    case NS_NETWORK_DOWNLOAD_EVENT:
+      os->AddObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_DOWNLOAD_TOPIC, false);
+      mObservingNetworkDownload = true;
+      break;
+  }
+}
+
+void
+nsGlobalWindow::DisableNetworkEvent(uint32_t aType)
+{
+  if ((!mObservingNetworkUpload && aType == NS_NETWORK_UPLOAD_EVENT) ||
+      (!mObservingNetworkDownload && aType == NS_NETWORK_DOWNLOAD_EVENT)) {
+    return;
+  }
+
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (!os) {
+    NS_ERROR("ObserverService should be available!");
+    return;
+  }
+
+  switch (aType) {
+    case NS_NETWORK_UPLOAD_EVENT:
+      os->RemoveObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC);
+      mObservingNetworkUpload = false;
+      break;
+    case NS_NETWORK_DOWNLOAD_EVENT:
+      os->RemoveObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_DOWNLOAD_TOPIC);
+      mObservingNetworkDownload = false;
+      break;
+  }
+}
+
 #define EVENT(name_, id_, type_, struct_)                                    \
   NS_IMETHODIMP nsGlobalWindow::GetOn##name_(JSContext *cx,                  \
                                              jsval *vp) {                    \
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 1a7db4718125..811db13d7425 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -537,6 +537,9 @@ public:
   virtual void EnableTimeChangeNotifications();
   virtual void DisableTimeChangeNotifications();
 
+  virtual void EnableNetworkEvent(uint32_t aType);
+  virtual void DisableNetworkEvent(uint32_t aType);
+
   virtual nsresult SetArguments(nsIArray *aArguments, nsIPrincipal *aOrigin);
 
   static bool DOMWindowDumpEnabled();
@@ -1084,6 +1087,11 @@ protected:
   // destroying this window).
   bool                          mDialogsPermanentlyDisabled;
 
+  // Temporary booleans to know if we are currently observing network blips.
+  // Will be hopefully removed after bug 795703.
+  bool mObservingNetworkUpload;
+  bool mObservingNetworkDownload;
+
   nsRefPtr<nsDOMMozURLProperty> mURLProperty;
 
   nsTHashtable<nsPtrHashKey<nsDOMEventTargetHelper> > mEventTargetObjects;
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index 96ae462f2bc5..ceeca57c45e8 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -48,8 +48,8 @@ class nsIArray;
 class nsPIWindowRoot;
 
 #define NS_PIDOMWINDOW_IID \
-{ 0x0c5763c6, 0x5e87, 0x4f6f, \
-  { 0xa2, 0xef, 0xcf, 0x4d, 0xeb, 0xd1, 0xbc, 0xc3 } }
+{ 0x54fd92bd, 0xda33, 0x4451, \
+  { 0x8f, 0xb5, 0x11, 0x20, 0x5c, 0x03, 0xce, 0xaa } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -574,6 +574,18 @@ public:
   virtual void EnableTimeChangeNotifications() = 0;
   virtual void DisableTimeChangeNotifications() = 0;
 
+  /**
+   * Tell the window that it should start to listen to the network event of the
+   * given aType.
+   */
+  virtual void EnableNetworkEvent(uint32_t aType) = 0;
+
+  /**
+   * Tell the window that it should stop to listen to the network event of the
+   * given aType.
+   */
+  virtual void DisableNetworkEvent(uint32_t aType) = 0;
+
   /**
    * Set a arguments for this window. This will be set on the window
    * right away (if there's an existing document) and it will also be
diff --git a/dom/interfaces/base/nsIDOMWindow.idl b/dom/interfaces/base/nsIDOMWindow.idl
index 3620cafecd80..5799a0490b4e 100644
--- a/dom/interfaces/base/nsIDOMWindow.idl
+++ b/dom/interfaces/base/nsIDOMWindow.idl
@@ -32,7 +32,7 @@ interface nsIDOMMozURLProperty : nsISupports
  * @see <http://www.whatwg.org/html/#window>
  */
 
-[scriptable, uuid(AB4ED3B8-84F8-4585-B413-0996A7F96D20)]
+[scriptable, uuid(25404a1b-6c73-4850-af95-69aa095c8ad0)]
 interface nsIDOMWindow : nsISupports
 {
   // the current browsing context
@@ -501,6 +501,9 @@ interface nsIDOMWindow : nsISupports
 
   [implicit_jscontext] attribute jsval onmouseenter;
   [implicit_jscontext] attribute jsval onmouseleave;
+
+  [implicit_jscontext] attribute jsval onmoznetworkupload;
+  [implicit_jscontext] attribute jsval onmoznetworkdownload;
 };
 
 [scriptable, uuid(2146c906-57f7-486c-a1b4-8cdb57ef577f)]
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index e0cf3f2e23bd..ca851e2ee81d 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -46,6 +46,7 @@ MOCHITEST_FILES = \
 		file_moving_nodeList.html \
 		test_performance_now.html \
 		test_interfaces.html \
+		test_network_events.html \
 		$(NULL)
 
 MOCHITEST_CHROME_FILES = \
diff --git a/dom/tests/mochitest/general/test_network_events.html b/dom/tests/mochitest/general/test_network_events.html
new file mode 100644
index 000000000000..eefbb06d9586
--- /dev/null
+++ b/dom/tests/mochitest/general/test_network_events.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=795136
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for moznetworkupload and moznetworkdownload</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=795136">Mozilla Bug 795136</a>
+<p id="display"></p>
+<div id="content">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 795136 **/
+
+SimpleTest.waitForExplicitFinish();
+
+var gNetworkUpload = false;
+var gNetworkDownload = false;
+
+function isFinished() {
+  return gNetworkUpload && gNetworkDownload;
+}
+
+function finish() {
+  removeEventListener('moznetworkupload', uploadHandler);
+  removeEventListener('moznetworkdownload', downloadHandler);
+
+  SimpleTest.finish();
+}
+
+function uploadHandler() {
+  ok(true, 'got a network upload event');
+  gNetworkUpload = true;
+
+  if (isFinished()) {
+    finish();
+  }
+}
+
+function downloadHandler() {
+  ok(true, 'got a network download event');
+  gNetworkDownload = true;
+
+  if (isFinished()) {
+    finish();
+  }
+}
+
+addEventListener('moznetworkupload', uploadHandler);
+addEventListener('moznetworkdownload', downloadHandler);
+
+var iframe = document.createElement('iframe');
+iframe.src = 'http://mozilla.org';
+
+document.getElementById('content').appendChild(iframe);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/widget/nsGUIEvent.h b/widget/nsGUIEvent.h
index 0c4e39275e62..ad09db94ffaf 100644
--- a/widget/nsGUIEvent.h
+++ b/widget/nsGUIEvent.h
@@ -469,6 +469,11 @@ class nsHashKey;
 //System time is changed
 #define NS_MOZ_TIME_CHANGE_EVENT     5500
 
+// Network packet events.
+#define NS_NETWORK_EVENT_START       5600
+#define NS_NETWORK_UPLOAD_EVENT      (NS_NETWORK_EVENT_START + 1)
+#define NS_NETWORK_DOWNLOAD_EVENT    (NS_NETWORK_EVENT_START + 2)
+
 /**
  * Return status for event processors, nsEventStatus, is defined in
  * nsEvent.h.

From 701371086e0e8cc450b27898de68ec10fb62358a Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Sun, 30 Sep 2012 14:48:40 +0100
Subject: [PATCH 03/64] Bug 795136 - 2/2 - Add 'network-events' permission to
 access network-{upload,download} events. r=sicking

---
 dom/apps/src/PermissionsTable.jsm                 |  5 +++++
 dom/base/nsGlobalWindow.cpp                       | 15 +++++++++++++++
 .../mochitest/general/test_network_events.html    |  4 ++++
 extensions/cookie/Permission.txt                  |  5 +++++
 4 files changed, 29 insertions(+)

diff --git a/dom/apps/src/PermissionsTable.jsm b/dom/apps/src/PermissionsTable.jsm
index 9dac9257c585..8b47cd509709 100644
--- a/dom/apps/src/PermissionsTable.jsm
+++ b/dom/apps/src/PermissionsTable.jsm
@@ -62,6 +62,11 @@ const PermissionsTable = { "resource-lock": {
                              privileged: ALLOW_ACTION,
                              certified: ALLOW_ACTION
                            },
+                           "network-events": {
+                             app: DENY_ACTION,
+                             privileged: DENY_ACTION,
+                             certified: ALLOW_ACTION
+                           },
                            contacts: {
                              app: DENY_ACTION,
                              privileged: PROMPT_ACTION,
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index f14ff2b36681..2bbb755cea76 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -11136,6 +11136,21 @@ nsGlobalWindow::EnableNetworkEvent(uint32_t aType)
     return;
   }
 
+  nsCOMPtr<nsIPermissionManager> permMgr =
+    do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+  if (!permMgr) {
+    NS_ERROR("No PermissionManager available!");
+    return;
+  }
+
+  uint32_t permission = nsIPermissionManager::DENY_ACTION;
+  permMgr->TestExactPermissionFromPrincipal(GetPrincipal(), "network-events",
+                                            &permission);
+
+  if (permission != nsIPermissionManager::ALLOW_ACTION) {
+    return;
+  }
+
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (!os) {
     NS_ERROR("ObserverService should be available!");
diff --git a/dom/tests/mochitest/general/test_network_events.html b/dom/tests/mochitest/general/test_network_events.html
index eefbb06d9586..ef8853f64d44 100644
--- a/dom/tests/mochitest/general/test_network_events.html
+++ b/dom/tests/mochitest/general/test_network_events.html
@@ -22,6 +22,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=795136
 
 SimpleTest.waitForExplicitFinish();
 
+SpecialPowers.addPermission("network-events", true, document);
+
 var gNetworkUpload = false;
 var gNetworkDownload = false;
 
@@ -33,6 +35,8 @@ function finish() {
   removeEventListener('moznetworkupload', uploadHandler);
   removeEventListener('moznetworkdownload', downloadHandler);
 
+  SpecialPowers.removePermission("network-events", document);
+
   SimpleTest.finish();
 }
 
diff --git a/extensions/cookie/Permission.txt b/extensions/cookie/Permission.txt
index 341dec0d8a31..adc878ea79ec 100644
--- a/extensions/cookie/Permission.txt
+++ b/extensions/cookie/Permission.txt
@@ -90,6 +90,11 @@ systemclock
 Time/Clock API, 714358
 Set current time. Timezone will go in the Settings API.
 
+network-events
+{}
+Network Events, 795136
+Receive events when a packet is downloaded or uploaded from the device.
+
 network-http
 {}
 old name: systemXHR

From 4d37eb758f8a57b2c33c947c3285c10b20ac202c Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Sun, 30 Sep 2012 16:07:51 +0100
Subject: [PATCH 04/64] Bug 795136 - 3/2 - Disabling tests until bug 795711 is
 fixed. r=me

---
 build/automation.py.in                  | 3 +++
 dom/tests/mochitest/general/Makefile.in | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index 569ddc67c81e..2b8a05ded742 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -449,6 +449,9 @@ user_pref("extensions.getAddons.search.url", "http://%(server)s/extensions-dummy
 
 // Make enablePrivilege continue to work for test code. :-(
 user_pref("security.enablePrivilege.enable_for_tests", true);
+
+// Get network events.
+user_pref("network.activity.blipIntervalMilliseconds", 250);
 """ % { "server" : self.webServer + ":" + str(self.httpPort) }
     prefs.append(part)
 
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index ca851e2ee81d..00fefa807745 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -46,9 +46,11 @@ MOCHITEST_FILES = \
 		file_moving_nodeList.html \
 		test_performance_now.html \
 		test_interfaces.html \
-		test_network_events.html \
 		$(NULL)
 
+# Disable this test until bug 795711 is fixed.
+#		test_network_events.html \
+
 MOCHITEST_CHROME_FILES = \
 		test_innerScreen.xul \
 		test_offsets.xul \

From ef2beecd2b0538fdf4d98c922e25b3e2620d4db8 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Sat, 29 Sep 2012 08:03:54 -0400
Subject: [PATCH 05/64] bug 792825 - Crash in js::gc::MarkObjectRange on
 CyanogenMod 10, back out changeset 9a02263d7206 r=mossop

---
 toolkit/mozapps/extensions/AddonManager.jsm   | 56 -----------
 .../extensions/test/xpcshell/test_shutdown.js | 98 ++++++++-----------
 .../test/xpcshell/test_updatecheck.js         |  1 -
 3 files changed, 40 insertions(+), 115 deletions(-)

diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 2dceb4b85215..ceda1d4b50dc 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -1932,26 +1932,14 @@ var AddonManagerInternal = {
   },
 
   get addonTypes() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return this.typesProxy;
   },
 
   get autoUpdateDefault() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gAutoUpdateDefault;
   },
 
   set autoUpdateDefault(aValue) {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     aValue = !!aValue;
     if (aValue != gAutoUpdateDefault)
       Services.prefs.setBoolPref(PREF_EM_AUTOUPDATE_DEFAULT, aValue);
@@ -1959,18 +1947,10 @@ var AddonManagerInternal = {
   },
 
   get checkCompatibility() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gCheckCompatibility;
   },
 
   set checkCompatibility(aValue) {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     aValue = !!aValue;
     if (aValue != gCheckCompatibility) {
       if (!aValue)
@@ -1982,18 +1962,10 @@ var AddonManagerInternal = {
   },
 
   get strictCompatibility() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gStrictCompatibility;
   },
 
   set strictCompatibility(aValue) {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     aValue = !!aValue;
     if (aValue != gStrictCompatibility)
       Services.prefs.setBoolPref(PREF_EM_STRICT_COMPATIBILITY, aValue);
@@ -2001,26 +1973,14 @@ var AddonManagerInternal = {
   },
 
   get checkUpdateSecurityDefault() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gCheckUpdateSecurityDefault;
   },
 
   get checkUpdateSecurity() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gCheckUpdateSecurity;
   },
 
   set checkUpdateSecurity(aValue) {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     aValue = !!aValue;
     if (aValue != gCheckUpdateSecurity) {
       if (aValue != gCheckUpdateSecurityDefault)
@@ -2032,18 +1992,10 @@ var AddonManagerInternal = {
   },
 
   get updateEnabled() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gUpdateEnabled;
   },
 
   set updateEnabled(aValue) {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     aValue = !!aValue;
     if (aValue != gUpdateEnabled)
       Services.prefs.setBoolPref(PREF_EM_UPDATE_ENABLED, aValue);
@@ -2051,10 +2003,6 @@ var AddonManagerInternal = {
   },
 
   get hotfixID() {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     return gHotfixID;
   },
 };
@@ -2392,10 +2340,6 @@ var AddonManager = {
    * @return true if the addon should auto-update, false otherwise.
    */
   shouldAutoUpdate: function AM_shouldAutoUpdate(aAddon) {
-    if (!gStarted)
-      throw Components.Exception("AddonManager is not initialized",
-                                 Cr.NS_ERROR_NOT_INITIALIZED);
-
     if (!aAddon || typeof aAddon != "object")
       throw Components.Exception("aAddon must be specified",
                                  Cr.NS_ERROR_INVALID_ARG);
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js b/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
index 5859b9d648ac..60d74b4d8831 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
@@ -4,75 +4,57 @@
 
 // Verify that API functions fail if the Add-ons Manager isn't initialised.
 
-const IGNORE = {
-  funcs: ["escapeAddonURI", "getStartupChanges", "addTypeListener",
-          "removeTypeListener", "addAddonListener", "removeAddonListener",
-          "addInstallListener", "removeInstallListener", "addManagerListener",
-          "removeManagerListener"],
-  getters: ["__AddonManagerInternal__"],
-  setters: []
-};
+const IGNORE = ["escapeAddonURI", "shouldAutoUpdate", "getStartupChanges",
+                "addTypeListener", "removeTypeListener",
+                "addAddonListener", "removeAddonListener",
+                "addInstallListener", "removeInstallListener",
+                "addManagerListener", "removeManagerListener"];
 
-const IGNORE_PRIVATE = {
-  funcs: ["AddonAuthor", "AddonCompatibilityOverride", "AddonScreenshot",
-          "AddonType", "startup", "shutdown", "registerProvider",
-          "unregisterProvider", "addStartupChange", "removeStartupChange"],
-  getters: [],
-  setters: []
-};
+const IGNORE_PRIVATE = ["AddonAuthor", "AddonCompatibilityOverride",
+                        "AddonScreenshot", "AddonType", "startup", "shutdown",
+                        "registerProvider", "unregisterProvider",
+                        "addStartupChange", "removeStartupChange"];
 
+function test_functions() {
+  for (let prop in AddonManager) {
+    if (typeof AddonManager[prop] != "function")
+      continue;
+    if (IGNORE.indexOf(prop) != -1)
+      continue;
 
-function test_functions(aObjName, aIgnore) {
-  let obj = this[aObjName];
-  for (let prop in obj) {
-    let desc = Object.getOwnPropertyDescriptor(obj, prop);
+    try {
+      do_print("AddonManager." + prop);
+      AddonManager[prop]();
+      do_throw(prop + " did not throw an exception");
+    }
+    catch (e) {
+      if (e.result != Components.results.NS_ERROR_NOT_INITIALIZED)
+        do_throw(prop + " threw an unexpected exception: " + e);
+    }
+  }
 
-    if (typeof desc.value == "function") {
-      if (aIgnore.funcs.indexOf(prop) != -1)
-        continue;
+  for (let prop in AddonManagerPrivate) {
+    if (typeof AddonManagerPrivate[prop] != "function")
+      continue;
+    if (IGNORE_PRIVATE.indexOf(prop) != -1)
+      continue;
 
-      try {
-        do_print(aObjName + "." + prop + "()");
-        obj[prop]();
-        do_throw(prop + " did not throw an exception");
-      }
-      catch (e) {
-        if (e.result != Components.results.NS_ERROR_NOT_INITIALIZED)
-          do_throw(prop + " threw an unexpected exception: " + e);
-      }
-    } else {
-      if (typeof desc.get == "function" && aIgnore.getters.indexOf(prop) == -1) {
-        do_print(aObjName + "." + prop + " getter");
-        try {
-          let temp = obj[prop];
-          do_throw(prop + " did not throw an exception");
-        }
-        catch (e) {
-          if (e.result != Components.results.NS_ERROR_NOT_INITIALIZED)
-            do_throw(prop + " threw an unexpected exception: " + e);
-        }
-      }
-      if (typeof desc.set == "function" && aIgnore.setters.indexOf(prop) == -1) {
-        do_print(aObjName + "." + prop + " setter");
-        try {
-          obj[prop] = "i am the walrus";
-          do_throw(prop + " did not throw an exception");
-        }
-        catch (e) {
-          if (e.result != Components.results.NS_ERROR_NOT_INITIALIZED)
-            do_throw(prop + " threw an unexpected exception: " + e);
-        }
-      }
+    try {
+      do_print("AddonManagerPrivate." + prop);
+      AddonManagerPrivate[prop]();
+      do_throw(prop + " did not throw an exception");
+    }
+    catch (e) {
+      if (e.result != Components.results.NS_ERROR_NOT_INITIALIZED)
+        do_throw(prop + " threw an unexpected exception: " + e);
     }
   }
 }
 
 function run_test() {
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-  test_functions("AddonManager", IGNORE);
-  test_functions("AddonManagerPrivate", IGNORE_PRIVATE);
+  test_functions();
   startupManager();
   shutdownManager();
-  test_functions("AddonManager", IGNORE);
-  test_functions("AddonManagerPrivate", IGNORE_PRIVATE);
+  test_functions();
 }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
index 6d45833ad7c0..8b7dc4cfbdfb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
@@ -18,7 +18,6 @@ function run_test() {
   testserver.start(4444);
 
   do_test_pending();
-  startupManager();
   run_test_1();
 }
 

From dfa819730079d345b01d6c3f73b8effc302ec7a9 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Sun, 30 Sep 2012 17:51:26 +0200
Subject: [PATCH 06/64] Bug 787856 - Use static JSObject::getProto in proxy
 code; r=wmccloskey

---
 js/src/jsproxy.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index dc784e0b8540..306c8cc6d5c5 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -1603,7 +1603,9 @@ ScriptedDirectProxyHandler::getPropertyDescriptor(JSContext *cx, JSObject *proxy
         return false;
     if (desc->obj)
         return true;
-    JSObject *proto = proxy->getProto();
+    RootedObject proto(cx);
+    if (!JSObject::getProto(cx, proxy, &proto))
+        return false;
     if (!proto) {
         JS_ASSERT(!desc->obj);
         return true;
@@ -3125,14 +3127,16 @@ proxy(JSContext *cx, unsigned argc, jsval *vp)
                              "Proxy", "1", "s");
         return false;
     }
-    JSObject *target = NonNullObject(cx, args[0]);
+    RootedObject target(cx, NonNullObject(cx, args[0]));
     if (!target)
         return false;
-    JSObject *handler = NonNullObject(cx, args[1]);
+    RootedObject handler(cx, NonNullObject(cx, args[1]));
     if (!handler)
         return false;
-    JSObject *proto = target->getProto();
-    JSObject *fun = target->isCallable() ? target : NULL;
+    RootedObject proto(cx);
+    if (!JSObject::getProto(cx, target, &proto))
+        return false;
+    RootedObject fun(cx, target->isCallable() ? target : (JSObject *) NULL);
     JSObject *proxy = NewProxyObject(cx, &ScriptedDirectProxyHandler::singleton,
                                      ObjectValue(*target), proto, proto->getParent(),
                                      fun, fun);

From 5a65bc3488989fa514b7c4fff39bf0cfaffeec22 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Sun, 30 Sep 2012 18:01:13 +0200
Subject: [PATCH 07/64] Bug 789897 - Implement the preventExtensions trap for
 proxies; r=jorendorff

---
 .../testDirectProxyPreventExtensions1.js      |  6 ++
 .../testDirectProxyPreventExtensions2.js      | 17 +++++
 .../testDirectProxyPreventExtensions3.js      | 13 ++++
 .../testDirectProxyPreventExtensions4.js      | 13 ++++
 .../testDirectProxyPreventExtensions5.js      | 12 ++++
 js/src/js.msg                                 |  2 +
 js/src/jsapi.cpp                              |  2 +-
 js/src/jsobj.h                                |  3 +
 js/src/jsproxy.cpp                            | 68 +++++++++++++++++++
 js/src/jsproxy.h                              |  7 ++
 js/src/jsscope.cpp                            | 43 +++++++++++-
 js/src/jsscope.h                              |  1 +
 js/src/vm/CommonPropertyNames.h               |  1 +
 js/src/vm/ObjectImpl-inl.h                    |  6 --
 js/src/vm/ObjectImpl.cpp                      |  2 +-
 js/src/vm/ObjectImpl.h                        |  2 -
 16 files changed, 187 insertions(+), 11 deletions(-)
 create mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js
 create mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js
 create mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js
 create mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js
 create mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js

diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js
new file mode 100644
index 000000000000..f668719c6540
--- /dev/null
+++ b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js
@@ -0,0 +1,6 @@
+// Forward to the target if the trap is not defined
+target = {};
+var proxy = new Proxy(target, {});
+Object.preventExtensions(proxy);
+assertEq(Object.isExtensible(target), false);
+assertEq(Object.isExtensible(proxy), false);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js
new file mode 100644
index 000000000000..cc6db477b600
--- /dev/null
+++ b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js
@@ -0,0 +1,17 @@
+/*
+ * Call the trap with the handler as the this value, and the target as the first
+ * argument
+ */
+var target = {};
+var called = false;
+var handler = {
+    preventExtensions: function (target1) {
+        assertEq(this, handler);
+        assertEq(target1, target);
+        called = true;
+        Object.preventExtensions(target);
+        return true;
+    }
+};
+Object.preventExtensions(new Proxy(target, handler));
+assertEq(called, true);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js
new file mode 100644
index 000000000000..e04e1073fad9
--- /dev/null
+++ b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js
@@ -0,0 +1,13 @@
+load(libdir + "asserts.js");
+
+/*
+ * Throw a TypeError if the trap reports that the proxy has been made
+ * non-extensible, while the target is still extensible
+ */
+assertThrowsInstanceOf(function () {
+    Object.preventExtensions(new Proxy({}, {
+        preventExtensions: function (target) {
+            return true;
+        }
+    }));
+}, TypeError);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js
new file mode 100644
index 000000000000..4333464ba294
--- /dev/null
+++ b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js
@@ -0,0 +1,13 @@
+load(libdir + "asserts.js");
+
+/*
+ * Throw a TypeError if the trap reports that the proxy cannot be made
+ * non-extensible
+ */
+assertThrowsInstanceOf(function () {
+    Object.preventExtensions(new Proxy({}, {
+        preventExtensions: function (target) {
+            return false;
+        }
+    }));
+}, TypeError);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js
new file mode 100644
index 000000000000..d0b618fc123e
--- /dev/null
+++ b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js
@@ -0,0 +1,12 @@
+// Reflect side-effects from the trap
+target = {};
+var proxy = new Proxy(target, {
+    preventExtensions: function (target) {
+        Object.preventExtensions(target);
+        return true;
+    }
+});
+Object.preventExtensions(proxy);
+assertEq(Object.isExtensible(target), false);
+assertEq(Object.isExtensible(proxy), false);
+
diff --git a/js/src/js.msg b/js/src/js.msg
index 92d4519c6f96..8128405d81ed 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -375,3 +375,5 @@ MSG_DEF(JSMSG_MUST_REPORT_UNDEFINED,  321, 0, JSEXN_TYPEERR, "proxy must report
 MSG_DEF(JSMSG_CANT_SET_NW_NC,         322, 0, JSEXN_TYPEERR, "proxy can't successfully set a non-writable, non-configurable property")
 MSG_DEF(JSMSG_CANT_SET_WO_SETTER,     323, 0, JSEXN_TYPEERR, "proxy can't succesfully set an accessor property without a setter")
 MSG_DEF(JSMSG_DEBUG_BAD_REFERENT,     324, 2, JSEXN_TYPEERR, "{0} does not refer to {1}")
+MSG_DEF(JSMSG_CANT_REPORT_NON_EXT,    325, 0, JSEXN_TYPEERR, "proxy can't report extensible object as non-extensible")
+MSG_DEF(JSMSG_CANT_MAKE_NON_EXT,      326, 0, JSEXN_TYPEERR, "can't prevent extensions on object")
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 1b4845ed7168..f78861756e70 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3482,7 +3482,7 @@ JS_DeepFreezeObject(JSContext *cx, JSObject *objArg)
     assertSameCompartment(cx, obj);
 
     /* Assume that non-extensible objects are already deep-frozen, to avoid divergence. */
-    if (!obj->isExtensible())
+    if (obj->isExtensible())
         return true;
 
     if (!JSObject::freeze(cx, obj))
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index bf14f7f2cad6..752b62f3328a 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -548,6 +548,9 @@ struct JSObject : public js::ObjectImpl
     static inline unsigned getSealedOrFrozenAttributes(unsigned attrs, ImmutabilityType it);
 
   public:
+    friend class js::BaseProxyHandler;
+
+    bool isExtensible() const;
     bool preventExtensions(JSContext *cx);
 
     /* ES5 15.2.3.8: non-extensible, all props non-configurable */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 306c8cc6d5c5..ae8f98e86919 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -412,6 +412,12 @@ IndirectProxyHandler::defineProperty(JSContext *cx, JSObject *proxy, jsid id_,
            JS_DefinePropertyById(cx, obj, id, v, desc->getter, desc->setter, desc->attrs);
 }
 
+bool
+IndirectProxyHandler::preventExtensions(JSContext *cx, JSObject *proxy)
+{
+    return GetProxyTargetObject(proxy)->preventExtensions(cx);
+}
+
 bool
 IndirectProxyHandler::getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                           AutoIdVector &props)
@@ -442,6 +448,12 @@ IndirectProxyHandler::enumerate(JSContext *cx, JSObject *proxy,
     return GetPropertyNames(cx, target, 0, &props);
 }
 
+bool
+IndirectProxyHandler::isExtensible(JSObject *proxy)
+{
+    return GetProxyTargetObject(proxy)->isExtensible();
+}
+
 bool
 IndirectProxyHandler::call(JSContext *cx, JSObject *proxy, unsigned argc,
                    Value *vp)
@@ -1031,6 +1043,7 @@ class ScriptedDirectProxyHandler : public DirectProxyHandler {
                                           PropertyDescriptor *desc) MOZ_OVERRIDE;
     virtual bool defineProperty(JSContext *cx, JSObject *proxy, jsid id,
                                 PropertyDescriptor *desc) MOZ_OVERRIDE;
+    virtual bool preventExtensions(JSContext *cx, JSObject *proxy) MOZ_OVERRIDE;
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp) MOZ_OVERRIDE;
     virtual bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props) MOZ_OVERRIDE;
@@ -1654,6 +1667,47 @@ ScriptedDirectProxyHandler::defineProperty(JSContext *cx, JSObject *proxy_, jsid
     return TrapDefineOwnProperty(cx, proxy, id, &v);
 }
 
+bool
+ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, JSObject *proxy_)
+{
+    RootedObject proxy(cx, proxy_);
+
+    // step a
+    RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
+
+    // step b
+    RootedObject target(cx, GetProxyTargetObject(proxy));
+
+    // step c
+    RootedValue trap(cx);
+    if (!JSObject::getProperty(cx, handler, handler, cx->names().preventExtensions, &trap))
+        return false;
+
+    // step d
+    if (trap.isUndefined())
+        return DirectProxyHandler::preventExtensions(cx, proxy_);
+
+    // step e
+    Value argv[] = {
+        ObjectValue(*target)
+    };
+    RootedValue trapResult(cx);
+    if (!Invoke(cx, ObjectValue(*handler), trap, 1, argv, trapResult.address()))
+        return false;
+
+    // steps f-h
+    if (ToBoolean(trapResult)) {
+        if (target->isExtensible()) {
+            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_REPORT_NON_EXT);
+            return false;
+        }
+        return true;
+    } else {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_MAKE_NON_EXT);
+        return false;
+    }
+}
+
 bool
 ScriptedDirectProxyHandler::getOwnPropertyNames(JSContext *cx, JSObject *proxy_,
                                                 AutoIdVector &props)
@@ -2286,6 +2340,14 @@ Proxy::defineProperty(JSContext *cx, JSObject *proxy_, jsid id_, const Value &v)
            Proxy::defineProperty(cx, proxy, id, &desc);
 }
 
+bool
+Proxy::preventExtensions(JSContext *cx, JSObject *proxy_)
+{
+    JS_CHECK_RECURSION(cx, return false);
+    RootedObject proxy(cx, proxy_);
+    return GetProxyHandler(proxy)->preventExtensions(cx, proxy);
+}
+
 bool
 Proxy::getOwnPropertyNames(JSContext *cx, JSObject *proxy_, AutoIdVector &props)
 {
@@ -2453,6 +2515,12 @@ Proxy::iterate(JSContext *cx, HandleObject proxy_, unsigned flags, MutableHandle
     return EnumeratedIdVectorToIterator(cx, proxy, flags, props, vp);
 }
 
+bool
+Proxy::isExtensible(JSObject *proxy)
+{
+    return GetProxyHandler(proxy)->isExtensible(proxy);
+}
+
 bool
 Proxy::call(JSContext *cx, JSObject *proxy_, unsigned argc, Value *vp)
 {
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 93a40005f881..cbd451158166 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -49,6 +49,7 @@ class JS_FRIEND_API(Wrapper);
 class JS_FRIEND_API(BaseProxyHandler) {
     void *mFamily;
     bool mHasPrototype;
+
   protected:
     // Subclasses may set this in their constructor.
     void setHasPrototype(bool hasPrototype) { mHasPrototype = hasPrototype; }
@@ -91,6 +92,7 @@ class JS_FRIEND_API(BaseProxyHandler) {
                                           PropertyDescriptor *desc) = 0;
     virtual bool defineProperty(JSContext *cx, JSObject *proxy, jsid id,
                                 PropertyDescriptor *desc) = 0;
+    virtual bool preventExtensions(JSContext *cx, JSObject *proxy);
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                      AutoIdVector &props) = 0;
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp) = 0;
@@ -109,6 +111,7 @@ class JS_FRIEND_API(BaseProxyHandler) {
                          Value *vp);
 
     /* Spidermonkey extensions. */
+    virtual bool isExtensible(JSObject *proxy);
     virtual bool call(JSContext *cx, JSObject *proxy, unsigned argc, Value *vp);
     virtual bool construct(JSContext *cx, JSObject *proxy, unsigned argc, Value *argv, Value *rval);
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args);
@@ -148,6 +151,7 @@ class JS_PUBLIC_API(IndirectProxyHandler) : public BaseProxyHandler {
                                           PropertyDescriptor *desc) MOZ_OVERRIDE;
     virtual bool defineProperty(JSContext *cx, JSObject *proxy, jsid id,
                                 PropertyDescriptor *desc) MOZ_OVERRIDE;
+    virtual bool preventExtensions(JSContext *cx, JSObject *proxy) MOZ_OVERRIDE;
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                      AutoIdVector &props) MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id,
@@ -156,6 +160,7 @@ class JS_PUBLIC_API(IndirectProxyHandler) : public BaseProxyHandler {
                            AutoIdVector &props) MOZ_OVERRIDE;
 
     /* Spidermonkey extensions. */
+    virtual bool isExtensible(JSObject *proxy);
     virtual bool call(JSContext *cx, JSObject *proxy, unsigned argc,
                       Value *vp) MOZ_OVERRIDE;
     virtual bool construct(JSContext *cx, JSObject *proxy, unsigned argc,
@@ -218,6 +223,7 @@ class Proxy {
                                          Value *vp);
     static bool defineProperty(JSContext *cx, JSObject *proxy, jsid id, PropertyDescriptor *desc);
     static bool defineProperty(JSContext *cx, JSObject *proxy, jsid id, const Value &v);
+    static bool preventExtensions(JSContext *cx, JSObject *proxy);
     static bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     static bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     static bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props);
@@ -234,6 +240,7 @@ class Proxy {
     static bool iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleValue vp);
 
     /* Spidermonkey extensions. */
+    static bool isExtensible(JSObject *proxy);
     static bool call(JSContext *cx, JSObject *proxy, unsigned argc, Value *vp);
     static bool construct(JSContext *cx, JSObject *proxy, unsigned argc, Value *argv, Value *rval);
     static bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args);
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 48e22fff8339..96864ae1daa7 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1028,12 +1028,21 @@ Shape::setObjectParent(JSContext *cx, JSObject *parent, TaggedProto proto, Shape
     return replaceLastProperty(cx, base, proto, last);
 }
 
+bool
+JSObject::isExtensible() const
+{
+    if (isProxy())
+        return Proxy::isExtensible(const_cast<JSObject *>(this));
+    return !lastProperty()->hasObjectFlag(js::BaseShape::NOT_EXTENSIBLE);
+}
+
 bool
 JSObject::preventExtensions(JSContext *cx)
 {
     JS_ASSERT(isExtensible());
-
     RootedObject self(cx, this);
+    if (self->isProxy())
+        return Proxy::preventExtensions(cx, self);
 
     /*
      * Force lazy properties to be resolved by iterating over the objects' own
@@ -1049,6 +1058,38 @@ JSObject::preventExtensions(JSContext *cx)
     return self->setFlag(cx, BaseShape::NOT_EXTENSIBLE, GENERATE_SHAPE);
 }
 
+/*
+ * Per spec, preventExtensions should be a fundamental trap. We don't want to
+ * force consumers of BaseProxyHandler (i.e. DOM bindings) to implement yet
+ * another fundamental trap, however, so we provide a default implementation
+ * here. We cannot simply forward the operation to the target object, since
+ * BaseProxyHandler is not guaranteed to have one. Instead, we use the proxy's
+ * shape tree (as we would for normal objects) to store a flag indicating that
+ * the proxy is not extensible.
+ */
+bool
+BaseProxyHandler::isExtensible(JSObject *proxy)
+{
+    return !proxy->lastProperty()->hasObjectFlag(js::BaseShape::NOT_EXTENSIBLE);
+}
+
+bool
+BaseProxyHandler::preventExtensions(JSContext *cx, JSObject *proxy_)
+{
+    JS_ASSERT(isExtensible());
+    RootedObject proxy(cx, proxy_);
+
+    /*
+     * Force lazy properties to be resolved by iterating over the objects' own
+     * properties.
+     */
+    AutoIdVector props(cx);
+    if (!js::GetPropertyNames(cx, proxy, JSITER_HIDDEN | JSITER_OWNONLY, &props))
+        return false;
+    JS_ASSERT(!proxy->isDenseArray());
+    return proxy_->setFlag(cx, BaseShape::NOT_EXTENSIBLE, JSObject::GENERATE_SHAPE);
+}
+
 bool
 JSObject::setFlag(JSContext *cx, /*BaseShape::Flag*/ uint32_t flag_, GenerateShape generateShape)
 {
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index d869196e55cd..a7ec511634ca 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -15,6 +15,7 @@
 #endif
 
 #include "jsobj.h"
+#include "jsproxy.h"
 #include "jspropertytree.h"
 #include "jstypes.h"
 
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index bfeb290c7d52..6714a05ef281 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -106,6 +106,7 @@
     macro(of, of, "of") \
     macro(parseFloat, parseFloat, "parseFloat") \
     macro(parseInt, parseInt, "parseInt") \
+    macro(preventExtensions, preventExtensions, "preventExtensions") \
     macro(propertyIsEnumerable, propertyIsEnumerable, "propertyIsEnumerable") \
     macro(proto, proto, "__proto__") \
     macro(return, return_, "return") \
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index f2265d2fcd81..b30da6f6d76c 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -100,12 +100,6 @@ js::ObjectImpl::nativeContainsNoAllocation(Shape &shape)
     return nativeLookupNoAllocation(shape.propid()) == &shape;
 }
 
-inline bool
-js::ObjectImpl::isExtensible() const
-{
-    return !lastProperty()->hasObjectFlag(BaseShape::NOT_EXTENSIBLE);
-}
-
 inline bool
 js::ObjectImpl::isDenseArray() const
 {
diff --git a/js/src/vm/ObjectImpl.cpp b/js/src/vm/ObjectImpl.cpp
index 5a5e57bbd19d..9eb0251b1d8f 100644
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/ObjectImpl.cpp
@@ -414,7 +414,7 @@ DenseElementsHeader::defineElement(JSContext *cx, Handle<ObjectImpl*> obj, uint3
      * If the element doesn't exist, we can only add it if the object is
      * extensible.
      */
-    if (!obj->isExtensible()) {
+    if (!obj->asObjectPtr()->isExtensible()) {
         *succeeded = false;
         if (!shouldThrow)
             return true;
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index 56ab79a1b19b..b7bc0081a251 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -1016,8 +1016,6 @@ class ObjectImpl : public gc::Cell
         return type_->proto;
     }
 
-    inline bool isExtensible() const;
-
     /*
      * XXX Once the property/element split of bug 586842 is complete, these
      *     methods should move back to JSObject.

From b86af95695705d67ad5c78b04684febff41c3eba Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Sun, 30 Sep 2012 12:12:47 -0400
Subject: [PATCH 08/64] Backout 12465a1211e0 (bug 789897) for landing without
 addressing all review comments.

---
 .../testDirectProxyPreventExtensions1.js      |  6 --
 .../testDirectProxyPreventExtensions2.js      | 17 -----
 .../testDirectProxyPreventExtensions3.js      | 13 ----
 .../testDirectProxyPreventExtensions4.js      | 13 ----
 .../testDirectProxyPreventExtensions5.js      | 12 ----
 js/src/js.msg                                 |  2 -
 js/src/jsapi.cpp                              |  2 +-
 js/src/jsobj.h                                |  3 -
 js/src/jsproxy.cpp                            | 68 -------------------
 js/src/jsproxy.h                              |  7 --
 js/src/jsscope.cpp                            | 43 +-----------
 js/src/jsscope.h                              |  1 -
 js/src/vm/CommonPropertyNames.h               |  1 -
 js/src/vm/ObjectImpl-inl.h                    |  6 ++
 js/src/vm/ObjectImpl.cpp                      |  2 +-
 js/src/vm/ObjectImpl.h                        |  2 +
 16 files changed, 11 insertions(+), 187 deletions(-)
 delete mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js
 delete mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js
 delete mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js
 delete mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js
 delete mode 100644 js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js

diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js
deleted file mode 100644
index f668719c6540..000000000000
--- a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions1.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Forward to the target if the trap is not defined
-target = {};
-var proxy = new Proxy(target, {});
-Object.preventExtensions(proxy);
-assertEq(Object.isExtensible(target), false);
-assertEq(Object.isExtensible(proxy), false);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js
deleted file mode 100644
index cc6db477b600..000000000000
--- a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions2.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Call the trap with the handler as the this value, and the target as the first
- * argument
- */
-var target = {};
-var called = false;
-var handler = {
-    preventExtensions: function (target1) {
-        assertEq(this, handler);
-        assertEq(target1, target);
-        called = true;
-        Object.preventExtensions(target);
-        return true;
-    }
-};
-Object.preventExtensions(new Proxy(target, handler));
-assertEq(called, true);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js
deleted file mode 100644
index e04e1073fad9..000000000000
--- a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions3.js
+++ /dev/null
@@ -1,13 +0,0 @@
-load(libdir + "asserts.js");
-
-/*
- * Throw a TypeError if the trap reports that the proxy has been made
- * non-extensible, while the target is still extensible
- */
-assertThrowsInstanceOf(function () {
-    Object.preventExtensions(new Proxy({}, {
-        preventExtensions: function (target) {
-            return true;
-        }
-    }));
-}, TypeError);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js
deleted file mode 100644
index 4333464ba294..000000000000
--- a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions4.js
+++ /dev/null
@@ -1,13 +0,0 @@
-load(libdir + "asserts.js");
-
-/*
- * Throw a TypeError if the trap reports that the proxy cannot be made
- * non-extensible
- */
-assertThrowsInstanceOf(function () {
-    Object.preventExtensions(new Proxy({}, {
-        preventExtensions: function (target) {
-            return false;
-        }
-    }));
-}, TypeError);
diff --git a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js b/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js
deleted file mode 100644
index d0b618fc123e..000000000000
--- a/js/src/jit-test/tests/proxy/testDirectProxyPreventExtensions5.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Reflect side-effects from the trap
-target = {};
-var proxy = new Proxy(target, {
-    preventExtensions: function (target) {
-        Object.preventExtensions(target);
-        return true;
-    }
-});
-Object.preventExtensions(proxy);
-assertEq(Object.isExtensible(target), false);
-assertEq(Object.isExtensible(proxy), false);
-
diff --git a/js/src/js.msg b/js/src/js.msg
index 8128405d81ed..92d4519c6f96 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -375,5 +375,3 @@ MSG_DEF(JSMSG_MUST_REPORT_UNDEFINED,  321, 0, JSEXN_TYPEERR, "proxy must report
 MSG_DEF(JSMSG_CANT_SET_NW_NC,         322, 0, JSEXN_TYPEERR, "proxy can't successfully set a non-writable, non-configurable property")
 MSG_DEF(JSMSG_CANT_SET_WO_SETTER,     323, 0, JSEXN_TYPEERR, "proxy can't succesfully set an accessor property without a setter")
 MSG_DEF(JSMSG_DEBUG_BAD_REFERENT,     324, 2, JSEXN_TYPEERR, "{0} does not refer to {1}")
-MSG_DEF(JSMSG_CANT_REPORT_NON_EXT,    325, 0, JSEXN_TYPEERR, "proxy can't report extensible object as non-extensible")
-MSG_DEF(JSMSG_CANT_MAKE_NON_EXT,      326, 0, JSEXN_TYPEERR, "can't prevent extensions on object")
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index f78861756e70..1b4845ed7168 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3482,7 +3482,7 @@ JS_DeepFreezeObject(JSContext *cx, JSObject *objArg)
     assertSameCompartment(cx, obj);
 
     /* Assume that non-extensible objects are already deep-frozen, to avoid divergence. */
-    if (obj->isExtensible())
+    if (!obj->isExtensible())
         return true;
 
     if (!JSObject::freeze(cx, obj))
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 752b62f3328a..bf14f7f2cad6 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -548,9 +548,6 @@ struct JSObject : public js::ObjectImpl
     static inline unsigned getSealedOrFrozenAttributes(unsigned attrs, ImmutabilityType it);
 
   public:
-    friend class js::BaseProxyHandler;
-
-    bool isExtensible() const;
     bool preventExtensions(JSContext *cx);
 
     /* ES5 15.2.3.8: non-extensible, all props non-configurable */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index ae8f98e86919..306c8cc6d5c5 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -412,12 +412,6 @@ IndirectProxyHandler::defineProperty(JSContext *cx, JSObject *proxy, jsid id_,
            JS_DefinePropertyById(cx, obj, id, v, desc->getter, desc->setter, desc->attrs);
 }
 
-bool
-IndirectProxyHandler::preventExtensions(JSContext *cx, JSObject *proxy)
-{
-    return GetProxyTargetObject(proxy)->preventExtensions(cx);
-}
-
 bool
 IndirectProxyHandler::getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                           AutoIdVector &props)
@@ -448,12 +442,6 @@ IndirectProxyHandler::enumerate(JSContext *cx, JSObject *proxy,
     return GetPropertyNames(cx, target, 0, &props);
 }
 
-bool
-IndirectProxyHandler::isExtensible(JSObject *proxy)
-{
-    return GetProxyTargetObject(proxy)->isExtensible();
-}
-
 bool
 IndirectProxyHandler::call(JSContext *cx, JSObject *proxy, unsigned argc,
                    Value *vp)
@@ -1043,7 +1031,6 @@ class ScriptedDirectProxyHandler : public DirectProxyHandler {
                                           PropertyDescriptor *desc) MOZ_OVERRIDE;
     virtual bool defineProperty(JSContext *cx, JSObject *proxy, jsid id,
                                 PropertyDescriptor *desc) MOZ_OVERRIDE;
-    virtual bool preventExtensions(JSContext *cx, JSObject *proxy) MOZ_OVERRIDE;
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp) MOZ_OVERRIDE;
     virtual bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props) MOZ_OVERRIDE;
@@ -1667,47 +1654,6 @@ ScriptedDirectProxyHandler::defineProperty(JSContext *cx, JSObject *proxy_, jsid
     return TrapDefineOwnProperty(cx, proxy, id, &v);
 }
 
-bool
-ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, JSObject *proxy_)
-{
-    RootedObject proxy(cx, proxy_);
-
-    // step a
-    RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
-
-    // step b
-    RootedObject target(cx, GetProxyTargetObject(proxy));
-
-    // step c
-    RootedValue trap(cx);
-    if (!JSObject::getProperty(cx, handler, handler, cx->names().preventExtensions, &trap))
-        return false;
-
-    // step d
-    if (trap.isUndefined())
-        return DirectProxyHandler::preventExtensions(cx, proxy_);
-
-    // step e
-    Value argv[] = {
-        ObjectValue(*target)
-    };
-    RootedValue trapResult(cx);
-    if (!Invoke(cx, ObjectValue(*handler), trap, 1, argv, trapResult.address()))
-        return false;
-
-    // steps f-h
-    if (ToBoolean(trapResult)) {
-        if (target->isExtensible()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_REPORT_NON_EXT);
-            return false;
-        }
-        return true;
-    } else {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_MAKE_NON_EXT);
-        return false;
-    }
-}
-
 bool
 ScriptedDirectProxyHandler::getOwnPropertyNames(JSContext *cx, JSObject *proxy_,
                                                 AutoIdVector &props)
@@ -2340,14 +2286,6 @@ Proxy::defineProperty(JSContext *cx, JSObject *proxy_, jsid id_, const Value &v)
            Proxy::defineProperty(cx, proxy, id, &desc);
 }
 
-bool
-Proxy::preventExtensions(JSContext *cx, JSObject *proxy_)
-{
-    JS_CHECK_RECURSION(cx, return false);
-    RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->preventExtensions(cx, proxy);
-}
-
 bool
 Proxy::getOwnPropertyNames(JSContext *cx, JSObject *proxy_, AutoIdVector &props)
 {
@@ -2515,12 +2453,6 @@ Proxy::iterate(JSContext *cx, HandleObject proxy_, unsigned flags, MutableHandle
     return EnumeratedIdVectorToIterator(cx, proxy, flags, props, vp);
 }
 
-bool
-Proxy::isExtensible(JSObject *proxy)
-{
-    return GetProxyHandler(proxy)->isExtensible(proxy);
-}
-
 bool
 Proxy::call(JSContext *cx, JSObject *proxy_, unsigned argc, Value *vp)
 {
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index cbd451158166..93a40005f881 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -49,7 +49,6 @@ class JS_FRIEND_API(Wrapper);
 class JS_FRIEND_API(BaseProxyHandler) {
     void *mFamily;
     bool mHasPrototype;
-
   protected:
     // Subclasses may set this in their constructor.
     void setHasPrototype(bool hasPrototype) { mHasPrototype = hasPrototype; }
@@ -92,7 +91,6 @@ class JS_FRIEND_API(BaseProxyHandler) {
                                           PropertyDescriptor *desc) = 0;
     virtual bool defineProperty(JSContext *cx, JSObject *proxy, jsid id,
                                 PropertyDescriptor *desc) = 0;
-    virtual bool preventExtensions(JSContext *cx, JSObject *proxy);
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                      AutoIdVector &props) = 0;
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp) = 0;
@@ -111,7 +109,6 @@ class JS_FRIEND_API(BaseProxyHandler) {
                          Value *vp);
 
     /* Spidermonkey extensions. */
-    virtual bool isExtensible(JSObject *proxy);
     virtual bool call(JSContext *cx, JSObject *proxy, unsigned argc, Value *vp);
     virtual bool construct(JSContext *cx, JSObject *proxy, unsigned argc, Value *argv, Value *rval);
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args);
@@ -151,7 +148,6 @@ class JS_PUBLIC_API(IndirectProxyHandler) : public BaseProxyHandler {
                                           PropertyDescriptor *desc) MOZ_OVERRIDE;
     virtual bool defineProperty(JSContext *cx, JSObject *proxy, jsid id,
                                 PropertyDescriptor *desc) MOZ_OVERRIDE;
-    virtual bool preventExtensions(JSContext *cx, JSObject *proxy) MOZ_OVERRIDE;
     virtual bool getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                      AutoIdVector &props) MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, JSObject *proxy, jsid id,
@@ -160,7 +156,6 @@ class JS_PUBLIC_API(IndirectProxyHandler) : public BaseProxyHandler {
                            AutoIdVector &props) MOZ_OVERRIDE;
 
     /* Spidermonkey extensions. */
-    virtual bool isExtensible(JSObject *proxy);
     virtual bool call(JSContext *cx, JSObject *proxy, unsigned argc,
                       Value *vp) MOZ_OVERRIDE;
     virtual bool construct(JSContext *cx, JSObject *proxy, unsigned argc,
@@ -223,7 +218,6 @@ class Proxy {
                                          Value *vp);
     static bool defineProperty(JSContext *cx, JSObject *proxy, jsid id, PropertyDescriptor *desc);
     static bool defineProperty(JSContext *cx, JSObject *proxy, jsid id, const Value &v);
-    static bool preventExtensions(JSContext *cx, JSObject *proxy);
     static bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     static bool delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     static bool enumerate(JSContext *cx, JSObject *proxy, AutoIdVector &props);
@@ -240,7 +234,6 @@ class Proxy {
     static bool iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleValue vp);
 
     /* Spidermonkey extensions. */
-    static bool isExtensible(JSObject *proxy);
     static bool call(JSContext *cx, JSObject *proxy, unsigned argc, Value *vp);
     static bool construct(JSContext *cx, JSObject *proxy, unsigned argc, Value *argv, Value *rval);
     static bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args);
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 96864ae1daa7..48e22fff8339 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1028,21 +1028,12 @@ Shape::setObjectParent(JSContext *cx, JSObject *parent, TaggedProto proto, Shape
     return replaceLastProperty(cx, base, proto, last);
 }
 
-bool
-JSObject::isExtensible() const
-{
-    if (isProxy())
-        return Proxy::isExtensible(const_cast<JSObject *>(this));
-    return !lastProperty()->hasObjectFlag(js::BaseShape::NOT_EXTENSIBLE);
-}
-
 bool
 JSObject::preventExtensions(JSContext *cx)
 {
     JS_ASSERT(isExtensible());
+
     RootedObject self(cx, this);
-    if (self->isProxy())
-        return Proxy::preventExtensions(cx, self);
 
     /*
      * Force lazy properties to be resolved by iterating over the objects' own
@@ -1058,38 +1049,6 @@ JSObject::preventExtensions(JSContext *cx)
     return self->setFlag(cx, BaseShape::NOT_EXTENSIBLE, GENERATE_SHAPE);
 }
 
-/*
- * Per spec, preventExtensions should be a fundamental trap. We don't want to
- * force consumers of BaseProxyHandler (i.e. DOM bindings) to implement yet
- * another fundamental trap, however, so we provide a default implementation
- * here. We cannot simply forward the operation to the target object, since
- * BaseProxyHandler is not guaranteed to have one. Instead, we use the proxy's
- * shape tree (as we would for normal objects) to store a flag indicating that
- * the proxy is not extensible.
- */
-bool
-BaseProxyHandler::isExtensible(JSObject *proxy)
-{
-    return !proxy->lastProperty()->hasObjectFlag(js::BaseShape::NOT_EXTENSIBLE);
-}
-
-bool
-BaseProxyHandler::preventExtensions(JSContext *cx, JSObject *proxy_)
-{
-    JS_ASSERT(isExtensible());
-    RootedObject proxy(cx, proxy_);
-
-    /*
-     * Force lazy properties to be resolved by iterating over the objects' own
-     * properties.
-     */
-    AutoIdVector props(cx);
-    if (!js::GetPropertyNames(cx, proxy, JSITER_HIDDEN | JSITER_OWNONLY, &props))
-        return false;
-    JS_ASSERT(!proxy->isDenseArray());
-    return proxy_->setFlag(cx, BaseShape::NOT_EXTENSIBLE, JSObject::GENERATE_SHAPE);
-}
-
 bool
 JSObject::setFlag(JSContext *cx, /*BaseShape::Flag*/ uint32_t flag_, GenerateShape generateShape)
 {
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index a7ec511634ca..d869196e55cd 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -15,7 +15,6 @@
 #endif
 
 #include "jsobj.h"
-#include "jsproxy.h"
 #include "jspropertytree.h"
 #include "jstypes.h"
 
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 6714a05ef281..bfeb290c7d52 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -106,7 +106,6 @@
     macro(of, of, "of") \
     macro(parseFloat, parseFloat, "parseFloat") \
     macro(parseInt, parseInt, "parseInt") \
-    macro(preventExtensions, preventExtensions, "preventExtensions") \
     macro(propertyIsEnumerable, propertyIsEnumerable, "propertyIsEnumerable") \
     macro(proto, proto, "__proto__") \
     macro(return, return_, "return") \
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index b30da6f6d76c..f2265d2fcd81 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -100,6 +100,12 @@ js::ObjectImpl::nativeContainsNoAllocation(Shape &shape)
     return nativeLookupNoAllocation(shape.propid()) == &shape;
 }
 
+inline bool
+js::ObjectImpl::isExtensible() const
+{
+    return !lastProperty()->hasObjectFlag(BaseShape::NOT_EXTENSIBLE);
+}
+
 inline bool
 js::ObjectImpl::isDenseArray() const
 {
diff --git a/js/src/vm/ObjectImpl.cpp b/js/src/vm/ObjectImpl.cpp
index 9eb0251b1d8f..5a5e57bbd19d 100644
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/ObjectImpl.cpp
@@ -414,7 +414,7 @@ DenseElementsHeader::defineElement(JSContext *cx, Handle<ObjectImpl*> obj, uint3
      * If the element doesn't exist, we can only add it if the object is
      * extensible.
      */
-    if (!obj->asObjectPtr()->isExtensible()) {
+    if (!obj->isExtensible()) {
         *succeeded = false;
         if (!shouldThrow)
             return true;
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index b7bc0081a251..56ab79a1b19b 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -1016,6 +1016,8 @@ class ObjectImpl : public gc::Cell
         return type_->proto;
     }
 
+    inline bool isExtensible() const;
+
     /*
      * XXX Once the property/element split of bug 586842 is complete, these
      *     methods should move back to JSObject.

From 43e58e33c8bef46741cdab490169c65bf7cfd066 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Sun, 30 Sep 2012 09:40:24 -0700
Subject: [PATCH 09/64] Bug 760331: Coalesce data for inline style across
 nodes. r=bz

This patch enables sharing of an nsAttrValue's MiscContainer between nodes for style rules.  MiscContainers of type eCSSStyleRule are now refcounted (with some clever struct packing to ensure that the amount of memory allocated for MiscContainer remains unchanged on 32 and 64 bit).  This infrastructure can be used to share most MiscContainer types in the future if we find advantages to sharing other types than just eCSSStyleRuley.  A cache mapping strings to MiscContainers has been added to nsHTMLCSSStyleSheet.  MiscContainers can be shared between nsAttrValues when one nsAttrValue is SetTo another nsAttrValue or when there is a cache hit in this cache.  This patch also adds the ability to tell a style rule that it belongs to an nsHTMLCSSStyleSheet, with appropriate accessor functions to separate that from the existing case of belonging to an nsCSSStyleSheet.

The primary use case is to reduce memory use for pages that have lots of inline style attributes with the same value.  This can happen easily with large pages that are automatically generated.  An (admittedly pathological) testcase in Bug 686975 sees over 250 MB of memory savings with this change.  Reusing the same MiscContainer for multiple nodes saves the overhead of maintaining separate copies of the string containing the serialized value of the style attribute and of creating separate style rules for each node.  Eliminating duplicate style rules enables further savings in layout through style context sharing.  The testcase sees the amount of memory used by style contexts go from over 250 MB to 10 KB.

Because the cache is based on the text value of the style attribute, it will not handle attributes that have different text values but are parsed into identical style rules.  We also do not attempt to share MiscContainers when the node's base URI differs from the document URI.  The effect of these limitations is expected to be low.
---
 content/base/src/Makefile.in                  |   1 +
 content/base/src/nsAttrValue.cpp              | 541 +++++++++++-------
 content/base/src/nsAttrValue.h                | 202 +------
 content/base/src/nsAttrValueInlines.h         | 216 +++++++
 content/base/src/nsContentUtils.cpp           |   1 +
 content/base/src/nsGenericElement.cpp         |   1 +
 content/base/src/nsStyledElement.cpp          |  18 +-
 content/html/content/src/nsFormSubmission.cpp |   1 +
 .../html/content/src/nsGenericHTMLElement.cpp |   1 +
 content/html/content/src/nsHTMLBRElement.cpp  |   1 +
 .../html/content/src/nsHTMLBodyElement.cpp    |   3 +-
 .../html/content/src/nsHTMLButtonElement.cpp  |   2 +
 .../html/content/src/nsHTMLCanvasElement.cpp  |   1 +
 .../html/content/src/nsHTMLFontElement.cpp    |   1 +
 content/html/content/src/nsHTMLHRElement.cpp  |   1 +
 .../html/content/src/nsHTMLIFrameElement.cpp  |   1 +
 .../html/content/src/nsHTMLInputElement.cpp   |   1 +
 content/html/content/src/nsHTMLLIElement.cpp  |   1 +
 .../html/content/src/nsHTMLMediaElement.cpp   |   1 +
 .../html/content/src/nsHTMLMenuElement.cpp    |   2 +-
 .../content/src/nsHTMLMenuItemElement.cpp     |   1 +
 .../html/content/src/nsHTMLMeterElement.cpp   |   1 +
 .../html/content/src/nsHTMLOListElement.cpp   |   1 +
 .../html/content/src/nsHTMLObjectElement.cpp  |   1 +
 content/html/content/src/nsHTMLPreElement.cpp |   1 +
 .../content/src/nsHTMLProgressElement.cpp     |   1 +
 .../html/content/src/nsHTMLSharedElement.cpp  |   1 +
 .../content/src/nsHTMLTableCaptionElement.cpp |   1 +
 .../content/src/nsHTMLTableCellElement.cpp    |   1 +
 .../content/src/nsHTMLTableColElement.cpp     |   1 +
 .../html/content/src/nsHTMLTableElement.cpp   |   1 +
 .../content/src/nsHTMLTableRowElement.cpp     |   1 +
 .../content/src/nsHTMLTableSectionElement.cpp |   1 +
 .../content/src/nsHTMLTextAreaElement.cpp     |   1 +
 .../html/content/src/nsTextEditorState.cpp    |   1 +
 content/smil/nsSMILAnimationFunction.cpp      |   1 +
 content/smil/nsSMILTimedElement.cpp           |   1 +
 content/svg/content/src/DOMSVGTransform.cpp   |   1 +
 .../src/SVGAnimatedPreserveAspectRatio.cpp    |   1 +
 .../src/SVGMotionSMILAnimationFunction.cpp    |   1 +
 content/svg/content/src/nsSVGAngle.cpp        |   1 +
 content/svg/content/src/nsSVGLength2.cpp      |   1 +
 content/svg/content/src/nsSVGViewBox.cpp      |   1 +
 content/xul/content/src/nsXULElement.cpp      |   1 +
 dom/base/nsFocusManager.cpp                   |   1 -
 dom/bindings/Makefile.in                      |   1 -
 dom/media/MediaManager.cpp                    |   4 +-
 layout/forms/nsLegendFrame.cpp                |   1 +
 layout/forms/nsTextControlFrame.cpp           |   1 +
 layout/generic/nsBlockFrame.cpp               |   1 +
 layout/generic/nsBulletFrame.cpp              |   1 +
 layout/generic/nsFrameSetFrame.cpp            |   1 +
 layout/generic/nsSubDocumentFrame.cpp         |   1 +
 layout/style/Rule.h                           |  13 +-
 layout/style/StyleRule.cpp                    |  17 +-
 layout/style/nsCSSRuleProcessor.cpp           |   1 +
 layout/style/nsCSSRules.cpp                   |  79 ++-
 layout/style/nsHTMLCSSStyleSheet.cpp          |  53 ++
 layout/style/nsHTMLCSSStyleSheet.h            |   8 +
 layout/tables/nsTableCellFrame.cpp            |   1 +
 60 files changed, 781 insertions(+), 424 deletions(-)
 create mode 100644 content/base/src/nsAttrValueInlines.h

diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 8bfcc6b8e24c..674b8a8e295e 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -35,6 +35,7 @@ EXPORTS		= \
 		nsFrameMessageManager.h \
 		nsAttrAndChildArray.h \
 		nsAttrValue.h \
+		nsAttrValueInlines.h \
 		nsCrossSiteListenerProxy.h \
 		nsDOMAttributeMap.h \
 		nsGenericElement.h \
diff --git a/content/base/src/nsAttrValue.cpp b/content/base/src/nsAttrValue.cpp
index cf36d09ed3c6..2a22fc54fa96 100644
--- a/content/base/src/nsAttrValue.cpp
+++ b/content/base/src/nsAttrValue.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsIAtom.h"
 #include "nsUnicharUtils.h"
 #include "mozilla/css/StyleRule.h"
@@ -17,12 +18,101 @@
 #include "nsReadableUtils.h"
 #include "prprf.h"
 #include "mozilla/HashFunctions.h"
+#include "nsHTMLCSSStyleSheet.h"
+#include "nsCSSParser.h"
+#include "nsStyledElement.h"
 
 using namespace mozilla;
 
 #define MISC_STR_PTR(_cont) \
   reinterpret_cast<void*>((_cont)->mStringBits & NS_ATTRVALUE_POINTERVALUE_MASK)
 
+bool
+MiscContainer::GetString(nsDependentString& aString) const
+{
+  void* ptr = MISC_STR_PTR(this);
+
+  if (!ptr) {
+    return false;
+  }
+
+  if (static_cast<nsAttrValue::ValueBaseType>(mStringBits &
+                                              NS_ATTRVALUE_BASETYPE_MASK) ==
+      nsAttrValue::eStringBase) {
+    nsStringBuffer* buffer = static_cast<nsStringBuffer*>(ptr);
+    if (!buffer) {
+      return false;
+    }
+
+    aString.Rebind(reinterpret_cast<PRUnichar*>(buffer->Data()),
+                   buffer->StorageSize() / sizeof(PRUnichar) - 1);
+    return true;
+  }
+
+  nsIAtom* atom = static_cast<nsIAtom*>(ptr);
+  if (!atom) {
+    return false;
+  }
+
+  aString.Rebind(atom->GetUTF16String(), atom->GetLength());
+  return true;
+}
+
+void
+MiscContainer::Cache()
+{
+  // Not implemented for anything else yet.
+  MOZ_ASSERT(mType == nsAttrValue::eCSSStyleRule);
+  MOZ_ASSERT(IsRefCounted());
+  MOZ_ASSERT(mValue.mRefCount > 0);
+  MOZ_ASSERT(!mValue.mCached);
+
+  css::StyleRule* rule = mValue.mCSSStyleRule;
+  nsHTMLCSSStyleSheet* sheet = rule->GetHTMLCSSStyleSheet();
+  if (!sheet) {
+    return;
+  }
+
+  nsDependentString str;
+  bool gotString = GetString(str);
+  if (!gotString) {
+    return;
+  }
+
+  sheet->CacheStyleAttr(str, this);
+  mValue.mCached = 1;
+
+  // This has to be immutable once it goes into the cache.
+  css::Declaration* decl = rule->GetDeclaration();
+  if (decl) {
+    decl->SetImmutable();
+  }
+}
+
+void
+MiscContainer::Evict()
+{
+  // Not implemented for anything else yet.
+  MOZ_ASSERT(mType == nsAttrValue::eCSSStyleRule);
+  MOZ_ASSERT(IsRefCounted());
+  MOZ_ASSERT(mValue.mRefCount == 0);
+
+  if (!mValue.mCached) {
+    return;
+  }
+
+  css::StyleRule* rule = mValue.mCSSStyleRule;
+  nsHTMLCSSStyleSheet* sheet = rule->GetHTMLCSSStyleSheet();
+  MOZ_ASSERT(sheet);
+
+  nsDependentString str;
+  DebugOnly<bool> gotString = GetString(str);
+  MOZ_ASSERT(gotString);
+
+  sheet->EvictStyleAttr(str, this);
+  mValue.mCached = 0;
+}
+
 nsTArray<const nsAttrValue::EnumTable*>* nsAttrValue::sEnumTableArray = nullptr;
 
 nsAttrValue::nsAttrValue()
@@ -119,8 +209,13 @@ nsAttrValue::Reset()
     }
     case eOtherBase:
     {
-      EnsureEmptyMiscContainer();
-      delete GetMiscContainer();
+      MiscContainer* cont = GetMiscContainer();
+      if (cont->IsRefCounted() && cont->mValue.mRefCount > 1) {
+        NS_RELEASE(cont);
+        break;
+      }
+
+      delete ClearMiscContainer();
 
       break;
     }
@@ -179,51 +274,54 @@ nsAttrValue::SetTo(const nsAttrValue& aOther)
   }
 
   MiscContainer* otherCont = aOther.GetMiscContainer();
-  if (!EnsureEmptyMiscContainer()) {
+  if (otherCont->IsRefCounted()) {
+    delete ClearMiscContainer();
+    NS_ADDREF(otherCont);
+    SetPtrValueAndType(otherCont, eOtherBase);
     return;
   }
 
-  MiscContainer* cont = GetMiscContainer();
+  MiscContainer* cont = EnsureEmptyMiscContainer();
   switch (otherCont->mType) {
     case eInteger:
     {
-      cont->mInteger = otherCont->mInteger;
+      cont->mValue.mInteger = otherCont->mValue.mInteger;
       break;
     }
     case eEnum:
     {
-      cont->mEnumValue = otherCont->mEnumValue;
+      cont->mValue.mEnumValue = otherCont->mValue.mEnumValue;
       break;
     }
     case ePercent:
     {
-      cont->mPercent = otherCont->mPercent;
+      cont->mValue.mPercent = otherCont->mValue.mPercent;
       break;
     }
     case eColor:
     {
-      cont->mColor = otherCont->mColor;
+      cont->mValue.mColor = otherCont->mValue.mColor;
       break;
     }
     case eCSSStyleRule:
     {
-      NS_ADDREF(cont->mCSSStyleRule = otherCont->mCSSStyleRule);
+      MOZ_NOT_REACHED("These should be refcounted!");
       break;
     }
     case eURL:
     {
-      NS_ADDREF(cont->mURL = otherCont->mURL);
+      NS_ADDREF(cont->mValue.mURL = otherCont->mValue.mURL);
       break;
     }
     case eImage:
     {
-      NS_ADDREF(cont->mImage = otherCont->mImage);
+      NS_ADDREF(cont->mValue.mImage = otherCont->mValue.mImage);
       break;
     }
     case eAtomArray:
     {
       if (!EnsureEmptyAtomArray() ||
-          !GetAtomArrayValue()->AppendElements(*otherCont->mAtomArray)) {
+          !GetAtomArrayValue()->AppendElements(*otherCont->mValue.mAtomArray)) {
         Reset();
         return;
       }
@@ -236,8 +334,9 @@ nsAttrValue::SetTo(const nsAttrValue& aOther)
     }
     case eIntMarginValue:
     {
-      if (otherCont->mIntMargin)
-        cont->mIntMargin = new nsIntMargin(*otherCont->mIntMargin);
+      if (otherCont->mValue.mIntMargin)
+        cont->mValue.mIntMargin =
+          new nsIntMargin(*otherCont->mValue.mIntMargin);
       break;
     }
     default:
@@ -245,7 +344,7 @@ nsAttrValue::SetTo(const nsAttrValue& aOther)
       if (IsSVGType(otherCont->mType)) {
         // All SVG types are just pointers to classes and will therefore have
         // the same size so it doesn't really matter which one we assign
-        cont->mSVGAngle = otherCont->mSVGAngle;
+        cont->mValue.mSVGAngle = otherCont->mValue.mSVGAngle;
       } else {
         NS_NOTREACHED("unknown type stored in MiscContainer");
       }
@@ -305,44 +404,39 @@ nsAttrValue::SetTo(int32_t aInt, const nsAString* aSerialized)
 void
 nsAttrValue::SetTo(double aValue, const nsAString* aSerialized)
 {
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    cont->mDoubleValue = aValue;
-    cont->mType = eDoubleValue;
-    SetMiscAtomOrString(aSerialized);
-  }
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  cont->mDoubleValue = aValue;
+  cont->mType = eDoubleValue;
+  SetMiscAtomOrString(aSerialized);
 }
 
 void
 nsAttrValue::SetTo(css::StyleRule* aValue, const nsAString* aSerialized)
 {
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    NS_ADDREF(cont->mCSSStyleRule = aValue);
-    cont->mType = eCSSStyleRule;
-    SetMiscAtomOrString(aSerialized);
-  }
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  MOZ_ASSERT(cont->mValue.mRefCount == 0);
+  NS_ADDREF(cont->mValue.mCSSStyleRule = aValue);
+  cont->mType = eCSSStyleRule;
+  NS_ADDREF(cont);
+  SetMiscAtomOrString(aSerialized);
+  MOZ_ASSERT(cont->mValue.mRefCount == 1);
 }
 
 void
 nsAttrValue::SetTo(css::URLValue* aValue, const nsAString* aSerialized)
 {
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    NS_ADDREF(cont->mURL = aValue);
-    cont->mType = eURL;
-    SetMiscAtomOrString(aSerialized);
-  }
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  NS_ADDREF(cont->mValue.mURL = aValue);
+  cont->mType = eURL;
+  SetMiscAtomOrString(aSerialized);
 }
 
 void
 nsAttrValue::SetTo(const nsIntMargin& aValue)
 {
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    cont->mIntMargin = new nsIntMargin(aValue);
-    cont->mType = eIntMarginValue;
-  }
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  cont->mValue.mIntMargin = new nsIntMargin(aValue);
+  cont->mType = eIntMarginValue;
 }
 
 void
@@ -481,20 +575,11 @@ nsAttrValue::ToString(nsAString& aResult) const
   MiscContainer* cont = nullptr;
   if (BaseType() == eOtherBase) {
     cont = GetMiscContainer();
-    void* ptr = MISC_STR_PTR(cont);
-    if (ptr) {
-      if (static_cast<ValueBaseType>(cont->mStringBits & NS_ATTRVALUE_BASETYPE_MASK) ==
-          eStringBase) {
-        nsStringBuffer* str = static_cast<nsStringBuffer*>(ptr);
-        if (str) {
-          str->ToString(str->StorageSize()/sizeof(PRUnichar) - 1, aResult);
-          return;
-        }
-      } else {
-        nsIAtom *atom = static_cast<nsIAtom*>(ptr);
-        atom->ToString(aResult);
-        return;
-      }
+
+    nsDependentString str;
+    if (cont->GetString(str)) {
+      aResult = str;
+      return;
     }
   }
 
@@ -541,7 +626,7 @@ nsAttrValue::ToString(nsAString& aResult) const
     case ePercent:
     {
       nsAutoString intStr;
-      intStr.AppendInt(cont ? cont->mPercent : GetIntInternal());
+      intStr.AppendInt(cont ? cont->mValue.mPercent : GetIntInternal());
       aResult = intStr + NS_LITERAL_STRING("%");
 
       break;
@@ -550,7 +635,8 @@ nsAttrValue::ToString(nsAString& aResult) const
     {
       aResult.Truncate();
       MiscContainer *container = GetMiscContainer();
-      css::Declaration *decl = container->mCSSStyleRule->GetDeclaration();
+      css::Declaration *decl =
+        container->mValue.mCSSStyleRule->GetDeclaration();
       if (decl) {
         decl->ToString(aResult);
       }
@@ -566,69 +652,74 @@ nsAttrValue::ToString(nsAString& aResult) const
     }
     case eSVGAngle:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGAngle, aResult);
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGAngle,
+                                    aResult);
       break;
     }
     case eSVGIntegerPair:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGIntegerPair,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGIntegerPair,
                                     aResult);
       break;
     }
     case eSVGLength:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGLength, aResult);
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGLength,
+                                    aResult);
       break;
     }
     case eSVGLengthList:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGLengthList,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGLengthList,
                                     aResult);
       break;
     }
     case eSVGNumberList:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGNumberList,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGNumberList,
                                     aResult);
       break;
     }
     case eSVGNumberPair:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGNumberPair,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGNumberPair,
                                     aResult);
       break;
     }
     case eSVGPathData:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGPathData, aResult);
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGPathData,
+                                    aResult);
       break;
     }
     case eSVGPointList:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGPointList, aResult);
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGPointList,
+                                    aResult);
       break;
     }
     case eSVGPreserveAspectRatio:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGPreserveAspectRatio,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGPreserveAspectRatio,
                                     aResult);
       break;
     }
     case eSVGStringList:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGStringList,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGStringList,
                                     aResult);
       break;
     }
     case eSVGTransformList:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGTransformList,
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGTransformList,
                                     aResult);
       break;
     }
     case eSVGViewBox:
     {
-      SVGAttrValueWrapper::ToString(GetMiscContainer()->mSVGViewBox, aResult);
+      SVGAttrValueWrapper::ToString(GetMiscContainer()->mValue.mSVGViewBox,
+                                    aResult);
       break;
     }
     default:
@@ -679,7 +770,7 @@ nsAttrValue::GetColorValue(nscolor& aColor) const
     return false;
   }
 
-  aColor = GetMiscContainer()->mColor;
+  aColor = GetMiscContainer()->mValue.mColor;
   return true;
 }
 
@@ -690,7 +781,7 @@ nsAttrValue::GetEnumString(nsAString& aResult, bool aRealTag) const
 
   uint32_t allEnumBits =
     (BaseType() == eIntegerBase) ? static_cast<uint32_t>(GetIntInternal())
-                                   : GetMiscContainer()->mEnumValue;
+                                   : GetMiscContainer()->mValue.mEnumValue;
   int16_t val = allEnumBits >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS;
   const EnumTable* table = sEnumTableArray->
     ElementAt(allEnumBits & NS_ATTRVALUE_ENUMTABLEINDEX_MASK);
@@ -777,23 +868,23 @@ nsAttrValue::HashValue() const
   switch (cont->mType) {
     case eInteger:
     {
-      return cont->mInteger;
+      return cont->mValue.mInteger;
     }
     case eEnum:
     {
-      return cont->mEnumValue;
+      return cont->mValue.mEnumValue;
     }
     case ePercent:
     {
-      return cont->mPercent;
+      return cont->mValue.mPercent;
     }
     case eColor:
     {
-      return cont->mColor;
+      return cont->mValue.mColor;
     }
     case eCSSStyleRule:
     {
-      return NS_PTR_TO_INT32(cont->mCSSStyleRule);
+      return NS_PTR_TO_INT32(cont->mValue.mCSSStyleRule);
     }
     // Intentionally identical, so that loading the image does not change the
     // hash code.
@@ -807,8 +898,8 @@ nsAttrValue::HashValue() const
     case eAtomArray:
     {
       uint32_t hash = 0;
-      uint32_t count = cont->mAtomArray->Length();
-      for (nsCOMPtr<nsIAtom> *cur = cont->mAtomArray->Elements(),
+      uint32_t count = cont->mValue.mAtomArray->Length();
+      for (nsCOMPtr<nsIAtom> *cur = cont->mValue.mAtomArray->Elements(),
                              *end = cur + count;
            cur != end; ++cur) {
         hash = AddToHash(hash, cur->get());
@@ -822,13 +913,13 @@ nsAttrValue::HashValue() const
     }
     case eIntMarginValue:
     {
-      return NS_PTR_TO_INT32(cont->mIntMargin);
+      return NS_PTR_TO_INT32(cont->mValue.mIntMargin);
     }
     default:
     {
       if (IsSVGType(cont->mType)) {
         // All SVG types are just pointers to classes so we can treat them alike
-        return NS_PTR_TO_INT32(cont->mSVGAngle);
+        return NS_PTR_TO_INT32(cont->mValue.mSVGAngle);
       }
       NS_NOTREACHED("unknown type stored in MiscContainer");
       return 0;
@@ -861,6 +952,10 @@ nsAttrValue::Equals(const nsAttrValue& aOther) const
 
   MiscContainer* thisCont = GetMiscContainer();
   MiscContainer* otherCont = aOther.GetMiscContainer();
+  if (thisCont == otherCont) {
+    return true;
+  }
+
   if (thisCont->mType != otherCont->mType) {
     return false;
   }
@@ -870,50 +965,50 @@ nsAttrValue::Equals(const nsAttrValue& aOther) const
   switch (thisCont->mType) {
     case eInteger:
     {
-      if (thisCont->mInteger == otherCont->mInteger) {
+      if (thisCont->mValue.mInteger == otherCont->mValue.mInteger) {
         needsStringComparison = true;
       }
       break;
     }
     case eEnum:
     {
-      if (thisCont->mEnumValue == otherCont->mEnumValue) {
+      if (thisCont->mValue.mEnumValue == otherCont->mValue.mEnumValue) {
         needsStringComparison = true;
       }
       break;
     }
     case ePercent:
     {
-      if (thisCont->mPercent == otherCont->mPercent) {
+      if (thisCont->mValue.mPercent == otherCont->mValue.mPercent) {
         needsStringComparison = true;
       }
       break;
     }
     case eColor:
     {
-      if (thisCont->mColor == otherCont->mColor) {
+      if (thisCont->mValue.mColor == otherCont->mValue.mColor) {
         needsStringComparison = true;
       }
       break;
     }
     case eCSSStyleRule:
     {
-      return thisCont->mCSSStyleRule == otherCont->mCSSStyleRule;
+      return thisCont->mValue.mCSSStyleRule == otherCont->mValue.mCSSStyleRule;
     }
     case eURL:
     {
-      return thisCont->mURL == otherCont->mURL;
+      return thisCont->mValue.mURL == otherCont->mValue.mURL;
     }
     case eImage:
     {
-      return thisCont->mImage == otherCont->mImage;
+      return thisCont->mValue.mImage == otherCont->mValue.mImage;
     }
     case eAtomArray:
     {
       // For classlists we could be insensitive to order, however
       // classlists are never mapped attributes so they are never compared.
 
-      if (!(*thisCont->mAtomArray == *otherCont->mAtomArray)) {
+      if (!(*thisCont->mValue.mAtomArray == *otherCont->mValue.mAtomArray)) {
         return false;
       }
 
@@ -926,7 +1021,7 @@ nsAttrValue::Equals(const nsAttrValue& aOther) const
     }
     case eIntMarginValue:
     {
-      return thisCont->mIntMargin == otherCont->mIntMargin;
+      return thisCont->mValue.mIntMargin == otherCont->mValue.mIntMargin;
     }
     default:
     {
@@ -1243,33 +1338,31 @@ nsAttrValue::SetIntValueAndType(int32_t aValue, ValueType aType,
 {
   if (aStringValue || aValue > NS_ATTRVALUE_INTEGERTYPE_MAXVALUE ||
       aValue < NS_ATTRVALUE_INTEGERTYPE_MINVALUE) {
-    if (EnsureEmptyMiscContainer()) {
-      MiscContainer* cont = GetMiscContainer();
-      switch (aType) {
-        case eInteger:
-        {
-          cont->mInteger = aValue;
-          break;
-        }
-        case ePercent:
-        {
-          cont->mPercent = aValue;
-          break;
-        }
-        case eEnum:
-        {
-          cont->mEnumValue = aValue;
-          break;
-        }
-        default:
-        {
-          NS_NOTREACHED("unknown integer type");
-          break;
-        }
+    MiscContainer* cont = EnsureEmptyMiscContainer();
+    switch (aType) {
+      case eInteger:
+      {
+        cont->mValue.mInteger = aValue;
+        break;
+      }
+      case ePercent:
+      {
+        cont->mValue.mPercent = aValue;
+        break;
+      }
+      case eEnum:
+      {
+        cont->mValue.mEnumValue = aValue;
+        break;
+      }
+      default:
+      {
+        NS_NOTREACHED("unknown integer type");
+        break;
       }
-      cont->mType = aType;
-      SetMiscAtomOrString(aStringValue);
     }
+    cont->mType = aType;
+    SetMiscAtomOrString(aStringValue);
   } else {
     NS_ASSERTION(!mBits, "Reset before calling SetIntValueAndType!");
     mBits = (aValue * NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER) | aType;
@@ -1438,13 +1531,8 @@ nsAttrValue::SetColorValue(nscolor aColor, const nsAString& aString)
     return;
   }
 
-  if (!EnsureEmptyMiscContainer()) {
-    buf->Release();
-    return;
-  }
-
-  MiscContainer* cont = GetMiscContainer();
-  cont->mColor = aColor;
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  cont->mValue.mColor = aColor;
   cont->mType = eColor;
 
   // Save the literal string we were passed for round-tripping.
@@ -1505,17 +1593,14 @@ bool nsAttrValue::ParseDoubleValue(const nsAString& aString)
   if (NS_FAILED(ec)) {
     return false;
   }
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    cont->mDoubleValue = val;
-    cont->mType = eDoubleValue;
-    nsAutoString serializedFloat;
-    serializedFloat.AppendFloat(val);
-    SetMiscAtomOrString(serializedFloat.Equals(aString) ? nullptr : &aString);
-    return true;
-  }
 
-  return false;
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  cont->mDoubleValue = val;
+  cont->mType = eDoubleValue;
+  nsAutoString serializedFloat;
+  serializedFloat.AppendFloat(val);
+  SetMiscAtomOrString(serializedFloat.Equals(aString) ? nullptr : &aString);
+  return true;
 }
 
 bool
@@ -1527,15 +1612,11 @@ nsAttrValue::ParseIntMarginValue(const nsAString& aString)
   if (!nsContentUtils::ParseIntMarginValue(aString, margins))
     return false;
 
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    cont->mIntMargin = new nsIntMargin(margins);
-    cont->mType = eIntMarginValue;
-    SetMiscAtomOrString(&aString);
-    return true;
-  }
-
-  return false;
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  cont->mValue.mIntMargin = new nsIntMargin(margins);
+  cont->mType = eIntMarginValue;
+  SetMiscAtomOrString(&aString);
+  return true;
 }
 
 void
@@ -1553,17 +1634,65 @@ nsAttrValue::LoadImage(nsIDocument* aDocument)
 #endif
 
   MiscContainer* cont = GetMiscContainer();
-  mozilla::css::URLValue* url = cont->mURL;
+  mozilla::css::URLValue* url = cont->mValue.mURL;
   mozilla::css::ImageValue* image = 
     new css::ImageValue(url->GetURI(), url->mString, url->mReferrer,
                         url->mOriginPrincipal, aDocument);
 
   NS_ADDREF(image);
-  cont->mImage = image;
+  cont->mValue.mImage = image;
   NS_RELEASE(url);
   cont->mType = eImage;
 }
 
+bool
+nsAttrValue::ParseStyleAttribute(const nsAString& aString,
+                                 nsStyledElementNotElementCSSInlineStyle* aElement)
+{
+  nsIDocument* ownerDoc = aElement->OwnerDoc();
+  nsHTMLCSSStyleSheet* sheet = ownerDoc->GetInlineStyleSheet();
+  nsCOMPtr<nsIURI> baseURI = aElement->GetBaseURI();
+  nsIURI* docURI = ownerDoc->GetDocumentURI();
+
+  NS_ASSERTION(aElement->NodePrincipal() == ownerDoc->NodePrincipal(),
+               "This is unexpected");
+
+  // If the (immutable) document URI does not match the element's base URI
+  // (the common case is that they do match) do not cache the rule.  This is
+  // because the results of the CSS parser are dependent on these URIs, and we
+  // do not want to have to account for the URIs in the hash lookup.
+  bool cachingAllowed = sheet && baseURI == docURI;
+  if (cachingAllowed) {
+    MiscContainer* cont = sheet->LookupStyleAttr(aString);
+    if (cont) {
+      // Set our MiscContainer to the cached one.
+      NS_ADDREF(cont);
+      SetPtrValueAndType(cont, eOtherBase);
+      return true;
+    }
+  }
+
+  css::Loader* cssLoader = ownerDoc->CSSLoader();
+  nsCSSParser cssParser(cssLoader);
+
+  nsRefPtr<css::StyleRule> rule;
+  cssParser.ParseStyleAttribute(aString, docURI, baseURI,
+                                aElement->NodePrincipal(),
+                                getter_AddRefs(rule));
+  if (rule) {
+    rule->SetHTMLCSSStyleSheet(sheet);
+    SetTo(rule, &aString);
+    if (cachingAllowed) {
+      MiscContainer* cont = GetMiscContainer();
+      cont->Cache();
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
 void
 nsAttrValue::SetMiscAtomOrString(const nsAString* aValue)
 {
@@ -1615,71 +1744,90 @@ void
 nsAttrValue::SetSVGType(ValueType aType, const void* aValue,
                         const nsAString* aSerialized) {
   NS_ABORT_IF_FALSE(IsSVGType(aType), "Not an SVG type");
-  if (EnsureEmptyMiscContainer()) {
-    MiscContainer* cont = GetMiscContainer();
-    // All SVG types are just pointers to classes so just setting any of them
-    // will do. We'll lose type-safety but the signature of the calling
-    // function should ensure we don't get anything unexpected, and once we
-    // stick aValue in a union we lose type information anyway.
-    cont->mSVGAngle = static_cast<const nsSVGAngle*>(aValue);
-    cont->mType = aType;
-    SetMiscAtomOrString(aSerialized);
-  }
+
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  // All SVG types are just pointers to classes so just setting any of them
+  // will do. We'll lose type-safety but the signature of the calling
+  // function should ensure we don't get anything unexpected, and once we
+  // stick aValue in a union we lose type information anyway.
+  cont->mValue.mSVGAngle = static_cast<const nsSVGAngle*>(aValue);
+  cont->mType = aType;
+  SetMiscAtomOrString(aSerialized);
 }
 
-bool
-nsAttrValue::EnsureEmptyMiscContainer()
+MiscContainer*
+nsAttrValue::ClearMiscContainer()
 {
-  MiscContainer* cont;
+  MiscContainer* cont = nullptr;
   if (BaseType() == eOtherBase) {
-    ResetMiscAtomOrString();
     cont = GetMiscContainer();
-    switch (cont->mType) {
-      case eCSSStyleRule:
-      {
-        NS_RELEASE(cont->mCSSStyleRule);
-        break;
-      }
-      case eURL:
-      {
-        NS_RELEASE(cont->mURL);
-        break;
-      }
-      case eImage:
-      {
-        NS_RELEASE(cont->mImage);
-        break;
-      }
-      case eAtomArray:
-      {
-        delete cont->mAtomArray;
-        break;
-      }
-      case eIntMarginValue:
-      {
-        delete cont->mIntMargin;
-        break;
-      }
-      default:
-      {
-        break;
+    if (cont->IsRefCounted() && cont->mValue.mRefCount > 1) {
+      // This MiscContainer is shared, we need a new one.
+      NS_RELEASE(cont);
+
+      cont = new MiscContainer;
+      SetPtrValueAndType(cont, eOtherBase);
+    }
+    else {
+      switch (cont->mType) {
+        case eCSSStyleRule:
+        {
+          MOZ_ASSERT(cont->mValue.mRefCount == 1);
+          cont->Release();
+          cont->Evict();
+          NS_RELEASE(cont->mValue.mCSSStyleRule);
+          break;
+        }
+        case eURL:
+        {
+          NS_RELEASE(cont->mValue.mURL);
+          break;
+        }
+        case eImage:
+        {
+          NS_RELEASE(cont->mValue.mImage);
+          break;
+        }
+        case eAtomArray:
+        {
+          delete cont->mValue.mAtomArray;
+          break;
+        }
+        case eIntMarginValue:
+        {
+          delete cont->mValue.mIntMargin;
+          break;
+        }
+        default:
+        {
+          break;
+        }
       }
     }
+    ResetMiscAtomOrString();
   }
   else {
     ResetIfSet();
+  }
 
+  return cont;
+}
+
+MiscContainer*
+nsAttrValue::EnsureEmptyMiscContainer()
+{
+  MiscContainer* cont = ClearMiscContainer();
+  if (cont) {
+    MOZ_ASSERT(BaseType() == eOtherBase);
+    ResetMiscAtomOrString();
+    cont = GetMiscContainer();
+  }
+  else {
     cont = new MiscContainer;
-    NS_ENSURE_TRUE(cont, false);
-
     SetPtrValueAndType(cont, eOtherBase);
   }
 
-  cont->mType = eColor;
-  cont->mStringBits = 0;
-  cont->mColor = 0;
-
-  return true;
+  return cont;
 }
 
 bool
@@ -1691,19 +1839,14 @@ nsAttrValue::EnsureEmptyAtomArray()
     return true;
   }
 
-  if (!EnsureEmptyMiscContainer()) {
-    // should already be reset
-    return false;
-  }
-
   AtomArray* array = new AtomArray;
   if (!array) {
     Reset();
     return false;
   }
 
-  MiscContainer* cont = GetMiscContainer();
-  cont->mAtomArray = array;
+  MiscContainer* cont = EnsureEmptyMiscContainer();
+  cont->mValue.mAtomArray = array;
   cont->mType = eAtomArray;
 
   return true;
@@ -1834,13 +1977,13 @@ nsAttrValue::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
         n += str ? str->SizeOfIncludingThisIfUnshared(aMallocSizeOf) : 0;
       }
 
-      if (Type() == eCSSStyleRule && container->mCSSStyleRule) {
+      if (Type() == eCSSStyleRule && container->mValue.mCSSStyleRule) {
         // TODO: mCSSStyleRule might be owned by another object which would
         //       make us count them twice, bug 677493.
         //n += container->mCSSStyleRule->SizeOfIncludingThis(aMallocSizeOf);
-      } else if (Type() == eAtomArray && container->mAtomArray) {
+      } else if (Type() == eAtomArray && container->mValue.mAtomArray) {
         // Don't measure each nsIAtom, they are measured separatly.
-        n += container->mAtomArray->SizeOfIncludingThis(aMallocSizeOf);
+        n += container->mValue.mAtomArray->SizeOfIncludingThis(aMallocSizeOf);
       }
       break;
     }
diff --git a/content/base/src/nsAttrValue.h b/content/base/src/nsAttrValue.h
index 86ae9ebdcb64..30a7179afc24 100644
--- a/content/base/src/nsAttrValue.h
+++ b/content/base/src/nsAttrValue.h
@@ -26,6 +26,8 @@ class nsIAtom;
 class nsIDocument;
 template<class E, class A> class nsTArray;
 struct nsTArrayDefaultAllocator;
+class nsStyledElementNotElementCSSInlineStyle;
+struct MiscContainer;
 
 namespace mozilla {
 namespace css {
@@ -66,22 +68,10 @@ public:
 };
 
 class nsAttrValue {
+  friend struct MiscContainer;
 public:
   typedef nsTArray< nsCOMPtr<nsIAtom> > AtomArray;
 
-  nsAttrValue();
-  nsAttrValue(const nsAttrValue& aOther);
-  explicit nsAttrValue(const nsAString& aValue);
-  explicit nsAttrValue(nsIAtom* aValue);
-  nsAttrValue(mozilla::css::StyleRule* aValue, const nsAString* aSerialized);
-  explicit nsAttrValue(const nsIntMargin& aValue);
-  ~nsAttrValue();
-
-  inline const nsAttrValue& operator=(const nsAttrValue& aOther);
-
-  static nsresult Init();
-  static void Shutdown();
-
   // This has to be the same as in ValueBaseType
   enum ValueType {
     eString =       0x00, //   00
@@ -115,6 +105,19 @@ public:
     ,eSVGTypesEnd =    0x34
   };
 
+  nsAttrValue();
+  nsAttrValue(const nsAttrValue& aOther);
+  explicit nsAttrValue(const nsAString& aValue);
+  explicit nsAttrValue(nsIAtom* aValue);
+  nsAttrValue(mozilla::css::StyleRule* aValue, const nsAString* aSerialized);
+  explicit nsAttrValue(const nsIntMargin& aValue);
+  ~nsAttrValue();
+
+  inline const nsAttrValue& operator=(const nsAttrValue& aOther);
+
+  static nsresult Init();
+  static void Shutdown();
+
   ValueType Type() const;
 
   void Reset();
@@ -357,6 +360,15 @@ public:
    */
   void LoadImage(nsIDocument* aDocument);
 
+  /**
+   * Parse a string into a CSS style rule.
+   *
+   * @param aString the style attribute value to be parsed.
+   * @param aElement the element the attribute is set on.
+   */
+  bool ParseStyleAttribute(const nsAString& aString,
+                           nsStyledElementNotElementCSSInlineStyle* aElement);
+
   size_t SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
 
 private:
@@ -368,40 +380,6 @@ private:
     eIntegerBase =   0x03        // 11
   };
 
-  struct MiscContainer
-  {
-    ValueType mType;
-    // mStringBits points to either nsIAtom* or nsStringBuffer* and is used when
-    // mType isn't mCSSStyleRule.
-    // Note eStringBase and eAtomBase is used also to handle the type of
-    // mStringBits.
-    PtrBits mStringBits;
-    union {
-      int32_t mInteger;
-      nscolor mColor;
-      uint32_t mEnumValue;
-      int32_t mPercent;
-      mozilla::css::StyleRule* mCSSStyleRule;
-      mozilla::css::URLValue* mURL;
-      mozilla::css::ImageValue* mImage;
-      AtomArray* mAtomArray;
-      double mDoubleValue;
-      nsIntMargin* mIntMargin;
-      const nsSVGAngle* mSVGAngle;
-      const nsSVGIntegerPair* mSVGIntegerPair;
-      const nsSVGLength2* mSVGLength;
-      const mozilla::SVGLengthList* mSVGLengthList;
-      const mozilla::SVGNumberList* mSVGNumberList;
-      const nsSVGNumberPair* mSVGNumberPair;
-      const mozilla::SVGPathData* mSVGPathData;
-      const mozilla::SVGPointList* mSVGPointList;
-      const mozilla::SVGAnimatedPreserveAspectRatio* mSVGPreserveAspectRatio;
-      const mozilla::SVGStringList* mSVGStringList;
-      const mozilla::SVGTransformList* mSVGTransformList;
-      const nsSVGViewBox* mSVGViewBox;
-    };
-  };
-
   inline ValueBaseType BaseType() const;
   inline bool IsSVGType(ValueType aType) const;
 
@@ -428,7 +406,12 @@ private:
   inline MiscContainer* GetMiscContainer() const;
   inline int32_t GetIntInternal() const;
 
-  bool EnsureEmptyMiscContainer();
+  // Clears the current MiscContainer.  This will return null if there is no
+  // existing container.
+  MiscContainer* ClearMiscContainer();
+  // Like ClearMiscContainer, except allocates a new container if one does not
+  // exist already.
+  MiscContainer* EnsureEmptyMiscContainer();
   bool EnsureEmptyAtomArray();
   nsStringBuffer* GetStringBuffer(const nsAString& aValue) const;
   // aStrict is set true if stringifying the return value equals with
@@ -448,10 +431,6 @@ private:
   PtrBits mBits;
 };
 
-/**
- * Implementation of inline methods
- */
-
 inline const nsAttrValue&
 nsAttrValue::operator=(const nsAttrValue& aOther)
 {
@@ -466,112 +445,12 @@ nsAttrValue::GetAtomValue() const
   return reinterpret_cast<nsIAtom*>(GetPtr());
 }
 
-inline int32_t
-nsAttrValue::GetIntegerValue() const
-{
-  NS_PRECONDITION(Type() == eInteger, "wrong type");
-  return (BaseType() == eIntegerBase)
-         ? GetIntInternal()
-         : GetMiscContainer()->mInteger;
-}
-
-inline int16_t
-nsAttrValue::GetEnumValue() const
-{
-  NS_PRECONDITION(Type() == eEnum, "wrong type");
-  // We don't need to worry about sign extension here since we're
-  // returning an int16_t which will cut away the top bits.
-  return static_cast<int16_t>((
-    (BaseType() == eIntegerBase)
-    ? static_cast<uint32_t>(GetIntInternal())
-    : GetMiscContainer()->mEnumValue)
-      >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS);
-}
-
-inline float
-nsAttrValue::GetPercentValue() const
-{
-  NS_PRECONDITION(Type() == ePercent, "wrong type");
-  return ((BaseType() == eIntegerBase)
-          ? GetIntInternal()
-          : GetMiscContainer()->mPercent)
-            / 100.0f;
-}
-
-inline nsAttrValue::AtomArray*
-nsAttrValue::GetAtomArrayValue() const
-{
-  NS_PRECONDITION(Type() == eAtomArray, "wrong type");
-  return GetMiscContainer()->mAtomArray;
-}
-
-inline mozilla::css::StyleRule*
-nsAttrValue::GetCSSStyleRuleValue() const
-{
-  NS_PRECONDITION(Type() == eCSSStyleRule, "wrong type");
-  return GetMiscContainer()->mCSSStyleRule;
-}
-
-inline mozilla::css::URLValue*
-nsAttrValue::GetURLValue() const
-{
-  NS_PRECONDITION(Type() == eURL, "wrong type");
-  return GetMiscContainer()->mURL;
-}
-
-inline mozilla::css::ImageValue*
-nsAttrValue::GetImageValue() const
-{
-  NS_PRECONDITION(Type() == eImage, "wrong type");
-  return GetMiscContainer()->mImage;
-}
-
-inline double
-nsAttrValue::GetDoubleValue() const
-{
-  NS_PRECONDITION(Type() == eDoubleValue, "wrong type");
-  return GetMiscContainer()->mDoubleValue;
-}
-
-inline bool
-nsAttrValue::GetIntMarginValue(nsIntMargin& aMargin) const
-{
-  NS_PRECONDITION(Type() == eIntMarginValue, "wrong type");
-  nsIntMargin* m = GetMiscContainer()->mIntMargin;
-  if (!m)
-    return false;
-  aMargin = *m;
-  return true;
-}
-
 inline nsAttrValue::ValueBaseType
 nsAttrValue::BaseType() const
 {
   return static_cast<ValueBaseType>(mBits & NS_ATTRVALUE_BASETYPE_MASK);
 }
 
-inline bool
-nsAttrValue::IsSVGType(ValueType aType) const
-{
-  return aType >= eSVGTypesBegin && aType <= eSVGTypesEnd;
-}
-
-inline void
-nsAttrValue::SetPtrValueAndType(void* aValue, ValueBaseType aType)
-{
-  NS_ASSERTION(!(NS_PTR_TO_INT32(aValue) & ~NS_ATTRVALUE_POINTERVALUE_MASK),
-               "pointer not properly aligned, this will crash");
-  mBits = reinterpret_cast<PtrBits>(aValue) | aType;
-}
-
-inline void
-nsAttrValue::ResetIfSet()
-{
-  if (mBits) {
-    Reset();
-  }
-}
-
 inline void*
 nsAttrValue::GetPtr() const
 {
@@ -580,25 +459,6 @@ nsAttrValue::GetPtr() const
   return reinterpret_cast<void*>(mBits & NS_ATTRVALUE_POINTERVALUE_MASK);
 }
 
-inline nsAttrValue::MiscContainer*
-nsAttrValue::GetMiscContainer() const
-{
-  NS_ASSERTION(BaseType() == eOtherBase, "wrong type");
-  return static_cast<MiscContainer*>(GetPtr());
-}
-
-inline int32_t
-nsAttrValue::GetIntInternal() const
-{
-  NS_ASSERTION(BaseType() == eIntegerBase,
-               "getting integer from non-integer");
-  // Make sure we get a signed value.
-  // Lets hope the optimizer optimizes this into a shift. Unfortunatly signed
-  // bitshift right is implementaion dependant.
-  return static_cast<int32_t>(mBits & ~NS_ATTRVALUE_INTEGERTYPE_MASK) /
-         NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER;
-}
-
 inline bool
 nsAttrValue::IsEmptyString() const
 {
diff --git a/content/base/src/nsAttrValueInlines.h b/content/base/src/nsAttrValueInlines.h
new file mode 100644
index 000000000000..160db93efc29
--- /dev/null
+++ b/content/base/src/nsAttrValueInlines.h
@@ -0,0 +1,216 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsAttrValueInlines_h__
+#define nsAttrValueInlines_h__
+
+struct MiscContainer
+{
+  typedef nsAttrValue::ValueType ValueType;
+
+  ValueType mType;
+  // mStringBits points to either nsIAtom* or nsStringBuffer* and is used when
+  // mType isn't mCSSStyleRule.
+  // Note eStringBase and eAtomBase is used also to handle the type of
+  // mStringBits.
+  PtrBits mStringBits;
+  union {
+    struct {
+      union {
+        int32_t mInteger;
+        nscolor mColor;
+        uint32_t mEnumValue;
+        int32_t mPercent;
+        mozilla::css::StyleRule* mCSSStyleRule;
+        mozilla::css::URLValue* mURL;
+        mozilla::css::ImageValue* mImage;
+        nsAttrValue::AtomArray* mAtomArray;
+        nsIntMargin* mIntMargin;
+        const nsSVGAngle* mSVGAngle;
+        const nsSVGIntegerPair* mSVGIntegerPair;
+        const nsSVGLength2* mSVGLength;
+        const mozilla::SVGLengthList* mSVGLengthList;
+        const mozilla::SVGNumberList* mSVGNumberList;
+        const nsSVGNumberPair* mSVGNumberPair;
+        const mozilla::SVGPathData* mSVGPathData;
+        const mozilla::SVGPointList* mSVGPointList;
+        const mozilla::SVGAnimatedPreserveAspectRatio* mSVGPreserveAspectRatio;
+        const mozilla::SVGStringList* mSVGStringList;
+        const mozilla::SVGTransformList* mSVGTransformList;
+        const nsSVGViewBox* mSVGViewBox;
+      };
+      uint32_t mRefCount : 31;
+      uint32_t mCached : 1;
+    } mValue;
+    double mDoubleValue;
+  };
+
+  MiscContainer()
+    : mType(nsAttrValue::eColor),
+      mStringBits(0)
+  {
+    MOZ_COUNT_CTOR(MiscContainer);
+    mValue.mColor = 0;
+    mValue.mRefCount = 0;
+    mValue.mCached = 0;
+  }
+
+  ~MiscContainer()
+  {
+    if (IsRefCounted()) {
+      MOZ_ASSERT(mValue.mRefCount == 0);
+      MOZ_ASSERT(!mValue.mCached);
+    }
+    MOZ_COUNT_DTOR(MiscContainer);
+  }
+
+  bool GetString(nsDependentString& aString) const;
+
+  inline bool IsRefCounted() const
+  {
+    // Nothing stops us from refcounting (and sharing) other types of
+    // MiscContainer (except eDoubleValue types) but there's no compelling
+    // reason to 
+    return mType == nsAttrValue::eCSSStyleRule;
+  }
+
+  inline int32_t AddRef() {
+    MOZ_ASSERT(IsRefCounted());
+    return ++mValue.mRefCount;
+  }
+
+  inline int32_t Release() {
+    MOZ_ASSERT(IsRefCounted());
+    return --mValue.mRefCount;
+  }
+
+  void Cache();
+  void Evict();
+};
+
+
+/**
+ * Implementation of inline methods
+ */
+
+inline int32_t
+nsAttrValue::GetIntegerValue() const
+{
+  NS_PRECONDITION(Type() == eInteger, "wrong type");
+  return (BaseType() == eIntegerBase)
+         ? GetIntInternal()
+         : GetMiscContainer()->mValue.mInteger;
+}
+
+inline int16_t
+nsAttrValue::GetEnumValue() const
+{
+  NS_PRECONDITION(Type() == eEnum, "wrong type");
+  // We don't need to worry about sign extension here since we're
+  // returning an int16_t which will cut away the top bits.
+  return static_cast<int16_t>((
+    (BaseType() == eIntegerBase)
+    ? static_cast<uint32_t>(GetIntInternal())
+    : GetMiscContainer()->mValue.mEnumValue)
+      >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS);
+}
+
+inline float
+nsAttrValue::GetPercentValue() const
+{
+  NS_PRECONDITION(Type() == ePercent, "wrong type");
+  return ((BaseType() == eIntegerBase)
+          ? GetIntInternal()
+          : GetMiscContainer()->mValue.mPercent)
+            / 100.0f;
+}
+
+inline nsAttrValue::AtomArray*
+nsAttrValue::GetAtomArrayValue() const
+{
+  NS_PRECONDITION(Type() == eAtomArray, "wrong type");
+  return GetMiscContainer()->mValue.mAtomArray;
+}
+
+inline mozilla::css::StyleRule*
+nsAttrValue::GetCSSStyleRuleValue() const
+{
+  NS_PRECONDITION(Type() == eCSSStyleRule, "wrong type");
+  return GetMiscContainer()->mValue.mCSSStyleRule;
+}
+
+inline mozilla::css::URLValue*
+nsAttrValue::GetURLValue() const
+{
+  NS_PRECONDITION(Type() == eURL, "wrong type");
+  return GetMiscContainer()->mValue.mURL;
+}
+
+inline mozilla::css::ImageValue*
+nsAttrValue::GetImageValue() const
+{
+  NS_PRECONDITION(Type() == eImage, "wrong type");
+  return GetMiscContainer()->mValue.mImage;
+}
+
+inline double
+nsAttrValue::GetDoubleValue() const
+{
+  NS_PRECONDITION(Type() == eDoubleValue, "wrong type");
+  return GetMiscContainer()->mDoubleValue;
+}
+
+inline bool
+nsAttrValue::GetIntMarginValue(nsIntMargin& aMargin) const
+{
+  NS_PRECONDITION(Type() == eIntMarginValue, "wrong type");
+  nsIntMargin* m = GetMiscContainer()->mValue.mIntMargin;
+  if (!m)
+    return false;
+  aMargin = *m;
+  return true;
+}
+
+inline bool
+nsAttrValue::IsSVGType(ValueType aType) const
+{
+  return aType >= eSVGTypesBegin && aType <= eSVGTypesEnd;
+}
+
+inline void
+nsAttrValue::SetPtrValueAndType(void* aValue, ValueBaseType aType)
+{
+  NS_ASSERTION(!(NS_PTR_TO_INT32(aValue) & ~NS_ATTRVALUE_POINTERVALUE_MASK),
+               "pointer not properly aligned, this will crash");
+  mBits = reinterpret_cast<PtrBits>(aValue) | aType;
+}
+
+inline void
+nsAttrValue::ResetIfSet()
+{
+  if (mBits) {
+    Reset();
+  }
+}
+
+inline MiscContainer*
+nsAttrValue::GetMiscContainer() const
+{
+  NS_ASSERTION(BaseType() == eOtherBase, "wrong type");
+  return static_cast<MiscContainer*>(GetPtr());
+}
+
+inline int32_t
+nsAttrValue::GetIntInternal() const
+{
+  NS_ASSERTION(BaseType() == eIntegerBase,
+               "getting integer from non-integer");
+  // Make sure we get a signed value.
+  // Lets hope the optimizer optimizes this into a shift. Unfortunatly signed
+  // bitshift right is implementaion dependant.
+  return static_cast<int32_t>(mBits & ~NS_ATTRVALUE_INTEGERTYPE_MASK) /
+         NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER;
+}
+
+#endif
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index c8c4b6cfb34c..f01b5b5a6218 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -99,6 +99,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsDOMJSUtils.h"
 #include "nsGenericHTMLElement.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsReferencedElement.h"
 #include "nsIDragService.h"
 #include "nsIChannelEventSink.h"
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 0b068a2b9346..68e21eafa76f 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -54,6 +54,7 @@
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "nsDocument.h"
 #include "nsAttrValueOrString.h"
+#include "nsAttrValueInlines.h"
 #ifdef MOZ_XUL
 #include "nsXULElement.h"
 #endif /* MOZ_XUL */
diff --git a/content/base/src/nsStyledElement.cpp b/content/base/src/nsStyledElement.cpp
index d78c9c094338..9b8f13417232 100644
--- a/content/base/src/nsStyledElement.cpp
+++ b/content/base/src/nsStyledElement.cpp
@@ -7,6 +7,7 @@
 #include "nsStyledElement.h"
 #include "nsGkAtoms.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsGenericElement.h"
 #include "nsMutationEvent.h"
 #include "nsDOMCSSDeclaration.h"
@@ -251,21 +252,8 @@ nsStyledElementNotElementCSSInlineStyle::ParseStyleAttribute(const nsAString& aV
       }
     }
 
-    if (isCSS) {
-      css::Loader* cssLoader = doc->CSSLoader();
-      nsCSSParser cssParser(cssLoader);
-
-      nsCOMPtr<nsIURI> baseURI = GetBaseURI();
-
-      nsRefPtr<css::StyleRule> rule;
-      cssParser.ParseStyleAttribute(aValue, doc->GetDocumentURI(),
-                                    baseURI,
-                                    NodePrincipal(),
-                                    getter_AddRefs(rule));
-      if (rule) {
-        aResult.SetTo(rule, &aValue);
-        return;
-      }
+    if (isCSS && aResult.ParseStyleAttribute(aValue, this)) {
+      return;
     }
   }
 
diff --git a/content/html/content/src/nsFormSubmission.cpp b/content/html/content/src/nsFormSubmission.cpp
index d4fc46333da1..11d62f0651ef 100644
--- a/content/html/content/src/nsFormSubmission.cpp
+++ b/content/html/content/src/nsFormSubmission.cpp
@@ -17,6 +17,7 @@
 #include "nsIDOMHTMLFormElement.h"
 #include "nsError.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsISaveAsCharset.h"
 #include "nsIFile.h"
 #include "nsIDOMFile.h"
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 8d90df65f5b5..3be2dcffa898 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -8,6 +8,7 @@
 
 #include "nscore.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"
 #include "nsIContentViewer.h"
diff --git a/content/html/content/src/nsHTMLBRElement.cpp b/content/html/content/src/nsHTMLBRElement.cpp
index ae2273591bf5..e9c410352446 100644
--- a/content/html/content/src/nsHTMLBRElement.cpp
+++ b/content/html/content/src/nsHTMLBRElement.cpp
@@ -8,6 +8,7 @@
 #include "nsIDOMHTMLBRElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"
diff --git a/content/html/content/src/nsHTMLBodyElement.cpp b/content/html/content/src/nsHTMLBodyElement.cpp
index 95bb9937e519..fd85ac9a8162 100644
--- a/content/html/content/src/nsHTMLBodyElement.cpp
+++ b/content/html/content/src/nsHTMLBodyElement.cpp
@@ -9,6 +9,7 @@
 #include "nsCOMPtr.h"
 #include "nsIDOMHTMLBodyElement.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
@@ -21,7 +22,7 @@
 #include "nsIDocShell.h"
 #include "nsIEditorDocShell.h"
 #include "nsRuleWalker.h"
-#include "jsapi.h"
+#include "jspubtd.h"
 
 //----------------------------------------------------------------------
 
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index ee3f2a5e071f..3811d9a324e4 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -2,10 +2,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include "nsIDOMHTMLButtonElement.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsStyleConsts.h"
diff --git a/content/html/content/src/nsHTMLCanvasElement.cpp b/content/html/content/src/nsHTMLCanvasElement.cpp
index e37015241983..304bb39e2041 100644
--- a/content/html/content/src/nsHTMLCanvasElement.cpp
+++ b/content/html/content/src/nsHTMLCanvasElement.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsHTMLCanvasElement.h"
+#include "nsAttrValueInlines.h"
 
 #include "mozilla/Base64.h"
 #include "mozilla/CheckedInt.h"
diff --git a/content/html/content/src/nsHTMLFontElement.cpp b/content/html/content/src/nsHTMLFontElement.cpp
index f678d66b0c81..3a2491006d84 100644
--- a/content/html/content/src/nsHTMLFontElement.cpp
+++ b/content/html/content/src/nsHTMLFontElement.cpp
@@ -9,6 +9,7 @@
 #include "nsIDOMHTMLFontElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
diff --git a/content/html/content/src/nsHTMLHRElement.cpp b/content/html/content/src/nsHTMLHRElement.cpp
index b7e9480b5686..5b124ca3eed5 100644
--- a/content/html/content/src/nsHTMLHRElement.cpp
+++ b/content/html/content/src/nsHTMLHRElement.cpp
@@ -13,6 +13,7 @@
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsMappedAttributes.h"
+#include "nsAttrValueInlines.h"
 #include "nsRuleData.h"
 #include "nsCSSProps.h"
 
diff --git a/content/html/content/src/nsHTMLIFrameElement.cpp b/content/html/content/src/nsHTMLIFrameElement.cpp
index d8f711709ed4..54a0d9a4d016 100644
--- a/content/html/content/src/nsHTMLIFrameElement.cpp
+++ b/content/html/content/src/nsHTMLIFrameElement.cpp
@@ -8,6 +8,7 @@
 #include "nsHTMLIFrameElement.h"
 #include "nsIDOMSVGDocument.h"
 #include "nsMappedAttributes.h"
+#include "nsAttrValueInlines.h"
 #include "nsError.h"
 #include "nsRuleData.h"
 #include "nsStyleConsts.h"
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index eaae6297658d..2e8bdfe7c5fb 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -6,6 +6,7 @@
 #include "mozilla/Util.h"
 
 #include "nsHTMLInputElement.h"
+#include "nsAttrValueInlines.h"
 
 #include "nsIDOMHTMLInputElement.h"
 #include "nsITextControlElement.h"
diff --git a/content/html/content/src/nsHTMLLIElement.cpp b/content/html/content/src/nsHTMLLIElement.cpp
index 193e58d8233e..365902cc7dbc 100644
--- a/content/html/content/src/nsHTMLLIElement.cpp
+++ b/content/html/content/src/nsHTMLLIElement.cpp
@@ -8,6 +8,7 @@
 #include "nsIDOMHTMLLIElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 7895b536fb6a..aeb9617c7b20 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -12,6 +12,7 @@
 #include "nsHTMLMediaElement.h"
 #include "nsTimeRanges.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsGkAtoms.h"
diff --git a/content/html/content/src/nsHTMLMenuElement.cpp b/content/html/content/src/nsHTMLMenuElement.cpp
index 9734471304f6..9fc215c280be 100644
--- a/content/html/content/src/nsHTMLMenuElement.cpp
+++ b/content/html/content/src/nsHTMLMenuElement.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsHTMLMenuElement.h"
-
+#include "nsAttrValueInlines.h"
 #include "nsIDOMHTMLMenuItemElement.h"
 #include "nsXULContextMenuBuilder.h"
 #include "nsGUIEvent.h"
diff --git a/content/html/content/src/nsHTMLMenuItemElement.cpp b/content/html/content/src/nsHTMLMenuItemElement.cpp
index f132976f7237..8e2349780342 100644
--- a/content/html/content/src/nsHTMLMenuItemElement.cpp
+++ b/content/html/content/src/nsHTMLMenuItemElement.cpp
@@ -6,6 +6,7 @@
 #include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsHTMLMenuItemElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsContentUtils.h"
 
 using namespace mozilla::dom;
diff --git a/content/html/content/src/nsHTMLMeterElement.cpp b/content/html/content/src/nsHTMLMeterElement.cpp
index 2446863551d1..ff49435922ac 100644
--- a/content/html/content/src/nsHTMLMeterElement.cpp
+++ b/content/html/content/src/nsHTMLMeterElement.cpp
@@ -6,6 +6,7 @@
 #include "nsIDOMHTMLMeterElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsEventStateManager.h"
 #include "nsAlgorithm.h"
 
diff --git a/content/html/content/src/nsHTMLOListElement.cpp b/content/html/content/src/nsHTMLOListElement.cpp
index 7b27514eaf9f..3cab8f7cb440 100644
--- a/content/html/content/src/nsHTMLOListElement.cpp
+++ b/content/html/content/src/nsHTMLOListElement.cpp
@@ -10,6 +10,7 @@
 #include "nsIDOMHTMLUListElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"
diff --git a/content/html/content/src/nsHTMLObjectElement.cpp b/content/html/content/src/nsHTMLObjectElement.cpp
index 2fffea25456a..f7f9bb649f53 100644
--- a/content/html/content/src/nsHTMLObjectElement.cpp
+++ b/content/html/content/src/nsHTMLObjectElement.cpp
@@ -8,6 +8,7 @@
 
 #include "nsAutoPtr.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsObjectLoadingContent.h"
 #include "nsGkAtoms.h"
 #include "nsError.h"
diff --git a/content/html/content/src/nsHTMLPreElement.cpp b/content/html/content/src/nsHTMLPreElement.cpp
index ebec88a556f1..b38ef0ee1808 100644
--- a/content/html/content/src/nsHTMLPreElement.cpp
+++ b/content/html/content/src/nsHTMLPreElement.cpp
@@ -8,6 +8,7 @@
 #include "nsIDOMHTMLPreElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"
diff --git a/content/html/content/src/nsHTMLProgressElement.cpp b/content/html/content/src/nsHTMLProgressElement.cpp
index aa51ff7bd98d..071232722692 100644
--- a/content/html/content/src/nsHTMLProgressElement.cpp
+++ b/content/html/content/src/nsHTMLProgressElement.cpp
@@ -6,6 +6,7 @@
 #include "nsIDOMHTMLProgressElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsEventStateManager.h"
 
 
diff --git a/content/html/content/src/nsHTMLSharedElement.cpp b/content/html/content/src/nsHTMLSharedElement.cpp
index 53e724084443..e2cfda9e0496 100644
--- a/content/html/content/src/nsHTMLSharedElement.cpp
+++ b/content/html/content/src/nsHTMLSharedElement.cpp
@@ -12,6 +12,7 @@
 #include "nsIDOMHTMLHeadElement.h"
 #include "nsIDOMHTMLHtmlElement.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
diff --git a/content/html/content/src/nsHTMLTableCaptionElement.cpp b/content/html/content/src/nsHTMLTableCaptionElement.cpp
index 2112db742347..572e9f6c630b 100644
--- a/content/html/content/src/nsHTMLTableCaptionElement.cpp
+++ b/content/html/content/src/nsHTMLTableCaptionElement.cpp
@@ -8,6 +8,7 @@
 #include "nsIDOMHTMLTableCaptionElem.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"
diff --git a/content/html/content/src/nsHTMLTableCellElement.cpp b/content/html/content/src/nsHTMLTableCellElement.cpp
index 477b397099da..9ce90ca6dc30 100644
--- a/content/html/content/src/nsHTMLTableCellElement.cpp
+++ b/content/html/content/src/nsHTMLTableCellElement.cpp
@@ -12,6 +12,7 @@
 #include "nsIDOMEventTarget.h"
 #include "nsMappedAttributes.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
diff --git a/content/html/content/src/nsHTMLTableColElement.cpp b/content/html/content/src/nsHTMLTableColElement.cpp
index caaa3f8e4df4..13436ec6107e 100644
--- a/content/html/content/src/nsHTMLTableColElement.cpp
+++ b/content/html/content/src/nsHTMLTableColElement.cpp
@@ -9,6 +9,7 @@
 #include "nsIDOMEventTarget.h"
 #include "nsMappedAttributes.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsRuleData.h"
diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp
index ac5a6f0ce4af..0b6fc68d5ba2 100644
--- a/content/html/content/src/nsHTMLTableElement.cpp
+++ b/content/html/content/src/nsHTMLTableElement.cpp
@@ -13,6 +13,7 @@
 #include "nsError.h"
 #include "nsContentList.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
diff --git a/content/html/content/src/nsHTMLTableRowElement.cpp b/content/html/content/src/nsHTMLTableRowElement.cpp
index 673344084a32..c362621b7a45 100644
--- a/content/html/content/src/nsHTMLTableRowElement.cpp
+++ b/content/html/content/src/nsHTMLTableRowElement.cpp
@@ -13,6 +13,7 @@
 #include "nsError.h"
 #include "nsMappedAttributes.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsContentList.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
diff --git a/content/html/content/src/nsHTMLTableSectionElement.cpp b/content/html/content/src/nsHTMLTableSectionElement.cpp
index 8c6f232a2f0f..e42cae49bfaf 100644
--- a/content/html/content/src/nsHTMLTableSectionElement.cpp
+++ b/content/html/content/src/nsHTMLTableSectionElement.cpp
@@ -9,6 +9,7 @@
 #include "nsIDOMEventTarget.h"
 #include "nsMappedAttributes.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsHTMLParts.h"
 #include "nsStyleConsts.h"
diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 205a91701862..a3bfdddbe3b6 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -21,6 +21,7 @@
 #include "nsFormSubmission.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp
index 4587701e36d0..d8e3e8eeb542 100644
--- a/content/html/content/src/nsTextEditorState.cpp
+++ b/content/html/content/src/nsTextEditorState.cpp
@@ -24,6 +24,7 @@
 #include "nsITransactionManager.h"
 #include "nsIControllerContext.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMEventListener.h"
 #include "EditActionListener.h"
diff --git a/content/smil/nsSMILAnimationFunction.cpp b/content/smil/nsSMILAnimationFunction.cpp
index 7bd2c1decd68..ad57fa82e0ec 100644
--- a/content/smil/nsSMILAnimationFunction.cpp
+++ b/content/smil/nsSMILAnimationFunction.cpp
@@ -9,6 +9,7 @@
 #include "nsSMILNullType.h"
 #include "nsISMILAnimationElement.h"
 #include "nsSMILTimedElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
diff --git a/content/smil/nsSMILTimedElement.cpp b/content/smil/nsSMILTimedElement.cpp
index c69e707f0127..442f6696662e 100644
--- a/content/smil/nsSMILTimedElement.cpp
+++ b/content/smil/nsSMILTimedElement.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsSMILTimedElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsSMILAnimationFunction.h"
 #include "nsSMILTimeValue.h"
 #include "nsSMILTimeValueSpec.h"
diff --git a/content/svg/content/src/DOMSVGTransform.cpp b/content/svg/content/src/DOMSVGTransform.cpp
index d016324c88af..86520ff3ad8c 100644
--- a/content/svg/content/src/DOMSVGTransform.cpp
+++ b/content/svg/content/src/DOMSVGTransform.cpp
@@ -10,6 +10,7 @@
 #include "nsError.h"
 #include <math.h>
 #include "nsContentUtils.h"
+#include "nsAttrValueInlines.h"
 
 namespace mozilla {
 
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
index 03f29a4044da..3905700335b4 100644
--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
@@ -9,6 +9,7 @@
 #include "nsWhitespaceTokenizer.h"
 #include "nsSMILValue.h"
 #include "SMILEnumType.h"
+#include "nsAttrValueInlines.h"
 
 using namespace mozilla;
 
diff --git a/content/svg/content/src/SVGMotionSMILAnimationFunction.cpp b/content/svg/content/src/SVGMotionSMILAnimationFunction.cpp
index 725ab59f976a..b91030c4f8c3 100644
--- a/content/svg/content/src/SVGMotionSMILAnimationFunction.cpp
+++ b/content/svg/content/src/SVGMotionSMILAnimationFunction.cpp
@@ -12,6 +12,7 @@
 #include "nsSVGPathDataParser.h"
 #include "nsSVGPathElement.h" // for nsSVGPathList
 #include "nsSVGMpathElement.h"
+#include "nsAttrValueInlines.h"
 
 namespace mozilla {
 
diff --git a/content/svg/content/src/nsSVGAngle.cpp b/content/svg/content/src/nsSVGAngle.cpp
index c7f921453dd7..e04fbf3c8f2c 100644
--- a/content/svg/content/src/nsSVGAngle.cpp
+++ b/content/svg/content/src/nsSVGAngle.cpp
@@ -13,6 +13,7 @@
 #include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "nsSMILValue.h"
 #include "SVGOrientSMILType.h"
+#include "nsAttrValueInlines.h"
 #include "mozilla/Attributes.h"
 
 using namespace mozilla;
diff --git a/content/svg/content/src/nsSVGLength2.cpp b/content/svg/content/src/nsSVGLength2.cpp
index 80019cf2ae32..56d543463e03 100644
--- a/content/svg/content/src/nsSVGLength2.cpp
+++ b/content/svg/content/src/nsSVGLength2.cpp
@@ -15,6 +15,7 @@
 #include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "nsSMILValue.h"
 #include "nsSMILFloatType.h"
+#include "nsAttrValueInlines.h"
 
 using namespace mozilla;
 
diff --git a/content/svg/content/src/nsSVGViewBox.cpp b/content/svg/content/src/nsSVGViewBox.cpp
index 93d38c320f1f..b03be04ee642 100644
--- a/content/svg/content/src/nsSVGViewBox.cpp
+++ b/content/svg/content/src/nsSVGViewBox.cpp
@@ -11,6 +11,7 @@
 #include "nsSMILValue.h"
 #include "SVGContentUtils.h"
 #include "SVGViewBoxSMILType.h"
+#include "nsAttrValueInlines.h"
 
 #define NUM_VIEWBOX_COMPONENTS 4
 using namespace mozilla;
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index e0a198fe21d8..260e0ec358d8 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -87,6 +87,7 @@
 #include "rdf.h"
 #include "nsIControllers.h"
 #include "nsAttrValueOrString.h"
+#include "nsAttrValueInlines.h"
 #include "mozilla/Attributes.h"
 
 // The XUL doc interface
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index c7e0ef50f13d..29c7a497910d 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -24,7 +24,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMRange.h"
 #include "nsIHTMLDocument.h"
-#include "nsGenericHTMLElement.h"
 #include "nsIDocShell.h"
 #include "nsIEditorDocShell.h"
 #include "nsIDocShellTreeItem.h"
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index 69fe4be4e9b0..1dd733774c64 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -6,7 +6,6 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
-FAIL_ON_WARNINGS := 1
 
 MODULE           = dom
 LIBRARY_NAME     = dombindings_s
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index a37dbcf852ea..0350192f5c78 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -475,7 +475,7 @@ public:
   {
     NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
 
-    uint32_t audioCount, videoCount, total, i;
+    uint32_t audioCount, videoCount, i;
     MediaManager* manager = MediaManager::Get();
 
     nsTArray<nsRefPtr<MediaEngineVideoSource> > videoSources;
@@ -486,8 +486,6 @@ public:
     manager->GetBackend()->EnumerateAudioDevices(&audioSources);
     audioCount = videoSources.Length();
 
-    total = videoCount + audioCount;
-
     nsTArray<nsCOMPtr<nsIMediaDevice> > *devices =
       new nsTArray<nsCOMPtr<nsIMediaDevice> >;
 
diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp
index 0dac02dcb143..6abe1ed0a0c4 100644
--- a/layout/forms/nsLegendFrame.cpp
+++ b/layout/forms/nsLegendFrame.cpp
@@ -7,6 +7,7 @@
 #include "nsIContent.h"
 #include "nsIAtom.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsHTMLParts.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 984a5a15d138..b31402be8ca1 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -70,6 +70,7 @@
 #include "nsTextEditRules.h"
 #include "nsPresState.h"
 #include "nsContentList.h"
+#include "nsAttrValueInlines.h"
 
 #include "mozilla/Selection.h"
 
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index b7986540c96c..fe35f45b7243 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -28,6 +28,7 @@
 #include "nsGkAtoms.h"
 #include "nsIDOMEvent.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "prprf.h"
 #include "nsStyleChangeList.h"
 #include "nsFrameSelection.h"
diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index 6d4fd9ef2f12..68b2dafbfc0f 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -11,6 +11,7 @@
 #include "nsHTMLParts.h"
 #include "nsContainerFrame.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index 49746e728d90..d476a2201187 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -8,6 +8,7 @@
 #include "nsCOMPtr.h"
 #include "nsFrameSetFrame.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsLeafFrame.h"
 #include "nsContainerFrame.h"
 #include "nsPresContext.h"
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 47815a653165..a76fe5d8eb17 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -13,6 +13,7 @@
 #include "nsSubDocumentFrame.h"
 #include "nsCOMPtr.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellLoadInfo.h"
 #include "nsIDocShellTreeItem.h"
diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index a0bf02f93f87..99d35b0f5079 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -16,6 +16,7 @@ class nsIStyleSheet;
 class nsIDocument;
 struct nsRuleData;
 template<class T> struct already_AddRefed;
+class nsHTMLCSSStyleSheet;
 
 namespace mozilla {
 namespace css {
@@ -31,7 +32,7 @@ virtual nsIDOMCSSRule* GetDOMRule();
 class Rule : public nsIStyleRule {
 protected:
   Rule()
-    : mSheet(nullptr),
+    : mSheet(0),
       mParentRule(nullptr)
   {
   }
@@ -75,7 +76,8 @@ public:
 
   virtual int32_t GetType() const = 0;
 
-  nsCSSStyleSheet* GetStyleSheet() const { return mSheet; }
+  nsCSSStyleSheet* GetStyleSheet() const;
+  nsHTMLCSSStyleSheet* GetHTMLCSSStyleSheet() const;
 
   // Return the document the rule lives in, if any
   nsIDocument* GetDocument() const
@@ -85,6 +87,9 @@ public:
   }
 
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet);
+  // This does not need to be virtual, because GroupRule and MediaRule are not
+  // used for inline style.
+  void SetHTMLCSSStyleSheet(nsHTMLCSSStyleSheet* aSheet);
 
   void SetParentRule(GroupRule* aRule) {
     // We don't reference count this up reference. The group rule
@@ -117,7 +122,9 @@ public:
                                                    void* aData);
 
 protected:
-  nsCSSStyleSheet*  mSheet;
+  // This is either an nsCSSStyleSheet* or a nsHTMLStyleSheet*.  The former
+  // if the low bit is 0, the latter if the low bit is 1.
+  uintptr_t         mSheet;
   GroupRule*        mParentRule;
 };
 
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index e36e88ea36fc..6807247d895e 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -1394,7 +1394,7 @@ StyleRule::Clone() const
 /* virtual */ nsIDOMCSSRule*
 StyleRule::GetDOMRule()
 {
-  if (!mSheet) {
+  if (!GetStyleSheet()) {
     // inline style rules aren't supposed to have a DOM rule object, only
     // a declaration.
     return nullptr;
@@ -1418,14 +1418,15 @@ StyleRule::DeclarationChanged(Declaration* aDecl,
   NS_ADDREF(clone); // for return
 
   if (aHandleContainer) {
+    nsCSSStyleSheet* sheet = GetStyleSheet();
     if (mParentRule) {
-      if (mSheet) {
-        mSheet->ReplaceRuleInGroup(mParentRule, this, clone);
+      if (sheet) {
+        sheet->ReplaceRuleInGroup(mParentRule, this, clone);
       } else {
         mParentRule->ReplaceStyleRule(this, clone);
       }
-    } else if (mSheet) {
-      mSheet->ReplaceStyleRule(this, clone);
+    } else if (sheet) {
+      sheet->ReplaceStyleRule(this, clone);
     }
   }
 
@@ -1449,7 +1450,7 @@ StyleRule::List(FILE* out, int32_t aIndent) const
 
   nsAutoString buffer;
   if (mSelector)
-    mSelector->ToString(buffer, mSheet);
+    mSelector->ToString(buffer, GetStyleSheet());
 
   buffer.AppendLiteral(" ");
   fputs(NS_LossyConvertUTF16toASCII(buffer).get(), out);
@@ -1467,7 +1468,7 @@ void
 StyleRule::GetCssText(nsAString& aCssText)
 {
   if (mSelector) {
-    mSelector->ToString(aCssText, mSheet);
+    mSelector->ToString(aCssText, GetStyleSheet());
     aCssText.Append(PRUnichar(' '));
   }
   aCssText.Append(PRUnichar('{'));
@@ -1492,7 +1493,7 @@ void
 StyleRule::GetSelectorText(nsAString& aSelectorText)
 {
   if (mSelector)
-    mSelector->ToString(aSelectorText, mSheet);
+    mSelector->ToString(aSelectorText, GetStyleSheet());
   else
     aSelectorText.Truncate();
 }
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index cdbfaea3f19e..286840f91d09 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -42,6 +42,7 @@
 #include "nsStyleUtil.h"
 #include "nsQuickSort.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 #include "nsAttrName.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 3076124ddd19..430db883e544 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -58,13 +58,43 @@ namespace css {
 NS_IMPL_ADDREF(Rule)
 NS_IMPL_RELEASE(Rule)
 
+nsCSSStyleSheet*
+Rule::GetStyleSheet() const
+{
+  if (!(mSheet & 0x1)) {
+    return reinterpret_cast<nsCSSStyleSheet*>(mSheet);
+  }
+
+  return nullptr;
+}
+
+nsHTMLCSSStyleSheet*
+Rule::GetHTMLCSSStyleSheet() const
+{
+  if (mSheet & 0x1) {
+    return reinterpret_cast<nsHTMLCSSStyleSheet*>(mSheet & ~uintptr_t(0x1));
+  }
+
+  return nullptr;
+}
+
 /* virtual */ void
 Rule::SetStyleSheet(nsCSSStyleSheet* aSheet)
 {
   // We don't reference count this up reference. The style sheet
   // will tell us when it's going away or when we're detached from
   // it.
-  mSheet = aSheet;
+  mSheet = reinterpret_cast<uintptr_t>(aSheet);
+}
+
+void
+Rule::SetHTMLCSSStyleSheet(nsHTMLCSSStyleSheet* aSheet)
+{
+  // We don't reference count this up reference. The style sheet
+  // will tell us when it's going away or when we're detached from
+  // it.
+  mSheet = reinterpret_cast<uintptr_t>(aSheet);
+  mSheet |= 0x1;
 }
 
 nsresult
@@ -83,7 +113,7 @@ Rule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
   NS_ENSURE_ARG_POINTER(aSheet);
 
-  NS_IF_ADDREF(*aSheet = mSheet);
+  NS_IF_ADDREF(*aSheet = GetStyleSheet());
   return NS_OK;
 }
 
@@ -571,10 +601,11 @@ void
 GroupRule::AppendStyleRule(Rule* aRule)
 {
   mRules.AppendObject(aRule);
-  aRule->SetStyleSheet(mSheet);
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  aRule->SetStyleSheet(sheet);
   aRule->SetParentRule(this);
-  if (mSheet) {
-    mSheet->SetModifiedByChildRule();
+  if (sheet) {
+    sheet->SetModifiedByChildRule();
   }
 }
 
@@ -612,7 +643,7 @@ nsresult
 GroupRule::InsertStyleRulesAt(uint32_t aIndex,
                               nsCOMArray<Rule>& aRules)
 {
-  aRules.EnumerateForwards(SetStyleSheetReference, mSheet);
+  aRules.EnumerateForwards(SetStyleSheetReference, GetStyleSheet());
   aRules.EnumerateForwards(SetParentRuleReference, this);
   if (! mRules.InsertObjectsAt(aRules, aIndex)) {
     return NS_ERROR_FAILURE;
@@ -626,7 +657,7 @@ GroupRule::ReplaceStyleRule(Rule* aOld, Rule* aNew)
   int32_t index = mRules.IndexOf(aOld);
   NS_ENSURE_TRUE(index != -1, NS_ERROR_UNEXPECTED);
   mRules.ReplaceObjectAt(aNew, index);
-  aNew->SetStyleSheet(mSheet);
+  aNew->SetStyleSheet(GetStyleSheet());
   aNew->SetParentRule(this);
   aOld->SetStyleSheet(nullptr);
   aOld->SetParentRule(nullptr);
@@ -671,7 +702,8 @@ GroupRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 nsresult
 GroupRule::InsertRule(const nsAString & aRule, uint32_t aIndex, uint32_t* _retval)
 {
-  NS_ENSURE_TRUE(mSheet, NS_ERROR_FAILURE);
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  NS_ENSURE_TRUE(sheet, NS_ERROR_FAILURE);
   
   if (aIndex > uint32_t(mRules.Count()))
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
@@ -679,13 +711,14 @@ GroupRule::InsertRule(const nsAString & aRule, uint32_t aIndex, uint32_t* _retva
   NS_ASSERTION(uint32_t(mRules.Count()) <= INT32_MAX,
                "Too many style rules!");
 
-  return mSheet->InsertRuleIntoGroup(aRule, this, aIndex, _retval);
+  return sheet->InsertRuleIntoGroup(aRule, this, aIndex, _retval);
 }
 
 nsresult
 GroupRule::DeleteRule(uint32_t aIndex)
 {
-  NS_ENSURE_TRUE(mSheet, NS_ERROR_FAILURE);
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  NS_ENSURE_TRUE(sheet, NS_ERROR_FAILURE);
 
   if (aIndex >= uint32_t(mRules.Count()))
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
@@ -693,7 +726,7 @@ GroupRule::DeleteRule(uint32_t aIndex)
   NS_ASSERTION(uint32_t(mRules.Count()) <= INT32_MAX,
                "Too many style rules!");
 
-  return mSheet->DeleteRuleFromGroup(this, aIndex);
+  return sheet->DeleteRuleFromGroup(this, aIndex);
 }
 
 /* virtual */ size_t
@@ -722,7 +755,7 @@ MediaRule::MediaRule(const MediaRule& aCopy)
     aCopy.mMedia->Clone(getter_AddRefs(mMedia));
     if (mMedia) {
       // XXXldb This doesn't really make sense.
-      mMedia->SetStyleSheet(aCopy.mSheet);
+      mMedia->SetStyleSheet(aCopy.GetStyleSheet());
     }
   }
 }
@@ -796,7 +829,7 @@ MediaRule::SetMedia(nsMediaList* aMedia)
 {
   mMedia = aMedia;
   if (aMedia)
-    mMedia->SetStyleSheet(mSheet);
+    mMedia->SetStyleSheet(GetStyleSheet());
   return NS_OK;
 }
 
@@ -2000,8 +2033,9 @@ nsCSSKeyframeRule::SetKeyText(const nsAString& aKeyText)
     // for now, we don't do anything if the parse fails
   }
 
-  if (mSheet) {
-    mSheet->SetModifiedByChildRule();
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  if (sheet) {
+    sheet->SetModifiedByChildRule();
   }
 
   return NS_OK;
@@ -2026,8 +2060,9 @@ nsCSSKeyframeRule::ChangeDeclaration(css::Declaration* aDeclaration)
     mDeclaration = aDeclaration;
   }
 
-  if (mSheet) {
-    mSheet->SetModifiedByChildRule();
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  if (sheet) {
+    sheet->SetModifiedByChildRule();
   }
 }
 
@@ -2150,8 +2185,9 @@ nsCSSKeyframesRule::SetName(const nsAString& aName)
 {
   mName = aName;
 
-  if (mSheet) {
-    mSheet->SetModifiedByChildRule();
+  nsCSSStyleSheet* sheet = GetStyleSheet();
+  if (sheet) {
+    sheet->SetModifiedByChildRule();
   }
 
   return NS_OK;
@@ -2212,8 +2248,9 @@ nsCSSKeyframesRule::DeleteRule(const nsAString& aKey)
   uint32_t index = FindRuleIndexForKey(aKey);
   if (index != RULE_NOT_FOUND) {
     mRules.RemoveObjectAt(index);
-    if (mSheet) {
-      mSheet->SetModifiedByChildRule();
+    nsCSSStyleSheet* sheet = GetStyleSheet();
+    if (sheet) {
+      sheet->SetModifiedByChildRule();
     }
   }
   return NS_OK;
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index 2fdde7744e16..fa2414498d26 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -22,15 +22,41 @@
 #include "nsRuleData.h"
 #include "nsRuleProcessorData.h"
 #include "mozilla/dom/Element.h"
+#include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
 
 using namespace mozilla::dom;
 namespace css = mozilla::css;
 
+namespace {
+
+PLDHashOperator
+ClearAttrCache(const nsAString& aKey, MiscContainer*& aValue, void*)
+{
+  // Ideally we'd just call MiscContainer::Evict, but we can't do that since
+  // we're iterating the hashtable.
+  MOZ_ASSERT(aValue->mType == nsAttrValue::eCSSStyleRule);
+
+  aValue->mValue.mCSSStyleRule->SetHTMLCSSStyleSheet(nullptr);
+  aValue->mValue.mCached = 0;
+
+  return PL_DHASH_REMOVE;
+}
+
+} // anonymous namespace
+
 nsHTMLCSSStyleSheet::nsHTMLCSSStyleSheet()
   : mDocument(nullptr)
 {
 }
 
+nsHTMLCSSStyleSheet::~nsHTMLCSSStyleSheet()
+{
+  // We may go away before all of our cached style attributes do,
+  // so clean up any that are left.
+  mCachedStyleAttrs.Enumerate(ClearAttrCache, nullptr);
+}
+
 NS_IMPL_ISUPPORTS2(nsHTMLCSSStyleSheet,
                    nsIStyleSheet,
                    nsIStyleRuleProcessor)
@@ -94,6 +120,7 @@ nsHTMLCSSStyleSheet::Init(nsIURI* aURL, nsIDocument* aDocument)
 
   mDocument = aDocument; // not refcounted!
   mURL = aURL;
+  mCachedStyleAttrs.Init();
   return NS_OK;
 }
 
@@ -141,6 +168,32 @@ nsHTMLCSSStyleSheet::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
   return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
 }
 
+void
+nsHTMLCSSStyleSheet::CacheStyleAttr(const nsAString& aSerialized,
+                                    MiscContainer* aValue)
+{
+  mCachedStyleAttrs.Put(aSerialized, aValue);
+}
+
+void
+nsHTMLCSSStyleSheet::EvictStyleAttr(const nsAString& aSerialized,
+                                    MiscContainer* aValue)
+{
+#ifdef DEBUG
+  {
+    NS_ASSERTION(aValue = mCachedStyleAttrs.Get(aSerialized),
+                 "Cached value does not match?!");
+  }
+#endif
+  mCachedStyleAttrs.Remove(aSerialized);
+}
+
+MiscContainer*
+nsHTMLCSSStyleSheet::LookupStyleAttr(const nsAString& aSerialized)
+{
+  return mCachedStyleAttrs.Get(aSerialized);
+}
+
 void
 nsHTMLCSSStyleSheet::Reset(nsIURI* aURL)
 {
diff --git a/layout/style/nsHTMLCSSStyleSheet.h b/layout/style/nsHTMLCSSStyleSheet.h
index 9260eec6df17..246f1c895114 100644
--- a/layout/style/nsHTMLCSSStyleSheet.h
+++ b/layout/style/nsHTMLCSSStyleSheet.h
@@ -15,10 +15,13 @@
 #include "nsIStyleSheet.h"
 #include "nsIStyleRuleProcessor.h"
 
+struct MiscContainer;
+
 class nsHTMLCSSStyleSheet MOZ_FINAL : public nsIStyleSheet,
                                       public nsIStyleRuleProcessor {
 public:
   nsHTMLCSSStyleSheet();
+  ~nsHTMLCSSStyleSheet();
 
   NS_DECL_ISUPPORTS
 
@@ -59,6 +62,10 @@ public:
   virtual NS_MUST_OVERRIDE size_t
     SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
 
+  void CacheStyleAttr(const nsAString& aSerialized, MiscContainer* aValue);
+  void EvictStyleAttr(const nsAString& aSerialized, MiscContainer* aValue);
+  MiscContainer* LookupStyleAttr(const nsAString& aSerialized);
+
 private: 
   nsHTMLCSSStyleSheet(const nsHTMLCSSStyleSheet& aCopy) MOZ_DELETE;
   nsHTMLCSSStyleSheet& operator=(const nsHTMLCSSStyleSheet& aCopy) MOZ_DELETE;
@@ -66,6 +73,7 @@ private:
 protected:
   nsCOMPtr<nsIURI> mURL;
   nsIDocument*     mDocument;
+  nsDataHashtable<nsStringHashKey, MiscContainer*> mCachedStyleAttrs;
 };
 
 #endif /* !defined(nsHTMLCSSStyleSheet_h_) */
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index fc9f6ffac07c..75aba45a29c1 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -14,6 +14,7 @@
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
 #include "nsGenericHTMLElement.h"
+#include "nsAttrValueInlines.h"
 #include "nsHTMLParts.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"

From 4bb2f6dc8a6daa916e3befb534dce43c543c3b43 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Sun, 30 Sep 2012 09:43:47 -0700
Subject: [PATCH 10/64] Bug 795128: Add memory reporting for attribute maps and
 nodes. r=smaug

---
 content/base/public/FragmentOrElement.h |  2 ++
 content/base/src/FragmentOrElement.cpp  | 36 +++++++++++++++++++++++--
 content/base/src/nsDOMAttributeMap.cpp  | 20 ++++++++++++++
 content/base/src/nsDOMAttributeMap.h    |  2 ++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/content/base/public/FragmentOrElement.h b/content/base/public/FragmentOrElement.h
index 18f6b10b0e78..37d2bbf3159e 100644
--- a/content/base/public/FragmentOrElement.h
+++ b/content/base/public/FragmentOrElement.h
@@ -348,6 +348,8 @@ public:
     void Traverse(nsCycleCollectionTraversalCallback &cb, bool aIsXUL);
     void Unlink(bool aIsXUL);
 
+    size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
+
     /**
      * The .style attribute (an interface that forwards to the actual
      * style rules)
diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp
index 8c7f4dc45b39..ef4dfb466e48 100644
--- a/content/base/src/FragmentOrElement.cpp
+++ b/content/base/src/FragmentOrElement.cpp
@@ -598,6 +598,30 @@ FragmentOrElement::nsDOMSlots::Unlink(bool aIsXUL)
   }
 }
 
+size_t
+FragmentOrElement::nsDOMSlots::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
+{
+  size_t n = aMallocSizeOf(this);
+
+  if (mAttributeMap) {
+    n += mAttributeMap->SizeOfIncludingThis(aMallocSizeOf);
+  }
+
+  // Measurement of the following members may be added later if DMD finds it is
+  // worthwhile:
+  // - Superclass members (nsINode::nsSlots)
+  // - mStyle
+  // - mDataSet
+  // - mSMILOverrideStyle
+  // - mSMILOverrideStyleRule
+  // - mChildrenList
+  // - mClassList
+
+  // The following members are not measured:
+  // - mBindingParent / mControllers: because they're   non-owning
+  return n;
+}
+
 FragmentOrElement::FragmentOrElement(already_AddRefed<nsINodeInfo> aNodeInfo)
   : nsIContent(aNodeInfo)
 {
@@ -1938,6 +1962,14 @@ FragmentOrElement::FireNodeRemovedForChildren()
 size_t
 FragmentOrElement::SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const
 {
-  return nsIContent::SizeOfExcludingThis(aMallocSizeOf) +
-         mAttrsAndChildren.SizeOfExcludingThis(aMallocSizeOf);
+  size_t n = 0;
+  n += nsIContent::SizeOfExcludingThis(aMallocSizeOf);
+  n += mAttrsAndChildren.SizeOfExcludingThis(aMallocSizeOf);
+
+  nsDOMSlots* slots = GetExistingDOMSlots();
+  if (slots) {
+    n += slots->SizeOfIncludingThis(aMallocSizeOf);
+  }
+
+  return n;
 }
diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp
index 7caea2f36aea..629b6de6411b 100644
--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@@ -501,3 +501,23 @@ nsDOMAttributeMap::Enumerate(AttrCache::EnumReadFunction aFunc,
 {
   return mAttributeCache.EnumerateRead(aFunc, aUserArg);
 }
+
+size_t
+AttrCacheSizeEnumerator(const nsAttrKey& aKey,
+                        const nsRefPtr<nsDOMAttribute>& aValue,
+                        nsMallocSizeOfFun aMallocSizeOf,
+                        void* aUserArg)
+{
+  return aMallocSizeOf(aValue.get());
+}
+
+size_t
+nsDOMAttributeMap::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
+{
+  size_t n = aMallocSizeOf(this);
+  n += mAttributeCache.SizeOfExcludingThis(AttrCacheSizeEnumerator,
+                                           aMallocSizeOf);
+
+  // NB: mContent is non-owning and thus not counted.
+  return n;
+}
diff --git a/content/base/src/nsDOMAttributeMap.h b/content/base/src/nsDOMAttributeMap.h
index ee4dcba3673b..b4c200b172f3 100644
--- a/content/base/src/nsDOMAttributeMap.h
+++ b/content/base/src/nsDOMAttributeMap.h
@@ -159,6 +159,8 @@ public:
 
   NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMAttributeMap)
 
+  size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
+
 private:
   Element *mContent; // Weak reference
 

From 35610fce7c3d8498efd9354fe8fd584dabe38d91 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Sun, 30 Sep 2012 09:45:05 -0700
Subject: [PATCH 11/64] Bug 792625: Fix xpcshell to accept non-ASCII command
 line arguments on Windows. r=bsmedberg

---
 js/xpconnect/shell/Makefile.in  | 11 +++++++++++
 js/xpconnect/shell/xpcshell.cpp |  7 +++++++
 toolkit/xre/nsWindowsWMain.cpp  | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in
index 2a7a8c913245..9b11780c5a85 100644
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -16,6 +16,10 @@ SDK_BINARY	= $(PROGRAM)
 
 CPPSRCS		= xpcshell.cpp
 
+LOCAL_INCLUDES += \
+  -I$(topsrcdir)/toolkit/xre \
+  $(NULL)
+
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CMMSRCS += xpcshellMacUtils.mm
 endif
@@ -63,6 +67,13 @@ ifeq ($(OS_TEST),ia64)
 LIBS += $(JEMALLOC_LIBS)
 endif
 include $(topsrcdir)/config/config.mk
+
+ifdef _MSC_VER
+# Always enter a Windows program through wmain, whether or not we're
+# a console application.
+WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
+endif
+
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp
index 4d7d31e7a153..900c8a223994 100644
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -51,6 +51,13 @@
 #ifdef XP_WIN
 #include <windows.h>
 #include <shlobj.h>
+
+// we want a wmain entry point
+#define XRE_DONT_PROTECT_DLL_LOAD
+#define XRE_WANT_ENVIRON
+#include "nsWindowsWMain.cpp"
+#define snprintf _snprintf
+#define strcasecmp _stricmp
 #endif
 
 #ifdef ANDROID
diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
index 3a2e39514b11..17660e28ef59 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -42,7 +42,11 @@ int main(int argc, char **argv)
 
 #define main NS_internal_main
 
+#ifndef XRE_WANT_ENVIRON
 int main(int argc, char **argv);
+#else
+int main(int argc, char **argv, char **envp);
+#endif
 
 static char*
 AllocConvertUTF16toUTF8(const WCHAR *arg)
@@ -97,7 +101,13 @@ int wmain(int argc, WCHAR **argv)
   }
   for (int i = 0; i < argc; i++)
     deleteUs[i] = argvConverted[i];
+#ifndef XRE_WANT_ENVIRON
   int result = main(argc, argvConverted);
+#else
+  // Force creation of the multibyte _environ variable.
+  getenv("PATH");
+  int result = main(argc, argvConverted, _environ);
+#endif
 
   delete[] argvConverted;
   FreeAllocStrings(argc, deleteUs);

From f391946e844b5e69f58c21f7959579204fa821a7 Mon Sep 17 00:00:00 2001
From: "Gordon P. Hemsley" <gphemsley@gmail.com>
Date: Thu, 20 Sep 2012 18:10:09 -0400
Subject: [PATCH 12/64] Bug 792575 - Change Hawaiian [haw] langGroup to
 'x-western'. r=jfkthame

---
 intl/locale/src/langGroups.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intl/locale/src/langGroups.properties b/intl/locale/src/langGroups.properties
index 05ce6cca0681..0d0d12b39398 100644
--- a/intl/locale/src/langGroups.properties
+++ b/intl/locale/src/langGroups.properties
@@ -70,7 +70,7 @@ gn=x-western
 #ha=x-western : Latin and Ajami scripts
 gu=x-gujr
 gv=x-western
-haw=x-unicode
+haw=x-western
 he=he
 hi=x-devanagari
 hil=x-western

From 15e9437300f38192b3a093be233af3a43d4c6864 Mon Sep 17 00:00:00 2001
From: Frank Yan <fyan@mozilla.com>
Date: Sat, 29 Sep 2012 21:56:40 -0700
Subject: [PATCH 13/64] Bug 781327 - Use 2x images for HiDPI browser UI.
 r=dolske

---
 browser/themes/pinstripe/Geolocation-16.png   | Bin 416 -> 312 bytes
 .../themes/pinstripe/Geolocation-16@2x.png    | Bin 0 -> 666 bytes
 .../themes/pinstripe/Geolocation-64@2x.png    | Bin 0 -> 26989 bytes
 browser/themes/pinstripe/Search@2x.png        | Bin 0 -> 545 bytes
 browser/themes/pinstripe/Secure-Glyph@2x.png  | Bin 0 -> 1423 bytes
 browser/themes/pinstripe/Toolbar-lion@2x.png  | Bin 0 -> 17375 bytes
 .../themes/pinstripe/actionicon-tab@2x.png    | Bin 0 -> 1371 bytes
 browser/themes/pinstripe/browser.css          | 710 ++++++++++++++++++
 .../themes/pinstripe/devtools/debugger.css    |   8 +
 .../themes/pinstripe/downloads/downloads.css  |  11 +
 .../pinstripe/identity-icons-generic@2x.png   | Bin 0 -> 1235 bytes
 .../pinstripe/identity-icons-https-ev@2x.png  | Bin 0 -> 1162 bytes
 .../pinstripe/identity-icons-https@2x.png     | Bin 0 -> 1077 bytes
 browser/themes/pinstripe/identity.png         | Bin 10051 -> 13607 bytes
 browser/themes/pinstripe/identity@2x.png      | Bin 0 -> 33250 bytes
 browser/themes/pinstripe/jar.mn               |  39 +
 .../pinstripe/keyhole-circle-lion@2x.png      | Bin 0 -> 5642 bytes
 browser/themes/pinstripe/newtab/controls.png  | Bin 4180 -> 4671 bytes
 .../themes/pinstripe/newtab/controls@2x.png   | Bin 0 -> 15928 bytes
 browser/themes/pinstripe/newtab/newTab.css    |  14 +
 .../themes/pinstripe/page-livemarks@2x.png    | Bin 0 -> 1167 bytes
 .../pinstripe/panel-expander-closed@2x.png    | Bin 0 -> 362 bytes
 .../pinstripe/panel-expander-open@2x.png      | Bin 0 -> 356 bytes
 .../pinstripe/places/bookmarksToolbar.png     | Bin 405 -> 524 bytes
 .../pinstripe/places/bookmarksToolbar@2x.png  | Bin 0 -> 1179 bytes
 .../pinstripe/places/editBookmarkOverlay.css  |  18 +
 .../pinstripe/places/folderDropArrow.png      | Bin 161 -> 201 bytes
 .../pinstripe/places/folderDropArrow@2x.png   | Bin 0 -> 443 bytes
 browser/themes/pinstripe/places/history.png   | Bin 559 -> 843 bytes
 .../themes/pinstripe/places/history@2x.png    | Bin 0 -> 1872 bytes
 browser/themes/pinstripe/places/organizer.css |  10 +
 browser/themes/pinstripe/places/query@2x.png  | Bin 0 -> 1055 bytes
 .../themes/pinstripe/places/star-icons@2x.png | Bin 0 -> 4458 bytes
 browser/themes/pinstripe/places/tag@2x.png    | Bin 0 -> 1593 bytes
 .../pinstripe/places/unfiledBookmarks.png     | Bin 719 -> 586 bytes
 .../pinstripe/places/unfiledBookmarks@2x.png  | Bin 0 -> 1289 bytes
 .../preferences/aboutPermissions.css          |  12 +
 .../themes/pinstripe/reload-stop-go@2x.png    | Bin 0 -> 1850 bytes
 .../pinstripe/searchbar-dropmarker@2x.png     | Bin 0 -> 189 bytes
 browser/themes/pinstripe/searchbar.css        |  16 +
 .../alltabs-box-bkgnd-icon-lion@2x.png        | Bin 0 -> 1350 bytes
 .../pinstripe/tabbrowser/connecting@2x.png    | Bin 0 -> 30143 bytes
 .../pinstripe/tabbrowser/loading@2x.png       | Bin 0 -> 40165 bytes
 .../themes/pinstripe/tabbrowser/newtab@2x.png | Bin 0 -> 1742 bytes
 .../tabbrowser/tab-arrow-left@2x.png          | Bin 0 -> 2768 bytes
 .../tabbrowser/tab-arrow-right@2x.png         | Bin 0 -> 2732 bytes
 .../tabbrowser/tab-top-hover-active@2x.png    | Bin 0 -> 891 bytes
 .../tabbrowser/tab-top-normal-active@2x.png   | Bin 0 -> 968 bytes
 .../tabbrowser/tab-top-selected-active@2x.png | Bin 0 -> 1098 bytes
 .../toolbarbutton-dropmarker-lion@2x.png      | Bin 0 -> 286 bytes
 browser/themes/pinstripe/urlbar-arrow@2x.png  | Bin 0 -> 362 bytes
 .../urlbar-history-dropmarker@2x.png          | Bin 0 -> 807 bytes
 .../pinstripe/urlbar-popup-blocked@2x.png     | Bin 0 -> 769 bytes
 browser/themes/pinstripe/webapps-16@2x.png    | Bin 0 -> 481 bytes
 toolkit/themes/pinstripe/global/findBar.css   |  19 +
 .../themes/pinstripe/global/icons/chevron.png | Bin 401 -> 251 bytes
 .../pinstripe/global/icons/chevron@2x.png     | Bin 0 -> 462 bytes
 .../pinstripe/global/icons/close@2x.png       | Bin 0 -> 1788 bytes
 toolkit/themes/pinstripe/global/jar.mn        |   3 +
 .../themes/pinstripe/global/notification.css  |  19 +
 .../pinstripe/global/tree/folder@2x.png       | Bin 0 -> 589 bytes
 toolkit/themes/pinstripe/mozapps/jar.mn       |   1 +
 .../mozapps/places/defaultFavicon@2x.png      | Bin 0 -> 477 bytes
 63 files changed, 880 insertions(+)
 create mode 100755 browser/themes/pinstripe/Geolocation-16@2x.png
 create mode 100644 browser/themes/pinstripe/Geolocation-64@2x.png
 create mode 100755 browser/themes/pinstripe/Search@2x.png
 create mode 100644 browser/themes/pinstripe/Secure-Glyph@2x.png
 create mode 100755 browser/themes/pinstripe/Toolbar-lion@2x.png
 create mode 100644 browser/themes/pinstripe/actionicon-tab@2x.png
 create mode 100755 browser/themes/pinstripe/identity-icons-generic@2x.png
 create mode 100755 browser/themes/pinstripe/identity-icons-https-ev@2x.png
 create mode 100755 browser/themes/pinstripe/identity-icons-https@2x.png
 create mode 100755 browser/themes/pinstripe/identity@2x.png
 create mode 100755 browser/themes/pinstripe/keyhole-circle-lion@2x.png
 create mode 100755 browser/themes/pinstripe/newtab/controls@2x.png
 create mode 100755 browser/themes/pinstripe/page-livemarks@2x.png
 create mode 100644 browser/themes/pinstripe/panel-expander-closed@2x.png
 create mode 100644 browser/themes/pinstripe/panel-expander-open@2x.png
 create mode 100755 browser/themes/pinstripe/places/bookmarksToolbar@2x.png
 create mode 100644 browser/themes/pinstripe/places/folderDropArrow@2x.png
 create mode 100755 browser/themes/pinstripe/places/history@2x.png
 create mode 100755 browser/themes/pinstripe/places/query@2x.png
 create mode 100755 browser/themes/pinstripe/places/star-icons@2x.png
 create mode 100755 browser/themes/pinstripe/places/tag@2x.png
 create mode 100755 browser/themes/pinstripe/places/unfiledBookmarks@2x.png
 create mode 100755 browser/themes/pinstripe/reload-stop-go@2x.png
 create mode 100755 browser/themes/pinstripe/searchbar-dropmarker@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
 create mode 100644 browser/themes/pinstripe/tabbrowser/connecting@2x.png
 create mode 100644 browser/themes/pinstripe/tabbrowser/loading@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/newtab@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/tab-arrow-left@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/tab-arrow-right@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/tab-top-hover-active@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/tab-top-normal-active@2x.png
 create mode 100755 browser/themes/pinstripe/tabbrowser/tab-top-selected-active@2x.png
 create mode 100755 browser/themes/pinstripe/toolbarbutton-dropmarker-lion@2x.png
 create mode 100755 browser/themes/pinstripe/urlbar-arrow@2x.png
 create mode 100755 browser/themes/pinstripe/urlbar-history-dropmarker@2x.png
 create mode 100755 browser/themes/pinstripe/urlbar-popup-blocked@2x.png
 create mode 100755 browser/themes/pinstripe/webapps-16@2x.png
 create mode 100644 toolkit/themes/pinstripe/global/icons/chevron@2x.png
 create mode 100755 toolkit/themes/pinstripe/global/icons/close@2x.png
 create mode 100755 toolkit/themes/pinstripe/global/tree/folder@2x.png
 create mode 100644 toolkit/themes/pinstripe/mozapps/places/defaultFavicon@2x.png

diff --git a/browser/themes/pinstripe/Geolocation-16.png b/browser/themes/pinstripe/Geolocation-16.png
index a40cc1bb9ab74689fc3b7fdcffb3c9258387e4f4..54ef8f8eae7221735fe774a2d6cfc4c68c1e342e 100644
GIT binary patch
delta 296
zcmV+@0oVSZ1GoZ^8Gi-<001BJ|6u?C0RKruK~#9!rOQF8f?yQI@v{kMxffkTJYPF#
z7g~s!h=@qJt`}kGE^^#`=Yunlj|M@5A6yRqi(wePg6s9_3#p(#GDr7`Lcho5a#{PK
zg^V6#-n~#l5TNgSNJ1}~Dbi*FZL^w08_;!~v!N$V6cEG&5`U;!^aHeQ>zv6bCai1)
zE3w*&fTn4jJB@@7jrsxVx^~R7BY5_2I-sg5$2>cNXaA-H%CdBBG!i~E>IW!_!a0*s
zOjy|pRwA_(0ePM~8+y`20YOY4ftp1>!0~v5B=n-0B5fwnHmOOp0f)n3Eun>s9%SCV
u&@VxNEX#Z$ogwH(CO2)N-y==aulxgfsrhYt7Waq%0000<MNUMnLSTYc!Gm%D

delta 401
zcmV;C0dD@d0-yts8Gi%-006c6H|hWY0cS}>K~yMHZBff=!cY`ED;M=05u+w*^DxqQ
z@qvK`#kdHzf=j=|{|E%~4gCN?$WH`>f*^G32LuX%3xVlEW4kD`IK!ObJQxDq@MILc
zQdCaMX(=jrPe!KSOK~qG4YVOcMjH(XNpb%$<a3o!M2GhR#edObJyx7v(BUE~VLk^U
zkl;&DugVw%QZMQ!2&9bFs|3LVQI*MQpR4RPP&qyyZcJr;E~nKOYWf2Vg6t%@E(;kS
z1O}QOsTT%qk%@nyEf|zDnS2U^x1xGj)v{Jqs~=mDkxXI6G~shtDT}mFd>BMcJF;k&
z&N2BW>uUwu{(o<UZLeUR$qJSj`I%Vj)WnRB{3T{SjhT~9xpaS1I!GUP#-@Ckjv0ZR
zU<LEqVjvJZvl9r^V&-)P#|IH;mUBY~L*DguXCBXEebM!Y+<_a;a*wdqdpEIR;~j5!
vg$*}Z|AuvgYizvjX@?!Qr;X=6;{E{z2IkOF7ucEr015yANkvXXu0mjf9n7sO

diff --git a/browser/themes/pinstripe/Geolocation-16@2x.png b/browser/themes/pinstripe/Geolocation-16@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..314089368457780f64af9b7107edfda1d8f37ebc
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007ENkl<Zc-pnj
zJ5F0s6oui%O#_iV3N9015HJKgnE~%N;{BGeqbQ<GfHnzjW??Gg0pxKzFs+GVH#>iE
zkdC%4&c!mtR~+r7wT@0sPKqj_f{$q64u69?G{UVCvMQoTD8&WZu!7pSKnnGu<KyF}
z45Nk)tWO=(LznXC=;$cVC~jZ_a)T7|^2Wz;3(Jw=6caFKGTeT`ywExB_jGu87)#ND
zIT_yI6%?4GAPLzF=CqK;n>si+cr=3VFy|Y}kYkRV628EkX4n#>{r&w%b(nL81j=EK
zatz@E%&9}rV{jB*7rF`s>f;0c6IU+VMG9$eZ%?>@MKYA29?Ve>C1fst32AqCw~RI{
z@)jDfs@rIzteu^m3M}#)2{d3y=(b2j+uPgcut*JhAvL#kuC1-D1}riOy^u+_)zIeV
z<~^(cJ(Cr1uZ@k34y*t@lNHd>`uchYR)C(#3g~EUZS5XbfS$<;xYz3HY6BLTfL_R?
z+iGZKW#t?esX;HK=C;nYyu4h2MSdZH1}q8P7O7}yX{n4hEK-FAtm-x%P}bt&qHqa|
zWGF#Bn4=y_$Xxys(!#=mkfIBVe8mv-1ap*+4!T^ni!n&^^Yf4DFy{;jl*1h57{Ys)
z^A3XI@CceP=Nrm>e4vESFsF&v5Tv=exmb!8%*jwi0tMzMNJ2J)IW45|re<eny>Z;a
za%4Eg1k9NTw;wPsbdLKy&CJZ?NzsH2NHcWGiyz)F>gdAy)I~jXDUYV7r~hXR7kGdb
z^aqz1gL=`_)KpO=RPhPdXrUXla2;;dkW~@?02aAW9_}4~KL7v#07*qoM6N<$f;@aM
A9smFU

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/Geolocation-64@2x.png b/browser/themes/pinstripe/Geolocation-64@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..411db1a5a455401d5df6a5fd3bca39bd3b3bca77
GIT binary patch
literal 26989
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
Q9RL6T07*qoM6N<$f>=WD@c;k-

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/Search@2x.png b/browser/themes/pinstripe/Search@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..a12c4133f83c46a2ac4ed3ffd516d69413a64958
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0005#Nkl<Zc-pno
zyKWOv5XNz&uqU#}b3lh(q}bQU1sd}LwD^9JFY<NQE^v4Unw$sNf|h4MD1{@%Ee&bB
zG?Q<viF9;wd|0!j_{sK+XaABVzo=9yxe(Dod=FFb9=^gFQn-g7Jd>UJU%@lD0rHXW
zoF5ddR;#8Xh=2|h@olDHtyVKdK>sMp6s*_lk1l~MDXbub6A{WR1+rZJHP~o0n1VYX
z!v;#ccah!3aihG!X0yr4K!y}bvhyjz*1G-R4Ypb>b`4~>;(10_)~)si+wC^H1u}#@
z&nUERZ@s}zr^B{D2F3G?j;-6&8|-$w>^G1>@jRmw>((Fa^?K|lkRjxGMxk}<|4IA(
zKD!1otazT$%DUCw;9xLdWgx>Ain8;03tQ{f|F;+phfKj8kYNKQ*}D{B<G4BY21ldO
zqjx}-6h6Z#yb`A}OMxukq2LXU$753rlv4tQy}`+3Vmg8^KshB)a0aK-smlf20Qtyw
zzU|p1P<RrY&1U;3D1(MI{1I!=vQrSqXL3kDq7t0X=eZCOzXqUz91=iOf>9LZA`jyC
z0caqH1k^4V$8jzaWc)b*4dn1?7hEhBxtKxVSpXWy67Pb`<uVsL2s{r!1BqYo=GlT0
jeF+~ShSxlMrl8*gMbfs1T)RnW00000NkvXXu0mjf4;}b7

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/Secure-Glyph@2x.png b/browser/themes/pinstripe/Secure-Glyph@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..59d75d1377a34c338cb194eb01b6a1f5c3500548
GIT binary patch
literal 1423
zcmV;A1#tR_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G6Nkl<Zc-qyO
z>q})-7{-rXp@}K!u8lP~MSnn06ZWAXiEhxhiXnpP!xRlcA4&-v@Av!tem4yi1r>uq
z1wpcl27xB2j6%p5jh8X=0`8ulxMOoVo!0T3)7c3RXP^D7_g&Ak*1OhOd+V_*>wk@)
z6J%y)+Ti=0LX1Dq#t{>710YJcA90<Xov#!Z7nc<j6invj<y{l@0N31uQ=3<5OAN7*
zHgM0u!9i?oZS98=IbTvzV%5~tSk2ANR(pH9)z#GnxaQswN1Oco{Q2tY>PtI2I}ej1
zQU+oM2M5n<WWTMbsIXdFTM=sn+A0Pk-wg~5B#`UBHV~r`eY3Eza7&+vIuVF1Dk}QD
zv9a;ONllzcJRPc@_bCn4bWl(Z%Ict@q2V2Jhugq?eSLk;mzI|9baZt5qaaG8rKN?>
z8{qgF&Swm{l=F|Co}NVY@j$o?M6Io@#c9fC5ksdAAP&)##y4YQW2qY(8?P(o1;F+A
z_;{+guW3VD?|5=5_rmh>@>#{)91a5yY2kgYss3B%ZEbCczdkuR`I*{1BRneHnvs#=
z0bC1@z^Torv?aznk4n=jFE7ssq?C+De`{;&jFPXaV@A*h;#rKp&CSidt#*$i*dJ)K
zw6yewVt)0NtE{Z-`s(T`W^W3mfxFb<TZ}#(InmVAbf{7Nm{GSy8kmTinwt86Snqty
zLS0?m`)U&%N&_*Km6a_r!6*T{Y*>U7;vY*-Pxk}>a-P$gxIzx^oK;m-U(#nt4JhgN
z_HJTBBWMi|4}T*5?zFTtPXHk2>5-9<j~H=hPWsTV^jydd=(zBUw*g8@<@22Q+fQKN
zmf6|ar^rDr2RL%9hr_@o2Ars`ueUZgH{)64si~=+KtPNTr+T-%^XlGqI1FsF2At46
zQC4ga2FOb;C&Fidns<WE;Sh8A@?}pTa2oKDHzWp5k;De0;@uI`4;Ku`;UlkYz{aUS
z4RBO`Iy*bNTl@CUdUCp|q=)PnPOt{xv@M<p#FE21FMYw$HyY4_CQ}2adwY8mlwe)I
zitGqXDLalYz|kg980SR;TF`_x69X~1xw&6yFJ^>Y0kohAZAJ!k*59Ev-2^n57>J^g
z4sA@KtAHkZ$1^eDU9U{zp^g(bbfi9l&PF@>{%>3;co3KY7LJlIbyxLC2Yf%&*(Jq(
zNLgQBe@&gh`{RfWng?hyHlWA5BgZo{GZ*x^O(LLeZL7b(|Ge7VD?B(oJ$=M$)O>LU
zv1UB8fhJ=Eyt@$yI6E{nl%n86L^29Gi2b;-vcePB9ZudKM{JNhdW;RQ3t564@Py9k
zU)ZyvS1Fc$gj(T<aq><sDJjY0FBaZ3H|Ee|Y(Nj!mS6|mw!6FgB+mnML^Az4!e8{}
z86}%Dh&ARBj~-(Kj08d5-QCX~zr&1PTwHuf0<Y1Lz;tgr`Gtjrm*EB9oOi4_AB!Gf
zY(TFIErg_`r2M46_~XOWnTd&si%PUF4ukOXzIa9p&QGi{Z|ecZ2K3JI$beqhS~~jL
z&!-?>XObd1@W<=VAl95mJerIR5KJPFm6c^_!Tkk2j8KmTykE|kPfkwe9)^q!aF`>=
zRX~%mft;Ki7LBWbCSwC^Wz?OUfTlnUuxQ+bzznc>STt?|nv4zT5spRUDxk^OfKG-i
z8dm{L#s+ktqUKx$G?^FxF*=LvQFCqrn$TwYR$>~*)SVlE7Bra}h}PrXdpd{g%QdwZ
zQ6L^I()2FcObmc?qobpjw0LF|yr+|)6(Q_N!w+cTuovjN(O4ltNEBX-5E9XVmZ1O1
d7YUeX`xASu@XDv6%@qIu002ovPDHLkV1n<?r3?T7

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/Toolbar-lion@2x.png b/browser/themes/pinstripe/Toolbar-lion@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..156dbefdec89cf8818f9a2f0ba27c971784108cf
GIT binary patch
literal 17375
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
U`yN72nE(I)07*qoM6N<$f@?|61^@s6

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/actionicon-tab@2x.png b/browser/themes/pinstripe/actionicon-tab@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f53fdda5733fa693ddfc6073c8092afc8edb5505
GIT binary patch
literal 1371
zcmV-h1*H0kP)<h;3K|Lk000e1NJLTq002M$001lq1^@s6)nC5<000FdNkl<Zc-rNc
zS!i5U9LCQ`GpV-42gRx-Rv%geVrhL)C@qLsCR?+RgzWnc+4t=|Bw(sm5c(>;GwI9)
zp%f9dVj4+onx-~2N{C5FlNj4K(<V|w;`hM>CbwrMkj#HZ@Zpz%IcL7#x!;_7=0=s2
zl<2U5bCs2q{k65VuDZH9b2sp_%wQHX{kVEDkMlzcoph_>;$j^&4Gj(M_V#vHS67$O
z-QB$__*rH!i<vrCO-+rdafm}F-Kwal$jVtX<mv3}baGNKU=}l(ZS_@GSDP5;ypTdC
z-KwCVU>jv+Wj!q|Ev}A^4kMT_li3y@OXx*8ZjNKOaIPqH&_yTQeNPooRaIrQwY70#
zP+=ys>97z1qRY$6dm0-X2YlQjYiMd}a#d7RT!8Z=u&cbhJYQIV+1lD_NWg45{1Ax}
zE@FXBDL=Du@t5E_u;o=bIXT<F1hcuh*^q$QbOgYG`|^sApNHN69Or$VDmy#d7oGto
zwxS^cv*`%HD=5h$<;PF58;&EsPL-LNxsB4&QnS9k-jIOVbOc}@=6D4C9ysj2PL+|7
z;R}D8`H)~pz-)^z?0%J=p1zI3!a@`Gp&<dYExxe(RcdOgFZ=TI^F92zl7QK8*y-{E
zPi9lf&upttrKF_z@-ilQa1a>+umCq4N9giLZf>qA<!83lr;?MCeQ{usS8!Sz0`MVd
z0FLu?`GF_1DdlIj)u$2@6Ss)OJ#i6_hfe&LWJthl96XocIzXoep3J6{pV?NQN=QhE
z0MWP~day+Xa8PieA|RXhp$o1HaGnHqpnTxL#CalaW?Oyy(~ED#jf;0-`*WL$LI+)R
z(j6ZkuY5^LO6uWwu)WM=w$;azkk98_SV*Ch?zp%(W#KHoDG$b-L3BBp$!x2SCn2BD
z*-%KKlkV8qSf!yhEiKKRm6hefygfOX!7OI#Tq-6erWdCne;z^#opAR7rNIWy;TGw~
zJl7r^E@m)`nL3wpI2`|L)aK@9IQh>OU<0|}d$0%|?2<)hFpHUfTwj5QoF8Hy((SK+
zPr#pG2`uiBC1x>G>+%*ACLZV(lmh+$_k#>GQ#8J1j)#e5T>)3UgY!Y=KC`X9l}C@h
z^X`%b0cW7KEWv&KsRA}OHh#zJoCM6a`l3&qe(SQ+lZwTB!^Lr)F!QUcYd5Z5`#R^;
zdmp^5+W`w;Mu-KgFXG^<QQ-KyXB;Qi*8U#Bd$WT6*(Xo_8IMoSeuqxFbp_0WX(8q{
z1=zrT5H)uD=O!*v&_8>3VzL9Squ@EZbp_0UDIw-G1#DsK>;LQw7b)nU{pjP*--qj&
zEx)dS8StwRGyV!7AI7G>DD6+nDtU?CKm|;LUxb(rPymUL_QPS{sembPSBR+{3b0B0
z=?GLn1o#cy5rWx~{t6%=@T))tyyo31w}oK#8#@#*Dd?XJSit)FdX~4TQ6cWYQLsY+
z_XPd-0u}Hqp46^+C;lYFC>-D7^-zEUCItNxx&rLr6!-#+f?;9kFu`fC-%<c~A;(7q
zyd%uk6>u4hd8I#wh!HyJwifW$%8G~M5>9683K$1B!o;|>fWe{RV!VF~3<c3M#7t)E
z3K#=Fgo!ar0VHZ^Y57x(-SjSea1Z%|%wQHXnQbkATh8=0J{n?f(XA=q(7_j8e{<yK
zSk>dlt6$>K9Nw*ipJfKKn8|Ew0Tdn&GfKl@0ncGxu&#ipFkU>}$`8+jqu|&c@{cit
dS-e;s{{ly`>rF95EY<)3002ovPDHLkV1jTLmG=Mu

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index 27bcca30d1b0..4e2b9aed1e96 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -121,6 +121,16 @@ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   transform: scaleX(-1);
 }
 
+@media (min-resolution: 2dppx) {
+  toolbarbutton.chevron {
+    list-style-image: url("chrome://global/skin/icons/chevron@2x.png");
+  }
+
+  toolbarbutton.chevron > .toolbarbutton-icon {
+    width: 13px;
+  }
+}
+
 /* ----- BOOKMARK BUTTONS ----- */
 
 toolbarbutton.bookmark-item {
@@ -140,6 +150,17 @@ toolbarbutton.bookmark-item {
   -moz-margin-end: -2px;
 }
 
+@media (min-resolution: 2dppx) {
+  .bookmark-item > .toolbarbutton-menu-dropmarker {
+    list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png");
+    -moz-image-region: rect(0, 14px, 10px, 0);
+  }
+
+  .bookmark-item > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
 .bookmark-item > .toolbarbutton-text {
   display: -moz-box !important; /* prevent [mode="icons"] from hiding the label */
   margin: 0 !important;
@@ -161,6 +182,13 @@ toolbarbutton.bookmark-item[open="true"] {
   -moz-image-region: rect(5px, 7px, 10px, 0);
 }
 
+@media (min-resolution: 2dppx) {
+  .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
+  .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
+    -moz-image-region: rect(10px, 14px, 20px, 0);
+  }
+}
+
 toolbarbutton.bookmark-item:active:hover,
 toolbarbutton.bookmark-item[open="true"] {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.4);
@@ -220,6 +248,40 @@ toolbarbutton.bookmark-item > menupopup {
   list-style-image: url("chrome://global/skin/tree/folder.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .bookmark-item[container] {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  }
+
+  .bookmark-item[container][livemark] {
+    list-style-image: url("chrome://browser/skin/page-livemarks@2x.png");
+  }
+
+  .bookmark-item[container][livemark] .bookmark-item {
+    list-style-image: url("chrome://browser/skin/places/livemark-item.png");
+  }
+
+  .bookmark-item[container][query] {
+    list-style-image: url("chrome://browser/skin/places/query@2x.png");
+  }
+
+  .bookmark-item[query][tagContainer] {
+    list-style-image: url("chrome://browser/skin/places/tag@2x.png");
+  }
+
+  .bookmark-item[query][dayContainer] {
+    list-style-image: url("chrome://browser/skin/places/history@2x.png");
+  }
+
+  .bookmark-item[query][hostContainer] {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  }
+
+  .bookmark-item[query][hostContainer][open] {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  }
+}
+
 /* Workaround for native menubar inheritance */
 .openintabs-menuitem,
 .openlivemarksite-menuitem,
@@ -246,6 +308,21 @@ toolbarbutton.bookmark-item > menupopup {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
 }
 
+@media (min-resolution: 2dppx) {
+  #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+    background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+    background-size: 16px;
+  }
+
+  .bookmarks-toolbar-customize {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  }
+
+  .bookmarks-toolbar-customize > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* ----- BOOKMARK MENUS ----- */
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
@@ -262,6 +339,17 @@ toolbarbutton.bookmark-item > menupopup {
   list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png");
 }
 
+@media (min-resolution: 2dppx) {
+  #bookmarksToolbarFolderMenu,
+  #BMB_bookmarksToolbar {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+  }
+
+  #BMB_unsortedBookmarks {
+    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png");
+  }
+}
+
 /* ----- PRIMARY TOOLBAR BUTTONS ----- */
 
 .toolbarbutton-1:not([type="menu-button"]),
@@ -310,6 +398,18 @@ toolbarbutton.bookmark-item > menupopup {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
+@media (min-resolution: 2dppx) {
+  /* Whitelist built-in buttons, instead of .toolbarbutton-1,
+     to avoid potentially breaking add-on toolbar buttons. */
+  :-moz-any(@primaryToolbarButtons@):not(#tabview-button) {
+    list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
+  }
+
+  :-moz-any(@primaryToolbarButtons@):not(#tabview-button) > .toolbarbutton-icon {
+    width: 20px;
+  }
+}
+
 toolbar:not([mode="icons"]) .toolbarbutton-1:not([type="menu-button"]),
 toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
@@ -371,6 +471,18 @@ toolbar:not([mode="icons"]) #restore-button {
   list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker.png);
 }
 
+@media (min-resolution: 2dppx) {
+  .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+  .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+    list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker@2x.png);
+  }
+
+  .toolbarbutton-1 > .toolbarbutton-menu-dropmarker > .dropmarker-icon,
+  .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
 .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
   -moz-margin-end: 1px;
 }
@@ -448,6 +560,14 @@ toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme {
   -moz-image-region: rect(0, 40px, 20px, 20px);
 }
 
+@media (min-resolution: 2dppx) {
+  #back-button,
+  #forward-button:-moz-locale-dir(rtl),
+  toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme {
+    -moz-image-region: rect(0, 80px, 40px, 40px);
+  }
+}
+
 #forward-button,
 #back-button:-moz-locale-dir(rtl),
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
@@ -455,6 +575,15 @@ toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
+@media (min-resolution: 2dppx) {
+  #forward-button,
+  #back-button:-moz-locale-dir(rtl),
+  #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
+  toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
+    -moz-image-region: rect(0, 120px, 40px, 80px);
+  }
+}
+
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:-moz-locale-dir(rtl),
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
 toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme,
@@ -474,6 +603,12 @@ toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
   border-radius: 10000px;
 }
 
+@media (min-resolution: 2dppx) {
+  #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+    -moz-image-region: rect(0, 40px, 40px, 0);
+  }
+}
+
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not(:-moz-lwtheme) {
   height: 31px;
   padding: 4px 5px 5px 3px;
@@ -482,6 +617,13 @@ toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
   border-radius: 0;
 }
 
+@media (min-resolution: 2dppx) {
+  #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not(:-moz-lwtheme) {
+    background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
+    background-size: 90px;
+  }
+}
+
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:-moz-window-inactive:not(:-moz-lwtheme) {
   background-position: -60px 0;
 }
@@ -612,12 +754,24 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-image-region: rect(0, 80px, 20px, 60px);
 }
 
+@media (min-resolution: 2dppx) {
+  #reload-button {
+    -moz-image-region: rect(0, 160px, 40px, 120px);
+  }
+}
+
 /* stop button */
 
 #stop-button {
   -moz-image-region: rect(0, 100px, 20px, 80px);
 }
 
+@media (min-resolution: 2dppx) {
+  #stop-button {
+    -moz-image-region: rect(0, 200px, 40px, 160px);
+  }
+}
+
 /* home button */
 
 #home-button {
@@ -639,6 +793,12 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-margin-end: 3px;
 }
 
+@media (min-resolution: 2dppx) {
+  #home-button:not(.bookmark-item) {
+    -moz-image-region: rect(0, 240px, 40px, 200px);
+  }
+}
+
 /* tabview button */
 
 #tabview-button,
@@ -692,6 +852,12 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-image-region: rect(0, 140px, 20px, 120px);
 }
 
+@media (min-resolution: 2dppx) {
+  #downloads-button {
+    -moz-image-region: rect(0, 280px, 40px, 240px);
+  }
+}
+
 /* history sidebar button */
 
 #history-button {
@@ -702,6 +868,16 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-image-region: rect(20px, 160px, 40px, 140px);
 }
 
+@media (min-resolution: 2dppx) {
+  #history-button {
+    -moz-image-region: rect(0, 320px, 40px, 280px);
+  }
+
+  #history-button[checked="true"] {
+    -moz-image-region: rect(40px, 320px, 80px, 280px);
+  }
+}
+
 /* bookmark sidebar & menu buttons */
 
 #bookmarks-button,
@@ -718,6 +894,26 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
+@media (min-resolution: 2dppx) {
+  #bookmarks-button,
+  #bookmarks-menu-button {
+    -moz-image-region: rect(0, 360px, 40px, 320px);
+  }
+
+  #bookmarks-button[checked="true"] {
+    -moz-image-region: rect(40px, 360px, 80px, 320px);
+  }
+
+  #bookmarks-menu-button.bookmark-item {
+    -moz-image-region: rect(4px, 356px, 36px, 324px);
+    list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
+  }
+
+  #bookmarks-menu-button.bookmark-item > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 #bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
@@ -728,42 +924,84 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-image-region: rect(0, 200px, 20px, 180px);
 }
 
+@media (min-resolution: 2dppx) {
+  #print-button {
+    -moz-image-region: rect(0, 400px, 40px, 360px);
+  }
+}
+
 /* toolbar new tab button */
 
 #new-tab-button {
   -moz-image-region: rect(0, 220px, 20px, 200px);
 }
 
+@media (min-resolution: 2dppx) {
+  #new-tab-button {
+    -moz-image-region: rect(0, 440px, 40px, 400px);
+  }
+}
+
 /* new window button */
 
 #new-window-button {
   -moz-image-region: rect(0, 240px, 20px, 220px);
 }
 
+@media (min-resolution: 2dppx) {
+  #new-window-button {
+    -moz-image-region: rect(0, 480px, 40px, 440px);
+  }
+}
+
 /* cut button */
 
 #cut-button {
   -moz-image-region: rect(0, 260px, 20px, 240px);
 }
 
+@media (min-resolution: 2dppx) {
+  #cut-button {
+    -moz-image-region: rect(0, 520px, 40px, 480px);
+  }
+}
+
 /* copy button */
 
 #copy-button {
   -moz-image-region: rect(0, 280px, 20px, 260px);
 }
 
+@media (min-resolution: 2dppx) {
+  #copy-button {
+    -moz-image-region: rect(0, 560px, 40px, 520px);
+  }
+}
+
 /* paste button */
 
 #paste-button {
   -moz-image-region: rect(0, 300px, 20px, 280px);
 }
 
+@media (min-resolution: 2dppx) {
+  #paste-button {
+    -moz-image-region: rect(0, 600px, 40px, 560px);
+  }
+}
+
 /* alltabs button */
 
 #alltabs-button {
   -moz-image-region: rect(0, 380px, 20px, 360px);
 }
 
+@media (min-resolution: 2dppx) {
+  #alltabs-button {
+    -moz-image-region: rect(0, 760px, 40px, 720px);
+  }
+}
+
 /* fullscreen button */
 
 #fullscreen-button {
@@ -775,6 +1013,17 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-image-region: rect(0, 360px, 20px, 340px);
 }
 
+@media (min-resolution: 2dppx) {
+  #fullscreen-button {
+    -moz-image-region: rect(0, 680px, 40px, 640px);
+  }
+
+  #fullscreen-button[checked="true"],
+  #restore-button {
+    -moz-image-region: rect(0, 720px, 40px, 680px);
+  }
+}
+
 /* zoom controls */
 
 #zoom-controls {
@@ -789,6 +1038,16 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   -moz-image-region: rect(0, 420px, 20px, 400px);
 }
 
+@media (min-resolution: 2dppx) {
+  #zoom-out-button {
+    -moz-image-region: rect(0, 800px, 40px, 760px);
+  }
+
+  #zoom-in-button {
+    -moz-image-region: rect(0, 480px, 40px, 440px);
+  }
+}
+
 toolbar[mode="icons"] #zoom-out-button {
   -moz-margin-end: 0;
 }
@@ -821,12 +1080,24 @@ toolbar[mode="icons"] #zoom-in-button {
   -moz-image-region: rect(0, 20px, 20px, 0px);
 }
 
+@media (min-resolution: 2dppx) {
+  #sync-button:not([status="active"]) {
+    -moz-image-region: rect(0, 880px, 40px, 840px);
+  }
+}
+
 /* feed button */
 
 #feed-button {
   -moz-image-region: rect(0, 460px, 20px, 440px);
 }
 
+@media (min-resolution: 2dppx) {
+  #feed-button {
+    -moz-image-region: rect(0, 920px, 40px, 880px);
+  }
+}
+
 
 /* ----- FULLSCREEN WINDOW CONTROLS ----- */
 
@@ -1027,6 +1298,22 @@ toolbar[mode="icons"] #zoom-in-button {
   background-image: -moz-radial-gradient(center, circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
 }
 
+@media (min-resolution: 2dppx) {
+  .urlbar-history-dropmarker {
+    list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
+    -moz-image-region: rect(0px, 22px, 28px, 0px);
+  }
+
+  .urlbar-history-dropmarker[open="true"],
+  .urlbar-history-dropmarker:hover:active {
+    -moz-image-region: rect(0px, 44px, 28px, 22px);
+  }
+
+  .urlbar-history-dropmarker > .dropmarker-icon {
+    width: 11px;
+  }
+}
+
 #urlbar-icons {
   -moz-box-align: center;
 }
@@ -1071,6 +1358,26 @@ toolbar[mode="icons"] #zoom-in-button {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #page-proxy-favicon {
+    list-style-image: url(chrome://browser/skin/identity-icons-generic@2x.png);
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
+    list-style-image: url(chrome://browser/skin/identity-icons-https@2x.png);
+  }
+
+  .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
+    list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png);
+  }
+
+  #identity-box:hover:active > #page-proxy-favicon,
+  #identity-box[open=true] > #page-proxy-favicon {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+}
+
 #page-proxy-favicon[pageproxystate="invalid"] {
   opacity: 0.3;
 }
@@ -1155,6 +1462,40 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   -moz-image-region: rect(11px, 32px, 22px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .ac-result-type-bookmark {
+    list-style-image: url("chrome://browser/skin/places/star-icons@2x.png");
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark {
+    list-style-image: url("chrome://browser/skin/places/star-icons@2x.png");
+    -moz-image-region: rect(0, 128px, 32px, 96px);
+  }
+
+  .ac-result-type-tag {
+    list-style-image: url("chrome://browser/skin/places/tag@2x.png");
+  }
+
+  richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
+    list-style-image: url("chrome://browser/skin/actionicon-tab@2x.png");
+    -moz-image-region: rect(0, 32px, 22px, 0);
+    width: 16px;
+  }
+
+  richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
+    -moz-image-region: rect(22px, 32px, 44px, 0);
+  }
+
+  window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
+    -moz-image-region: rect(0, 64px, 22px, 32px);
+  }
+
+  window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
+    -moz-image-region: rect(22px, 64px, 44px, 32px);
+  }
+}
+
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
   color: GrayText;
 }
@@ -1231,6 +1572,44 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
+@media (min-resolution: 2dppx) {
+  #go-button,
+  #urlbar > toolbarbutton {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+  }
+
+  #go-button,
+  #urlbar-go-button {
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+  }
+
+  #go-button:hover:active,
+  #urlbar-go-button:hover:active {
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
+  }
+
+  #urlbar-reload-button {
+    -moz-image-region: rect(0, 28px, 28px, 0);
+  }
+
+  #urlbar-reload-button:not([disabled]):hover:active {
+    -moz-image-region: rect(28px, 28px, 56px, 0);
+  }
+
+  #urlbar-stop-button {
+    -moz-image-region: rect(0, 56px, 28px, 28px);
+  }
+
+  #urlbar-stop-button:hover:active {
+    -moz-image-region: rect(28px, 56px, 56px, 28px);
+  }
+
+  #go-button > .toolbarbutton-icon,
+  #urlbar > toolbarbutton > .toolbarbutton-icon {
+    width: 14px;
+  }
+}
+
 /* POPUP BLOCKER BUTTON */
 #page-report-button {
   list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
@@ -1242,6 +1621,19 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #page-report-button {
+    list-style-image: url("chrome://browser/skin/urlbar-popup-blocked@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+    width: 22px;
+  }
+
+  #page-report-button:hover:active,
+  #page-report-button[open="true"] {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+}
+
 /* social recommending panel */
 
 #share-button {
@@ -1303,6 +1695,23 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+@media (min-resolution: 2dppx) {
+  #star-button {
+    list-style-image: url("chrome://browser/skin/places/star-icons@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+    width: 22px;
+  }
+
+  #star-button:hover:active,
+  #star-button[starred="true"] {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  #star-button:hover:active[starred="true"] {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+}
+
 /* BOOKMARKING PANEL */
 #editBookmarkPanelStarIcon {
   list-style-image: url("chrome://browser/skin/places/starred48.png");
@@ -1530,6 +1939,21 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   display: none;
 }
 
+@media (min-resolution: 2dppx) {
+  #editBookmarkPanel .expander-up {
+    list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png");
+  }
+
+  #editBookmarkPanel .expander-down {
+    list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png");
+  }
+
+  #editBookmarkPanel .expander-up > .button-box > .button-icon,
+  #editBookmarkPanel .expander-down > .button-box > .button-icon {
+    width: 9px;
+  }
+}
+
 #editBMPanel_tagsField > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:-moz-placeholder {
   color: #bbb;
 }
@@ -1575,6 +1999,25 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   margin: 0;
 }
 
+@media (min-resolution: 2dppx) {
+  .panel-promo-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .panel-promo-closebutton:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .panel-promo-closebutton:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+
+  .panel-promo-closebutton > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* ----- SIDEBAR ELEMENTS ----- */
 
 #sidebar,
@@ -1653,6 +2096,16 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .bookmark-item {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  image.bookmark-item {
+    width: 16px;
+  }
+}
+
 .openintabs-menuitem {
   list-style-image: none;
 }
@@ -1678,6 +2131,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .tab-throbber,
+  .tab-icon-image {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  .tab-throbber {
+    list-style-image: url("chrome://browser/skin/tabbrowser/connecting@2x.png");
+  }
+
+  .tab-throbber[progress] {
+    list-style-image: url("chrome://browser/skin/tabbrowser/loading@2x.png");
+  }
+}
+
 .tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-icon-image:not([selected="true"]) {
   opacity: .8;
 }
@@ -1844,6 +2312,22 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-border-image: url(chrome://browser/skin/tabbrowser/tab-bottom-normal-active.png) 0 11 fill repeat stretch;
 }
 
+@media (min-resolution: 2dppx) {
+  @TABSONTOP_TAB_STACK@ > .tab-content,
+  @TABSONTOP_NEWTAB_BUTTON@ > .toolbarbutton-icon {
+    -moz-border-image: url(chrome://browser/skin/tabbrowser/tab-top-normal-active@2x.png) 0 22 fill repeat stretch;
+  }
+
+  @TABSONTOP_TAB@:hover > .tab-stack > .tab-content:not([selected="true"]),
+  @TABSONTOP_NEWTAB_BUTTON@:hover > .toolbarbutton-icon {
+    -moz-border-image: url(chrome://browser/skin/tabbrowser/tab-top-hover-active@2x.png) 0 22 fill repeat stretch;
+  }
+
+  @TABSONTOP_TAB_STACK@ > .tab-content[selected="true"] {
+    -moz-border-image: url(chrome://browser/skin/tabbrowser/tab-top-selected-active@2x.png) 0 22 fill repeat stretch;
+  }
+}
+
 @TABSONBOTTOM_TAB@:hover > .tab-stack > .tab-content:not([selected="true"]),
 @TABSONBOTTOM_NEWTAB_BUTTON@:hover > .toolbarbutton-icon {
   -moz-border-image: url(chrome://browser/skin/tabbrowser/tab-bottom-hover-active.png) 0 11 fill repeat stretch;
@@ -1870,6 +2354,24 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
     url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-inactive.png);
 }
 
+@media (min-resolution: 2dppx) {
+  #TabsToolbar::after {
+    content: '';
+    display: block;
+    background-image:
+      url(chrome://browser/skin/tabbrowser/tab-top-normal-active@2x.png),
+      url(chrome://browser/skin/tabbrowser/tab-top-hover-active@2x.png),
+      url(chrome://browser/skin/tabbrowser/tab-top-selected-active@2x.png),
+      url(chrome://browser/skin/tabbrowser/tab-bottom-normal-active.png),
+      url(chrome://browser/skin/tabbrowser/tab-bottom-hover-active.png),
+      url(chrome://browser/skin/tabbrowser/tab-bottom-selected-active.png),
+      url(chrome://browser/skin/tabbrowser/tabbar-top-bg-active.png),
+      url(chrome://browser/skin/tabbrowser/tabbar-top-bg-inactive.png),
+      url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-active.png),
+      url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-inactive.png);
+  }
+}
+
 .tabbrowser-tab:focus > .tab-stack {
   box-shadow: @focusRingShadow@;
 }
@@ -1977,6 +2479,13 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   margin-bottom: -8px;
 }
 
+@media (min-resolution: 2dppx) {
+  .tab-drop-indicator {
+    list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator@2x.png);
+    width: 12px;
+  }
+}
+
 /**
  * In-tab close button
  */
@@ -2004,6 +2513,25 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+@media (min-resolution: 2dppx) {
+  .tab-close-button {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .tab-close-button:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .tab-close-button:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+
+  .tab-close-button > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
   -moz-image-region: rect(0, 13px, 20px, 0);
@@ -2059,6 +2587,43 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   opacity: .5;
 }
 
+@media (min-resolution: 2dppx) {
+  .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down {
+    -moz-image-region: rect(0, 26px, 40px, 0);
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left@2x.png");
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right@2x.png");
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:hover,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:hover {
+    -moz-image-region: rect(0, 52px, 40px, 26px);
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:hover:active,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:hover:active {
+    -moz-image-region: rect(0, 78px, 40px, 52px);
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+    -moz-image-region: rect(0, 26px, 40px, 0) !important;
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon {
+    width: 13px;
+  }
+}
+
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):-moz-locale-dir(ltr),
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):-moz-locale-dir(rtl) {
   border-width: 0 2px 0 0;
@@ -2131,6 +2696,34 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(0, 54px, 20px, 36px);
 }
 
+@media (min-resolution: 2dppx) {
+  .tabs-newtab-button,
+  #TabsToolbar > #new-tab-button,
+  #TabsToolbar > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab@2x.png);
+    -moz-image-region: rect(0, 36px, 40px, 0);
+  }
+
+  .tabs-newtab-button:hover,
+  #TabsToolbar > #new-tab-button:hover {
+    -moz-image-region: rect(0, 72px, 40px, 36px);
+  }
+
+  .tabs-newtab-button:hover:active,
+  #TabsToolbar > #new-tab-button:hover:active {
+    -moz-image-region: rect(0, 108px, 40px, 72px);
+  }
+
+  .tabs-newtab-button > .toolbarbutton-icon {
+    width: 40px;
+  }
+
+  #TabsToolbar > #new-tab-button > .toolbarbutton-icon,
+  #TabsToolbar > toolbarpaletteitem > #new-tab-button > .toolbarbutton-icon {
+    width: 18px;
+  }
+}
+
 #TabsToolbar #alltabs-button {
   list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png);
   -moz-image-region: rect(0, 17px, 20px, 0);
@@ -2145,6 +2738,26 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(0, 51px, 20px, 34px);
 }
 
+@media (min-resolution: 2dppx) {
+  #TabsToolbar #alltabs-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon@2x.png);
+    -moz-image-region: rect(0, 34px, 40px, 0);
+  }
+
+  #TabsToolbar > #alltabs-button:not([disabled="true"]):hover {
+    -moz-image-region: rect(0, 68px, 40px, 34px);
+  }
+
+  #TabsToolbar > #alltabs-button[type="menu"][open="true"]:not([disabled="true"]),
+  #TabsToolbar > #alltabs-button:not([disabled="true"]):hover:active {
+    -moz-image-region: rect(0, 102px, 40px, 68px);
+  }
+
+  #TabsToolbar #alltabs-button > .toolbarbutton-icon {
+    width: 17px;
+  }
+}
+
 #alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
   display: none;
 }
@@ -2158,6 +2771,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+}
+
 .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
@@ -2187,6 +2806,25 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+@media (min-resolution: 2dppx) {
+  :not(#sidebar-header) > .tabs-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  :not(#sidebar-header) > .tabs-closebutton:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  :not(#sidebar-header) > .tabs-closebutton:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+
+  :not(#sidebar-header) > .tabs-closebutton > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
   list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
@@ -2235,6 +2873,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(128px, 64px, 192px, 0px);
 }
 
+@media (min-resolution: 2dppx) {
+  #identity-popup-icon {
+    list-style-image: url("chrome://browser/skin/identity@2x.png");
+    -moz-image-region: rect(0px, 128px, 128px, 0px);
+  }
+
+  #identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon {
+    -moz-image-region: rect(128px, 128px, 256px, 0px);
+  }
+
+  #identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
+    -moz-image-region: rect(256px, 128px, 384px, 0px);
+  }
+}
+
 /* Popup Body Text */
 .identity-popup-description {
   white-space: pre-wrap;
@@ -2279,6 +2932,14 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/Secure-Glyph.png");
 }
 
+@media (min-resolution: 2dppx) {
+  #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
+  #identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
+    list-style-image: url("chrome://browser/skin/Secure-Glyph@2x.png");
+    width: 24px;
+  }
+}
+
 #notification-popup-box {
   position: relative;
   background-color: #fff;
@@ -2291,6 +2952,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-margin-end: -8px;
 }
 
+@media (min-resolution: 2dppx) {
+  #notification-popup-box {
+    -moz-border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
+  }
+}
+
 @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
   padding-left: 7px;
 }
@@ -2323,6 +2990,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
 
+@media (min-resolution: 2dppx) {
+  #geo-notification-icon {
+    list-style-image: url(chrome://browser/skin/Geolocation-16@2x.png);
+  }
+}
+
 #notification-popup .text-link, .panel-arrowcontent .text-link {
   color: #0073e6;
   text-decoration: none;
@@ -2344,6 +3017,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url(chrome://browser/skin/webapps-16.png);
 }
 
+@media (min-resolution: 2dppx) {
+  #webapps-notification-icon {
+    list-style-image: url(chrome://browser/skin/webapps-16@2x.png);
+  }
+}
+
 #plugins-notification-icon {
   list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-16.png);
 }
@@ -2358,6 +3037,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 
+@media (min-resolution: 2dppx) {
+  .popup-notification-icon[popupid="geolocation"] {
+    list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
+  }
+}
+
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-progress"],
 .popup-notification-icon[popupid="addon-install-cancelled"],
@@ -2629,6 +3314,25 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+@media (min-resolution: 2dppx) {
+  #addonbar-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  #addonbar-closebutton:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  #addonbar-closebutton:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+
+  #addonbar-closebutton > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* Status panel */
 
 .statuspanel-label {
@@ -3368,6 +4072,12 @@ html|*#gcli-output-frame {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .social-notification-icon-image {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+}
+
 /* === end of social toolbar button === */
 
 /* === social toolbar provider menu  === */
diff --git a/browser/themes/pinstripe/devtools/debugger.css b/browser/themes/pinstripe/devtools/debugger.css
index 4de928e9c372..9b8fb49a5d93 100644
--- a/browser/themes/pinstripe/devtools/debugger.css
+++ b/browser/themes/pinstripe/devtools/debugger.css
@@ -299,6 +299,14 @@
   opacity: 0.5;
 }
 
+@media (min-resolution: 2dppx) {
+  .variable[non-writable] > .title:after,
+  .property[non-writable] > .title:after {
+    background-image: url("chrome://browser/skin/identity-icons-https@2x.png");
+    background-size: 32px;
+  }
+}
+
 #element-tooltip > label {
   margin: 0 2px 0 2px;
 }
diff --git a/browser/themes/pinstripe/downloads/downloads.css b/browser/themes/pinstripe/downloads/downloads.css
index f468d376b854..bc909af7d179 100644
--- a/browser/themes/pinstripe/downloads/downloads.css
+++ b/browser/themes/pinstripe/downloads/downloads.css
@@ -206,6 +206,17 @@ richlistitem[type="download"][state="1"]:hover {
                                     14, 34, 34, 14);
 }
 
+@media (min-resolution: 2dppx) {
+  #downloads-indicator-icon:not(:-moz-lwtheme-brighttext) {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 280, 40, 240);
+    background-size: 20px;
+  }
+
+  #downloads-indicator:not([counter]) #downloads-indicator-counter {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 280, 40, 240);
+  }
+}
+
 /*** Event notification ***/
 
 #downloads-indicator-notification {
diff --git a/browser/themes/pinstripe/identity-icons-generic@2x.png b/browser/themes/pinstripe/identity-icons-generic@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..5cce49f892e81a5f8036cce30df6be00e991452d
GIT binary patch
literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq002M$001Be1ONa42$Z%D000D<Nkl<ZcwW`l
z?QfN50mt#r-E*H7`gowFDFeDuFoi+8)v|0X=*F^$89s~{7c)&v^bIfOOZ*Fb3~E9k
znTykH$wu^rS+<a6#3<2Xrb8%n;7~fYcCEBs%V}BZ0orqJ-<({@xzm$r`oj2q|4Dwi
z?ibg6MK4)dA6Qv6{)bf`kg?AZXXGUkd1oB4Pezqi;-eR(iXC)Fr*w=u?B|wJpJ0VP
zdO<}y9oGY^+%2PMN|(IRvh$9oU93JJc=fi+S~RA|q<^?m#n%YoNq^N-W2=2SbXcp-
zymothNfzjF#sL+jea8L1X|pctHJH`ufP?C)_~=(cU-ny>R*$K7%{i^c&7;x7hFujZ
z`l?sM38egbU(@7$f6(DQvuN=}7rax&N52H<^_Kc>ed;jfygt8oTL>AAZn@2Z-G+dX
z3g7Qh^%!%?UcXilLM&&&LWPf>2eJn3==2z1QBmxo^D4VfqjL&e(q|Dy2)^4>fIAk|
zddnYG_8B>+%m+{O3*Z??V_&fvK*4o+=af{|?H(uLJC4Cf@LA7j1Tb&HM@}iKtlxGo
z2Tz<p#v!&?B?07}kabHsrgcf+kY^PMUayAWr#!FDf^>}AS>fXZ9@j}r;Nw;+DOj%S
zavFV1r^lTnc<X|HPot8XmTOYGoP6+c3HC!yQs(D1TC#j41NJ*<hA)Hx`w0UK8PK9=
z`IfxyTV8Rk?BfJ>leNwTdAChkGN*bCvbG!GAt-ybHaKlc!Kg(us@JT}F0Yq;oWNG@
z7&Bu+LG_?TyF{&otx)!E8#ZCYyy`)lO%khvkB$*3`44;0U0N{Z4XBZf{#X8Uy0l`<
zOJyH_l5Ny(!31c~q*;PQ*-1X}#5VfaC}_6U+Okgo(GkeYNtLzAO(oRZ;0oy13%KGm
zv)1ro6<?>`oD!OBHUu8^Fkr}uvX2uOwo7QI7Jt)igMvS4QycacC4dPD!;tnosMRTb
zy4>`dyVM~8OTmu>AD7_mFhGZXv|3}<yGr`x{RME{q;VT%3@h<ABq_hiUUX<T<E+FZ
zCjAaDZOm0$#4bt7KKd!_^QQ7)eM+;CL8Gn%$coVIk`jF0NydU_jct0Z6*AzTrU2B6
z(C3U|@X=2o<9(ZGa<6+;mU!8ckbA_2VN{nQW5JWN%dWKdGmApDiCqky=y149Ao6KF
zLb&CGc>rtVd>{#z31cb$h=+tw@S-^Y>$JIC;o}5&&Otj!ylb0S$PM?KHwdz3MM`kV
zb3odk)h8=t+8%QTK%HqdDIfi~;)eouctB-;b_L|L%ln9e-7Wy*Y3~7hRraPK&}M@v
z*D8GUBcZ1pm!ZLvYK7eJnk9WUy6v<DioWhQgaIkv<lE|m<h@|g9$OT=VLs)f9}026
zajRJGKJ98SZ_;Hq^vk*ID%|q4SB1u<J$Kt}qZ-T^Gbrz~+6?-8+9Udbih8|bC&bn%
znpP5NRAUaf=o>DO9+38AtygqSNu*h9rizcgzud#(yEaM3hYowz5~%?z@-@;eIcBpb
x9Cg+lm~+-qPuT2enzK?Leb37J*Z=$L_}_|I(s$=3_QwDK002ovPDHLkV1h%aV~zj-

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/identity-icons-https-ev@2x.png b/browser/themes/pinstripe/identity-icons-https-ev@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..b8d54de6582bfe6cdb473273a47fb7bc4ad479a6
GIT binary patch
literal 1162
zcmV;51a<p~P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000D0Nkl<ZXx`OX
zT}TvB6uvV%vuajrMTLTt61loX5fY*)BngUdn)TG1(BDf^y;StpQ)E2_Wly~o5j`YD
zl;%%nkf}tr64-<NKo4Q!{<uFgox9yx&)l8eo!w^L@xsSl@7#OtobR4<=6J54sw&B6
zyZ`e<x+wzcMb=}`rgBhNPf%~zBx3I-AjK&hT#pH$N=La~L9*1fMgXrkeOH<F5+Z>h
zr6UYs)?*?BBNC)FpuDEI6Hvf<jR;JDrg#Xj%zBLo!dXN11Y8_(*Fe_|XaiKR;W@x_
zz`g5@-WdzcUSbLtYMA}>wdUviucN_0s6kPbGP*z%#qWhh&au++ZI7xv6*I^}G#7~^
ziwT0+Ab4@uO<$xJa2hesH_CD!pyzs%H;`oz6p+c&J&P#(zM$*f@YH4KJ5%jnw65?;
zZNr{x8(r&v!`}gh5ON8f!lEhVhd_Ci^aIWU#Dti;0{ZME;Aw1)MW;`dA9*!#*XIj%
z!8T&@?TP632Rq&lP2YhvCCqA^$X)Q4!#n|CBsT#^sIiztGoUw17tn&9%zVCZd}!)Q
zcsYD91@St-+*(+3i4jo1WI2rVO-sOqLAQsUD&FJ^pcCL?=wxGf&Z*ei?5rT}0^W~v
z9^X=+gSx5)@cD0L<y)^dwbZs#(BE_n&w(|abS<&~2Y>pef*{E1W{b5p3#hx%>|H=(
zkIxUd2cRDZRIxD!3zj`uME|%2{FwjM6>}|3sN|ThKfM1;$>xoJm`{@fb)MG?zZWOR
z2B&UEBhhm0aOqn2-pU#DRS@~lp=g4DR?fUHamvRU9iz{<xvg0$ulc_-;1AVfncGXZ
z^nvnA>=U=l5T;}F8J<hmYI3;TK`<W!6jB*aCH~=Min%Yixs_Q2KTJSDG@_JYrFK>C
znBcO%c-p($v-3TkOV^^@fhRyPYXMFyw712(m~1XQTjDIh`5)#VJ2^F~N|;pFruBa0
zzA{RR$Ocz&0MCuBU9kY!$O6*G041{smg#&00&wOhtI7YD(UjNkpEzGO$R35XiO{)c
z)g#ayvM9A3z18-)F-0PzDNfC`7~txEIQ$?SitMvubJ;0Pw;yXd4nJw&^s%@>6C*`R
zagtUkPfQTW`@b9tTBAH|OqOgE2&EjD^8dPkBL?fs6poByKpyHOx_^Jw+z=p|4}!|7
zE3YFV2NuXHFWAunP;kzz{PZrc`Y|9cEx8Niw^mA4t5|DW3s|lF?Gyu4U5;=4{)VOU
z6fPj-LwO}$;kBLszErN-(E{S-?Ht4aTqZYT0eK@J!ipDGH?1(Lm@0_C0gPr)15AfE
z8Js>XbOfRD^TDe9LDnRd$z<!SK(NW(pn&QCGC}tM2E`1s0WXTIDTok8M5uPU8B*Cx
z3G77`_M(QRtW4qwS-CMvxErt|0a$@B%HhQf<te(aiXOHjKsESWMM>gihLE8=d|j@P
c#9IXN7ryS1^94Aj;Q#;t07*qoM6N<$g7=#$8UO$Q

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/identity-icons-https@2x.png b/browser/themes/pinstripe/identity-icons-https@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..2ca81aa61c5962197aa2dbb6f005e54ade6c35b7
GIT binary patch
literal 1077
zcmV-51j_q~P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000C0Nkl<ZXx`PC
zJxmi}7{_~e?G^9~`IsDt#1IODaj{4sCdPq5ClVzNx<HVW0T%}c9ZVb~!Nn$pK{peY
zPDqH-FjSM8)TseuT+oHJfqqf?;qx@lOCB!m^{&06$0fgTzVGwV_y0Wad%Y@`%Vk$9
ziO1vhkO&!205{+PR1F@QQ^;2M>Bg5`&b}l9Kc@n?0S}-8UZRcusx;>&TbcRSyyP>q
zc(HI?a654h=wSbDV?r1bK|Z64@1VsC&NCrQiC|iQm6eqtU<vpI<cJ*_8?tHfUa|1)
z?d|JZTU)O;HZ~&b>+3rR+<(O}oMS?Gjfh}afaT?76?hK^R|0qj3<6%lM`H=F2?6aE
zh#=E`u2epqPG5{fB5!tgch@qR%;RFQcop)g2;BGM7|wys+hj6%nRSAj3D8&vghC-q
z^ce^Mvd*cFbF;u2`dF~|O7&Bz)P-m?`Z1f$KB|`=Y#zj7u@C6Ox}c^Ah6I4X?|{1|
z9&dMmC9C#6Ea+9CP`G6@2-y0;=cSRepsoPHU~srpD$N2e#vfo3xI|3S7`J(fzRh+(
zB9Rz|_I}7?!}YJXxA*zz=;&<(?{SRVfX@{AHr)YG$!S1g)%^|J3<LsUV4n!%7|jVg
z^qFpO@#2}U?(OYO@wS&``R~Zc$P>TczuDE*l|=9!$8e5s2lQp<fKp9_x&nZj6Pn7t
zn4h0dYVB|g=QOqx&3@_0<#OXZW_NdYu&1Zz06QHxA__Q$bKDkv>wP&gB0#@pQJXrp
zUo^J;O&)+A*w0t^`7$st@Iy2wrX=v*<@5Ps+!lRBoLbw!$QDp}(1nGC{aUs#m(m=D
zYJ=4m2cQRHcz8^xa+-WZmx$`RIy*Zvn*1InfKsgsjC6oYa{yUtUt|9tS4}6Lo1XP;
zbYCmKTO)#OXbUVZE=GZ}HXx4aQNuoJV)2#AhQr}ctE;PVZ9E*)qnbU&Vx4kA1X-t&
zW7=R%FlP1%kk99DSoO+{v1&aDWTUOzEGEu@N|kKLFRCv&Q2>4jR{q+MU)JQ1oYn!n
zD3aB`Jh8<a`zF{T0Yqy`HsqHyIb2TdfK$!ySOIL<0_Frbtq<T>0b0}nWq}R(%M8a0
zP_iL^$&>)6yajl5iuihKL;eEAKG6wIIs?S(ZIRybt-g*Zc8Pa^o&eu06yUoF0kBee
zMN#5b<%d{5F($<}CIGy_jRTTJjG3(d;mpj;{kgfhKHwTK2n+$k1{oqB^zDOK_b_I)
zE^yNS42k_;q-y1W43GlwC$N2!9FT8@V&z%<`W?`M#S02z8_);O0_g_Hvc-$I#ty+2
vT_tu79MK0qB!n17$T7dX_~DerKfeA0R8}{cfW~}=00000NkvXXu0mjf1kC)p

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/identity.png b/browser/themes/pinstripe/identity.png
index 2480f5b74746945efe535d32820ce45fa8965b86..99db29c752183a9c74aa6d757299633ed6c471d7 100644
GIT binary patch
literal 13607
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

literal 10051
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
Z{{yqA>%z?!GBE%E002ovPDHLkV1lEbe4GFP

diff --git a/browser/themes/pinstripe/identity@2x.png b/browser/themes/pinstripe/identity@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..f95b18ae98695daacec9fc5c3b545a858456098e
GIT binary patch
literal 33250
zcmV)BK*PU@P)<h;3K|Lk000e1NJLTq004jh00Dpq1^@s6Wl3s(004ohNkl<ZcwX(j
z2i#=GRVVsCb-Viulch<T8Cf~!9Go-ul70?=jae2JOjyi%ciG+dmh}S+#(3ZIfCZk(
zhF#Xi0b_!Vqa3g;$&#!%k|rpOW=5K%3E#|o-`Cx@>b$G-tJ~*ST{m>kZQ0E8lz!#@
zd~eOU6;BLB%#82ca;g}7N0(Ej1pw>M*og1Ia;lud0H+GATfYI{$>kIYC@<vSPXTD3
zblBolaRB-Nx&TrDJkACn0G$gjyy*N*XP)`Gsi~>6h^T{;rkpCw-0OC`J9h2d`Hx$-
zZrKi?2Y^Q<0qu(}zU0Dl&pr3;L^O?)xt!Vvi;qA4_#bU~^pULq`lDii>5UsVzMhC?
z&d<sfS6y@KlG!Cw#w5CP2mk{Nz&ZI}5C~*wxCdbQVW~s_k<ovQ{72q{9fOFZ`llf{
z=ioSOGXw~Zox(8$u)gF091F()0Wijd-(iNpaZdUKA{Y-REDY=05J=$YccA@o){kA<
zXbXiW-_kau-OvJOEwn!-=!bLRw^C~t9^3xd9ox2T+y2~IW*gwCq77im(EoF29{{en
z@|s&`XO~SG(+U?~i*^_s1Jg+rz=n+c7F9z88jPHy_h25tNr+0}BxIuYF&y945C~k{
zA5#KHPnY(`l#Pq!U0r_^4h3_kg<%q-hiYhd5CN>u(dl$%F1X-=n*ktO%d-J=6r`3`
z8S|IZ{F#~T<P)K&Ftivla`K#PMID%f7BU9qMcc4bIN`?_>^Dk191<)butJom6G~<X
zz7~%9!}-RHS}B|ulpYcT=f}m`nc+4O5DH<+CUDjT<6_+u0i0H=H6t*H+J3DG09RlD
z-TY;XRyy|-{rPP#9N?s2@v5F`iCZ>!AGfc6Rx+m)fr{3K;&w*YH^Kl>!-TbAPMb<Q
z#-4^j(WWno1=u;MvY{#<v4_)2TC&^q<jXgZrm64%2~ouahW&|o5{7duZA_9BOuQZx
z&f$;=_#4i77V8A_B}oZ33Hu}CH!-8;u>&JXsB#ln=kn8yBuT)ENMLOr{eCL25*Zhu
z>xjg!ts4;ocsfjZCmqTPJBCL!ppuRgQ7s(D9*!Yd{30}Jh;%|rPMy>KluRUPe_Ta>
zoD17)(eY}33VOpK9IAuE(l##frq%`4l0B1m+Ey`Bhym)EKm+ZZa_H=$A<A>)rzFNr
zF&w9Gw8}I1=dG5U%EH=ex8yfJfspF^H`Gr<0F}TomHlz~bAf3Lw4YM-yT%m2A!!>u
zC*L-%C2$bKAu!tQmVP6s{++guNWhqyKtCSx3>C9Kr4&jrRIvEW5u-z7z|Q*40bH<A
zl2#JJjzupa4{6$m6CjZo7@~eIC$j{CwJBVm!4a8I35Tt`joO4L+yb!rEM^pa8=Vs(
z>1Td8d>bcBo&pKswA*ccuD?OEcB_qkzb|m=Sh7}AmW4_<(ReaLF$G+VF3B-q7%~6B
z0jZF+uVDTR2w;DzN?QTvpMM_CJMSD!y2M;Xarxw@KCS3nYr*2z?q`MJ=bW3_0%Drl
zN)lzvd~wzx^{3hpq0{cb!9^QD>5>slkgutB+If`jv4HXy!q^a0`D4>`a5@Q8s7w+@
z$Rt%;SlT?gbvve}r?F|{8JJ|DNIuYKC5Qx08DPIDwBOcRq-iQAJ5$o2s`Ll*V;UQS
zlrbX`4i+2?MK*+CC+$*e@sbx^6Ya^SB~2}!+_4iocRdYdr~pDaLzSatGNyD>6G8Zm
zhaY}aCVb86)9`#1uEfQx<H{MlP$H3MUXLJ~Ku7@)(aP*yFb{Pkz|@Jg%<RRE7)`Nq
zpDGO?sAEaVtV%I0{@drDcQ!U`SO;fqsGo?x<<+*sBuB}PGKvr^K?FSb&}JMyGKWc*
z`lAr^Q|Na|5z)_M3c(1BNL3t*zbv&031B3VtQ@N$lf(#WPE$J;Zmch=-Fm^Mjo7i{
zDUhk`kLRl4WqljAVQoWXRMch0{r5kB>#x5SOJ-*yG+kL})M3Q@h;=E55-;JjD-}dJ
z#_G#F_W|yMgZ}B_E1ZTT06hBf<q`#m&FWZ%g|r|s6u_C9>HuT_E}c|;#p5a42qgT>
zJ@?#)8*jJ{)6-Mq<9Ei`C0IeO?QFOfDg+h32bxO(3`S~Gv`yPXV{iyFw?65YDSVgF
z@2u{UNlw}c2o#BL$|$A-wDN*8H{t@}(4ll21nUCLTL?;(FRC0F($ZOH1zU**kCFhD
z_0vA?x%WQYbi;Lma+%AgF`RuGg8)z<u97hW+TQ6*Rhf3>^fN>p6!OIiTbRUNukYta
z-Zl3L^ou3H!9`SE7at%UoAL*;h%db5daTZvEMl>a2`U?|#*ly3LOc82xodZ<86#zy
z%D4=6PBn@FLj|S#!q6gs&wjiM^9#89oA-}M&PYE$&f@EyQ^r-9xVZQQ_H!yV<`ML{
zbFLW);Cy&q5hC=|SQrZFueC0ia48(CaF;DzitDev0?!^igsoej!2IGOj0`?T=ZU9b
z1d@RmV}`7b-oEa88EYn$q2daLs^@y10RuqcsXTV{C_ev%FUmV_FDRAGQ_p7@5piSn
zwij_ju~Zd710@;Q<_w<4a9XS~cq#!zMczr<TuaI)P6AYuCw+4)JCG>V7GCSg<T>xu
z0bH%aKK-;+xcR1)*tPo^Y=7(tk@58e0LF`O0O!9Ek(0J!dRDT-Lz|%8YQ@Ad<QN3Y
zc;iXDtjw|q<TZ5)BZgy`1V&7dfrJ2tf$?LkuvtnQ$4(f$G>v+c+xa~iE>pQ9Ytu%r
z*VFlF#so$)6QI3O8AbJ0A=wCLZrXq|&RB=-+n>bFox8y#3tLZ4nSBizd;Q;7gawxy
zvEp|_&zS3_7FRxguG9kX_!ecZY0FwC#ss>+B&vfU&%ru&u#QLSdu~D{B0-54UvwT`
z@PZAQ9R4T{A3g#$#-l}PTL{Ck%V}OD657-XPtr?MOm*5|E}!zgO>=S(kQq;lz3l_u
z^ehaRs=h<?9BC$XZ+KCZZA7;TEZ>E|S5vQ1tP`1xyS<)hF3a|$W0p1ozo8}&!<xXt
z(UT0?PnN6Qx&#^w$XY9dotd7&jn`j|yY9JPHbI&Hf%?vQ)38Z~H;K?|BYuOTLYBoX
zDrvtjT_W9ZfkI`~s#Un*x~rpilP>@8$xlh2W0NtLX*g9A7?ns9*hmT>0K~ch6hrEN
z-ioD*I-b5nwORmh-nnPNc{66&=~s<es}wsX@-D|rHo%LjF^l0aSlTbi7}o2qz3O>i
zd>vEl&J`DZXRR%gP(-v<Y-ECU93KO4z;qQ++SpZ0Iq+JSB`qpV%uG+CWsK*Xt(a<K
z)vzp@ey5}_t;EPArD=*3Tu9T^w?Lg<I#ZoYTDe-tlT0!glT!pnkYtQNqKj6;2pB^`
zD*9;;{a%rskV8!%H`D|&4=*|uIV<Wyaf8z!a(M_dEUc%6W08}=0W4`7g9zKGHBv~*
z_19jTi&7)2teHm8aC0?J8#k%vfx+R(V|dM(K+oif@}>%$x@b|As<;{pkP&5vn1c<G
zEJ#==H+PDtQ{H73I9?YJn3v(TmTAAA)l|eP_8q(SnyWB7Goy<S23KG&uCw)O2@enj
zJc~Mlu=?_arNm_1P6C|loE1%=`UIjm4*((!wkVc20tTkCR3cRN3}PNUQhX-l1w$6E
z0EB8S{p1FV52#;5Rv9evGBa?^Raauw$`z6END9@Xe&!QW1V#+oI6i?fc?f(08}R^<
za)SMKk98tyS|u{|DpCJ$iHgkG`b{m7saFP<Tlx$o!KSj#f*t4LU9>W+e1s@mthKn}
zip#M2^wV+;T1>N<YS1&+Y=VlN!ph+J?|V!c+gsE$U#$u3cDt$xY^n(IVNaejx3G?Y
z*c>Ei%(5GSUE%<>7M+IJpD+v!BO>`tdnq`KcGAe0b{kZ)DxFpfXP<vIHf}gWum*Dj
zzy2nS59`KPpTP134v9QR@UqSAeFE)76hYyFQ8D-JTTL{WgUdB*`dh{XR{VQyO?Y(6
zRy_RZmay*(IgQ`_`q!#BHTlI?gVq>x=z<k3kO6`^A%6fjK&hU_=u7npbgt%$^`=wS
zNvRluTKkefgU5d1oS3hB{T`+|(;zDDgIB1?csj#y0Cc-OsWUUvlU;Z%f~resd?5*N
z&I$9{R+DkLGDwX^)WjU@wR>D@%rJ>JbPSk5F04ETeqg7HATmaw=mv>3cpi8n{V@PT
zZ2JWzU?Pnn4<|OQ9zAv}I9H8=#yD<s<jC9*^T&0;Bf7vfi*Jl+=oHGT9HHD_KMo2R
zOuF-)!S#j86*#$KL@bbmbI&<D_U~sm;N-!@%BiGf;CiXRN(rGlSX9udRAs0*CL;tK
zK71H!)~wcEkB!sx9p?<NMo(ei{sSODgE&-)Q>p|?#r$qzEvaa(7$lcsBtV406Hx?-
z%*kA|_&Qlh)~4UHRXmr9b`>`I*S+>t094m6BAphQfT>QW!bqo_a<AXdYAV0MYt;mn
z@(=)F@7@Er@PhOG32vwgBm&e%FXP(f9bSl35@4?87YP!DEq0DRbCD~Ypnm2FDuPtg
zQ9cuX2RG%LrSoC5jlw*Bd>(MD-Kl`;syRSC9mIuDhzN^|3)s7FAJ(o}Titsm@R(A=
z_QxLg#xT<Npb1MM&6z;eyyXi+q%TA5T78GP#vs7e^ljVr$7Nyq-qc$@A1sCuu)0Yx
z7|PT-;SaJZ*rZHWHw0{ccnem)c(pg%Hc<s?IePRsp4{=2U_2st=N7Ki;BgV72-5dz
zVU;<Y(%_L3VFHzH^JrTpi;Dye@4@0-v1M_}OC2s1&OEAfb4N2Dz5B5Lz<&7#;N-dX
zLHnb9Woc^?VNat#OdlMoa5%4_ujBmuu}oCl0?;@ovNS$IG>>=PbGOVJ5l5O&#d=}Y
zcVT;9_4#02y&#zNL@|J;?L7hF$jO9;9=1+uu6n)m&U<j>m6u`pvZbXl_u%r7rq6ut
zi;=CHeDJAo_XJrO%MQjmPd7tNptW91Y<CJ{6+OQpjuX~dFLp&fcmjuDuw%zgEM2-R
z^HSbaq1>uR<BN-nxbqwLU~!=fV<<QaL^&g!FD6AK&5PqY=9mxia2%xXW<tTCEm51M
za<a(ku)*p+N`^py?7VN>^-WxK;d$crRT|>Rg~&m^)fz&Bthh%tW<F*R;4&t#mQ;F;
znbeYI-Z_)7dGo{Qb{BEM`R7%i{}M=h_wK{}4?GAL(*3eDGDYx54*D?aX5O3!P+g#g
zg%^ol<X@AVRA9@N?KpIJ4wqkgVJxpVFd2;nsKluRW5Fhn-{9LGdkp(C(e1KJFTsix
z%TZZW))#H#f&B-Bz7r9~E!>RfqlS6_Mk@5g2O}gVfGSQGwg<-mnM8fv2-vrGFYY)x
zhpVr;0<*I-u|+hFZIly&C_6~hMo$C9Hhw2|f}WUqD;8Hso1Q9){0<yD`Iamk7zq*P
z=8oX2U;jEzTeS)s&Nu_7pMH8awpp*Jk#FPJv154l;6Xg|%--zxSrGe;RN-2#<C1xn
zKIz<Obg*EM#FXsjXnq>&0R+u5i^fkXbF2v@r>KiezPconGC#kFuitTZc4{ud`gLnG
zxkSauw*sfA^9;w*MqsmNcnTsdq+KuV`(Vo$XQdwPlW!mK3i@38BW=W)ReTo@9y$zX
z^Q<Oquc+|>G@ftCNSd_qa1@0X+66RHNacF<8z5)loWd!S5_lrf!3t17$V75MsuaKn
zH3Cj!{1Ijsakw`NynN)*tz{Os$YGS-u!)5Ib64i^8l_uNe?u<Nm?<1C)x4RoKUzGg
zqk$@!NX+6$#8#ixT%XSYoOt~De59Zcfa~FC-<$9NO#V#D;t%KApm5=26J(^qPi!14
znvlU$yPn3}(POy!$}1$$vv|@2-FR6Jz<NfAOrBLNt3~$2`bqMeNu!JlOALp(lrbxV
zQ@i-uMl_rPE0zNETcjhUMxkMvgvnK66Lv1P<A*;G8hYdiZomCbTzS=HLPv)U85G;P
zW44T|9q%}>v&V3l^|TNZ7-d|yVjbpcuA8WO12C(xjD$SqHTDgVwye%GYKY^Zc}8vF
z#{K~87iMY-CQAFFlv~<>Lldp0kr5f+Izf^0_g#12D<ai7=bVMS?0#ks90S5e_(@eA
zID>Pv?ljJ>41HTa*<Qxi`E@MX!3`VNXH49BELpMyQ=O?3G-30I%r-|*9((+WOj6nc
z&1T}zljz`%L<qm+#V?dO-MeqUL{7~eJpw~Acgiau(iJFqOOnZ`f{6q$`n|qazeXF+
z8(Rv4ECS72o=TQ{=eKTu414zO6;As2{5<yV*$WV)5|!llgH9NkVoy!Sab7<5&(A&g
z99(kog=GOF-;xwDhYlYW?IMAKemci8moL2aR!mP%OI@~X8O}fNT<myiC%&0!Lj`Lo
ze-RWz1lA4Z*P<Z?Fb1$z0w$0;VQ!*e1m|p_X%);++LfT&wF4sz5s-i+3is&T96;)G
zXvl<Tn*^5n#oL_OBoK;x=fX@Gj#(^=w_JZC)~;PM(3v}@0jO1e{6ti_u%o#S%X{HT
z?zr<CAaKx}WZ_a=cFE;fxpGAi;Un2mUT`LsE?t5zfB7o{r^;mPoVPD<6AZvQvjzmg
z0^J@8bxYpnu3zLb&6}8K*^5rvR`V+wQc<&n%aJzX{Ar7btxklp0fd`xyaA_s$Iq-r
zd$ggg7Xa4-V@MjB#rcIO{X9Fy`t@gI8q^DA@mXQzA#}nsU4PwmnWpt_BuTN1PnwfZ
zNH4en28b9Ziv7jHaIw%j70d9NUtdGc5O^E8q8@Wa5@;@N>_7v{-woGaD~qp=pG9E#
z`F8)rQ#*HM%Aq~7m{B<U)Ku2b>(nzjECbc<nP+aw_=m@F=+Ge$sLB*I2_8VXSI&bh
z3<bWSsgn~WE>@<~sZQQZlqrNR7UnDSwG+$O{sYenFK{#y55Wv_l9Z}?ah=QM>qsPY
zd4K))GMX=5zoO7$u3+$}JPw<w={At@ZQlG)ATjVD;Ux=(O1#a5Dgt%;X)0s7`|g7=
zX$li}H{$_xvh4uvCQ6G{w3Apq>m3$*KHe@~u<XVW+<fy*;;Q6(Buvhkn>J$8#toU>
z{gG@VY=?pI{{E)e^EmLGi}ySE>iD^DF2&{9hD+0;Q^jMPb8hVY`;EKr60>=dB!RTd
z>~Ps-nMi!vDq#StUCRVkhRs&X_@eZ@p>Lt)IBuc`5ECSmEL;il6qB*FJu%TzDxzM1
z-dgPrZn^m;8N5wXmBEPyOwQ$(U5e8(Y2dEA?vWUOBq%hAvYJFo{Ne%lO>|?1QauK1
zu=u_-@CkhIp@(pE?x<G=X*4xE&Y045Lic;U{%C$BEHMvW6dpeLER|VJ#@yT`Oqe$q
z;!>+Oc{8r<r$f=WLi2I;#TN<F;yK&Muh3d2o8ydiYw@aAygcKQ@5JFFBKHn6)~Xl*
zSHxL3vDhtNv0T2{guSb06e|NBh2}rCW2YPv_F}N}W1pIy!i_gx?|Bn9a*sS5!E6Ov
z*sGx@!~>`?nBvKZ7qgHd*>J`>S%|6u=FHFR>@;5X(ih`_2Or9qohKtLTS0_r#89nY
zzYZ5)bfKWs$rm0u5A6K>0`9y2KF{=Vi24ECdh;!EaQb8RlbOGD=3p>GG*r}qH}u7x
zwBEW#dEg@Hx7%JbsJeZs%puh8JDHTLvtZ3NYu4aiQGVEgqC}WHYe7i@P#ikGWa$#&
z`i1U0E;$Lh2t=b!Hu<&`ywh*X`{3O@-@M10W@*TT&A9Z^%SAHL#gE`bg~Rws$$=1)
z04E}Hf<)jnHU|TFS`yI&MyH%}ld-h)Ht|3W?6X!74ZLuvGE9zz9=2MEaPKRYFU#Dh
z?iL$61t!|SJ<Zd-M0gENyigzpb5TI2&Q$r~mJ?jjCVc<!BacX2fdqY8HPJGFHEY-6
zqKj1CkKv5KbC{3_vVR8F`AHJf+#F0AZY)0eL%ElQVRO#rw`aucm4hT<rfP4naL}X<
z5KEUX6_T)V(?%H-$UwzY&izuQe>dK6J!WQRHI@K05*nX7I@f^rkJ^gYP$sK;|2&53
zJV@yN%{SgyD(`bchEp(%ito+M!K7(P#NV$MMH?_cIcken(-82)lRL2L>MNCgFi`Im
zfZRYLB;opNufdwtt20g7gRtI}njK*M;$Lya<ygCBO^8yd-lu9|aZxmDugsXwMtVT0
z67MG>pR*QBE^zt;K^9->ehHj033{BkTh!&=iIk~vaHz(7L?|kpU&n>}Xzw$7v1`pU
zg3_yt(m@3-hA5e|vod}7X{%P^YhS-pYzVm}ZPUh$nJ9IEoP517s+N71ws&TF`R-!3
zv@Ii`$+fiku52^)yZu<zEAsvoV)*LydUbFrHS|=oQ`k))Pav!8t)|t)47+N16lX;v
z*fIr9k0fM7JYu`uMTz$-?iW|F)qZh}kc3yh@@1kg*uDE{F`Q(gl%`T80Gj@_k_bGw
zc{2_kJcQXLvr)e}@P4X-qkZ49b-U30wg#;X#I>~<-M`q={Yp5>a8~w*fs!og9ON71
zrYT~A{B?$+Ky;DGRqtLHTmoWwzj^bc_~yO$!#N%gxoKd8kc7k-VfL=Q_Ug=ZdUKGh
zkwz5YpLzNjY~Q{eNm3j|OH>6XdM6uc+xBfyd;t+*dS)88-f~lQ5(?({+vE2qNY|sP
zU{HfZk(wp6;KPxL);VPy0nH@Ja3BM*|9|ysw`Zc-HJF*1DV+x*)@PxZASkrmZVNVH
z|NqC3nZ@_u?tAV*GVotuZC4JbG9>%13|?sBRUd>G-*U6`H*42a&JPkoA&w4?OySMV
z!JPZ)k#?*oTPPWD?u2P=3~r#IGB|$xIKJ}L+i~4BS7G()(~HnxWr|nwlkV@)8AoL!
z?Qg&1PU&Z>mH2Tri$M71efOc)?P;`+ek+srFU9K9PnZ5S%QqP3RqS(G<`byn;)$e)
zsi%O9NE29TWw2=<w`UC4#hG```RAP%GE5^+g2lMyzWW~#2b4)=0evis^4*iEdy}LU
zF_>%Cti`35T&(i`x2ZIh0=%xC{1c8Oto)ib%B_Y&=~k@A49@4l&tv5YkQ=)WW%Tpf
zYp#|P9j2zG;zW`DeLWft8Nr=9cVYLg-ML;~#%0WyaI}bi<DrK($0{Rc@p``brW-u-
z>MG&Ln=!{_j0xP@Sl!(R>qSIO&A}@6IhP`#q!2edwthiLCX}7^i=~<$_`t{1g;}!=
zASdX{NB>C_Ihm7YRTdHdPOXV`G?WJR_@m;DW4syJTCXgTKe!%FjD0ejywH6B$Rmhy
zx}PonO*!2U;Z%p0jyx`-+0=q(9vct(18_4b0LFmTn@2?uU#<88hzRDBEvH$v($=xd
ze+SVz3I|esV5uz77ryu<JhNwSrQBWbejPVXQ!DD^+&IdbdnoTuEu5H?Jc#-Ed6*;#
z;5Zh#FT72frZsSacVmr<fw;!wYLX~Y^>QXjJPLQPoQpE7mogCh-R~;%|0NzyX#}i$
z&Vcew9M9zC3(h|uWrc!UMQU?W2$Lp@Whm;87>yJ~SHRJ-bJs5H%Br_i=Hv46{+gWb
z>lh<Ab)|k>K+Qa-{!lh|2@{tuIn@MK8a;%Pn8WN=<EN2P|G;hAw~If(HCJ6Fbne7;
z^o+-!cp{VepH{J`sz3EJE)vWG4?G~7iHLJJQZqe&rkA)S-{jAucOh%7o##eUfS7q@
zKnxa76j_iUI=BxB`bfn@TS>p1b!92c^jcJj>Yc)YeFrjq!PmtLHgktYPy!QeIh{Oo
z=rA@v^sq3d(u@oG!!?Xo*hf+I`fQ~G3}{m)DECFT-a3}N-+T{L%rnb8H`fEC-fATQ
zkF8ep&7{>vnsc8OIc}^*t>$zpwmLHVyYVE)4Hgy_WD{I<)s^Dp5nfMAC`?UEByD=V
zu6P#Z6p%~$1K*!oCXfgZZGISYM~?<7)|~ENe);9%zaUDf8aM!&wux22CG!jhP2|Rq
zR&~^Bl?hUwjd~-7>d*V0)(c-CNfuaO^C<k3*a{XF7Io6b?oarUr=Qs)<b+7udyz}@
z{FzUqa{SF0yixiy>O4141*>2p@oL6YMx%(+Xex}4l^PdemMU`v5@|MYpSoo*K@V?!
z2>bW#!%a8dApNPBD9Pk;=<q>lQqvzDYq@wPnCR}i1@#9Bv6)$}a)03qZ&k*&98Nuh
zr#gaKIL_H1>Y0b<S@FcT;_l!v+F*P*<n8JE_wC1Rw|x<}W{lSI<%KC)#P?v^mTe#y
z5N!1~S%0})7a$^}P17JAj~Sls-y*z`p#G+Xd9*32obQR>9Sq5)HEpI!(4{(VPz{5Z
zT3eMTM@^X}aL75#FD&45U${*&cy8LXNp2)fQ!8fJCwA<>p@Rp(&^*C){V}Hcj@`|f
zYuCYp&+6533L}f-yG+o3Hb2eW$H%{cSV;1;Mm6WzM+IxjJe#D!tzjCfM`I)?Rug1Q
z+ef_-qZUpc7QKD@<M{g5@4%-&`#F66w%al@^SwBH=#acm)297V*RCyFw#p_67oV|u
z^_qz8*A<$OA&7ujJoe8L<)d^R$L9fJQ?C`8(~mx!YILxlq|r>qW^7ZY!pY@aW?Rso
z{@DHDcoWE}zVoiTV7!YJz)-s15&Ql?-e*>cV%+FqEn~rnX@KTGPP<({&y&ax;FBU*
zXT>!utMQJdobjNN`BpeyqbM~l<G|7WG=L-IL%C-ycYWh7^cK55l#KvZx_`?}Hwz;w
zbYC@-RW!T~9ghcxsFVjVWYB4M#60b+YaSQi^~%k8z%k(9TM8#`yLH<(NfJ$Dz(IS5
zOD?%2qx+$}Urzx>jQZje*8_3M{4|dX$Ypy987lSM^+q2%f+kR}KQAODeXn&)>fzKe
zc;mq#BkeSM$5u5NtCbI{*Q~)6mtUrIe;i*vX1yz*flnZFwPuIC2tBdrU^_@qOhvi?
zZ~oQv?q!-l=iww`$BxXD^2}PXo!7ys?+=gMAFnafy9V#d=st-9EDcP?)~0e{^9yge
zS=v}@Ptb_N6EOxcm&@k;v=_}!BMgv7<0i4*HO|<<3<p=t;5p6VTL!1y(ksvE;26`i
zKMIGu8~VMO!|KBPqIc;QID`9;Zn;_f`ULfVy9)!7kD=8`A}nfCHwX{~Pe>0SD6mFF
zNyhsG`dUzgagufwQAjOsOsRq+r<w>{(;w$tJsgm<-?8H<?Dkee9#XwtnxXx5>()Uw
zX9E##f<A%%S~yn-TYMBogx11$cp(zeF^l2fT$Jxm6g^j6aRqwaF1UCj#k9RX=%X>5
zaZ0m9kq{b)79~I>LuEnL44zo%rlu-2iV}WS&)}saFnD%kIM$XKm>7Ha?!o{5(1&DP
zSsgxwnsB<-6mH8>=?OZ2(;MF~7Nckk3E!me!f~~X$C6D+0D-_hi9@T1p&|tK=T_2+
zHfZ)t+W1^TC0V>7GJS5JH!;s4&lsHByvrFp>m~+=Kyt6(^we}bc~c3<XY$VV3UTr8
zy=u1bTdg?%L4ELu@y`m!<&$zI&HVvPVnnwL547+!X`*9r)uj{GN~JU{!V)8eGzo3b
zBWuh1Gf_D0PNxixyh|4rn)Js%3$=|!a-f#-&@ki2CEs)tNfRf#7OudTPau;rcrd0i
z%-n0w)YKc70JV?rTR3?*(`6(}CtTVrcDqgbql;go6{5NXcYa){AJ;@~4Dq`68Wk7U
zhmo*rU^D)<!KrP-jcwt4V!|LluReil_;#riFv$=DL#hcB-Sf=!6yVjT6n9E!yvG(r
z43%I9n_48zeGA8d<J(Yp`Lw`c98VV{xU-6JU0hi7{ZaR_VK_E*LQaXOm}k*LKU!Lw
zij3)2d9vn;pwyQ6@~Iy>EX(9A_QaR3(7r7xVm&Hs#k_(%OMM#G3HcU|42MB@>sx*h
z6{T_`O`wRM!-#j#f}y{WuVb)YjZ(zK_X8Id&fhWe3mT&L{WO)u1(BS71`2EbE({*g
zYCS{6%1}jB-;DuhByz!3&zhGo%UWDR)L-cHFVA$nCY2@*Ui_m9`c8UPSvi9z*nvi4
z6zdqO8s|yv&xmmJ1de}YSKOE8aB9(jb7H$FK9IUzjWdMk{)<;XY@zMSK0A5m!sc)$
z&!9d3aDw?R#U`X*ZJa68raqRQ2~0(6s|;0A!I*Uyx{@TC$dq!gy~SR=$=FGMDn0C6
zTFWRZoN8g9Hd-0X<2!Z5n`0z6tf}_}qYmG^+V4g4(=a%c2u_(nso_n${+;@D!)Y63
z6n${$Vz*aH<MMZ8Gzdj2<e3;chWf)5{UPNQqW);xvcjm3>m{Y!4d5t*`rZ%#Gc-SL
zXny)SE|NOl22jYtOlTT*-K_PDN645Z#!tB9`H2>#=e=2l8JsF-6x*Hlhzy>7Gp_!f
z!iieQe+&&BD}h9$A~}OA;h>VmtA_*aPigMUj-Maa^^)2^5fp38!ndJmwX`T4Ve-oC
z>QkLg9UN)XEoBtP?@yj#ySXnPz|Ainsen_x`0@NSzC1eA1hPWYO-tW;&6}I7Ca~t4
z)Rf_zyw`x@mZ&)w%ugdtAhT+!s(b=dVH8`HLv^;^C$QV?#o5DRtKle`K>bElf7B<i
z#0SrnGOgNnG@rl`Gfqlh;{LF&4j`k1-xn^JADWCN&;qgMO@2u=f!?RiJ5W-wNz}`z
z!oWBLMV`TvnT4+S4WOuqjsO5D!x<K129wnvq)937kH8^-3(+xwz06IfToWj8P!Fdr
z-<I}=3gD1$!+<AQx)#CwOkNY{7p@fX8UHS1JhVFNeef9KvkpdF^_{d&`|0p|d1g~9
z&k~aq!_jy0O=nB{QvoNA8}#ji%1)mH7!3{waH8h~Dutst2}B7L5gv6|)iuE+^Z-dK
zsq<@(eDJ7H6WFO`rhI~hT9a{28CerpTPRqhvVM=r;FZ8JqcfcSep)szU3_k;3XT}Q
zG1#J$Ne@Ugfm=bp#f1<Ro?vvaPEPI<*lJa6gi(C(#H+T7!DHr8eFEzlJZDFSV+i=@
z-+ZFTzAk)?!l5BJ8eAfpH!UX$M>M5X^Ru|v1xOrKylb7VRod%|_~*x^hoG@fAaibC
zk8cGh&rmU7>V5FUZ=l2{P~MH|%V*O{25)RQ2@yasoWz(?U%tfXT}NO<ZN`Tq{VAIt
zIY1d4LGkT&CsZ)`n2R*E0?RYx%~io3h-w0Z5;9a0YcGGsRaLlF85pgD+r_nQH5}<r
zxhC*rgi}91{>B!$?Oa|ITU;5?sOM(c!nJd<tDFM@pTK~jstrgqM&O{^>jM>0y^4ve
z;iT39)}54a#-AU(Y!gJ_a-Tp6V_RHYMB2zFkn6)%dEA@y8#z#%g2P%zhr<()0<2S0
zZ;{WNPX;ZFN7Xme5#Xc>2l&o}BRPkXu&v}M>h=3_vX{)xRyhuehqCmifg;E;^CE=t
zSWI)P7n#T^CeMg8f~bJP>AN~Or{MT}jLGnOd1gHP#qMGW9DPRwSSLWi%v}I(oDI;=
z7JjRwT7B%Xr}}9>Rn1Z%eXGn9$breY0?sKoDgl&QN=0HQRFYYrU%?xM((T)}KLs$d
zwcG-rKMo1#J-vJPN6tC-+za+R^Yp>zDo)CBsxb4yb888pH_iq~vuxN8JLi65<EBkN
zka3<D5>W>yQ#rNpy^LSjx_j5Ik39YK(+>kkN8JDnzyjz#_YbrB-vLYmFgTgYsp0@E
z0yqYs>(`X4H$doOmIBC`hk4~DLHOrfP8HT)q@MPtftzME29So<|3jnCU{0FFKUFwf
zN2ykxjfMgIKh(ufPW}yWY6Fal0h9#jW-uom4{)kDU#*^g@Muh+0$~43C)?>iRf@wn
zMiT?IG3f?4smm#bu%xsa065vpsq&pm*H4vG8{kwqwE<3*dVhd6fLQ=jC*@{2B?flA
z7Pk+8$Jqb`U}k>PEf>viyy3NWYQ-jyY2)N6rwY4%(mk?kcK2PMnca2!761!Hn}F7>
z-++SB$rk^LqvyQpM?q!^Cv!Qq5xUEs`21gFo8UnJy-_j1lKC^Pdku)Due$W&^Iv}b
z6}O%?+n#DCCcqJzBfu*Qi2e2KL6CypI^s18hA47fQ_os}v`r+3S~m=b^*x7hq>a(e
zC@c>r|CXW11yaAoK-`}Yj(?aK3j3>Y;8?$<0E))N0;kADux}Z@JH8F;xLpp%$=`jO
zE<E_~!*@LR@FUxwTgz+%JYKW`Od0yO(<?Utz{{_@;?^~@ooMmH1W{F)tn&*T@`NMu
z8&`cNZ3ULTi{KcA1J>X08zaD>e9<`0y(sT|f7}ophCI{$n38enI~^C3)Vw(TZUiUv
zED8=w@SaEy8N_?2J#*z{m);Bj*;<|nU<LryVF2>AmDBuHGp#8@0I~Mj>j?D$5ezY8
zq8$63NrPjcd2FFT3ib*?;6N~n#?VEl!RWU`5FEm>4q#ghhX!!U5_oBwyg!aP#!9{o
zaaF7q>A18%(G4QTD4aOaC;Nod3~RMNgC02@N4{R2q&4Gra?7u^0;?baMxO(%e3qyp
zxsgZz%#+B9#S>~jnu|4oYM}Cj627vwInj2SmZoT~^-NM>`umn&TU&zxq){TEJZQ^G
zE24cszKw(KVo<;XI0y|yD&g3Qy0~E20*3_MWz__9GPMqA8p7eSct$5902#o5v<)k&
zlyMmj`m4Vo9641)G0$S7acQ4@bEo49`oq%7pJu0U2vmrboX#^^t$cnIt)(fWm(|n(
ziL8T0a;ix`v<jLM3}7Mz<hUXbQ+FJJB7#DsnKR14XwVTE8C<kOTE-wT+7=vEg`+uj
zO?<*VqZ+i8!e#w|GJ(qAdDsf4EMP|AkiyZDZ?14$I)8D0i~(ASi9$G9iSlF4an-u&
z!xA3A#7PO127<Nfz=Od>?Tm7((mC)j93C)3?Sw!a!eIYj(xTub%R8wGhn-R_`3=6M
z@3^Kv?BIi5bNF#J6pzb)H|`GssDvYJWn5I!A26ZQGWw0M%DcjOR)-!MQ4yrv2ob|U
zfP(!9Ie$&L_&1<JrD0>jnB|+vapB2p=L?MD_h3PP==WvA1m6oec<B#Z1x+>NkXoNq
zl8aBTF%0J@?hA*x{jH0}9JEOc;CPrsaDJ1B|CWe@0?P(h$0@8%TgAUJ?xfuYdOd*y
zT}RNUnm}rn@0dd<9Jnf%;#&@24E=v1a0sUaj6PG6T<!7ly7N1D`MERrc9nPh<3Ui;
zstw2F$*|Ehespk-<_T!EC|5uX<Y_CrA70Vnu%hiRWTrx8hw=(U!8^xF0y>ESL7B_r
zeFnpy6e9S`!G{<s0J$veat04k38<I_KDA{LE2aq7Zk+zMY3w;q`epqI_6%@%HM~PV
zm6MI>DT+yeN`vV4@^JlTY2rxlp;bmD*NiEOB-osGS&N^3(F#nubW_IHb}ZnlyHcdi
zD|{%IHWbC{<;s3DIfgM68bu;dE5XMeUJ$<H!quJ9lSGqG{T%m4<}=S?8mHt>C9?_8
z?K@1hO<^B;edSzzhSP?ZNBiHTRXPR2efE6X6>d5;9M5>C1-#<CS@hj;d}T)p5@|p=
zGcAf4kn%uOqd+&Ei-Ed<9VhtEL-Y9YYY1nqXa|eV&wCyq_WjAnN(Ez5{;1n?!at?f
z4&9#0NF5IpaVF4mHNH8N1~b5g$`olMGI}o^Be@ZePQO})ar35Wd}+s=h=W{ri?+!*
z;hd$6NkBrHBr4?u|MUK1c>DFsv3fQMA#zPVgitv$*3BY)ry^jd4RF<&@MO3z^1jaq
z$^{&!V!fs$ARaYWB#|f@W9m4oV<G?+MG)GCpm2aCQwFU_eOrI0(r5}w!h&t#&+a*j
zpSoc=R!p1m(}eK}Xb5@CYYPHKy7u2UAOQgb!k`XSBohEqi?EQs`}&UKxFe(C41=Vd
zfH1T;9BaA^Ioy2a6kd7W5=imy5&%61m;|6g<}Os4v^+zlm{K;SoFbd+&6R(^T$<o7
z?w!NiZ&-op76DwW0wvYuk4+x5HH&x%5j7<%3_3&e%tQ0sPjgX^&@!RfRWL(OGn>+6
z?hfX`CTO<|IL>h|DOtG$3w9F9==V}wy<rBQ-*z029d<B!RZFlL;Jhl?>kRJL)x}HB
zne~`JWoH)2gOLafjt+r~7%B!2W#vkZsBs~1hRnfx=LvuD%{lzowacXc<<={G#LT*^
zV+d-T>rgyP)9YJd@QS|JOPwdlETkaR&a!OwG-22@tDXUFkRyo6(;d&@%cRMqs||o<
zW2nlsc&=IoSidyE+pb-KCl2=TnXU8Ky8sw6{sVwhjUUtuYvk1X`A{z3dGVAO6wZ2(
zpI_C<5vCATYS%h}<-h_rheKrW#GJz~e*SRIPz4(`_AO9J$spWJ7CJvkv>>7g@|r+_
zBW+V+VXU=?7^q@m%M>#|Ebq|oTfKLHo0EWicM6K>t7R~_$1cZ4T*l~lM(&)`I{2xZ
zI=E-|0=}?)0mu3VM5Gvjg7L)TR0c2CbQQIc6QTz+{w3e0-}hR)=;lrm1&uMm<|szy
z>|roq3;IHd8k0(|oMb;P3-nT!3dCfx(@}>TTSD>M9fMxi!Mf&5pbSbGJSw))tNp*U
zu-^!VSun!&n`Ut3`e}Uev19n^Q++UrqDSpyWt=m!ukusPc~vlhjOzTq%+Vl=;Q>J+
z>2V5!3;JB5;N^0rF=h^(!fDO~s(TfYKMfuO5c~Jq@rt6RWoLneSTtU*y=WP3IMd><
zA3BOBk1#+6CMlm!$54}Kn_!5votlj01a&&)sM|p>8rZ{0LYFT|#+)$2up4*{&G*$*
zi;x7U^d)e@P3CgV<PchCs4V~htYtN+5A}yVdFb{SG+i#{F-w~qP9q*5GOZGkq9gK^
zWlC}b&&d3*Wx!e?3pj1Y;Ky%Ri9f&R2p&7+;2f#)CN@1Qy`@+am>2_V9M}on^k&l-
zRN8j~MloD`7KPRYrxD(M-AduKpU?7B|8PJ^jhfWs#n($D*fWX_owh+-<Xs4d8(tW}
zdB>o@xZt{br&_2|#VIM+K)$!alrdg<&J4Cadkh8%U>M9X9?ze(T1MZ8{gFlMSqEWU
z;rt>h80{+r4w#`Q&0*70WLm)$0*9aPv?$E}bm#i};zd(N(R2CaLN1@>xl}MK9H2Q9
zNJPb&Hy+Zwp@uFKppX#2>{(#dj1dth_mHtJr}g0iCoMDFm&g+*@ftJd8P_5cZL1x^
zVP>2*<?s{NtrYQZF;%bI+Ct?MSOp@r41-*3jmS$>$iUkJ<bV_^h)CfyV*(>)g-NA?
z$PC=nWT}=srt(>f?efL%czENCaDmi}u^HN5f!Ve}&oaJMg-_JevA&DVjX_R5R*En{
zprvE3(fM<AcM_6Q3)2dG=pz*0?>iB7%1)S*Hk^xtQnk;5Swv&j?>SJ11ZbNqe&X8Y
zIDNL2FMfRbsr+OUpNM^4$LM^&63-}d2@q@50GG6eNPuPZ`V98UEl~X?G1WUqs^?@m
zywH&KZ^v;0Ds4LYY?uPakEoFJLzErrx~aeNE|qs)V}_vL4E7pA-?nE#Z1H1PFT)E~
zw$XDX_Dp&{e3PMRX7jl$bao8i86#T1=zU@UV<I>t^+b69BFa&-1|R_8&Qo*Mh*+s)
zbFwaajKZ})`Pj%Z5*pIVS<X+1IF`5yO<>x$qQ-vPl}mBK>W-Xz$J#C^+}uH(O1-G^
zak27HM3Jt+I_<kiU9l!mnA$Y;s(CvJMG$xpb>djPPC%?98>nyjgz28z=Yt!v3-uDl
zOC4!HVDJLKLL!LE7l%at$9G*gi|aSepqtA08Wlbv9+5#%x!uV^N6>U!?LgUF;uA<h
zCY|F+@Bkr`r|w=9({~<!mN;Srb#HP08z};##nN`H?OYLqI0Wo(A6dXB9zG5RqV(*)
z`Q7WqQ)raJb>pOBQ#m_*$LgpO7o8Kh!m;QlLkitg3K04~(4DJ@G0<L#E0~vK$M^Q3
z0!hGBOsY&ktO=9~Ryn!XbC{koU@BP<7N-i3F=)4wDE)q~2OR4;teQ!Hv4<6&k20I_
zT-QZ$2&|gGSOMlBCwr<xRh^MG9$Pe31*@ftyxp3IP7@j3B<vixQN$PfXdLH#=q-fC
zb9isCg8}(TQWj8yCahtw$ja7Ff)-Yd*`WVK1@V3fu;*wWE2onh96kmk$RU_rhkNoM
zznxU$Ph)Z_^P!qR85c)$CyOueWLyb1_Xlu;P%Tmhi9+-u4vW^o^3ZYMF}Z0XxiHB%
zz>veM&Re3|IE1KuYKXyO#Qkv=fH$pbQ(+RtUI35PA~;eE9zWE>#cQVZ#dr)}m2aW^
zZr;}gGl89+{=`rLDGeD#>j0wI-fvUDS~UwZ(A*!u8%qLUq;yCDwG3=(Yt&e%EK@DQ
z`(D2u3~>jOx{!u|`YBWgP$6ZCT|9N@_gQKv1t<y866@aY-_yhEE{bIQ#(@;<J)Q5`
z*@bh;tX4U2D25|AD}ET@P-X@P3^1fL_Xo&bzK3wJf>n!`v>i|UixU&HH6XM<q+B|1
zJVoCzI?4o=g^+ua6!wQBb8!Ag@kTnZ;IMhmA}(7u)i9npZuhxubC^$+gbMBFs&xpM
z;6jF0+mH^bxflpJK^-E1^o_!15R2sv;|l@tyM<m5Srjm5pWS*4AUWCSbWD}1SK8z<
zvq@s}c8(c39V$obCc)o6JeQGy)q<KQ<?a5=(G;J5qAOTa=)GrNooWJ0c?jneTY$nw
z&dPhyaCWBTeRC#|z_6aPY;}wpRG_=irfwj<EcP9y+vdb?I2f2Sb>N2<EI$3{F>F0(
z^9d6!ztxIJfignuxoH#FNdo^)7Dr6+uZt(#`wKj?$oPjx=J0)&t!T9Pp7@Jo@%}pw
zq3;Zc;xIUCW7_WD3+iX>e|P{?%E;$ONI_E`K=jR4+@=_08I&L}3|Z^ooL-#t`(J++
zZ@p$E&RE{Ax+EV(rQ5T3*Jt*~4dRi}hY}Il3;^pjcE&Mi2ya>&ntEe%F?$|C94EXf
z*2rezLO6umo>;`%r7hfY){@EvrW#4%$b!Z1XN&*rB0y${<uvk5kK$uk>=ebDq@4RP
zMzM)YC*u<+n;`9rYz+jW3P4~rK@#C`&&Uq{o{N{@`ZH&tWweVZO{)zgEl`Q35KwMd
zM7jKFZ0fBwMYIy~uGFs7+D3v#2p@Xz7>;xuUUT6x?HiAN@8g4e7V*FCKZ4_FA~3aS
zJT7aw7=v(bGG-tSq7BW#R>##;6|9U06)lLWg(+7X!{Bc+l>Ox4F24V=daoLeeC@gN
z5=;)*KdyWqe}^L<fKrJ<(XA}nC%4Vxk$qjf@rva*b43TElwC)9_+&;x9@v+Hk_1Fy
zPkH3zG;y1-U9n8uJT}ngZbl@hN@QwMf@3YqDT10H!5|PNxOb1m({l&$!`G}3GpkN&
zxtwf0nGrZ8K9kO}x=AVOR)0t__X?vJX{^B^o%9Tq!U?4a=}!W|ZbF70JHq&HUpbh$
zjJ0s>h8bLN`V`hIZNZSLclRDmvHjUD?#oX7mi;L#3<w4ZS2K9lvg-Sju#rv0jm`H*
zCr!1WTCL7cb5(H9=Du?zw8w#iRTM`@>m!H)zX1Y>@XS2pcW*z4H(j<2m#v?v-q{|s
z4{C_o`FHw#!?AZ#5M-f@P#8Jn8O5C0G|^@Y;0XVds93^D3tJ8|wj4YLm(EGk=@v<w
z1*?1x$bi}{P|7(RnXmZFhQTb9M2W&=?n$_Og(GcB;E>EuBPoCfoF|bgO$23<4uZVm
zp}Xi!kPiMd>4J1qlSSGb!As8S;q{lUKq*C_oa8W^!jY20W*%0Wa3u12A4M;rFiaAT
z%h^zz;t1_VjF}%-_zi{u{6_7{18t-5IDo?r5#!4FxKw|SxX2oazrWYb6f%lBKWbAw
zQ4&D8bxu&Jx`zWCt2Ir_AobD$EDAoI;GcGOvFqrw8A(`)Wm8Fs8^5>rqXdo)P8Xib
z87evH{bDB*N(e5FAqb0y11tTB$*jkMTx#iL=%(}=!Ip%7doi0Uu4PYTo~^)%NB~$F
zMU9Z6#@0YJxRiGc+Nw0Vh{)ja!xq2&)dTq9t5;@GLZOCjq0b7ZqVR|b8<b6qO^TkW
z)i#BTr^%Meq=bBqiK>i1?BN97u^JH-LYKa2aEB))c{?7}|7cQyAq+t~olXKIYLW%%
z+B+w0<YCel&6_eQxsf7uUddrF*Ju2}HxA+T7cRj|&Q-DM-re)CjzGpUW`2P@C|wNa
zc@HWITUSPrp>Uv^8M7_MjT@(N^@drjS=NfMQ9T>pJoClpwjagE9ytyo%Eu*h*zOQc
zpJBY~rR%ZKcX(*;LKZnSj~z!Wz{cA(LdKQD3~WO7l4Md|!31xI=0b6fArY<6XxwP>
z<e3{{U>FJhe(OB$f2NCzR(G)fxWzZ0UIdXBl_<t1<n1Q12Rxkk<SP9qQjMZKV2kfM
ze-_`9@gdV;?&IbgU}T&{c=AvepLpab2qqYpD5d%qKljqL;)jq`Y*^mLt1noNuRVDT
ze|qOZFegPCPKDz%3!5?2Tnq%kYn8-C3u;sF-lnR!Fo{ug8R!gr1`*Ar=1--;lXDJF
z9$A26&yEvdsKPUbJhM}xRJ2ZG^~eyMNB7gl;pc8S4VSK)_95*Kea_Ks!?ouTH<B>K
z4*%op`_X5QnV41O?kwJV<#L?8vV&tiE8r4u6@6i*g*;<v3-A8iKJ;NUntF&S(WKEl
z8IK^BPo%`9IiRmJEcCB4V5*=<21weZj3RUgYf@7$YAX3CB74#wf#KrCV`cEbeu5KN
zyz_;talz^-ar~6D>k~ZSN~7v+#(#P5LF}22gEttA>o#`qx{Fr`>UWxI9z8JHhJ<JO
z>1-4KP9|0pk`kuXGq+aexj7F2R{b=<<;<8<rm9R?&X(b<3!-v`1_n${Y_<i*j2RqP
z`U4Paj=P__d8I7=Vk(m|-cct^tlYli81CHF1({Is;Fz(x!}yt-*T@F7Tohu@Vw1V)
z1xs-8wmCfdtObFJGgCS}U5$-F&WnHS_3LKHImB5p1w#TBDFK@zy*PtYhb6}0wO1^|
z)f;Dpz8&j1Ji2cIpWb#1I}ckp5S%5|D3)o=RE7r)&w)?1DhwxO-@9NI*KJxNr^=S+
zJBkxcOqdVYGuOxezVEOwM2;v>Z4w;b@xnC{j<%4N%Wc+)q=Z+WzYLEYI0#Up-7B7-
z=EfkGdQLncVY=YLOxVWcL5sP`m{dy8fJ>aU)Zph{v`)gV^0Hz&$#(S8EIfP(KK|fg
zd@8da$ON&Vu|h`@Yk4R-8L{u2=Y}^dBfRN~m5`Iq<*|AcJfD0?9pnAC@5e&lh+&Nx
zQ0(fmxP)am_w;GZcO5|Wur6FZ4R#zVomfrAPzHEHi6Tkz1HlbsX9~$ci@-f6n}Aaw
zNkSQTMVs-C7q1aNzOLoq3YCONT(94F<tm(?q3J)m^MF{)44GJ~=1;c|BP;blB4QZW
zj9#vTW0|x{=S{}*TRwc>K|FQDf=uF*S86=swd>n>{Us{}Lvg*!B$$EOPT~_mh2v+L
zR~|@S%oB+VU>`-RJGaR9(@3NZ!}Xl!6Z1}4y!E;jXd8q1o{Qym2va8L@5(b~@$T1b
z!0&x+A09uHs>^P0LRIs|T*k9Fyg4H^n^tsiyzk0ao9Yxw&H03TcOS<WpICqq%m&W~
zNk5Stdi-og_q#sFKLI0oRj14VsX$i0aF+D|3~K@tnw%8C`d@i~1+g-T!|mX3)kdMg
zmGj#5%+G1FE&SJ4oq@l~xaH4oJq|Wz6kHa>_usHVP8H_+?ptzC36&h(XXjIV;GTm*
zC&L}fNZ|1AU$P!kZ6kDjoWknN`21@Eo!11mXABHf8er1Tu;Wler3x6#wu~r{`i^7s
zZ%p4LG4xE!;D@g}9T%;g#vk8x5Q~lijaiy<Ap^+F*tFE(?KiJQFIC$G6-DT9eY7&T
zT*N2DVk!;I+aKMrAM>dJ3v;XU130|(sudZ@n-;8yayV69%W8ut&;*)9y_p+D2j`P)
zdk)NndHe<Sa|t?Jv=9_upGQEWevbDXdX|NI|K(S&$EIZj=bVg4NlOr`EWnqvEZ&*%
z8ioX;=)`E%g@;t_Q&ELxDdDorWhHI?=AnbwE@Vve`H`2au36u~cVD&&3#o%Eg%ek(
zf(I0@Tu3o32kUskIf6L9HOmtz(+byFGH&{?Rce`tF|(G%Gw7^UQw9EWrS=Ws+*1Rr
zTiV7iz48qFuX_&QOBpQ%8TFf!L93eg-(>Xk^d)UMRaJ$D#<+W~hYjN4Q`IM~wV9AV
za*ym?z&~z1Dq@<o9BhEorh#|dx>k}tTE~@ew8Xg=I1Haw5^MlYS?_LWoFfRTSrXG~
zTA=(QWz2?|GbV#CZlA-yx?xRdO6GbZn_9-aV~G{`@f+7<B;hDNaQ7iBIPVhf&9v-X
zW@28Rsd;CG?sMg`1+fj{sQHJt@53*@cGHO~f=IE*+@j4yz60o6GnhdYmtCfjTqj=B
zSwE}blozU(WMsWm>DAaA90VhPi(&)HJ5J2_=I%vYzV0ZlJ9BB&>$(ZI4AF~Ew+vo*
z_A*h2{??cGVb`1mc~S7z7fj<{2-6pyDjtEq`Tei%#gRo@+LpKmPRLSZbblX?bUDh<
z#m?a^SFgYYYo>+7F^|uTYJc=}S84(=0Wr`50SY7UkVd2?TI<CUlTef|*XMe{pWk~3
zN4pj;JAXy#VpnBeUQ8V<len9|`@1&akF$yX`i^;=eOenodCOWXS{5b}W90Y$==}$<
z<=H;gEJ?I&Wp}C<?bDAO!owN7q@4u13u`T|Ti?O=W^{kP&$WwBHJgkoFaRU;c4{sL
zO3()>gHhlQK*(>{azH}G&@5#Nkt5h~u$$=x)>OycEBxs0+|;sY6W{UT^|);P5nQ=p
z7KRXrQd|i}<@0~cOtMBib;ou<iN5vtvx`}tfjJO`dVT_9^)&ErGm)?B(Q+d(lmVu4
z48W=0Tt<_K46*~w62X<ZP8kB{+C3L!sMM?3K=R^_r+e6a?3v6!vsPsOdi7jPYL0as
zraK0&xL}1$sG!tprYR@~j`i_}nTW<o0?}f|pRb3b7*|No`!kG`!bF**3}^EG%gzuI
zmh}@<4o9_pwNXYsb-vECI?S;00Ss<z4DupJXagwGzk;1=y23#+m_=JC&v(u--h0~~
z{N#<N<H9vF1p}-<8DiXVBxs-OEVLZz8h+<1dobTOFf9{ZbWsl{E`M>?ejHec-LTm?
zyfvfy7p<9=O^X^hR7+>HKVB24uR~3sZmQ;yL5!lkL=_e@=6VD-*9U&{pZ4L6m#x67
zFIpL&hWc_sx%~d}?)}(tBn6p7m$pH<ZR=rtWA}n=?m)s|hilI0;QKE>P3eBaGJXm+
zo`f+-cAMS`8aw>xjs!`&+$T_j8Zo$_k@V(IY4pJd4oeWlkKec!orD5Eff!Y42s%}t
zmjI61<B#IYJLZM%JLg@-TS`vr;e=)9;VwRysjM9mA%mnJ$Eqp9&%f{th@RhaB^=;{
z#uX%=cC0}$GA?;Hq3B@tMhr@*C^4c+2>@U;qnLyIf{{OCP=CnOON2YK6SVvDJMnWb
zT#vO&+TJIyEY+-P>1r6WKn{O;u9qdF-tSL7K&<2PQ0w7@*e8?s_j<YyuyuZ13}TD_
z@RALf?NG>{P!0aC8&}{Jr5GT1=EC)Ao*~2#T<QZO$X5WCG+sT;0}@(hz=bj~cqn4W
zSsg2xFa+nR!;D}0)GqwY3)kYRO-t)+qSbnQ9?r($@VlA3-?e&G4GiTPGwBzPng8d1
z-n}nlW*sOo9!}oI;cZv1%9K{KINGx@PcssiUuOu=Y-%Ct497(@k?3FoB_746?C-SI
zzyqhz+hAM8cdAB_1w9}t$JyX_GVc5hm-X@bi&udvI5Xza?@0YX#-!~&?m%RU`s1A_
zYvBZ><SRQC@+e=0V=b=D=>8k7I9*P@bK`rKF>1zD!6)&MCXj7&9zgW`*2!;pDFub6
z+Yr@`l3l$Hn91O;A3lO74=&<g-?&!9rzX78ZQBmx_NV6653i^{JbE73eaHIvi@Ohi
z$f)e?05~Ul{(twfGX&$Ljw|3aH%Z5OfPhb$m?lsLV}06m(-F}rkY&aD)JLtF7S&`N
z(_8|vw~sd~cNy(zgS+?iu=@*7<L5KO$@*oTLRv^vF*g97$Trbm-ggi%2^dt=pL&~U
zXs*tjRrX-PhCT|;IidUi@fDk}q%FRV&s&HA*Jc=Jjh;@LYXT(>jhSR|^%4RKvRym!
zn!wbRG9DcGsulV2X}q89S|n2m_8fQkmD`@i+cQJb)f<)sHV2|=<<0S)#qWOQ8CW*?
z(~|xOk*jCA2>8f-`!maC-{17b12}9g-gfOOT(WLf)ZKM(05oi)_Uu>_=u{IZ<6>$o
z2Ew2IvI$Q*3HpmxI!F%1r#sM4g(bFP0T2<5u;@${NU<-=II<kyf9dI?5mf^IFgvOH
z=2_%(qWb=DO@hCBcOAoLwjKqNWGHU%IeC8?Z@PL7gzj@S9Igv&)Qw#Q$4CA|SyrQQ
zP2}?E)|44AlT;ExYuX03=NS)MxIh}pRaJa?leFi6o<9EAy@#=V&mw;IMQ6wrvZ#Rb
z$wv<2{sTSfgv<Mbvi{U7Ob^Yc_=C(((K-VSCsuj?KfHVcx>o6aZQ;h5sJ$l8#TbC|
zaW%O-I@&pPDL`qAkrAp(*^S^vGH$%<A9vuLFWZ1KS56gc=C&Wsn8-Php%FEG)y*t(
zW-@*T$J1dso;}?^6H7Wu_v^2StK;yg9uALm*U03egZqmP?OCcIyo|K#a?}%P@t6fO
zc+Fe2!PBK2z!@IP-eV5$`s7Z$=F%0o`K)Ewu)HIw<(@d$#pkyl!RGxv5K-J8l=p{G
zMwS?#xc`9U1v2ec0Ee9wzs1YWm=z}w-|LZ_3*&aIO^8Q<BN#VnhsHE#9n!AVq!^&)
zVqkt%ne7Q<hJqp=4X!FHNp!3lDucMl0P5iwAZ5ZoK01fbK6We+35bkfinN>7!=ZXj
z;G=uz@rj2H!Gy`31od9MzJnjQdbON<rR$^Sl;u+TK4M~GO*IpeG#`o0I?v5`0M#tn
ztim|&?4a+R-f0UerSY+biVAMTU^glpfUUHX#R+T@{qg(b97pYrbuE5Bvl==iFvbMY
zJS(50`!Cxlev5rOQb^H6+YrhXVZw{0*3a`qcmThv9E)eL>lavqykVjm<pjI4j3$l)
zNBU#o8pA=HmoJkdp25K`BWWcbj?(@A^s-Gt_eJFU78jx#)J`N!d%Ea6cAJ1Xm{}^Q
z+Hs<;gm?A+^MMn!{mjD$Ge1VJ>SYe-{@bouHK6+qO2Y&r`S^>kL~)udYBCNXY<UoO
zPPy<&L)pY_9fPO3>7-*|5);vX+jFDBsblcQhU1H<pg;V;A((aowmL3m&glL$gzk4m
z-v8DX(%=s=)f>h3lmTuY9W3Zt6B-ri09a^^w5`+x=5c+LL`o%j2IIhPG&n?P*q<2A
zV*fd-;U1(g9*%>+NgY<r8vMd5Hlk}0L^+|{Wo(jdVnr5;iY&gamzjVR;GEx0nxnS(
zI@6rNgOj$=sdPMGQeyO^+QxLjjs%C)d8AQ)C{Y>x&+goVJ;!bC*y-WOj>Ip#^sExP
zuTn@2*QV3zn>K-C`xc3+0tXva7(kt$#yo(cl1eb7=3pnauzfOR08kYaArH3a6i!)x
zK%?}h9**BJUw-TezV5At!Hg5*t=FE8D>p2`++tel4_RA?>SN<*^e7Z7(oU+6xqQ7E
zs)8BNtK1YYp9o`Cp99b-oJOJ&j|_)|rvG_n;uW;dp|<a;^)q<Ob!$Z|w5~yif@aO(
zaH%<%b*<1mJX|ejrgT?n8;{15mI>MlYU*XR>tJT&U3qY5uU3O6m1<1SY<Xlj3n`cS
zpxw870k8j~M+7q^!9^H8_o0^tOpV`yOH0QkC;5Xva>+PRC|(C*VqHoq<5DcpoCMH7
zMN4hcPKJZa-H~M?I6_GVWO7xd^Q0gyX>L)J2`W<JXue|UPeSDy#Yw>d!L-_iTF|5e
zu(i^TnX2I!1ES(K#G^-{XenfXH5%D6kThokm6po!B#?=Bo!5nmSs36FlQF?9h}#q>
z<>3<}G>x5}k}^2bpVaq<^)yBOnIN2G+LXbOckZ}t*q`_|t$LNR17M2B<#fH8n}Z2J
zLIad3gpi`cBqxMxZ1g5;W4qRydR-Y~RyPk}f56WxoMbwwwb7gDL`cC2_NOR8bammX
z{)FRd&I7R47)=#KD{@UZE>A>XK5;nDf13t<Eh7(H`nT5R=3wt;MBbM#39~EZVpiJi
zqh;D4Q_kR}Jv%s6NlXF+JFw+?hRW75isQjC1J*i%<Bs<MiB+gDmuGG2`U6|eD6+Go
zXPnL5;mRU|obo`E-~lw+lw@#G=q-^dWZa@fGLsaVKwVclC6kcE6CoV7>pRHerDa@x
z+@F{aQiav1Z~%wTy#3OuQ&+hG>bdv&HqRbUeSby_9B=^^j>naEy17djD-DZAqg=j-
zdd`7+;v*Pqs5}-iout%IlT5YbG%+(MMaVHLwy8Dsl9B$54##mdt*yDyb7VgbF82p<
zfu^vI+T{5d!Z$K5U9ZXL0hpbfS`e4he^P0|^{rGbq#v73K&HG$WQ41RFjTTgRhr2%
zI6;3#gu`+zZDAR~XOKcIUPCw)3<9Y_j-8WvjxSBpaWz*3D`^}?IlATZAKxw}WMNWd
zs?!#_5jA)`Ax)ra)tc~<<>Q(>99?S{FFsU4Y>+HE)~YGJr2@j{hBR*`Lb>wZE?Af)
zrktKSsAetFym?a6bxPZ-P;Oe=AB9uLp{vy}ddY57U)P%Kq&yZJ!OE@a761-O?V{85
znutGuEU->i%my%A#3;s$nV)#s1g)78-@=7d;20x}Vg$z|2JAJ8QGddXGFpFF##N!3
z4i`TzH1L^Z9x>>n(%pYFI0X3l(Z!GEr|*E)1pEOg@upR0LC$~%HUV`OQN|;YzY9m2
z!21?jpbwbg)7^6_mQ4{{nL?#Q;05oY<f7B9{i#cn5@-TTQ_R#O@tVbBju!ev;b;Q`
zI5-fSVE{6BeBAp4xaMM@PNZdD3m4d<WUdTvAwxMSkXkGWB-JxTB4voqKo&4=I5HPZ
zhUyu`N(;84bav5#pIGPwSHWRDfLu;uk|~{^2`GZJ>eeivSq@r=8~F0oYYQDumQiG`
zYE1QTMocNrjcvyIx;$Sr!?C_^><<9d1bT)FN*Gn9_Kb%CD(oEs2VxV5B8gq!2^p}9
zDO$6wN(Rp@rXw<VriM{;&{JL#tl{L;)$PcdppOWz*D)O>B*2qCic*RO{DAAG0Bdw`
zqh!%S|MSrq3U1wIK%cR?VKJhrzJ-a=)NEQoZ8Lx+oGegSMGD9_po!tgGYY<0)t`#1
zHS`&~>NTrp@wD;yi=RJ^f?I>N2<C@%Tql|=I?n&oCPniUcG?iBD{`6U&HA>}M&U&2
z;6x+=@k3k$OlMdOWWf}k=O~3^$Urz@Fu;}l5je~!Cn=f)BG&T<r@v}}N00g;DhH#P
z#~H3`#ikNsQJo($G$}nm6v`FTe-bnbWfY~eWei?<F+v_>aIWv9o{*0sNt;o80_$0G
z3KT{S6H3=IrK7^}c9RrRxBw1KC`}xz8qhx~F+%wNVsuAiF?j6Uw?Pw#e-1_IdtFhU
zpaRQKLvt_(TD3sT(~U5m=FKkT3?7v-Q*P1L!eKWOgEul90^x`LWOL#5->x2x`UL9h
z6Nb~8shA&TA&~%O?b<L?tuRirmqP3)DO5?ujYxo+dqYP|)*p~+-V8}CL~RZN$90`}
z&=eIrh%&B$qx~tf^N$UOC@It^Qtr#wDuSb-b5NhaMsPSa<@2+Uf=o*^rKZ!0OqF73
z?Q@_hZLSDPNPx*{u>}m3Rg_JJ{NG`lFv{40`xH4xxSoZxJVsQn^ru)8=x|cPsh=M&
zM$ed11(>*}9dq)YoUUU-CNN;|w9tu}Xk9nWYGYHcuO|<j=JUhia0643ebOLnV?@)M
zljX+dU^riC#CSI1a?WLZ2JaM{crB`nwwX+_XwRU8G@e2RCO1J+iCD#BnrH<Mz7yey
zC>)c3zJ=>KiJfdECi)Iozn8U9tOKSK(F8g;*98OVVy<@`8XQXvZ~eAh8>ypk%4FB?
zY&evdBIi*FSBHmh=WW>?c4}lJg0sC;-Z|F;;Ktbiy;eH^1OV*Ye%DjBx0qJMq^qLH
z>6Il~{otHDR}EEMeLC0gY&fQ4O5r4(#J6{%ERzy4it-N3aJHN7-E!Ac0FbTa;{bZ2
zk^ly<Fnjp1PaIu+#XAo@z2)F@6(?mmRfyf<b887;0RWH61N3H&KDC+H{{Hcm=YOAV
zFFBjZv~e<(Qw!fu`p2JKa(MgSP9NL7xeNo)y7e1|NkRv}G=OCQmIGJ;U=~1vlc}64
z7Qj4!BLL<A90joGH-f9e0M7s8z6ap^KUUwEf8OO(QGqe_i{AHZ>gq@U>jpqinMAZt
z$_;R81M~rOWi53Ba5WF0JEtoT6i{+fZGcl7!1{IU`L#?(!~jyP0`iN0GGc&J7{L0P
z`d_ZY0Q!&h*941yGHilVi?8dbl`F--3QXWm%7s5wIR1@GYa{^wzb&VV!FO&sRZeYy
zQ^o9gW;ed`%BgY+1Dq;q3;510r%J0P1flH>K~pCkwm4NBfUdXa^v4wg3Bb&XOO9Q%
z{KDg}ZOyt(WcVa92cIhJsGrW8U2|KPeCEg_OSh;$z-T0(lP&%gr(J#YN6GLMPUdoI
zBXkemx9l&nP4FOq-l!O0$?^;4Uqgnc&$@W^`Bz?X<E<-Z)=jmk4G@EebVW}7V-N@l
zsrxg7HKJvZM}?)0LeaL?Ie98=G?*@kzfakL6^@2+D?FqEhe7%+{SN1F><}F7F_;55
zAV{02KMbVsaKLDhQ7GCL+8^k+f*E2zE`Wmm42{dW!Hg$*dwGx}Ds>i)0h^`^yS5y>
zW5*-UZhvkqvkg$_7M3hsx~vHOuR8tOx$h=I@{*Um^t)G1Z=7mT0s@6PVak6vOogJI
zmL}|YFewQEr0+of7k+}A-zdZk<KOEy1dcpw2^{~P6&AoSB<%(ZX><dD!lV!iC;Zl+
zYCNNh`y-2{{Xsac!QX~B$V6ts?*(uYBJGcE0G%JFhl)tAN+-zN4c@mC(_XP^di{<q
z2OltPUUvAQWw!%3R)+z|*A@}C!NBsVbyLOw1S-pMF7FJH#{>Sf2LYmf;L?&&o#&Wf
znFW#?I@vscqlHT#88EEhn3jhzfYiZca{;E|!MGUGA7Ayo!ZbOY;$C^o2!#U<atDTR
zLJXm}$-^;#^|=lD>~ahcV8O%?h#iuanejKIxBOZwxC%Xh@r`|_+5l)Qa}Z(Dg&UYA
zs?u<C42|_v#f8U$-{4-m>NzEVs}oIXwwCa)n^7=;QRk1`o0;X!V1H6P1vcM((BKCq
z9jj#r2LKg0j@Z+95TiweR-yoM`qpy}Rxm}JcSp~q^Kj%;!34xfu|g_XfI%QVL8Op8
zHd8nO?*cgI;V`3Rs<wrv@#GyV$OIV2`Tkhs^Q=H(I3C3tgSJe9lHb%?Ec#o_wLc!5
z`gFKaFn}3OP2#{+Nt={@P)txrezmO@)(WLx#t03IjFO2lFnMr<X0M8-JcmQ1q)Xcj
z_oqB=%PJh0!g$wwvkRFhHKvAe$UlwYFc83D?Wgt!tn)LpMy+sus@7E>mhb>3Xu!zB
zsiV1atjwrEd2oaooIY9T=)D`jXLMjZBN(T1ZNuc(zUgMt8$cnFME*?%Nc$Y1_r&*E
z;JBP$R9M#k3LM1aVW|ugz>$YRJL`A=JE@qTB!UCz_&J9o&!$LP7s3&SP2fPrrA2wq
zdND9;D7(rzWnjXbwv?mD5Frys%!~oS!J|6Ig<@VOF(4J)B1%of=omuJF%%03{s`J8
z{`6Pfcwrz5BxEJ*2kWL5&O7XnzW3u-l2Rz*X&$BgwO(3DMt%Wh6n%|FPCynIMAcXC
zO|=ZVsTCM?o?NYwcsL%NQDdE%D3Nu3N;v>X&}{{oBr+l0qXHDo(Ijghbcs1?kKh^O
zg=hRIZeIVU2{EeUm-pWDVo*{Hk5BabT$-1Zsy09^jc*x3%PV@Aa=HZcS?|(anyd!P
zDh^L|&g8J1VuMf_WTCQo2bxgYa*73e2#%b8=FoN4pDMr%4j~QtYNbDVvWg-p8BV_U
zmEC`i<*n0k+3J^r8!!C$B_A_GPyJM4kQfu3p1yVHIg73XrU{xW5H8x{U28oSY-|kj
zG|V#|hT`jE6C$JxIN!-1yzEyo>C&?cxOeYA;NAnDKuW4H6KQ`)!zYA@RcnxhIt1Nt
zei%u@`0UQ#LCbV-_KIs7Zh-Nx1!g~YspmNoLo%nz!_h#?*k>!ty<jb7k`};mF5#}t
z=VvtG-PCtp#g2TURj<cV^_@J6D{C$P&p|3{%}GNinZ`{U-i*sndp%N{Yx@8w>_Bu&
zj82M$gBJfK?F*#qrjLJo@;9;P__pWe^i$2hkp3u*Fa5?;k_;H;o^=tN)D0w#K%Lz9
z(x^^L5OzdcR6hlD46q1B-*%g$#e!){sEw=Ed>6j4{}bqt0dct!hCFU?P{x&&eII<o
z<cuOQoay549)B->;DTSn%IPyEfaH0kH+^SeOuoQIQF~nET_-Uj>-Sw&?U05u$7)8|
z--aY0UKlDE94lss-dWd2%KfpIKcSYO<-Az#W2U_v38uj4fwX-whpta_;j5N|fF94`
zuebj)e(=Iy$I{N}-v%#kiuzryK;%(3V8ctJ!04q8Q>|QCF{FI)C#~nWaE=`u?%nel
z+_&coU}Morlz|Cov%qnx>~Msu*1it6Y<#1_;uHpnv{8*>2qTAR*^?*HD4O7;Saw1y
zQwDr`zk&2J?+)M-+uwsXU-WC3N@gSa%{7Y$@K`s8wa5$<NsFn&Y^&sQ3U5ac8V_JP
zNzgH7zyz|qV=SarHGwR(sZSt-Asnb$w1UaD=(|+f5XE0>n<?D9@eO#(<-dfpmtQ5^
zyh*a!l8U6ogTG-o`vsDARy&Lb_J0bg>jixw62uM*`2`B9b5?#0v1~X<TWy~ZU`);o
z4#6OYgZ(G)iEY1zp6iad_^6)ks;lKl`swG6y@cZmYuBY-Bg*I`7z*HGA;U>9uI3~_
zt#giH$%z<<!1fL}HM_>eqx01>XX5)V{CC(n_Xxha`+wt5Z-**D<a8@mF!0ZfgJT;^
zvjOSF&mb5I5x-+q_)RCK)PU0=!UEg?4rx2-*VEmH@jvc+v%qVa*s{s`D<=+MZ!ZW*
zk)J!ia1<bUk!1XWi8SRkekrkt+*%+QHrMRUB<1IJre$!<rqW&4hy?f|c6n0HvrmZW
zEddFsz98ZQxF-v2OdFe)UyL7I{%&mE_Z8gn%ttWqjzA{D!%YS#nFFaJ>W?g3uCfjK
z<Ru4n770$L+ARcy_N?_VIMN0hBa4q<{R?QcNdW6|Tp7*{5qpe7Fo@<ZxH~!_fg>ch
zJ3NnmoHOkNM!Ohw$}nN3m0+PS<7$op90Ki~I%SX&HHLE9<p`1`S(PCp9R1~MUy6%P
zzX^9d{kOPp|0m&03XrOpxfq_>6AGn<P?^gmUPa+pP^@-Vh`Ol7ZB+dqw~O?dTC`OR
zr<#&*#XBc($hT{N0krGtP+>qA7E_(d))=KYk@34Qln8(Dk~4oWWA<K#&pz=7*tPH|
zU>FINbGlAV&**rii87OfK8tvSZpxTx8_3&|4cT+jdx6t3Mi<00zRpd<*aU)=9AnWQ
z1(QPX;~yx?k^u=IFw{%OIv@oj$|tS10G(&R!wFZzT7m`3$zIYnFeP%ngD`>vINVeZ
z;Ml5Zl~|WSxyZo=aO`wn*Ta>XP#eoT>+r^l{wqGd?Y-DJ{~!SM<tyxuClv|BF{~}Z
zKwH?gsmRvxmKJW>f5+2!IOVn-aMtYAc;kidg`rl}G15L(wka>acGu0I1j@7#U?|pc
z<Rq58CU8kBDP%quW%1c-0=ZFS5CI@|01r&FJfKBtf>qssqSRXDLLlF#Zc*OcwEp`B
z*S=X-EW5LR-X;pnve5paLtbNMfxgu~vwxr3+`KBMKQc?NnYtL?f5ET7P!bT7s5D%B
zK+U%705utNq4_!SW440fT-2s#S>7oeUB?r}0G{6aUj#H$;mbP|TLNq3Xyp$Uv9z;V
zPGc&K98%|^8^Rbs+q=8CNCBkWbvq$pT6>nIBBb@oC<+|adM-;g;0+hNTa-{ecf7)L
zizlKR>^W6k8&jrc(`SZcencC%n7Y6U%TPEBo{T0?DH<wHfmTM7qORkWQg@vDKx?!e
zqQ%$mfC2^46jo$t|2>#)EkoZe;@eZW>fLzln`;8q8zmu9U01~ODoUlQMA$W#Y#U01
zHYY9bnM%dCxpn&v(=F1C8DCN@Oq@5Z3N}!0U?B@w<W$<^SFpBu3BLcrcVp$$di3q$
z2op<VVF4~#jkb5Bu^zRP(Kfm{Rid>{9cS94*j+4&PDq2aX&DuRo7n<LCQ|L|d5=hk
z<OYEcu6Dk-bW1V_di8ACMv-rbW)hf^K_bFFU7LFMXrOHXaA-4cCyX8gRwm41irV;|
z^ZzfLvE(9Ie8n9TNBwc}aSRqb@GNQ(6?zU^uL&}PafRa+@@W9!aoE8SHCF`X!3Z3L
z0x--#(*-!V;Ch+LQj7@#8$OZ#&4Dkz`Xr=|VPMcQp;oT%7}mG$Bu3u_zbv+m<6VcI
z1zvydf4~ctUnOYY!4})`C$u5Bi2w29%A<p<j8j|cJWCNfK!o*x0cPlXO<-eHu<lSf
zEmHHRmcnyl3@R5twjLI<JBe2YF^b_aJNcG%;{1@+Vn%SfWnd!rGi_@C@twPQ?T_KI
zHLpO=EyA&#T$}@s2!y3-P>f@B5%-04g{9A=!_^;sCS=c(g60^23z#c`%HEq#*~Kxu
zV|c{xaSS!s7-3ugT%AyeDuYXifiLd*V|?MMKaRA8&NBYvO@AZOKsgp*G%42g!)4|o
zn%V4I%`pH=kmSHC$QahQ@VaYuf|7|xbM&BaIwLxlur731a{Yha9})wL77|B^o|r{b
z)tg6rg1`}l3JhbqO#|Z#d!y81518*C!Sbm!C${Jm2{#ehJKjGOcvq!?CQunbXb_4h
zda`jT;P{Y88;>oTV*u-&=E)F<)aFkEuNndkeCb_?EyfPn%HaTszltrPR?t?Y4X-V0
z5x^X7t`-QXXIi_d70X#n2E_KB```&2?SiVA56thtvd-#BX#yj<{LHa!0vEX(xZflO
z97(!HEuFH!(@9b|g<e6F`xZ9N5u~2Fh7^tJzEx(+x8<>fQjWA~&N`%hMlU7Yxc<#(
znRe_EBjTM3fyx3Y^XDUS#M-BYl~HugGffot#4D4YKDJq*)-L||<?+Mc@Db6vIdswD
zqm*Mi=OCCaKCB#wiH%8s`UDb~9KcHNiNm0eHUWzapn=!SR5F8qcjE`WNYg=*)vi4r
z9G%p4(P>jbNSG>g$e-ZuKojUx1{lEdzK&t2T3{~Te)y|+(WV~>9O1^2{cAj(A3Sgy
zQaJgTM)h*U*aaqIkdTUg>d<H1hB_=3)Gr`;A}(Qo3!Ob;-MBhlR!RawLTdb_rdvzZ
zb<6dF#Xq$83@pUAK;6nBeV;mpxClqa&SOp;OhQ=1INW<0+YfyM=dHT2_Vn|Z8{+oe
zA48XqflMqCqTVDNKPzj)ja9)8y_7N44mE)^j8?5vO<)u~tPTxCRLKi;)8nOT=i7IE
z1Ry!l;`vgh7G}}0r)n}b8Xd(0(%^Z7mMP~+4C4zs{tV}=yf(KA#&P?;(iob+{qs9;
z=iU!OcsW8Itvt}+G0IoavgS4*3i}{%Ec<aKlZgwEY4#`wYEjb@<(Vz^o;uxhzCcA^
zC&KBwh4h%z#q{`~?mzw{KC$J!*mmTfggXZ3%nk#gWzwsPQ+Z`_oA}WCBsaM-WHTuo
z1b_EZi)R;~#Fuyc&r-xr<7x0kviRtu?}GUJK(l)gG?)~wIPlZjq4ruLI6c2!&3ytB
zLMqM?vcND&$Q-5)>d24)fAz?_GR@l0W6hGYz@r;5y#0OwzkAn@q0?4tmio>yC{fA8
zIlz#CF#$Ybjx6UiJ^?GFh|8aMPWo>&Y&(KOhVhMkAH``i8*$aT*EG@x9qS#yhadSx
z97%TzTzMB-`BchMBCaG&qp?a+zVSYssn~D0xknH|Osj(8yVeeR5iAigjPZlC`|;5&
zzl@h``cYiA_NB#Y9xfNDT5W=94bf{>Y@?2<p1HH~E|yvbvR&*h234ENm;!BLD9OkH
z06Tno$8X_S{~&JN^n<aGk9xbywnKN~laK#5Eb<Xqd?^u^ubRM!3uO2<HAjg&9Pcy0
z&7}b6QLHOr0x5E~Wa{IKJO3C@AKikNpYvmAnHEMV1OnLRpn^pYO}Wtiglt{dET-$>
z?$g8o+9Hw)$e%2ic{6_iPaM7ruR8muv2N-4BQaTfk3WVlKlPV*Z0?`LotsGeSh$HC
z7cVWB2~!*^8(4pvDuR44LatdN*?|lKQEpm=#0)rZGM3MIl)dH1m$C2R$MG-De<xN>
zuLGmLh>?dw7Bl=?PRPJ+02<0o=JFs5#&p|&qD`W(7QHN;fRuO=sT3k6RwpM)nk0<f
z3lHK05B(fou<R;aa{5a%Bhr;vHGKvQB?I;DfrXveIrk8@9Q-FdId?DEH~~*Y)nk`&
z!AA$j^U{-`59IwRWPu@lR*ce^2k1MmF-!d76RWuF9UW7b(<ld{Vw6BQ*x!M_diWRR
z)SSEOI#kSoX8B;}>0Fd-LH!N{KE+g!l$q<LDW+OUq33Wfb(&tzP>d}|B^U9BkTwEe
zf>?IW-;1Y?-3u#BWGnm5w9s+UTM!T83tDZ4mHElxlxbW!cl#=A(;`Ajg0!?hVV83_
z$`DcmDL_-4*nuXHL$*|-cU$sK)0;q@M~N7H9LL{o`%Qdh#|OdeYP5tp>H4iW64-=#
z0BtHF5>#VmUC?jUm^pw24!Fc%lqfdv;|lW(k?{^3NeWBH(Whg=znBD4b1bQFq)%FO
zyi#j4c!C)ePU!*CZ|aa5#09XRQbA*Y8!}LN=;WO&JR8dvkz1EZ829e~JM5j`j_<zU
z-(t4C0#WfHQqFG@YhwjY9<ZV0FZSeTAwjax-Y+oluJOg6B8n0$1X#cr_KcYW+d_4a
zhr^|5=t4MtTrr&&%_PW`Yf=eW8xlK)kU<xWOHJJ&Mx(~oK=!qS>L^Lz;(R=szz}$5
z{vrJ3L;oog72k=C%P$T-xY(Zu#oELWnm(wu(&@2^#X!zawJKtYgG}_aafNdWgt;s3
z3u{9?wFHfZqJZH7JZe`&iNH;aBf+LNM6tO)KsQY>O=b|sHsnqT_DT~HcPsKtiuS`g
zD<{#ipl2+&XYsMEzl;}ccpI+U@Gl0?9zF0?!8qiDH_0!K+8%TC4YXA25uaaHqlmyE
zf-VAKDp`)pPJ1;jT79c9a7#KXoBME5WuvIwolk!Rx9xgAh?GC*T8C*QSl-@%e|_bj
zVlh32$1+v)1N%OSJ@cDE<b56eDW`({Zmo>nr}CMQN04(OQwk{vSu(XhJN9vXMDlm&
zRxX{*WALQ&pcG%u^7Cvt^fjEl{AwIrd<Ks``%eJz(4e?55ml;zqS~W~QIuh5@&uRQ
zmNVXhm!9=6(Me|TZ7L!jf9a_|1!VD|V-PD}f;V6O8(7v^BX!N}Ik;)#58(bipTftt
zz6Z|DgA5|H&qGKqmGz+J7{HJdV5t*lLnMg`qn?|V6Rv4wT<n<bF+<w71K&a-7QSHb
z;uh>#*dh$1&|`u!O$Fkc$;Bo0Q3#Hrb;FFJlL_fy34Y+x_hgdD^<X&kT^G)!aPYc-
zLK6i~)X|%~74Sn3|7Te01}zc>ddztB**}jnmR^L#bk5I3E2|w`z5exBoo$9cy!Y*J
zI9g&7(jZ->fQ^ko8jZWyw?K+~!n6zI?drtf@_e|`Mo59<LicizGE~Jxj(r=ziZ~R7
zq6Pd0yvS<Ybe5ms|HcbeTp<ge)mU}Mj7b(QaU%cJ_TR?g{!<_mM;u?i>J@m=3*I84
zq+=@&Ei8bpn8!CRyBI%k@h{<nkN$#+Z{?c6hCYD|6@eI1Ngw9Q;8+CF2Qgda0B5D0
zrk5pUqTs(3xM*<9RyidN;41GMPxIe=(YrE*%@ydS^RS$Li^DmzJh1n3c<A6~VNAfI
z%J1@I1KxDWFF`z$3;LM4o@|QC*1i&F?Y;p!j@<<+o^C%s6Eg>Uw{RbB)yk^wXA-TG
zM&puFWkOJ#Wwdb`UUK#iWX#viSU$BH^ZhwIdHBA}%==*x4;|Db3M$gx^T1-Jr<_85
z+vTQJz&OG!8-56vu70sURp|))TfE^YatIl}?4RF>Pe1Y7pxlj}m4PO1<A*MLFIvg8
z^pij(%Ayoq9LLQY-h?N&+*PJj)11qb-~p_)o^b;blMIY41ccGJ!YHz&GK<7O2dtgG
z6hCzNdob0SMP8P5PQw*zUxCZkycD-R@n`tz&JThN!$OTq2pLMvqwBMLvx{*6L9B&1
zZTdXC;+&rpx*IQkb&2$l4NB_z_}J!OmGE*gE=f_0_qwxx4reaE6bt>MAS&-2c~$cZ
zR$K{)<79*a0+X?6?h>Ziv|EWOoszZz7M$l|$%U#+24<4Ac*_;Pj+U8{#ju=$*~tPL
z(~>*^uR8Z9g+~ANBk##z%^?ASOyuqr#L&m_e^Nk9fNKd#WjKjI1~5jz2V;`uvyZ(W
z&n!NQoJTgw#p9xtFU#ou+r;mI!JrYM(PrDr1;bGi_SlnZRZcZa5TT&kEedv~bTo+d
z@?5@k=zAYLP>%Y6S6%QU!p(NmqmgmPx}MawnZ^aD-GraH{!j2%5B(B$AAh*SY{~(n
z7`^wC@al8kj&)1U!D4!}oH3)3mbyORh014e%Ym=qo_!ye`5D|8VrB8MqO}2UzT{WX
z7Yx;}-g+E_)C-){MtzKoKoc+rTY#y+ENen;E7TThGe;TCzX^+WzA|BfXMV&F|0k~d
zU3_NS`*Fw99|e&MCYW=&8HL3tqj|}ymkT#7r>X%vSF<9uZH_GN!{2Xx9}KzB)Xae4
z4&HY8`_M^d(Y41$Mm}nykA(l{M-%86SnNAY`y@yC$x{Tw(xI;9L3k6SvX5h1Dz4pq
z*Q@mlPC13O$0R@B>o0r<&R%s@<_h-f=;Ihbs+LWi8!(Ch2ODF}^!a$>rSFoArH*aP
zD1}O<N)s*fiIWD$4j<q0Ygoh_2%(9Vh3>xtXRf$RG1Qn_l#Dp5L^+3@WuGUICgT=P
zxvIA>$sz;8jjD<r;4~M7Vgi<v-*??m?5<oCiv@R7T*Nc(9qVTQ1Rvh~F6>*}3Zg-O
z)K0IT!ZfYGTQe;h!ANq4dhtH!Yh@T4jhP7gOHX_NyN*5J;}|vQ0}dJ8e<@yk){mf@
z9s|Rb!zt5E5nu`gBojJ^%KS7o2OFdD|Ebd#>}x+|XdXNin2h^)=IFL~5QtNtU`S)u
zwevV_b|c<?-5=nZHQy_zKMA~o6b?I+Y5LwRjwji_Lv7J9h|_7oJ6-%S6G1<5=w5vN
z>HqE1>uEm?2+P}NWEs`pjnoRsD~B_-Vp8e9VuXp9gPjaSeDL}yx~ZmRM;sj-%gV&K
zd-vbtdoKF-0+6G@aG?OE%8wLN$r60u#s3Lsue=(6x9xoZ7CbX0qm)U0-Fg2O=bm;w
z7SeJxX<Qh`x(D&Ghu({yzVZE~v%q7p4##?j@X^h`CfQSID6KxZRwnQN20E=-G4xcy
z;i^@M?Iij)L!-GZPrw}PkranVHDb)P#2tF%*)QYVeb?jCwJ)w$nFdc-=y<lMV!XL(
z{cEsc*+uxv2mcH9FFcl83nh#Ai_iKYEcTB{dx1*z%$su#AAaapaJ+x8RMw}Foc<Nx
z{q@7Yf#dc7$i%$VYtMNH&dNmHh4csjE`d{Bh{s`Ln=^sx4dZ?3^MMiRz}Rshmj+nC
zn|43B{Wme+KZ@%&zP_|~n(Z&P%=GNMV1w05UVxvy;ZN}Khu?<>_kTJwoLq=ET=t*Q
za|^KOt9{=ycvVyS`N#egPaVAvtEM-^%p#8;^zrqlK7t*`??k&z!NS{=apB4r<E7{1
zbf4=j%MJRYn!x5hfg;<p=LJA|8^<u{TrN#=lqtU)aK)k!ncIrjUG%d-+<i1qDprW}
zMQ30|oA^Ul{1VRHbrmkm)XGE#z4Umr|EqEqJ$m4Fd~N54KrMi3=qqzQ6S!;c(JX-E
zPa`7_7((~oa^<g~XBS~zI+`tkYZGk5QlM%ArO<>hfYSKb&wlXESv4Gm=#K|+dSn=n
z9Qr&C-1j8jaOr=+^653Day6Gk;#oK>^pBv^T7nxleV=TIg>-JL)D4Fh_u%7?{5mMH
zUR>guQ(3(jnZ6-|_ii}T3o!{p=>CsfozwlJwHt{>j52ag%;`XZkxZGv#<_x35>Qxv
z!Z>VcNDVP?T);f#jv$PEi`($$_r5b@?EVj&wes@frLKM|sMMJ$q}(qYs4|?fLFGda
z{1UouP7GU7qgps|`Q)Sj59WGLgG|`aIpDj_$y~@+UMZUvBPY?U=?}{WK$;dZfq{73
z+#IYaA_IAZhObfeZR?jZznI}!eCVP7oO$Q`IBq`k4JUG8n&=nCEuY%*d)PC-#arc?
zYyQ8n^Y5_v+1n81YjE&%|6fHa@JZjMjIzI*n}bycAfBeo1q4&w#whnyBMRDCiNUi-
zt%Xb!yMg!a=brezjD9|h@4fgJ&`zc_!icCmc0jq%YQjC#?!i4@z<vAwRy1f%qj7bf
zYT<-s@3F`6naBQL83!oT$}MZJ#}8idoH)3El+y@KRK^>Z%yTP2p(fDB4NOJ~AP5ua
z89XZB0aVikZ=!YH+UMW^fBToe+dc}8AVMZ4ehvq|`2>C-Q;@8h2`+4E!kGpA+<$xr
z{$bmHhmpmC2BC;qHA3=rM@dx8f4%wLaI^qGHE$5QpWv<6{0635vm(MqaK;{2+&zPs
z3pCP9$2F12AVWZ(8RX=v@Gyf&om3XwN^F4jNh6u^U9GNMZXnB$hokD_J@eb~{=0q(
zZ@Toq;-WP-m3N9Lpm(5J-K=omAKm=RNU;DS&8M4MKUrL><Bdtl*5Adm-6xSG3J1P^
z*SVP;W93zt?;oy#qb0tKZCnx%j|<$`9IP3v9XmM7g2ovZde2`TKp`Sy`85Ta2T$NQ
z#HGh`_*fP`{j&KV$E}%Sr>gJDlhi9s{^60|#Ip-edL}LI533_-B^)Isx8eT1pY+VJ
z!m)kEg{xkKm!12su+X2AIV*=V7Q)e&RJ8-NKdGPRM&@8m=PtSZ1+6o2VFG4iswZFd
z^af-szMSRmd*;|yd{3tSZR);#*RH?ELkB(&V<vOy>%oPmGo{vV2|U%6=5&7@e)#J5
zpzobtz71van!v7GfR&T&&}tFdqBzl@gVajy0NHWvn#*c6SVKubkO0BudGHLj9{v*k
z?3+*G%^6>C`s}80HD*$F&uzu0AOAg&VK9~Vrykv^2>H>6eic1F7HoFmBV2-idG-4w
z$C2nI&|t&W$)i+!r4FlWJa}T7z_br$2*=q{`BDLR7j5UN7?02-YNFW)OqpU{o@yH$
z>OF}M-1oEi-V6TEOyhS;=nz6xmKw%<?<hX};4kYXlU&jt0H*emM)@8-zx|J}XWqMZ
zvBF^oeAjtDC;kibs^>3*qh;JSRhI`bihKeanS)8Q!2z9iNmI>8sqWrE3EY&+Hb|5Q
zFHKn{BIRQlU+^w``H8;>?${+z<<9;1=HI~K?$h7~{ULpYE&J}koxA@U+B_G#fD2Z=
z5U)D_$Hc<N>?+{YqXD8(-qp{uF%+z01643E)iL4y3KTOXt;7fuC;=Pb(go()2_QI0
zh9GsIRr&nmAHb7`w&2ZI{1?o$m!hhCZO4c4_}m=;@&J;`{?ztquKR2z^1Tn1Ev!W-
z@3+=ws@`80mp04&(daXyX;Nw#7h8@JaE0OMlZg!+gL?7v#>Nl<+p{>rKe+R!Ge+xI
zuy*M=C@S}4z6W1=>W@U;w={acnYq-p>!S~5u3da6*7I|MAIaqXsrC}#`bQg8^F~~{
zE<C{-L$t^Z9Wzs=@-~ou>OfS@;ECp~hEa4?jG_S!^>*U@-}q_Va_0Br@^!Dk>Lq82
zod5LP7TlfPLHOj{T|Ql%15nqWdf&M(J^q(?YVKYntq=}7WS+<WCUZi$7RURC8wL@N
zZ+dPg2A!!81N2jtb+BS6BG6=f0{sH_96B9?xQM^ts0?0nMv)*FP~N`tBe?sSkI4gQ
zj6P)X$Lmk&EIfJW0et1j{|RG4IP8G)R^EzNo%gRr)5q*aGvrL@0vZD1%c1=<N1iFS
zjASA=h8TkL{(xjf8VE`%x@ToPqCu2ssNz$}aLSlf!(oQ?3)yN7t7x@9$%y@N92uY_
zZ0#ctz6Xx1h_|fR4oh2W@Ybu}BTgu(>#68jqnc(yRT&u$h)M}St1Z0P<ZcWhpVYxQ
zM!#>fI%KFJo$R`=CWH!2;Fxf<KaJry;iy7+`r{A05660YMfU;bfbReBwZDOx_A<%(
z`TVm$u_T}uCdLuYBvKiPE5B<N9XzRVoqTX^-|=y5JM{I!dyQUw?$6-d)0OW3b1ZI>
z=3wV(Gbux*7{I@GPJ<E3v6qTt?UpGZCBjGwoFu7*Q^(+q1&1{69-f)ohTER}BVnQ(
zD;x;jzXh*6|0i;~Kdxr7tS@81VIiNDS;K`V<4HvaJIeqn7%I|^xe5j^kLpc~GBA-w
zQAkZKoDmtk5#eYIoFuyb*n__+ae9Un%i5H&yuB80%jEskF2LGe@d0b#TR09J$K~3<
ze#ih%;O=17yYvArsQQle0_mXY^{*@*vt@AFEvkhx>HZj_X1afP^tW-SyAwqE4ziOB
z-kL3bM)!lD6P^&+;S&Iox@cVT%(`$6@^x%-eY{4S)JO}=T%`#V{eBf3BB0eWLJCUZ
zjL{$GxE_u#-+cPhcyQkrGzXz}Dx>>9jSEh{0mtN$r{=r~H-9f$(v(XyfjU1;ua8$K
z4cbk(&4l|yz@nYQr?>qM3~{vk&tG*DUUT8wMJ#mARx3<^Q3FjI!YL&IVVR67*fW7O
z43+o<QZ<7ocm7sr6deQo5jA*8eSb!V)3e75xiltV>$7*@-+%IIF^07higXU51Ow_B
zPFvoeGzH%Mn$Lqrw+E<CAcu-H=MZWFn_nHvg9%MEKTwJK7HB0Le<aB#93s0HTNZWk
ziBwS(F`VR;H?ESwn;0A+OC82kCm#1y3t)1v766sn-~EC}e+s|Vf<9v&&17sSMsbD+
zOisr|jr{@CI_JF8ry+_pcup;XC8$nld)jq^4akVd7;6-*?r!EvYoUK%)}M*O5v&%&
z(RXR;8uf>{URvP7P<nl#n}^hFP7_cBk!LELM=uT>?od*Hfofg1Fo8k_`h7;foH46|
zBW<kq=Xr%Q-7(Rk4xKt_v)FS@`V;3ntfb5J<4XOwz|A9rG_6^Trb7P!u0~;wc_IuR
zf2-l}^V}aED}9-^bHSQK{h7>-A;Q2YJvByPf+#TJD1%o_$GnD$J+>f0okR3r-jAli
z)0o5(lsgt2B7oQw!a2Ucn3<yBJHzc3x&o!LKh~Brip~x#B9&*Zl{Qo?0O(x{(16~?
zY2uuNGE}6WV%-$X>=)PynlB2d=?}PNc!iG}qNRDJ>k%0|?N4Jyk=Wq3zWad^@0}5Y
zb!fEIE>s$@x(`5k8;X1ax#$jrXnvYU2Ro&8VGk&vgVqWrKuV$02eX_;5p{?Fxo6l_
zFjR}0QLB=nN~jbLL3oz2;4qKBz#QLYRd4RCiNYoxfm-;@t;sZ@8ct<6C!_~pMP1?A
zD;A(UMBL?GDW#gg%F|>B=yV9ZUPA^?`!f<8mXvOL>q+$3jM?Pj&_K@t^{>#~6=^t|
zV*p=W#Q4eo<eMPQ{X-|Hoa1k;B2a!$HWRk4NsL;8wQ7U`wB#ByM1UCpdCgiqW7h3C
zOivq_3Qb_Imz#_!@*hma34~$o2%11!-yaWWq#ZycwNMskj4<JK4BnV<S_uiZ)JPGT
zADKVPIzN-~3Kle~lNFKznM`F05qaWh)T#q|T`O{PQR#Laz+R(hVmK`VEb*u&<NE%v
zzyYzT*1YNB7pI!#Q8jpV4BqH)T1FW(u+C4K&rd4q;O2@TV@M{69pH$=yJ{Fgu!b?F
zAPipNSg-Bt+bE38=NqgFLeY1NU9aveX7Hlm2rY4cm~$zHOBps(Vay5S8Ln{%sX#Wm
zPwU|r${$2c&~6)ag^|{S(AXG6o}sc*xp0B=t7QD!!U-cEMZ4I|D!6QcYx#gy%ZL$1
z(0n<AR|7};<7~wO6KV_j#j6ea;L*eXP}84qY~dzrwMj^&v(1^n*z`yxi8CCa#GM;x
z%v`1Wtis`ug!6hhkowP|@CgJLFqf{CmZo|D>r}KdCNwfSr`o54s_2(8X6<$XgO@t=
zQ(*!zC7QPilW~s$?N3DiRr5Ale@va`&C~>RxN#V~1`Ma}>v-`QIzN3M9ZVB&3G;L$
zHg^VeR)Z{pPL-OBsSvFjqgunbgzrfE6VY~};G1Rrsf0s_Cc2(c1ghawu6;ejsr`u-
zKbRjL=t8KuOPFI;Z6EyK@s3sI%W=u6RBfN*61v?YF&R4xP~Xa?7%~}4^)$W|4oDdw
zMrnT(j*FSVVMCZJh)Cu@gGWlaO5i9apwbH|2vq^J3P=1ZOzfbN`f-a_Gk5|nVGb~P
zE9ZYGL?7h;4m59ssI)r-Q*jiGm;c3F+%Lxj;#^U~aG8OJF|x{)aCjt(AL^%*0W`RQ
zgs4`-=^1R9A6VzY&$5n7ifgI|DAVq-ZiI=uzq)UqD)1!G1sBH#b7jVHYU&iK3>D&y
zplviUG#Ls(2+9=(4>Uy}Q_gVqQUIuiBi~A@W9Y0K9S$4DFMjHkC1dAWINm2v`_ll<
z)Rd{1A61r3O#`iV*wFU9CeW`}b16V&T%Vhk;%rw0WvFuc#zm-&HOhFZ#3!()K@D|q
zoR$8R1+$C|hYT0Okp&}2o1!Qb${AnfH5$RO)}qrYkHR)a7FQRap<r4BBg!@%*Tj4R
z+4|tagu?FI0uwEj`rt|D(mo?;MPlHI_ym@mrjrs*{rq_B*q&08Iv1JL`%Vc(b48G3
zrG_w5E-*m>6f#sy)%oy@5jY~p_j@R1%(U;7aHPWWNeXBD`C$N^DFRa!5M*tDURPjA
zX&fC4SEipXZqGC+Q|~D_O@nlrCyQpNCXk>gjzSdYa>j$oB>-pZ88eqE9N;?>PP<Ko
zBp~g}$;ON!z?3O&q>YabKJhehjvaO7!(EpKnJL21B$ZuRnXjnoyO2@jAvmYtcqT7`
zBQY1oAFf{4#W3<5i{4TyO)XM+?x+XAjk5uIc0PFm01oV2c*><NH39tq0{<pNRa!%J
zFgq>~Uq&?1o`NGxTv=&*&fhbN(K^_E9$X_IO84)We@fcVCyxW@jY<L-z{1h(OFyyl
z$|LWb+t)kzT*XOQP8D{v_}p3oSOCDI@&LW#Pt9&-N58-9f}`KpT4K*8!)=^Q<<!FW
z)8omLN4G8e+xcBHn@7a}?5hQEJo|?aX7womvj7sDOyyLu0OkQ40dU-}DNC)v0M0k=
zdjJl=QO_?BPKI)-uwS<nz@lGEE6-{%fNp@EGKpxPlpEmG2IvFm0_f=m7!3oY{vSdC
qAvviwz^M&j{W|viTBb!9;Qs@-!4T8u#N6Bf0000<MNUMnLSTZWS;?;e

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/jar.mn b/browser/themes/pinstripe/jar.mn
index e200af7016cb..aa30f1336d98 100644
--- a/browser/themes/pinstripe/jar.mn
+++ b/browser/themes/pinstripe/jar.mn
@@ -17,38 +17,55 @@ browser.jar:
   skin/classic/browser/aboutSyncTabs.css
 #endif
   skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/actionicon-tab@2x.png
 * skin/classic/browser/browser.css                          (browser.css)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
+  skin/classic/browser/Geolocation-16@2x.png
   skin/classic/browser/Geolocation-64.png
+  skin/classic/browser/Geolocation-64@2x.png
   skin/classic/browser/home.png
   skin/classic/browser/identity.png
+  skin/classic/browser/identity@2x.png
   skin/classic/browser/identity-icons-generic.png
+  skin/classic/browser/identity-icons-generic@2x.png
   skin/classic/browser/identity-icons-https.png
+  skin/classic/browser/identity-icons-https@2x.png
   skin/classic/browser/identity-icons-https-ev.png
+  skin/classic/browser/identity-icons-https-ev@2x.png
   skin/classic/browser/Info.png
   skin/classic/browser/KUI-background.png
   skin/classic/browser/KUI-close.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
   skin/classic/browser/panel-expander-closed.png
+  skin/classic/browser/panel-expander-closed@2x.png
   skin/classic/browser/panel-expander-open.png
+  skin/classic/browser/panel-expander-open@2x.png
   skin/classic/browser/panel-plus-sign.png
   skin/classic/browser/page-livemarks.png
+  skin/classic/browser/page-livemarks@2x.png
   skin/classic/browser/pageInfo.css
   skin/classic/browser/Privacy-16.png
   skin/classic/browser/Privacy-48.png
   skin/classic/browser/reload-stop-go.png
+  skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar-dropmarker.png
+  skin/classic/browser/searchbar-dropmarker@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/Search.png
+  skin/classic/browser/Search@2x.png
   skin/classic/browser/Secure-Glyph.png
+  skin/classic/browser/Secure-Glyph@2x.png
   skin/classic/browser/keyhole-circle.png
   skin/classic/browser/Toolbar.png
   skin/classic/browser/toolbarbutton-dropmarker.png
   skin/classic/browser/urlbar-history-dropmarker.png
+  skin/classic/browser/urlbar-history-dropmarker@2x.png
   skin/classic/browser/urlbar-arrow.png
+  skin/classic/browser/urlbar-arrow@2x.png
   skin/classic/browser/urlbar-popup-blocked.png
+  skin/classic/browser/urlbar-popup-blocked@2x.png
   skin/classic/browser/downloads/buttons.png                (downloads/buttons.png)
   skin/classic/browser/downloads/download-glow.png          (downloads/download-glow.png)
   skin/classic/browser/downloads/download-notification.png  (downloads/download-notification.png)
@@ -63,6 +80,7 @@ browser.jar:
   skin/classic/browser/feeds/audioFeedIcon16.png            (feeds/feedIcon16.png)
   skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
   skin/classic/browser/newtab/controls.png                  (newtab/controls.png)
+  skin/classic/browser/newtab/controls@2x.png               (newtab/controls@2x.png)
   skin/classic/browser/newtab/noise.png                     (newtab/noise.png)
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png
@@ -71,13 +89,18 @@ browser.jar:
 * skin/classic/browser/places/places.css                    (places/places.css)
 * skin/classic/browser/places/organizer.css                 (places/organizer.css)
   skin/classic/browser/places/query.png                     (places/query.png)
+  skin/classic/browser/places/query@2x.png                  (places/query@2x.png)
   skin/classic/browser/places/bookmarksMenu.png             (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png          (places/bookmarksToolbar.png)
+  skin/classic/browser/places/bookmarksToolbar@2x.png       (places/bookmarksToolbar@2x.png)
   skin/classic/browser/places/history.png                   (places/history.png)
+  skin/classic/browser/places/history@2x.png                (places/history@2x.png)
   skin/classic/browser/places/star-icons.png                (places/star-icons.png)
+  skin/classic/browser/places/star-icons@2x.png             (places/star-icons@2x.png)
   skin/classic/browser/places/toolbar.png                   (places/toolbar.png)
   skin/classic/browser/places/toolbarDropMarker.png         (places/toolbarDropMarker.png)
   skin/classic/browser/places/folderDropArrow.png           (places/folderDropArrow.png)
+  skin/classic/browser/places/folderDropArrow@2x.png        (places/folderDropArrow@2x.png)
   skin/classic/browser/places/editBookmarkOverlay.css       (places/editBookmarkOverlay.css)
   skin/classic/browser/places/minus.png                     (places/minus.png)
   skin/classic/browser/places/minus-active.png              (places/minus-active.png)
@@ -86,9 +109,11 @@ browser.jar:
   skin/classic/browser/places/starred48.png                 (places/starred48.png)
   skin/classic/browser/places/unstarred48.png               (places/unstarred48.png)
   skin/classic/browser/places/unfiledBookmarks.png          (places/unfiledBookmarks.png)
+  skin/classic/browser/places/unfiledBookmarks@2x.png       (places/unfiledBookmarks@2x.png)
   skin/classic/browser/places/twisty-open.gif               (places/twisty-open.gif)
   skin/classic/browser/places/twisty-closed.gif             (places/twisty-closed.gif)
   skin/classic/browser/places/tag.png                       (places/tag.png)
+  skin/classic/browser/places/tag@2x.png                    (places/tag@2x.png)
   skin/classic/browser/places/downloads.png                 (places/downloads.png)
   skin/classic/browser/places/expander-closed-active.png    (places/expander-closed-active.png)
   skin/classic/browser/places/expander-closed.png           (places/expander-closed.png)
@@ -110,10 +135,15 @@ browser.jar:
   skin/classic/browser/social/chat-close.png                             (social/chat-close.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)
   skin/classic/browser/tabbrowser/newtab.png                             (tabbrowser/newtab.png)
+  skin/classic/browser/tabbrowser/newtab@2x.png                          (tabbrowser/newtab@2x.png)
   skin/classic/browser/tabbrowser/connecting.png                         (tabbrowser/connecting.png)
+  skin/classic/browser/tabbrowser/connecting@2x.png                      (tabbrowser/connecting@2x.png)
   skin/classic/browser/tabbrowser/loading.png                            (tabbrowser/loading.png)
+  skin/classic/browser/tabbrowser/loading@2x.png                         (tabbrowser/loading@2x.png)
   skin/classic/browser/tabbrowser/tab-arrow-left.png                     (tabbrowser/tab-arrow-left.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left@2x.png                  (tabbrowser/tab-arrow-left@2x.png)
   skin/classic/browser/tabbrowser/tab-arrow-right.png                    (tabbrowser/tab-arrow-right.png)
+  skin/classic/browser/tabbrowser/tab-arrow-right@2x.png                 (tabbrowser/tab-arrow-right@2x.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-active.png            (tabbrowser/tabbar-bottom-bg-active.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-inactive.png          (tabbrowser/tabbar-bottom-bg-inactive.png)
   skin/classic/browser/tabbrowser/tab-bottom-normal-active.png           (tabbrowser/tab-bottom-normal-active.png)
@@ -122,10 +152,14 @@ browser.jar:
   skin/classic/browser/tabbrowser/tabbar-top-bg-active.png               (tabbrowser/tabbar-top-bg-active.png)
   skin/classic/browser/tabbrowser/tabbar-top-bg-inactive.png             (tabbrowser/tabbar-top-bg-inactive.png)
   skin/classic/browser/tabbrowser/tab-top-normal-active.png              (tabbrowser/tab-top-normal-active.png)
+  skin/classic/browser/tabbrowser/tab-top-normal-active@2x.png           (tabbrowser/tab-top-normal-active@2x.png)
   skin/classic/browser/tabbrowser/tab-top-hover-active.png               (tabbrowser/tab-top-hover-active.png)
+  skin/classic/browser/tabbrowser/tab-top-hover-active@2x.png            (tabbrowser/tab-top-hover-active@2x.png)
   skin/classic/browser/tabbrowser/tab-top-selected-active.png            (tabbrowser/tab-top-selected-active.png)
+  skin/classic/browser/tabbrowser/tab-top-selected-active@2x.png         (tabbrowser/tab-top-selected-active@2x.png)
   skin/classic/browser/tabbrowser/tab-overflow-border.png                (tabbrowser/tab-overflow-border.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabview/close.png                    (tabview/close.png)
   skin/classic/browser/tabview/edit-light.png               (tabview/edit-light.png)
   skin/classic/browser/tabview/search.png                   (tabview/search.png)
@@ -216,12 +250,17 @@ browser.jar:
   skin/classic/browser/syncProgress.css
 #endif
   skin/classic/browser/lion/keyhole-circle.png              (keyhole-circle-lion.png)
+  skin/classic/browser/keyhole-circle@2x.png                (keyhole-circle-lion@2x.png)
   skin/classic/browser/lion/Toolbar.png                     (Toolbar-lion.png)
+  skin/classic/browser/Toolbar@2x.png                       (Toolbar-lion@2x.png)
   skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)
+  skin/classic/browser/toolbarbutton-dropmarker@2x.png      (toolbarbutton-dropmarker-lion@2x.png)
   skin/classic/browser/lion/tabbrowser/alltabs-box-bkgnd-icon.png      (tabbrowser/alltabs-box-bkgnd-icon-lion.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png        (tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png)
   skin/classic/browser/lion/tabview/tabview.png                        (tabview/tabview-lion.png)
   skin/classic/browser/lion/places/toolbar.png              (places/toolbar-lion.png)
   skin/classic/browser/webapps-16.png
+  skin/classic/browser/webapps-16@2x.png
   skin/classic/browser/webapps-64.png
 
 % override chrome://browser/skin/keyhole-circle.png                        chrome://browser/skin/lion/keyhole-circle.png                           os=Darwin osversion>=10.7
diff --git a/browser/themes/pinstripe/keyhole-circle-lion@2x.png b/browser/themes/pinstripe/keyhole-circle-lion@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..bfd4b7d09471c94ecb3d99e840c0ac8438bbf181
GIT binary patch
literal 5642
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

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/newtab/controls.png b/browser/themes/pinstripe/newtab/controls.png
index 14f382fbdd18a1209f3dcd63831014b5ad2fc428..f42794644f4dc2b4ae69534a8c8cce352afc0092 100644
GIT binary patch
literal 4671
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
JF4MG&_#f2%Xxab(

literal 4180
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

diff --git a/browser/themes/pinstripe/newtab/controls@2x.png b/browser/themes/pinstripe/newtab/controls@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..abbee1f6b23c7624e4a9c73b48be08397e5f21fb
GIT binary patch
literal 15928
zcmV-8KF7g{P)<h;3K|Lk000e1NJLTq00Hm-001xu1^@s6?lUOn002GzNkl<ZcwX$B
zYm8jQmB;H;-ABLX{qO^#%_>14h|OYbu#|<w69*6|3kx=6wO=-9kya!uA*`Jb5uosG
zK@lOZFUdxmL;~}OvV;I8Je*y$B5Po52Q1r=*j@!Ne$2bOXS(mbRr^0R)zdvg%buC;
z9!s+>e5mewk5#`q_tZJ(R?V2k$HxV?j=u8<9mF-Qg^*IXMzh2i){v0u{lzs?qo4(m
zyH=GtEG%a1<OjyFEhBz+llhW_=U{cLU6kU!mY+m(o2l?K0FUp+VRqv2iKy<}ot)#J
zx18f&?D{<yf6m1pQ!0YOGZ(J8R9thz--yqwxl}683nq(29}3<afEZGSL=J#;f=2Xw
z-;cD`<&TaX(+3V75FdW<0pYt$r_<8+1M)nNtYRFSC@PyINi?RUr%g#xDb<i3#xlE}
zeH^@itLuEm%ylkV>xgqA2`$nI&75A&bv%fk(KG0XbcF-VHV7;O{y8Yn)0#vQoAL3X
zI%7iWwD#WB3*sL?^`V)sZhLzVv-2V{GmNe^!heqc9RIoavrztX@uyBpLHZ%RkQ_wT
z%s&q~4ms&``yeYC)H?+^(bwN!{Pwng5`TT&76qNOF(%a7D6O@H#Aj{^bf+Mb5aIMv
z4eBKWH~#$yD|ycO=8Ce=No<{sl&4auR1o;S<a>$M5)k|uVj6Tn;$9PxR#Iw)D@T!@
znwmmM5+}AABWZOQyw-`pF1RfNeio{lgrtxPj@xO+QJHq?@9Xv2ayhBBk)?8p*hw&l
z8RpfiRxXJDqP3TsnSqInl+uJjh@SLBKCe%lJQXL!abvk;z)H@6O)c{x_%-;;q!aLq
zCh-gKE9MV)9?j=ZgTH@?`A>j<a{1c7*7yHE#UBHH-6DRrJ)Ncav+8WbpX!(XD2l$0
z{tifH4nPs|L&&2}_b$j+8_`RW<i}wCE_9AM-IV8f8zDC+MXYaO@fmzx5p2)GR<FCc
zUJ1P~HKG^C@h+%50})<r1?VbA<-yT%*=*3=)!Eh7-nP24qob><vok;=z$*j*sgp!%
zW5}3B9MC;H7Ns--fL2N+<#O4KjE<H^$Hqn`#wR`;9vL0U7YgM#ikLNVm87Y#pO(L^
zZFPHlJMcS#Fa&?B!C#U|qNOmJjN`WRSU_X$8Lua4l#<{Nwen<ADwWOX=vW!Y6C)E7
zXXLMXq)yP0%;s`pMSq{y)7jaXZOg6d?(XhfxnhNv%Vh;GoKk7_0&0MN_5un++voEI
z@zL?)@$m5QXkj9MY-n_J^!SOBaWS8lz}39C=d}9#9UYyyTxL}_=CNu80zft^66UuF
zBxx?cQZ|7o@J|#9;@I(1@i4ga`Qovmv9U$-XDxq6=PG>9Wiyt)4F1IOize|4qre|H
z{(PY*j)8Z0bZoTHAU}L&71jal-^ccM{3Y<u@gK23elgqrN=fjCHTDPp2;0AKTK?r7
zf4aJ|;Lmk-0Dqc4PP8hQrlc)GYWT@4jNed|pM{H$AWUgbNy|S9{`~0JNWt=tEGYiu
z;6MHFA6~a<#GiJ=pMD#Eod1-Z|JVA=0{tHhvkE}#{~`R}#h(+1KjVl$lZZdOj!(dU
z3KjqPc<V{xxL)!W?%JJ@pE=z-8`aZV-vQoVR1!G+GQ^)R!af-!8R8gf&1r2_$`lL5
zYoj=Ni*<d^zc!Q2G^AH37O%lGcn0>LwZAW+Lc);8&bR*Zb$uJJSbxcvZ`=A!c;5v?
z<c=ro|DF3An(oBn8u6d1`x5_0m9=057SVe<o_OkCf4}?9{cpZCcye@PqzqLpgp#hJ
z6ldhWb;~!gj=(<?XdSxksmk8a9KcW9SI=oM2-eMeJDz-czWij8GH5)B;Hx$dZ0gyt
z?y^fZZyvZmo6TM%CGkkQYI7r++L+&AfSxODQz#S;zWnm5556(DXaCEu?ixBgHkJqx
zYm#ZV@ayyU&*I<oF@EPh&BeC__4s#L{+GaiWS;z0`~Owd{sewnB7OsYQ)~adO|ZXp
zAU*B#rbYaO-g+kNujgg|<sN@-1AjO8MU}s{C*k<bV*SPOSGX%Z4=@b=C+5Xp-+$J-
z_>+VGQ0@A4;iq}4z;V~aAES-QJO6)kPW)kpIfLhnF`3f<WNVUfwh4L}%s)5tC6kfq
zbjI)R?=Pe?nb`BZ$emgHIG6WMojfV0P_(gbDon}VzP`rvPMu5*$0Gtol<;cLY21TX
zc;oB2@{09q{`syue?Wq=iB3XSv2&|B9Diu=IhxwXX4lcou9I2O-+wU}eq_G?qpux4
za&+J5@bC$jAuD3)^LO=Jv0?q1yP2QBpXg8<O<LE<denFZuk8(bDZx+DtX#R`;=94G
zzsLMXPQ&l!pkvKlPft(RhV|>#Y`x`ge+u<nlED62li>;25n9k-8ZBH91HT9R!;WjW
zZoT>6g{0f}?EAyM!-o!?f*ToYYuD=W_u?;Zxcss;TesZ&Qz2C@(I!lcA#GgblA<*k
z&~Q({6{I{eU8%I?2h#0(_U_wvL?`p&@2TM@<~QKi0{nnqf+mT`lfrac{#(FLmjCcP
z`Fnf1XZ%M<Y3&ao?UpaK#{TY@)$%+0r)vBM_CHjIe>ujV9>gE;bNs=@tik#<mGx_C
z$c<?TpJw2x^4a2%4M5VY?(dt9Kg@r0{_&?9@n=2!=T`WSBFa_xg-%-J|7JD`^TYmW
z#GhN8{|wHGKT^(lg8rG7CNC-Oo23VhnK8pK6nOid?Ck1Fu;W__f?$$0uoIHT4s19%
zHEFb)Aa+!X(4)rmrZjeU1)q?3Rp%2*kko<_)t1Yik2lxtxREQBqhRN&uX+0q{!vVo
zN@6KmDh$LW7hNE(8@Nh@fk#_zzUk|~dG3Y#Ksp4*3U5-WBIoj>Vm$xvZo6f>Aj(B?
z9K5mbkazU`k3>0&mxMp?J@Lu&SBednUMNsK(bk)91po8(_><ZS01w5qw|5Kd#H>aI
zd>?^-a&j{D(8J$RzkT@?%IEV-!Vmk2YreSIY~OY-rPFD#>2p_ae{9E-+k`Num=R}Z
zbplwGzb%tqz4;59?&IWLjFQy1fAXYy;jKe75ou^iNc~;UhQqKi5G`_^6xXl6&^+*u
zw^GJeV$<iZ-v0RGPt2P?mq}TEV*c2q9{KGa^}EBvl#fL<{<WkT8#uB`h)tjBHuqd}
z8D+d_{>L8Qu`v4&d>;0fxk4#U-T&y1)o=cLkj6?8_+^!!s7csW`*RuC9{S=-pIv7j
zy!#Hyh93OqD%igcziZ1a{$z4F%P+xiO64H){BvIT_S=G{rj~@?q*9`^W{oIbe}j-=
zVEKRj{0sArKWP_#IC&?CKTkjOkowcEU1W+yJ5eHP!Rkd{d5J*G`P9IG*|L2*DHnf!
zQH?)f?4nA|B}^sRn)$eB6ZNWN`hLL2k5MWWCZ4BQtY2uY5?qTy-xnp{x61e&Lr*lM
z7X~po##ss6onv@J630&+pN^BnE}l2{z9W{hO-_{rkLfApT|4ku(bwB^F*7k67?q1c
zs>aHymS2znf9IzY@bBJt(0ljD`%B7SiXw67$e+28^wzJvQ1tcnUJRys{MyYyvf!+q
z&`G6KC(b`E1b_JOcOFsCKKBCo0jj*Vj@d!CRd3>23m!8}rPQ{2?+I}Zxt5uLYZ)nQ
zla4#F0CV|CbY?Q(*Cu@M-=0!W4IU-gz7ozD2$CMpfu-r(EJnv-GA@g!29Hqc=f6_-
zf9002tquGn=Fcyu`D0_kM_<~jo<BTJGSwjhkJ)95k~r910aA)%!DFU&{XyNmdF?d6
zoIk%OX~zB!eD5dfvDfyJ%ytXa764nd(*BS{6kvZIGZp?!J$TpcmLE*@__Z^nT2ArD
zkhJkfgWo3a-Mg)lS+WUC3Leua&nw<=J@|Vs2GhLbkHA{bBL483_b(rQSbeZ_C!H6D
zB4}&lhr|BgeD8NjF@}_rM7)nNf1L`|P5-hjY)AZICg4^X`HNEg_RA8L&QRPDnaH_m
zQ}mz_8B={>gSrI2j-q&Gaq(wdBdE>%DwxwVjp$i8l2*x^N#0frOA59LSrG|@-Z}8D
z9rkRrz3&_ln?JYFLNgPyLCP+8%9<!DXYm^mYVhks)6qX41OD0J|I`0|Al6-S0Wk}h
zPRCD9BsxziWeclBYkGCpe^PsAkHA?7rxw;~Z8KcyB?4zHV&{u5(Kqh7+p<kF5ky2a
zy!H8|@QC@1q38GfkyPhOL19LaP2kF{KWb_T@4$rtyNS!TQ25pEgY>O`FvKiinm<2T
zJ<{6HtA|HOWjdzWVFF_I7A0`91&D@uVmr>xcZcY%0b|*~v;h0lwEe;V?CbkTw)YAO
z(n2U78cGnP1^CwXf+dN#j1W)%?hSh2t6y>Uug~v9E~ogTjRC(Vlfdlz_6c*A;!iO6
zmMC0zEint2<{f{?#UG;)Kk?>$UOFu@o+kn+g$IFBQ<J!<dHasF7G<UEIPdLzk<2&l
zwQMvi{*YzGyb|6<PU3h1O2yNhgBJ|$yTJ<RvJL7LjW!dNyt1ONhhl9=Xye0X23y^p
zD{4KymQANjdp2!#6D=h4WFvZ+bjoKy7O$oP_Ly2qm6lQlY*2>bYV>S19$SNf4aH2%
zrj0H-g>ubVnw-ne#!bMFEx5DB&toTN=GX4<P;%7v{ZxR8QWE<#_@hLN-rg?Wrs3O5
z!p%v<3qo<~_=na9n1z}AAQeQ>WXW<HlT`N7=I}!+U{IrtF%wz}Kb5r!#3ezSL|V{X
z@`#1tF@QEPCIvG9#(-%N{K6EB6oDUt-N$X0z#%QkfLwsENZ<jjP-K4GSS&v#KOPx@
z{Tx9)0t3&%+D5kI4V(<v+5Yi#j2)jC!j#Tvf620(;*XNb@*}+%gSTOG)+R7%8F+j!
zEhzq2hs4}HZ2RZ%=ACv4+=r+Z?E*4sq_yxN)}Rv;f*Hiz_(KYOq$fs(>EQl%46u)%
z|A|k0Un=#rI!QMV`7UNT<VuxC(B0FB9x#8X<M=p9vZ_~YT(3Ji+6sejAL=Z}v8T26
z-BG@u$))M)jRQmD;}e>7v73<J^Y+1>M)a<_V(rBK0|%{Nc^uz}s9L>yc!EKY0wh(o
z#hTHs{lZn^#aCWiL^84C6EiWJj>-WP;_AY;jq3C3X5ot~*Igq1XK??*`7Og~`GII{
zO@e$cmC5-ygZAASk4+xF@7q|{$Yj2}<wmjN>1XDpOGG>-B&__d2{9A1MdLC13|Tdo
z#XiQL%UNK?B?WdrB_xD=Or5{CC;@Wvqa+fBY~r?KGXt}LY2N(VY|ba<#~mUCX0Iwz
zwQdVt8droclpC8F(7-f*{)+wij)W_DNZx)5J=@=FX#pZ+3>w8yc5KVQ{PpZ#O@1wp
zKTei3{%GfuXS2B<dtG$=@rguQDUp^^q|p25WsA1ZnKdF3iWPV)B70rTi9fi<H)#0e
zaT?tHx+qK*PDv>r{fkfj<<FJ!vL*ME+z<^ZK!zYAZlE8ad)y`FMd_8x(TG%X*dt3S
zHg32q?r3it+OY0Y#mQD{LoVT#z!fRzj*U+wtjl^=tXms2qDLh1!ueI@)tsiI1$k20
zO3iaWFig$b{<&`8YWtLSzVcrSbwDCwcxBl{M9gd)v#7_fl;hXU<KKAMXDt8k2N!l8
z=U!liQm5gsR=~mw0}qQ$@ja^}(OXAuY#z7Wa+4iq$1ne5e&Aqp6{h86CT4TlS32hU
z{9&Nn9hymeo^Qo%<F@7umXjYjo+O$c*HMCLLHuqJ6SK0A6JgKrTlYg?<a#5u9oI4}
zls~AoKbSphe^)@Yb_ay<tgq@=*s&euY5k}5@uyZ=9)F~go>kF?^w}>!h|>?478HNT
z#UBs753z6GPE?B$cmfV*bGw!9P4f}ei9fY})13?3>-bjdGvsuMrOvfQ>4C@UR))d9
zaiB}((tZ>f9nc9O3L=t3B*2?0PENivGCHPNH!4T_GnsT(BYG40{DCM=+!=TkRJtv7
zpR+z2<^S6I4sbb&E8SDo-7|B8bQN;|1Q>+KNx&kaWCJ2d0z~kxF*e_a1K0%HeBVCo
z_pRUC^>e@v0X7b-_ggO(LeU}#BR~WP5C}w)5Yfs=x<NOG>F#>xRM$++bk9upOwXW2
z@0K`pPxtAmzw1_?f6l3@(*zK=)$%W-7cPV-i^Ns^Oob6FiIIV$Zpv0_Mj`x6dBD}e
zPhPkXZh0gwq$w(fpXGHF0UXs0#BP94t`(_>>fpZ$y>Qw-9LW>UubVItHo}<2tdVK_
zq(|airNXtQBtC&##;v?nAjgdx0uRhR3Wg-hBbC<PG+e*p9oXF5qaQ8cp2x&puTJJc
z6j}TtGJb_#`MDef3NShUClCKoBa-mbnWLe>;$`9A*YCpZFYJa7+tb=aQ23k~D0;R&
zVPF;D*CtG|k0evUxt@cd$mhf<qhQfj&xau?t1SF2-F<M?Z=ZopyV^7fWS%!8uZ|M!
zuP3q9+WrKk_V$N}$o=o&feR?t{-Aio&dDQ2F_l>Ab1e#iAgk@DI<RhKKUu#0ang)<
zboi)=;<yt|5=S0=?C7!MC)}J)r@sN|v_ItCjdC~2ed_Z~D7T<gtY@0${lMTJ1htJ6
z7cE=GckJ5TWZUj!%d#4{!PSVK3y7)7GL5E56UWJe+jo4@gycIVj$UJZ-B#CiyfJX!
zBn*nTn~v)kRVQ$f38kN<NxTdKCrpHmFaj{Uz%L_>-|_GRR2@H(_%R@)C;nDs{6yf6
zQxZQ3CvC^Exs9SzEQ)ydpm8Wq97$Y6C2^72GQ#9|xVXk%7(d=C*O{4e9ae^tpM~O$
z-Cc0~%8l^5dDD=@O^8z3dTsd1%1yAjrB{DB2-?-8my1xy_Adj!oy9MdD4#=pzb@~z
z_QS0&?18(^8Uu|HNxU7&`!>9W$Xl0O&@5Z8#&4H{U+XaL2{5(KNV2D2+u8yPkcbz5
z^*k6_mxzSFwYwj#e&AUo?|m8yQ}}gVQd9}U&tll07*ZSi<0|`u0`7jtuL!&>`{Q`_
zN4uQBP&i2qXQ6XnT^gWZcJA}*I`Y(z;UmQ7rX3AOPMbcar>EzeMJBN|5D_Ehhg5q=
zQjVu5zF`{XV%xSQfxqzAR}A!)&!J&DM~Hrdd&|C%vp7ybvzlAG&--}m_LoREl}et6
ziIw8%wX~io1T0Y@bnTHSF@!5j<+fDs0m}KF3p9yGypDmyq&)2s;SLhR6|TfDn5c;X
zIPD}PaS-s*`Y;mLS)&kB2!0grq30yI*OSC={$M!$;gE28ZoOGtBpNf6#4i*9`hf`0
zM;#m9`e++m_h38x$2F%yQ=L_syn6=V`bF#D-MyUvbwhMGSZCME6A&@*D`7(6R+3wU
zlZK63THxD{x53XZJRF9G{0M39v*Fg&@4*Lc{lM#o0yDIJZXHZlQyKnj!V{q(%N<|C
zxDLGe{@>xMdso4tZ(ah!>XRYl-3QnF;!)VRvlT?5PPKo4@bWXJ2~i3^i(!A_O3mz#
zy8r#{fvdkitJwbJgxT}>K-4PQp+wgm?Ek8EmRVlH4c>tFS2`1$fO^#)4OP&q$NCyG
z_R%m+j;n->;Uh+NA(5vol{qbK+g49cuZ+eFq;0OUwy`Sc)!UTF#Z?}-j|6oHv5Fq7
z9t$eV6VD4FY68^cQ4GIFoUBUtgY9sd^u)tS+`CMK;@9^;Bm>;H#-a-NUEi4ar2xW3
z5?@sUeBM5n*ur0jrAdaw6(CT+bv<Ej{_QhVO*X(g=*@k3(Mz!6t23cgxgK>k?N;PX
zP_%)R`@$1dr-rF8MZ}My+l|byUNS3u__+bBt`VaF9dOGNo8jN*PA>%?$$K-r-`Xe1
z8#t%$_YJp@xFo)FP!WC*LgChucR53KD+O<DZ-%SydjwX0@5+++uf31RyTv1K#&i2-
zunr+Y@yE75@ulka2Ly_`SQGgEz5yu1{%8VcndgZyPXK6JyJ&%ahN<q{liL2MpSP~#
zK!0B!;EP+VP@ZBQ*TvS;ShIEFdo~!ZPwyW&a)g6kcwXi-Oum(*SAb?#j9^ZLKGb7z
z^lUrLd%C-GQ>n6C<I4nzM>?^_khRBswr-GuB>sHqKPr=31}K^UbuaSvHU4b2QH4Lg
z$9=5EUy#J#EXm-CGD_jsI|5YuXNf<y5nF&^bJq>x#|&{Y#J8j{iK}{r2VJ)-iJ(nk
z{38D)AE5eBp0Hr(IE5tsNqcC>apUd|)NS;x@%K$4TP?l_g2WaDzpwp$o`J^aBk>{d
zUQ0(<v;=i}6?q#$av}oH6UZIIFAIMT17+KvsdfnzGR#&I-rl}9wEf@Sv6slZX#0b1
ze@)Zj_*td)XU^x(g^N%!<?*N1!V@Tk3hB+!x}+!db%}3(^b1NvBo90_cP^wZyDY2F
z_s2g%->SmTBk7U8Dx^pH;ZZacg)6fC$(<Q4P+To}>_6_BYhWx&rhM|yL$DjAP$9i>
zT9@=tU+d~Rbe$r%|7aVUF^}3lqC|=&3aE~raI<w<mL(FFm8O^Bn1<n?NYZg}ACK91
zPLK}i;=YY~ET*2VK!90zJSy)kQE|yTOVn7(CUGr-6~r1SiYWCg%(&#8CF(*&o^wM;
zoJ2&y9~2RD44lTiuR@|O*1^@eLY{d1(7jG?TF3(rHbtTyLhK#s1U+x<fol;Y@$u^j
zg2=?ui@-O4rG`LAcOxCrE!;1q2ciW?;(Imv9)!M+VBsLl6u2REx~N0CP#8an!XB;P
z#<f3>{pne$bJ1*%m@k@jj;#NQHF?BL=d<Uq;Q0{pj$wat^_&m_?_RM&dYg4b%!;Im
zxO#oWT&IX$k%m0qgHlGR(Eex+psf_pW!IubbSz8aW3RrNbOIz!=he9&d26o8uPY=p
z$PI&5XV47wG<xD8H_y_lj;iS4>9o?385)_&#Ae%eww-C;(-9nXn8HqaB9<OXCMSrQ
z#jVBPsMRFzm?W;T78?i5?g`!bVvskAB<~Qt;-0twWiMIL2Z<Fq4nlinm3rP;FWX<j
zJ#kgH1{K5~<+yOeJa8?Hg<=&x&##0BuJvNzcZDlOh85&is|AGfP|g)PY+jha3A@_5
zvGEHMwb9$6?gisv?H>r62MJtn)rUyWZ>9Ffw$reD)#Eff7cRMQwp6%qHWIbaB#z`w
z$FleK=;}4_$P-V|*d>^z1tFy({82;b-Hrph7cYj<whf~%zg#NRBT*x%X9>C<$-6#>
zy!S3&4ttj^gL=b&29z)cRwcUqVa!k9`2xE1BF=Yy|9g5#HXL&8wVqdg)m3!k@Cn|R
z{EWn%IY#AUB>j*7@CRC3E=87-^=M2wdcdSzacqZ(tqVdjvC(-|2kke+)a!9ww==^F
z<Hw9-X-7s~EJ~a+;0jaOBivGkwR$nE(W^4;dP4zm^e7WsrhUxFW54mqy8;rAFK&e)
z^wWdn9f8DM_#2XV^@}K<ypfa_%)2ylA_>w3BJmZgs*7Cs$G~M^uF^X#eLrsQ7+Upa
z?~{O*5d9eEsV<+yE+R055u#q!T#6zg^tcg_=<R73rqo&W_@9U@k;G?t_Gi{v^z7?>
z*HPsCG!ZzFclO%am2d*DV+>rB-Ak5$a2!qIm&#{X?>kPGy!W6GdCO~ExAyNwC=o(W
zD*PWl_@KmlNX8Rius~u{`&s-Squ2cr5;zfe()WYiS5NW&!@Z&Wj(u(X{Y@KP&e`q>
z6EPDT=S4HI2_ah4XPIFwjvi%V6Ry3Rt5Jxv&Nvk_u{CwSvf-U!1L?GBJHjGG)8tlT
zeIuK7=BX_m?Hyi*wWgt6s5df>-nnO-(z)^7%_@Xmu&^iuu8A6@KnV@UJ^rU>P@YyZ
z`78uzhB)5k7ZHNt^plT6IkpnxLCXi=c@!#%L=vn-q6W_oi6}|b<UtoGq2AQP%T~hT
zr7P4k!GQ;66vsxNGX^d+ffRu?yv_>6Jh>?eTle*bc;G^hfuqDIIwY*a|3wqH3`-iJ
z9{7ZM19o(!OVs5miIIiOhp)&awt$RiNQJilK_ePrOG{@Vg;I4CZL_%cN0T^^S1t7~
zzF=0yHs#r&$DYiPw^adovx>Bw2n3r_B)DtoGD&)4=Fj(t`;tp&lO?}B7;fLad<8TZ
zTwddpN#3jiJt0KU3on3Q5Q(E#olD~5khs;4ZcW}ObzI{2wSS-v+6FN(<|QK%!1guo
z;cu*8ComIR3unf{$p;;Tnb-`>#MWOt!y1HTVhh*nSDDxnim%R?aS~=?8`?7C<l_y;
zapY`r4=U?NJYI&i_6{$@T9edE#L=TnY?2rvdEg-)?CPi2l1?EKk4)YqcDkSH(j*>H
z;^P17E3cD|BywMgOx`4zzK`(NfW%9CVzd;DNbgGWpraQeZz-zCP?Ru)kHkeaToCP<
zDH1GHQl<g-TzV`xAq;rm+~eR&54{R)y#od761qP5IezO$^T3k^gCEYE5K4gmdiF&4
z)|#!*-tUBa;82y-2Z0|@g-V@e!mqD8H<T0}xc+=t@XIG?Iavu0T&S&E^XFHSI7eLr
zNt`@!2j+ZXme1ZiO$4sUo5#Qw!vhZ`ae!URmPx`JJ8xc|!tRwT;S(hA21S0Z`|05)
zJT7DU^>K^^`@cH(0g^ajn~Guc-15=l#aZ%B7HJn({eV?<hTo$IBqHWQd^(xfa3@>O
zC%Z8dTmQg2_y)HoJeLFkhSGL$Xa_T_^}XHJwol&7K-zw%p{{N?FsN9MGO^jVtq44(
z2TNb{$46HK0>Fpn{OIJZ9wsF0kosyHf=dq!z|+tD83qRW;jGh7iALUkdqonsWhMNC
zU7e5|i#~~sjMbvWOTn>i%(OPI9P%#Wb&JB2*jR=51q7Cn`3q+Zess}MFn!#RPy(FP
zl!BjLJRQEa>~%;xZeaq?hR~rx{48$<w+M{iGar6{e?EN@95Esl>Vc1Mu;BY=jE6g(
z+Xl8Pf&?BI$JdxDd`X*XhvMF`!5Q3j^-MTs(#Y@#2zuZPuRR;C|M#bY?XSLHum6q_
z|ERzo7~GI%+;xJ+pN?^El8*k)8jFZb;5r=b0F%q31WIn9V=1!cWqRH${>WXxD;6ap
z34+9N{rKq^oez56#l3xvf%*EFL*&K9uu-GkqmMm79DdaF(PPJsyV=G}Y<Q;Tnb<7M
z#KsuhBUC1~2bZkGOl*6akOL<pA2b-8XQD5}FHH%{%FD2ZVeu((^coxMw`Tf)8Gj7Q
zASHNg^%_aO7ln}c6Uy^8Wf;rY?_*GgX-b{v{`@j-1&(K&66SfMtRwQyUR%==5=mvu
z0LB3pBOy~;F2E!$rOFcY*vV_>oXcxVHovF_{-6izuk?=dkASnLj*6VM>V%2I;D3I8
z8r=EB+aL<nrML0nyAV1H{TnBbgBcSVBI7@LbRFD&$~gG(-*yJ^ySY-emyBp(ZUFzC
zm!1aa9ytkBqTxUJ;4$!T^Ur|qEqNioiG`bA7u0$TJSZ2=K37Hq9p8_O3ud1u)5t#c
z><jQIma^@`n9DAOCOzhzm9cm%h1-rt9w`feQJt5JXbB0$AAIGNFyV^JLD+Vl!XbDp
z2|`8~e5L3ZxG1XVwN2x&;qGBaOoPuIF>Op=NG3K=8P-5$Sc|78zQGN1v6IQf_Lp@s
z6I(rIPD{F?pL6ai?&1Aj=Ct!Z-m+C@SW708=T$-POvJaO8X@%T_^BZb3{kBi{gNb3
zI^=cp$YHG78vxU?q~7y?c^S7QNt|?uytCKTqA-+l61i~3<wXxG62Ef(+>+im=Z1Gp
z2>wbO@SsDcy<&O5XV7js^Dwyln2AxzLmT8H#=@@lUby$g_wzk)RfixEBvlAOLvauM
z`s2pHoWq7enegG9gNDNH?g9AS8+!_S;83j)w9xMwFW`aS`h^qWsu@R=o$_<e@rS_9
zeO>VLC)XDo0~b|G0UW&zX5$N!W}SN`ILg4Ue(G6|)IWb7ZR9yuxUl9^BXLodx7>td
z-b3fi$&&XjH4A;bT4F}$$P;gW^wBa1T*Mx}(^7g?$#|TAH-6r{EdGxaSx>#<3fg$*
zTo-mNUtX-Q21L8yLBk|du5ykNJrf&%XsCi-y~xSL#tnm~>gtT)!-sd()zzg<%S?O2
z!nW1h+e<{j(m5H{;_A`q&dv^<$R#cTs+#~q2n<KR2s2JO5rz*RR@7tXF+A^D831e~
zsr%9^ufeg?kD%AN71lG&jP9p|Kim-NJmVZ5dHhK@=d6E#Q6ond(c`2W<vXinfD0vZ
z@f5B&ZZdrN)PpO|7k%9+2f@zv9$5CqHvf_}+E!~8cQA^e%EgBdhpVQItbCatUP~nY
z*!yjoz=L(gC-5S((62u2NVwsgV=8X{ubzE0>}czR#V@_9J@6RqAEyt_K6fU}I_J!+
z$NS`(wOIlu92cl{;-o_)vS#gz|E)amVMyLh7heoQ>F@mGDwIEFC*e()D<`UEb@ma7
z*S_e4Dj^>Dg!%I`1f3=C4^h-4wg8FmT(P342QKusq>JM^j+}ecFEg=)*+(I{E{<L>
z6B}eRv0>)4{*fa_I1Ms$nx!(QrR%yWb6PsBGpsc>_Msk&rDxk-CN{emfwRB_s!&nC
z8sLWOu7P1qP0-Wb3w3oVze)w<Ej&Q1G9OmB<>8-q(JUC+*a*G7eUM5f3lO+f;TRf=
zGl?o9{yMnhwr|0R;llwZIzR*7kFP``@A!#aSbzX^SXC3qve&o3vUQt*rTYT_*8N~X
z-se+)xFm?rN&;A^B8glCN&NO#OVb#0LHK5&Kf1XE9(i*ch=JgQuBUFyPYL_^Uk3?;
zB~rkW^?_OFIwfo@0t~MI_Icoo|F#Jpe(?=pPH;ltn?Juf@AI*@-5dORBLTup6!O4x
z>kcV#?GKUiOgR5+ByUHN_tR^on1-n`u011(^nzKE#64YCIvdruKNZYEA5P?*<9YAI
z3~M`3GHax_ucTxz4opxP+enx0r>({$E=cr{RBlSuAbHQ7t37Y@u!+1=%)|e|k|iFA
zt0i)zt4O?<2d?W30T?+Gn?7A7Jzb||dYRY~iG*u#?qps*VsOX7V>XH)9nw{wSu8!v
zvK7x)&jTm2Bl13Y%4BG1ZH2pk`CEL^`AL|*@ceSWZ@;VqPb4guH)j@17&ivmIy&I@
z4=sn|k2#9g_?7*AwO>XS6#B9BJtXhL4?7h0>}iI7`Pcu0p7>0-V*X_nw|`asRM`-^
z2oN~f1HjU~APRae5h5uAy&lF4iMYBhxfQjYg)Y*4Ao_cY^t<rqh_0296D#E#!;d!$
zJv5n)D$Gd(*!_juUx@JbxBI*nGA!+ZYpMAVnDVHRkpCg;>Hg`N=d$F@Rgx2m46a@y
zGq&OQ_&KCT*U&xD1lIlPfsa6sdiX^b0Vwj@fn(g;6?vy})-G*Zxl)qeL>vpJLe~&s
zwm$Y)tv&FPW8f3eqaII*XB7Sqk(56~0w?lLDn(Z?cz@|q*%pVYC318Pecp-pRdfs-
zB{UOTA_)mAnZ`-T(K4)osEQuAkd``%JAeTvt7AJhgS6K~w6An{B4Mi5ka{Af9s!NF
zj4VjrSHnS*Cn9;bz(OSN*0y$>u(n1Tj0-i1e>$OO7L~9xdC#9S8^(_v4g1<V;6EQ)
z0Ue#4G_j4YClZezR%UVXw}=SjeKQ<>=pnFY?;a%YA479<D=b~HQjVowF)x?IMfn(5
z+z7Ns+{{0-+Au*FLn5tVcT+=35tQEQ@ne)&T}Z!HL;x^FtSlFonFMG|M#2w`!%KQO
zK>`P=TWYYlLjW!bcw44~PB9aNWk$;3;93nOSV|PGtM+5y7z%#@o<wqX96M*2PS3H?
zb96ZBJtIZw$VsTRD2%bl1m28<y^YeM=IGT+^48a;6lHBivLjJCMDpcfs>}qH90T8>
z2)kF~SL?iWzova+oDa||C($~r^cZ-EF(odcFuLP7T?|;sOl*j}C$o>z5L2(m1<|Ph
z5^u0{+M&C#geydPz*f8}Oge^<Q88?2qts2?4o5v6N3XG=-U0#D@xW85BzzS;?<tcf
zK{I;Z_YisSYp01`)VOlSIbt9Zk3oR7TZWQMBrt3~8^(<p4Q=~6;J+3Vd3QlFRVULl
zK2Id>3Ye)#JVscvChNfK>+0aUx7-AWO+5s5@7W7K{I{PVdAERJ8qx?aUA{_UzI@)L
z6|{eK46yc$C5u!NIf<50&dsf>DwDu8b{3Y%CCF*f@drcbYFnLE0AYz-B6;AU*97aR
z{TR4hJ{cr$BY;;O%jnXxO*-*NJbnnBh%Z3iiQskKF@UUYCvF{0;<b~INo;*W1jsuX
z<PGl_V_98Fy()YpuIdO6i_<*|2Hl+<Y}=NP1x_Gq9yxmSuNh-EQWF+f9(ErC)~2i}
zEfc#rrrvLa>o#Y82%mKPF=E`9QN8P4duw=KdLZdIZp!P6%xXy0v-4-p*o(GVDvupA
zx_jOFH%G_OJNJx}dp5nhnJ{JvTxf|zfSSC&bPXJY<lRE#{R>UrAgG-UFDEgs`4)=A
z;}W0`rzmn<=R+56Y4X09!ser)U4_jRdCQAU)1>Qh=J`t?KziczIj;9D0=R?6{hhif
zd4K1YZ^B`RPDRhV*(2|k7PUN2jd!CgU4bMnB#F~DuJIHk(T?jG$vUh`+bFy#DwvF@
zCs1hu5f$QBN}7;DRs@82;86+Cw`N;Z)c#B>XWOB?(6;Nk<+i`?Z|sN3B0az5{s8CP
zAn{)lPdC2(iR^(VNjUdk6H7NJ(d|zlf)ElyPmpk4s_%#E>V3ZiBM6KM;HEsWuX(Sr
zVf`ykXLtAB6HYjJ;e<(({=f~RaiG6H(;*y{B6T-Pn+lN=F)u}FM5#y**Jn3##`hYg
zcQ5ChIl~@3azyhPGfp&+Y%SLn5-jJe&oFq}G|ZO0%`G<Rjv6(x<&0BLNXF4aY+XOO
z=T}(|T==KqaTKNvKxy)xgyh|V<bD5dp$*B~B=TnZI&4td$8h@76_4u?7QzH1;i>us
z2PQ&DNRs#5Ik}#<Chy$qOj9i}`}0e&@@q>>3_|e}>2ikJ*^|0XKY8E&?Qg=NQ>UWm
z-3<ThM;Y=qb>a@lCvjJli(lllKMxPX>7^Y$QYza6B#lZ4Fd*7^myKV;_YrH9A}aJ?
z>7SmQ12OO`T><;C{j;b_;g4>AYA^Ba4`G*jOcU&WFAP{X{$T$Pdg1z_T1deAF4F%w
zm%6>(9SjAM4Gq21rysK=m8#o9{DK5dSc~<y?NUPcP3r}V<r{Xwq2qqsyo@pfWr#2J
zYA4FNDU&CrmHIlA(_`wr<=BoQa6Ql|l!77}M*lQ<_{sa9ay;+*A3ze^C&@cVn#vP5
zgiPX+NG8kedH^I6law6yifNX};8#S+^!QB?&wI9<u-4wuiJteeAbG2zNgSjnURU2x
zkpWO`S`5F^k_RPzpVJZ~Z}PkkL(jXp8UD8>?}FsWIRh6MEMK{*+>oKhz!Wwq8gmdo
zQ##rJi(n#=(DEP8zXjLLJX-Gm?)f((hM;{RbPYpeD+50ZzRV=D`C7Do3tWBTLEiqW
ze~(V!D7l7=Rfu2nw~tUG-otPIv<|*9`xLeRav33X2(}dq#V;b;pZHQ^`vZb`y1@23
zfop^cQ#AX7QZyHOEeJe37rGA{qYYCZ<$7q_cI2>wB5m46=9h9yZ(pCBBzeSP2ZJgD
zD4S6}MlpSaYoqil9V+jkY>BDoys&y{4uP|5yc7Eya=Y!?>Uco{Ja+mtIA{uzcN>j)
zKcGBsD@cAp5~uSO5eQ)-Y=kk_Ko!LAxOS-}Q->dVFit!eLlf3Q$y<pEr<aYNFsM!z
zhM&Y0PI|z>^?r_oQDiyrDJP$(!sbNYKlORu#c*)h<)g#Tj~o*w!j>7`ErmawPCG$T
zg0e{PH_vW>gu!Lb?L~jx2%>Ii8Edv7&~S*UEc_Cse;vE)0Ptut68~%6hlroSzTN>?
zzF{k{#^Djiz@5Bx)DlCv_)!$UR2%{M)#|@O!o>FP>VXH>z6R*#R2%`JEn*76AJP8A
zmzvuj+fn#Izin%O-+*0~{TXn4r21(Sc)->YCf$F8HxGqdxaD9E^ux~WTVP1jP#8OQ
zJfJ5|a~<fJ(Vln}3uA%kii6TCCA{>JR7=l9Fs}A&1=5V2PJ5Zs1%tvC|K)Y-W&Y$h
z-`bcZZ{@#)<|>AA2~d4AVIpjVQDV*WMwkzO+NNWy2qC}m_9ltr-S^%{^6p0RPWj2Z
zIEj~wU*SVcMe#H6!dn925A^lgJ-xk-BKd+0{@n9_1`Dygy8d<Tc}Kv-Sp^KPj1yrZ
zYzW_BjB)MW7RFDg^~+2gB?gKcZECw|!F^AuEMHb4!q{zwG;-=w511$ye~;Jx5}|Oi
z+1-Hg=<R1E;eo%tpIPr+jt8zY$_XdyNF%0l@ay&`#XRSWN1McETCniZ7d=>JB4Q|8
zJ9xQ)BvBGSZCP~t6JKg>f3Vn@<<eq*d*DopKul%XAH~&rNtY(@uym^NXS@5xz=a6f
zAE{(m(njK2$za3!b<o}011Ft41Mt<N6lo*^*W`VGimA4)5?i>g?P6gJsGS&w%PFZz
zAhG`1=l?<qA)a?Uq2*DWb7CDvm<Ss%FN9EFB8H>!3zt}h<3Cy=hHr`q%v^oxmGy|9
zhmdzXNhT8#Kf*!$qBwr9lgYTR@&M&gx)zrVfV`c&*_tk_rX_kzy-E>8O)}U~-Gl*=
zGs2`iC|6@HjDNtkv-pQ5IdqWSFcNC5E9!C{UOzX1afj-W``|i}W{guEg0_g4>gH<v
z05MgBe~87Qi*R#8Igg6S!-|<AeGk9dkG5uBMG>%0s#~_dQz?GNhNUcMvj+eSla8qN
z562=%mrH%xkKX>IN0J_ZVJQ;`1BBq$&u^&xi7&OcKO`<l_y&XedT_hD_X~dB&;W#i
zupp+$_QxjTQ~jScHUjmh1nM9$&_OV26jdNlR0oA0`yB_UZiztvv-9l_v6E1^p|`sS
zWeehSpe~t`p3m5E<3c>~1BbvxE`g&AfDi-TWD+h;JnmTd^WWCx0btw!!=SBtz(sAq
zoqEy<L?Fa`LSh0Su{B=BTt56H<dx91M;>+vdfe{@(z#kzg0?zxP=hl4h{Gg);RVEt
z;Mby#IaqA^XmCT!nsuI>#cx^(J-!1(OkP+VL~TM@^uWx$<U+*21w}MHOyDStEC)0A
z@n=Ga24iCWjHBRpFMUXTMtjMeN5i3r62Z_WB7vkq(5q>?_rW!19V;;qD8v*QzoYPT
z24c>%aj^KE7SCpw1fM#-8)=+PCzx?U+gt5OU4i#2`g&mAaT6s50_~K6-*#2|b0)4l
z>qPj?+BY&}tm@#Amcj|(nfP(U@VTqVyAPnZ9lrSa(<BBuWV?m&mur9GOYQ9s=`se=
z{?wm&CUide<bJ{5aPGOl4KA4H)<(8Jl#N8tM{bBiFT4<T;aYE#`VR_46pR`XArW^P
zr4Q?9MbbTjGPg<l>40nJ*&nVWHxehH0<`S@1U9_-GW7QMD^Gk<%{}qIZ`%n6PoA*<
z2;AqvGTQbJq&s)++_i1W<jGU#U2*{v!sV}Rc#8(_^Il-$l^S^7sT7=e{4sFJg|l7G
zdHSOdKK_U>X#y$gffFbi!|B|)3-M2xJQb(-Q~%}fzW)*6n_M)Bn?}uMxzZ%LBM+Yn
zGfzL+Wt^oy{&34jh^Z8Q&<muQ=<Dn6+_$g&!_lKhO}q75H<1s+pTQR}boYEZzvL+e
z>lZGZ1>gMojV@zs0N0goB20uW7i&@c{R4=9--n|{kD2x_H!R=+mhcs?ya(-R2Fx%t
zc~o1J=h|cmn1A}`;GeIX?{W|WIMHttVv3G`AT9Ba9y4az9dl0Rg1yQg-?Rrh`;=G8
zSZ#ucDttb~aAD5TWAH^ICrJFe5kF#zj=wLb{crjTcg64c(!Xqg_6`A1<Msz?|0IJe
z&p96c$BqAl_`z%czLM>)pWkr%6H{t$e{8frI}rcDlP66b_2uiO{pot~Me@WyHP5?o
z=1ds*#eZ~xbF@DnePowme+K&cr2QF-_UE!Y?%=Bs|5p4FV)XP#BCnMnD>5E9+Mg+y
z;cd>Xx4MG!f#%(NHW8*^|M5OD83ne$?eB%%JGX<&06p=fbVSCE9}o2njk3$92hwu=
zzw5dOj7M&w=rM4C0xaFx)w%1g|9j8x@4o9NcO(-QTQL6;^YY6sVvdu|aHVI<R%40<
zW5A?%UZr7>7{cJ(#(H}1{pGJ7B20vh0OVoD62RZtwd-eye<9*em?oQj_8I1RGiMO~
zB9kOU9P|pi7Kxu5f)jpM;YUnG@Cz*l1IFFfwzg0H@X*5xZ@%g4cO?=D<9oN?W_|az
zTba;+p(YHX3iAqmrt!$`hnFtDpD+<N5Qg7-0zdwiwhqL<#KUh|#*e>#t@Wd?2_{HK
zh}z<3%nSc9*<1)ejrdpGkC-Ck$6N+^_<wNesn+)|fxPw?qDuIg+63C4db6PRm-rD=
z^!CrepR_FFr?=l|{rEQVY4)FB`xn7~Aljd<PQp+2=f`)jx)d9A<BjIX8*V`Sj$X<s
z|D*l*W87Yk&n!V@UStvRqu4It|HZE!LQIkEPkURN>_6YW>1%gcXn!vM!4E9>{`U*^
zpZEk&xc>lSR9UwFw->TM{-ht=^m*ca(i5LJ`5@q&(*Qxn<{vQObTfDS1{fpv$nNUu
zZrQYX^Sd|S`kkNM{_UH;G;z{|i2&YkmaE(+re=w;_zbQ(AQOzK^_Ey%EZeqj-*MN%
zdw>7l`|rO?m{7-7cy&01ipFnB{N3Fx?<)MaA^u5-U$}xRo?*H93e;}=4yc()U|k5v
zakp&Uw&Uj+{M|+IYeU8j6PO`zU47fDuf4wUo_p{A&KIw}>XuO>M|{q}!m#L?sz!uD
zuNBqDY}<D5y|eHAVbQ~PuYdjZjf4sD2{pCODL^0^f2+p-kJm1^W#q__9)7|aG+L~B
z#G$92A$+H$rRBW`7cKGdx0ZvyO}GCw3vL-TDu|y|3%~H;S5+W<2O}TvArUM5ZPD?!
zlxlxTel==;rjCf*_7CenZtnAYK-izIjQ#oU&u+T~?a#!C69r@3<p$7v7`4uy>1BTL
zu&cJ0Eh`uobR+o5-M(e(j-TJH@kg~kt=NCozxLY3yQ%+>{lWgj4Fu0vkZy?uVihI|
zCA)HM?Eln%(EhxJ{in4^|0(H-8wS*+>Y=NngCef-_J$81A(sL(COPK7@W3?zauXQq
z$HKO5-M$MAxclZ?Z!b)xQll)>tQSHg9M?(UjVD|oO#Ez+R7512MI92(n9VsKFt{;5
zVO#V(diwhMnvwXn_jLE{MoeA6IjztqtWq?AsLzZ$dH9<V|C?_wOs0|n{6gXf!xe5!
z{2cK^LHzxF{T}|FQuy`sU?yi(GG||Vd*AxkHthNM?^~Q_pL_1kp+kp`z&E8O4bBO#
z>A0?`+MUZECNT=*OnMZE*&&aEGj8MeJBYczqoV_9Z{JS*UkhPkhT(wVe$NSt;{W*X
z&f2xl-r3aHIHI9GmE?$DWbnHRzle#SDg4~S&k(<h_`7@h`rEs@T3g!Mcj7%%jQ`nZ
z34a5&e;u|z^V;8`_OCL2YJVfs{sP;-7x8zuw(g6Ae+#z%+B=(uVEgCc7diOdD&gmd
zpJnlP6aLOj`-k-({rnzC_J{CqxZ$0JNyKlOR=o=%;X2CxR2e^0__<*Wa5-l%-P4cw
zd%C(1e`WUPBeXwjo_qezMzlY54fRQmU+xOWbX|esR<-{lc87E7KL#y#b8uo>KN4>%
zdfq$Rg7(K%0;N3h*5+o|@cOIp!KSz6(A`)Z6F>g=lb~_PP~Zla312?zg|XxiNdzj>
zT{0`KTL(ha$rqb5UXKmXz&Wo6fRqrz!YxULz*&U^D2O-|nWb?*4M1}k+#caL-5}f^
z0M?Btdx7&_xzJt9fcC&E!7mhkh>0H*epU&72Xrx1M8qQp$FWeTCtASGgqcbu(TF8o
z#4dzOxJ^wU6?;)a69^Fbks+h7Rlkjc-r(AZk*C2hY?QS6TiGN&1IEJeTZrGx!!Hzm
zh>0H*ewM{=BmQ)J{K59GE&l)i+FuvrfV4mRAOC@Ge@F@!oj}Uzl?n$>J08C9g^S_H
zqo&Kq2fkaoqOtHkBz_7=96ogloH^r!{X2=x7sg7Xu$=T$HcCGTw_Dhv+tCDRW(W`^
z7J-Ot-IDxlO>m+I#UnaFg8LpprhVZb_^jd&<|1ZJHjk$33UB(gi$vrYc8{H~W#$55
zdbowg9s|GjhBAhL*>Wm3I0N3AQSO4v1aRqHI0|DRpK=)fG~!Qx_V5q3f9>(JLHiR2
z|DgQ|3e%@u$N%CRm9Y&Dh_P_fmw~~~4u%>=ZfkIqp6oIS?XB<_BobUgqDgo_ZuNeD
z&S%?4-Uk4Foyp0I%5#8(O#Pq5D6r^yl)+Hg<AmV!J!ny$3C}s_Xrm=G_L%qw@ekr3
zv_F;MAGAN=U+vvT5=0uZ8QXSj+XD3s4KQNVC@>A{Gd~t?29^;78#S#6$kN0og;m!B
zp{)*&_y{lUJEyT8Aov55lC(J5(@^5W9TR`h7-(_wwpyUN_y_S1;vcj>(Phy7lq1Zr
zz{}XS7x3+6fNw7Ye0v$-+sl9(#%FjeT!+wE9uaAAlup`5B6`0HvsnFv;qy9dpNH!w
z3iwRp4>tsa(NP`^3pZTx4T0X*+v4Ogh(DGL;vcj>amt|m2^Y>)#<mWWPO$3g@I_Fc
z1G*)S=RV8DY~Q;>G>x8EEUdv4@fbex2nn6U3#Ir7*eOCFg0R!hXC1%q9>5pk3V2Ie
zs#-*`>|P=75!Nz@KcWoc_x1fj`%|$D+MjS?d0*!^2hMtMlQuad&U^&Id|8IHj{01s
z5DNH+0tzP^2$J6cfIsYe1&QBa)q+5xZM6*Ik6Q-u589tt_y_GzxCDF&(=@Z5Hxc<~
ax%@xuNsIghG&*$v0000<MNUMnLSTa03Asc7

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/newtab/newTab.css b/browser/themes/pinstripe/newtab/newTab.css
index 772f6b54b07e..f88e51271556 100644
--- a/browser/themes/pinstripe/newtab/newTab.css
+++ b/browser/themes/pinstripe/newtab/newTab.css
@@ -28,6 +28,13 @@
   background-position: -232px 0;
 }
 
+@media (min-resolution: 2dppx) {
+  #newtab-toggle {
+    background-image: url(chrome://browser/skin/newtab/controls@2x.png);
+    background-size: 248px;
+  }
+}
+
 /* ROWS */
 .newtab-row {
   margin-bottom: 20px;
@@ -102,6 +109,13 @@
   background: transparent url(chrome://browser/skin/newtab/controls.png);
 }
 
+@media (min-resolution: 2dppx) {
+  .newtab-control {
+    background-image: url(chrome://browser/skin/newtab/controls@2x.png);
+    background-size: 248px;
+  }
+}
+
 .newtab-control-pin:hover {
   background-position: -24px 0;
 }
diff --git a/browser/themes/pinstripe/page-livemarks@2x.png b/browser/themes/pinstripe/page-livemarks@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..7b170897cc04d914e4163b915d155b804a45625c
GIT binary patch
literal 1167
zcmV;A1aSL_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D5Nkl<Zc-qa=
zT~L%&9LMo<>2%pNW8+0#b5&TDO1^<_WF<x*pddIVY9Oo#h`^vCiZG^_%49?~jOCz!
zNCJ%$HN{{_q_Cmw0ug}=EV~OVJi8C<%dc||oHI2K1yW!aAC~98=bZ0>*(Dox);>}H
zs|y5DCJHlPq?Y_A7g!%tBbX>Wh9Sy_BL4<iA6+AWNjm44R_K8yOs;RGo}$QXk#+RP
zf~VhPuV8d%9n(rYqaY~m4kq_pX8UJj9lyYi>Oji0Ea+3L2`fWH^3O98n%IQpTS`Fp
z%?fL>Hd#x5p|G09gX0<zo}`~Cww~`>N)LQotjXFWAgUV7#qu$f)Q-;w-V$9B5P1vK
ze8nZvCH~uQfyuw3;`n71X@yRtT$mH=Y}Vi{(IsoPeE}x>6O~Io@6@mid7(JH=y>Eo
zU6Tui6=VEBxn|~MM|9-{j(+T9ru^Q!J<zZYdr?(Cj>Cm)&5X&8yuj*+DlkWioZNu|
zhsJk5T3{MbG429f?!Owedr@39Ce}_zc0`w~3a<i_b;-#ko^fdG%rqi0^*(lGG~v`o
zMtpPE0*BL!v2jSZ@4BGV?A4GR(IqRxZi31D(829Lt!N}nzQ*U<u_vbw(HREBA8$sZ
zeh?1TE7dfNvvvPOc0`w~*m@I8`b7s9m#1hvGJDW#@t~o_h2lyTy7v|AJ2`}?)K*k|
z-G@<!S1PF<6Z@tjJEBWggjRw%bY9{1=8kF%k9z-%U*<}UihcCGs5B$KtRIl?nQb1V
zejv`#kR8z_uZ2{CNhwgc*ql*~YqcgcJs3g1)eW27D}DQu3wuw{OB^yl-=@fUO@k`-
zYKV^L62EtDfH`<}l-rd(q7j~KL`Xt2!gP(uFKS1}?<y>V9`5s6CtYJla-IPLwuxEq
zfE(|fn({2!5nZx8xB`ss^e7i|WaMu}XAL7FwHq;MEiiPd^grT3Prn;+G!~g|#_a|x
zn{fr7DN~&xJEBXLy<Gt&A#a4+k!jb+DN>+sccHbzjoe}dk%z6wI@bo%fQP$Orto#g
zE_BJ+jk+n%k{!_{OShDRiO(J3wx`=Q9(1_qU+Uo={_5hht;s#O|BHjqzWQF_vzQDM
zy89;9{h)VDb(ZXiE_pSm9L%0<JH-wj*3cWB=rXyv)^=6SORLR%X6PJ87<~>+vZ2K=
zv9`0vh456(S+XO#<dw~3py=&~xy|u|8c8P%Xf~+0_t1%hCk=9*S7bs*H@kof!HE;I
zsyZ8=>5VFabvDgeq9eLw$y?XKY)cv9Htx1*tc~uXpV&KGK=f~N?jPAkKS=cqeYW!1
z%CLLvnXYZXhIcKRvqVR9$;)qC2NRMw$oWTG=aTG*E_rFwH87iEtq9(4!>UNjTw)F0
z5?!)5@M{0!*Gusv(6*WQ_#NBryYZ^oH?S1*i8gzE{Eo(wXBIAcj(U;uoo6pl&$A0G
hpq`}`&9jB9{RcDB(eT=9a9;ob002ovPDHLkV1f)$HIe`T

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/panel-expander-closed@2x.png b/browser/themes/pinstripe/panel-expander-closed@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e7ded50f4143b22ec7ecbd831f33b07f8d3a339
GIT binary patch
literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq000sI000aK1ONa4#Tz9z0003oNkl<Z7#VfJ
zJxc-s00!Xq?ou(&Lmf^X1kq|Rlc=UFAqomAGa`iW6O;%EH4wThhiq)n22*TvkQS$Q
z|3O=8bEAv<TTxI_Jr8K5N;g%?l<)&3%2es5N-MlY^wC9c`IL5w_(GBPl>&O`qVFwY
z<n-6jL>--2k_tt<qevx|L<e;={k4%3bPXf3mnc9J+u1$J6ev*6?}%+^C<HHt5xN1;
z^Rn*Ik%KPXl{RRhrMhZpLPvf|dtIXkA1KiGwB@QG1<llGg<E0sEp((^mFG?RDBu$%
z&J3cq65=?Quazt4IC2yRQBG6DHyRjtI5Zt2hBC@HkWU`>8Q=uQ(a2CEA*Hd6T|@Rh
z&LEBWjgwrcW{{LpHwn(ujK5LgQa*E*;38%Gj}C@7M;pex0osjr2JJ-x4*&oF07*qo
IM6N<$g0z^D<NyEw

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/panel-expander-open@2x.png b/browser/themes/pinstripe/panel-expander-open@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..391337030cd9eef9b0deb9509653bc3d5d8e2c20
GIT binary patch
literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq000sI000aK1ONa4#Tz9z0003iNkl<Z7*}=A
zze@rE0LAg=o#&}}bvNWt1`UZ|77Ev3(%2Fjh{74B`Ge4NDnjnEYzZ4ADi9;0S_9XX
zX8(cy0RIgCfY($g<#+xJ?*UU$q=#;bm>mUbF>|{_mBMVYuz!SC;Voxy{$EB1m3&rs
zhJ}{!beyD*j=#ivwktm39ET|2QtG#N=$&G8(0#ilKfpr4-&i(LL~HK;PN#c<Q67Yq
zE^HX;$uKj_sHZr<h0+~_DgO}H=bCl{3u(Fbo@IpVA8DV7EbPVWuT@F_=o|%>u3#f2
zmHK&Z(nS|HUUE_yDcCFRQGia2{h=l-?7`?18KV~f=wY-|gn=aNP;=}@u#6sRs5Gk7
zsr;_=QEyaHK^?td8B`cyf^kNvO&kU_Mj2;<5h~v@1#mNpUWG>h0000<MNUMnLSTYb
CPnNU*

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/bookmarksToolbar.png b/browser/themes/pinstripe/places/bookmarksToolbar.png
index f89101f60390319fd4878abe63bc0a38c0410f5c..2047bffe5464843e5d6ad56768a83f6b6d601f8d 100644
GIT binary patch
delta 499
zcmV<P0Sx|?1B?WaBYy$YNkl<ZILoC|&r2IY6#iyrH!De$LPZd)0ozNHv;`3_){`fX
zN)bf#572W@z4hLsKR`TtvzHvi(z8E6rJw<o929%2nq3XaCfTI(O`M3gRv&!qW9Pl^
zeeb;)kw|vpIVSN;b2NrE(i*Y<%&ltVNs!GSA1z5KJs|{$W`DEUk|(9{3F|i+4HKik
z;oEd(o&;X4RwEt-GwA1j0j{Gk`aac8<{8b?#t#W352Gk*S7xA64px7hBIXE;WM8$<
z>h-!IXFPLBpemIL!Z2(}6AITs38%k{xa>+p=)BzS88ZFdc#-rFk15zznd{h1uqthS
zF^58_15VEXynoc7`S<PM7iyc^c$27Ld12gCS4ur7VE<G=nQNb?@OA4Pdl-O>CtJgG
zvlx9H$Ct4_l>8f0-F01~Kw1L!MisZkD||{P0HIs*gaQ4jOwuGXrdq99#fCsq5=jUi
zZ0sDP85Z%<KQW;HeLD|Zh~Gy;w2WL411|3(%%lQLzHI9?y{;cz;IPozl-*XjTy76B
z(*1<GFVEhAmD!J`N)QyeZ%lva#oSOoeBU?n?=M-%T%jM+1aIRL-UWwnM1r_>x;6CV
pApS9#x2mM^hXlC04W9fO{{q52_lSVR30eRE002ovPDHLkV1lks>pTDe

delta 379
zcmV->0fhdH1eF7jBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz
zH%UZ6RCwBA{Qv(y10{fwVgtm)#OeeE1@Dog`R&`cnvBbqE&Fe7Zcdi%Cr_SaVEO+2
zJHwYRU&t~5q?hI2zkduMj1BBQcppr=+ACs}2kB$^^XCu4?|<LFF(jY8_{y+u#|JQ5
zP3Z%Jlms`18jxO=zkmON8OWfj;~c}&H+&52To9W}J03Ggi+o~et1v=Q2hz*(`SWLn
zckkYzNR(t6F?7skWcdD96wDXk<6tOB{g0szq?ZZg50FX7nDO6x25}J<21X_}Fb1=M
zV(99?VF2>~uXJC(P)r8#fByW)5b4eW=I=lLk>T67Zx~?!(u*??%aYlEPJ9Mtn`-eg
zJbCgPdmw@cbQgfYy?cnn`TF&1tkDS4%V=wB`(IR4l&pjVGMEuaivck^nR)3a#kmn6
ZzySHlw21z)?iBz4002ovPDHLkV1kONwVMC{

diff --git a/browser/themes/pinstripe/places/bookmarksToolbar@2x.png b/browser/themes/pinstripe/places/bookmarksToolbar@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..dd458981e276b8144fd2db789f8e637857f51990
GIT binary patch
literal 1179
zcmbW#`CHNl90zb7oQ3D(nVg1Bw;}qhr|VgVr3<H&nIKtDZA&l=o1__e7FrWYpAJY(
zw5XxzuoNOu1QZ2Dl*1E5Xj&?*ty*SlT2Hy{yZ(f|p3m{i=cmu}u1HRb_i~53gFqlJ
zd;*RLZ1jH(aRDYySUCtR7$fd5BPBb7kx$O0f?|(nQ>bV>oqU2yq>_&po*t&|1cAWr
z$%&*m;Ml{{>;IL0XvknN@OX86KHra2?N6%mC*Srb{}e!J45W7lo{|NgQm>;3g7SKU
z^7?`b^g)HgK};)@E{0}HpiC>QKnW{U!AeG97slcHa^dF{@DdfA{RqKSAy~bLaub3*
zf?(Sam!=UFGl<IzNTw3W(jd$Gkn92E)p^tv1L}$q#TiF&oG8u{6!$TTJBQ-_8qA#t
zzVX}o`e*1{^JxA8`p%1x#>G%VerVH6OjaW{tMSX6s!h4o(Jb+9Rx6=^M=Y#6RCM!5
zUe)(ZKDqctPQ`7;Wx?61ru>@bqFT{8UQ3yv^O8`0rMZhEkZ>C$+$JfvMR~osv%0Oj
zM$}$=SHZil7IqCZD|D@Lbz57TSS*%EB=-S|Ua3_2;K76T_I8;}*3r??+1V+V%ew%*
zdWAxv1Zam;DphxPcMm{2s0Qc^YMrqcFfi2D*Qe2Fv|4R{fB(S1fKI0y930f^fyWOG
z4-W&+HyVv5lgVs0kBp3r0wyNM#>U106CX`}WU*Q-7OT}dH8o|k*`}wb?RLAv;h343
znVXxNpPye?Sa3R>HD|s$0i*%SASR`NAa2Ouu<(e;s118?1S08lF2BL)Tw20Vk$ymO
zT=2M95)`J>L|;oJL)Sch|BiPiBX7Ef17TH)Qo|5BKVQD#+St3e2m*E$47cM*q6FOU
zJ9gwP-`ckLe%EN!o1>M_!GG`eJ*&Y_Ppq0gb?5kiNPFEw3;_{KIpIb<ChcTpSyeI-
z{YfV1j|<p6UzlVvpD@V&&s-12-i^SsV^U}^FfAO?6z2MjW{&Tm-G%d_CyTfJ)nrT*
z%7eYlZU;}y2>qS?9`+uzmwx*`8!krb=4;q&!HoATuI}GTvT3)w!UM+OsTvq#dFcs-
z`O1!M_{Ng8<uNTQH1osj%t-1k{rElc(QjwT($de76F$!b2TJO*`GIfNm(z+@;=x(o
z@jjfi*&_9%3QD<0Ppt*}RX68Ygu;Z`*0m4U#0VZO&K{;haPG*kh(xE2sg7pv_Fl>U
z2eQ>>DFd_WBKsM#^~;CypZ<VxDNXgfy746c=c_Guh_CcZ5C05T`Z{V$T|{(G8f9nO
z*%!YY@H%oXVRCOwh;R9ZYNm7UwZp1Axv8~{LPn(in4X5uP|}?rbUhv4m8{mSIvmO>
zKNlp%+~?_dx%`$MWyGo`gUro@gC5AJ^BcEJtxM1J^STbBL>)a=o0CCoJT^M<oQtI<
zv)76^7r9%D^Ji|#6$-0&hFzuI+#~QWCJG-CHTa=)0^co3TmN>2>5}y{$<?%2x*doN
N2p^Y(6Mvm{@n4|`IR*d#

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/editBookmarkOverlay.css b/browser/themes/pinstripe/places/editBookmarkOverlay.css
index 3d82c5e4c375..cc749c1152b9 100644
--- a/browser/themes/pinstripe/places/editBookmarkOverlay.css
+++ b/browser/themes/pinstripe/places/editBookmarkOverlay.css
@@ -20,6 +20,12 @@
   list-style-image: url("chrome://global/skin/tree/folder.png") !important;
 }
 
+@media (min-resolution: 2dppx) {
+  .folder-icon {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png") !important;
+  }
+}
+
 .menulist-icon {
   margin: 0 !important;
 }
@@ -85,3 +91,15 @@
 #editBMPanel_unfiledRootItem {
   list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png") !important;  
 }
+
+@media (min-resolution: 2dppx) {
+  #editBMPanel_folderMenuList[selectedIndex="0"],
+  #editBMPanel_toolbarFolderItem {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  }
+
+  #editBMPanel_folderMenuList[selectedIndex="2"],
+  #editBMPanel_unfiledRootItem {
+    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png") !important;
+  }
+}
diff --git a/browser/themes/pinstripe/places/folderDropArrow.png b/browser/themes/pinstripe/places/folderDropArrow.png
index 61a85c5d6b90d29a7b2a515bb8ce38b840618ac1..8d722ccd5e6e62e89c00097c32d17ace829e4d0a 100644
GIT binary patch
delta 184
zcmV;p07w6!0m%W78Gi%-007d(jD`RJ02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l
zVPtu6$z?nM003)AL_t&tTVv3gXMEf0y45wS>&CaW<}v)&_1qf1KVf&|e$TD{br~2K
z{+q_kj@}Zo;=d^a1pL>{Y=v{c0!lE(mj4K_g@M82)s6ojKr!&u4F(U8f{<%F|KEOb
mj3ET3)nnsa1P27nAQS*DUpH~U2T@@F0000<MNUMnLSTYndQYMN

delta 144
zcmV;B0B`@v0igkq8Gi-<004N*L=6A{0BA`>K~xx(b&atVfG`L|PX|fI5LtjKPQrM$
zWCR*ZmchpO(CBsC|L<6cr~%k9XItI<VCJ4%X728O001JQiii?Xh=@i+eQXS20$F$$
yExywLpqQEF*31+@83T0)7nuImKX42AH~}a8UWV#g$6Wvb00{s|MNUMnLSTaP*g4n$

diff --git a/browser/themes/pinstripe/places/folderDropArrow@2x.png b/browser/themes/pinstripe/places/folderDropArrow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9efb6d95d8b33ac99aa364126b568b954fe01960
GIT binary patch
literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000gE000yS1ONa47YxLw0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzT}ebiR47wz&^s(-0ThSv?{aZnuj>&r
z))>VQf{etYu$6*@*xW?ICJe^JBxqHLLZLyY(+Gux(8**wg<7K!ugFBaLZR70vdQ`@
zgqgwj>&~gpL8kKMQQ0RR705)EZ<<{;SWmLSj(7e#8<}V2-ep!;OtRu#y70*a<h$(f
z&k!ZVAcKS$^UR)issaER3hcYi6a)0q%YZYr?<ydJx0J5ht^TZWT-=O_&3@I%B#|-|
zTnIDD=t5YH$|N<}YKcao5w*zXYjPA+P=(*D092%+)QL@iHrhY=Ni{i8eDp`(bb63m
z3i&x*hiCei>iDw6r2s4%{4?=e{Y|*Oub86|3rx!Bsb77#(c_z^yVf;+@dFbe13!IT
z+s|=b>FPP&y~A%R`FMmy6~iNY|4&{{BQe5MV<pZpu&HBwF}4(Al6q_mk}}Ani4a3H
llb5;zNW-Cq8XVHzN3Xn=u=mUC%ohLv002ovPDHLkV1hHG%8&p6

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/history.png b/browser/themes/pinstripe/places/history.png
index 0918714221c6d4e602dee063292c2503c2e8bf06..e5a00b56d38ca5af9b9d912e6ee2121ebfc90bbf 100644
GIT binary patch
delta 821
zcmV-51Iqlb1j`1HBYy)DNkl<Zc-mc)TTGH+7{^)KrI)qUeO<P-uG?yJ^FrBjMV?Qn
zXh15NXU%4%PF)ADa<g375=BtK6CjFbO)^D1;|ULlf`XvH_Zd&m`^~xZ+kShWJ@5bd
zzt8s`SO9Q=%>38akRU{e6rLeC%U!#yKM!8y75gE<rB&4xQ-6Ac*5NoZpPrsl1QL@R
znL`a5xq87slw0J7#3{N|jWkWWeLf%TTWzppT!DopBbawB;P!ao`1r&l?^HITHlEa+
z8)W1Zvb)q8sSiK9;|Nq5Ei}nmp{>1xKw`}Gf!VSL4yVh9CM{SK!Wg7w<zFu;ud1SO
zWrx!VGPwejYJUw_Z8mVZT;TP3nQl})8fcNXGbX!x`<|kbvX7*eCCtnV(M?Vb{>8R?
z2Zl&77EwUar(l?!BO`&ysnosDKQsb+XxQD;JH{8~uvr38&dY;?L-V2C4q|Bwu4V-{
ziait!5~+-g1d=12Fq*x6E9htEEXn+g0@kyPta6H?+<%M9Mv%73!ESee2gQW9?@G^O
zgv_Bv0qZ6cEU&D3;!_0Gtdz9O3Syu)%t3RD9NlfW;}k=12pbZ(iI87V2o2&U*fCoe
z&Dw^EoQ^j(DfJU8St!c2+75Q-78c>BL`Iy!d3*vV9`6N6&bYe9Xm%|Y_@(=8i%Q_V
zVI}d?Lw`rdCq@^SmZ4MG1B#Ar*xoUN({&6dZV!RPB*)D44~}3bX86(2G#MVljbm|B
zpWnzXDE_>@Ve*bo=s<#JE^qIIMZ7?!&20jSG1mpsHU(^MZNcpPJk1lPe}BY@xW!zg
zc%I;?SRzx7P3U|>W8>tApuV9A#LY5>di;NNpMMtCaPy2StG>z))!HYKvAjEX?_FUG
z;*$CPNLtO8I;BS2?;RK(f$13o%-}sR%+JH>`Z}@!fAo5~wDNr)Co=BU{fB`87amh=
zVyZt9o+irvR#RIy-KOX~(De1w14F}fw@Pz}IXyQ;AbuPk&3_OW6ma=9o)g1Oxfz|n
z3ogSADhrE>|B9>Caw1|Yu`r1p%DGM2{$KwOWBu^JNM+D`00000NkvXXu0mjf7xRzu

delta 535
zcmV+y0_gqA2CoE=BYyw{XF*Lt007q5)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vn
zZDD6+Qe|Oed2z{QJOBUz!AV3xRCwBA{Qv(y10{e3U7(|*lLtr@0kH=Vn?Z$70r3tX
z?yIOM|AMTZ5!nT;t!?(q%*+c64Gk4EH8mKdrKQ2*PoF+zxPN~A2E+OD=O6t2`!}Jw
zy6PZY6UYD%ZftA{?Cb0Q|NQy$|1dCT&Yb_q03-)e15yjq#{@E@uC87P$XOH>70DnW
zApth{*|TR1KY#v2@g7JHqz0rGqz5DhHsJT~-$g)Y^N5R!qiFc{?Hfj*fz*K1g7hF8
z;H|5xgQ57#mwzu<Lms3SqzBmmEjc+kq74A41?o|R8}RGbukYB>!}sss8FuX0fg%3q
z&mWK;W@H2IKYaKQLt#x#4a3EY7a1l@n1JG%Cr_S$^xQ%A!qyWfPGE#M8yg!#Qc@Cw
zii!$De}6y2$B!Suav-%JJ;(-3+_7Wlm&cDE!wq0!Vt--~78YjU;NV~|H8o{ONJwDd
z=jUetsR5}4=|M?I!NDORsi|rIfnNEK4uH-D(;zvJ8jxC;K9r;!5D@6f%E~&+!^2&{
z!oq?<TU#3}e*OA&hGWN$foy&Nv^jIbhV?tJ<^>S&_4NZ~rcxZ4seAM0O}H}?IRGHQ
Z0NC3m(hxkZMV<fv002ovPDHLkV1oUW^SS^4

diff --git a/browser/themes/pinstripe/places/history@2x.png b/browser/themes/pinstripe/places/history@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..684b374ff5732cfa75ec8d81201874eaaef679a9
GIT binary patch
literal 1872
zcmV-W2e0^vP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000LUNkl<Zc-p0x
zSxl5y6vs!~m-ewQP1C2QX`7}#^{EfGPfgRr+Eh^s2+9oGFbuMY$SR;{T+$R|7X$&>
zQITbaeHjKAMNniB6l6d^0Rd&$Mg~vM|E8Zx1O=JoA3p9q=l8$M`R?425z%`U5FGY3
zYd6b>by(7gQ)m34H`@?{SmdmS{T}1cFIe_0-(%qse#NDl_`d#!I+MvXvb?;!ME`&A
zj5hQk2C>LNE*KjgfPc`jEv)S<-_YYH{cqoCFE*RaGqlbRVv&PfFu($HJp+LGN31_t
zM{@ECqUPr2#wGBQ#X<{<W}2Owr{|{G6+#>O5F>q%n^$l(8Z0oue&+y=28L{5{l)UD
z*EM8G%M9?d=QA`p{fzGQ-lv+ndb(D4ow9RsDK{^lii%6nhCaj~7CF-PSik}kY<R3a
zfPmm%SpJ-l^O8SHOBR}X_M9drr>OmI2W4jGP<%onB_&^^Y<|9S^%`Bda+NZ(veAY<
z#2^+qB6n#?%;6=NV8dh80dUoP$@0(4&W*vS7Zw+3Y~m>mk3OctqGF1RPXJuZl=qkJ
z_x005;~@1t9H5^256~w1vN#5@$U*Md_ymCkCfM+R*INVNO>ztgJ$`I<c5Y&Rex61+
zdFatFmRZcKs;Zj0@Ac5|$S6%tO_OPMmc|)w;{C@n+R%p>#3Bc|V1NZC*zkbYiUIf@
z4g7``)N-p;Yc{{2q2Uo4<iu;&iv&ooZ=`|2A)4a-T{N398=;n#7P{BdBmIv)#2^+q
z$OQu|!36tOYnv8c@O(W0zW|${;Lxyzg@qXe_751TvDrW|v2j$(%Zgc`uq+mfFp`wV
z1z1>ExS|a)h(!+XI~ZUICfMv@f){(*iUAxx;{ORNxKvY?H8nj=y$|}to?c8zrTl^`
z*ke)IT#yW3UZJS-(G(pM`&K(*k%Qa<E>y6<1REaOvhpnU41u@I$M@*>tgr`t{jCV-
z;yu*y@|};4p&K__L=i16E@EbH>G+8g6c!e~Y9Dft%iD@Uf+^VWfEPUBE%WyE`;`?w
zJUlvnx1)=oYlTH()V=&(PfbnZRa#YEUf!hkIJ9Oza__TY>ZLTnl=$$1C%k1|hmTmX
zP7DkVF17Ki1YJr?r$R0s?BmRgiC(-|T2*p|BiZh^TeBazU|cUM7EFl`FL=UR=IP^W
z9}pCBx}&R`Zt`+L7m|{xvbu&wpN!FrX%?p%Yf)%^Vd0hb?A=E@{@5x0THDx?!qJI5
zc~!!~!zm&00##I2iQ=oStrJX%4=;GaTjuF~_+UU_@L2=zcaz};B$BIm0FQY9;}cKU
zl$W=U7{IRGR<!SLYjTh)Nae03-y?n$aq^Tnru(@N@g{*O@!<tec*_oX`Rw!X@;P0n
z(_3`<CW4ZA|FLY3hDT6Hn-UHujYcb&62GpY(E?9+%RD^2e^+~YpDEFnP1e@y2+Auc
z5PQbo@APDBd{e>-q-R_fOo<OKc*0wzKIFBHbuJ?-x2vkAmY_;LN+YA9=}vnGjXoaZ
ztr-6xA-DZ*C(aAOl=$$1C%k3u9-g1F&Yt@>T3gOV1L+#{;vCSFmE%}NF@BJct1Yhp
zOE4uqyx<9MaTKf6hg_Uhp7BMcnz^!yN(6}_jEsz;*0$TI1)j~54GDYScKZ&m<aw|J
z6YOI4fEPSpeHXa7d;H*}bdQdXPr6xNSxu0>$v~I0vhn)x;n695tF22Ia7SmCD7?#=
zS%M{T;Q=r9-1d3^D)knnO6{j`Ri_r0YG*2|Yl+1(Xs6_hsg#_YB4#sS9K_7lG)5m{
za5qRvO`{~_@w3EZwn^@yPK6gdSKJ4bZth>no!nxBLnBIRYU`J4>QJ!_Jd<v|@#Ii!
zTs*!+aN7~bt8s7$s{-K}=ey`DE3e?#1mxhr5e%@v3=WGZQ8>HB!E4nknTt}j(@yS^
z92pbe+|bxakiMyjdU|_F&(GKn94NSGU|*Y>4cy*D6}-1NbP_KlAqKG`r?I)2Bo3Hh
z!(+`mp{vqutE010Y3tye5)+qbXg1tfHr%*L5b9vSXrwkSN{zORa(ECpE7H?5C_ldd
zZ75j8h*&AF$zXU17MRR-g~vOu<u0zuj}IzbR5k~k(!wLol=BSd0G8Cr%ZlYT8V7m#
zAJNdzBN`YmqD}O@8H?QGr_NS_1t!?*`eEYiqTFid;B3W-mkv0oGBb1Y@9|a2j6GhD
z5Q`k-f&mto8~$mw|De;i*7lAktq(Y++bLW#{)vj!6>GFZhL)B&e$AG<y1NO&GuqIH
z7{nq6xi$wJzx&|dhS1MDY_?k2%75CsUmj>}uSjEMNRqp#vY|KI5QA9cAa@f#PT$sV
zyX-#OW$mziw~d268+h-rl?Ot2MjQGNvk|83^B;F^Mq8lGF#ZE_Rn=mqA|HqV0000<
KMNUMnLSTa2xs%oa

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/organizer.css b/browser/themes/pinstripe/places/organizer.css
index 832c2477ef3c..bcc1e176e81e 100644
--- a/browser/themes/pinstripe/places/organizer.css
+++ b/browser/themes/pinstripe/places/organizer.css
@@ -108,6 +108,16 @@
   -moz-margin-end: 2px;
 }
 
+@media (min-resolution: 2dppx) {
+  #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker {
+    list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker@2x.png);
+  }
+
+  #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
 @media (-moz-mac-lion-theme) {
   #placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon,
   #placesToolbar > toolbarbutton:not(:hover):-moz-window-inactive > .toolbarbutton-icon,
diff --git a/browser/themes/pinstripe/places/query@2x.png b/browser/themes/pinstripe/places/query@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..20b458aaca5ec3f06510c9d12ea1ffb70a48fe67
GIT binary patch
literal 1055
zcmV+)1mOFLP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000B#Nkl<Zc-qaD
z-%p!W7{_~Qyf&HPLa)72W7HV0jFQ<b=yZmamX@{yx_01fVMrLX9l?PcTf3DN${1}a
zY_wFml!3rNSmuu@kxUTSU>j^kjC$jL@b!64@}7{iFDr9^7oWG!d(Ly7&$ov(L1Q(v
z?JEDP09s<5Kn^SuuRqlQQl2~i5HCH=0AQk>^N*$0nNUJ35YPU{00B*2-fR2`CK8%|
zEa8qhI2|$WXCi$5Nnp3eVhCu7^#dPxQBu^3CeKh#G}I>X$^J&rxhI01?ABQHfpr2V
zT`P_si=)Y%&Kd6Ka|a5%TZWzN<^W)R`hFdY^MCIM>{7fk0B!6f8v~pNbL+d`@$K|)
zn7aNDlVfY!0?%d#yA-bsaC7RBU}AJNXWo9Rh}p^+>B$IiWAc$;d}LLX6YdxSzG3;U
zEA%q*z4gmMxa-54&5#}$z)TNjdg7sA?An8@G<tfmH~$C<_Bm1QY=^$kjY>zCK(BMd
zb+nE4T+r^VfVZJXZI1K^uLw|d4$L>>Yl5%S_p{Q`HV&iyB<!{h9J2VuXYH|sz+nra
z)N&4v!yy<AEx6P<r8Y-;6t4_0Il3kozIrb!W5W+{vN3_GqkX8Uio^A3FDmR^4A;CS
z_L`dp_?xQDk)DhI*GE<bLxU@-SWGQ&k;F;D&#NOC8Cqhv<~6Zrrk+h^NY91<elVky
znz=f#oWYxK9K=3t6%LsLsCFe#X1#z^avtfgRv4~%P3&3C=ed{9WSb>DidR!Y4`w8N
zUoaTIn?e4&4w#D1&~-=Ys*@-w_Mta2EBE`TrZwK<9`5Bc*=9+P;*|lerS1s^F5k&u
zVsuSlFAvgH_oLL>4zsZt;fpiq4*keAuhHHW>S>q#S!OAo4FPn1FzMuqARb#%rLHE1
zO1l7h-6{IXxfrg+TE*cWG}QHNHbZ(8F9q;{NhR(IE=Lx!;;D<{;}1P>lt*yH7KOd6
z8@AFehHIA7UYL5^_`;h~n<G7nR|ZI4xg&^O`ZX(`Rfg~p1uz+W@YD~W%yNOQJ1Qu%
z2H`%QfU(Gj{RM8+xFTwEq(=rY(SzylSrT-&&t;`Qx=4S5UIhKqh*MuGz6?X5pW#|u
zumAKoy!CPVri*HGq(|{mfU_Xv|9e5-tSS-Ozu0zLzQ6a5lacRT!Cw##&22VAdK9n5
zbdU<7GjLnrYo5uOzVHIGl{3<#cx8a#*;&D<6SuY#>DdtA3>bgQ3<9TrMzi~eZG|1|
zQoNet!qz{HRO|-i{!63HuPo<c7vz7upI>RyJhvzB1>zOr)g9(#;zbVd4DmdXx5MmV
Z_rJhNzO~NC{we?f002ovPDHLkV1l@m15*G1

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/star-icons@2x.png b/browser/themes/pinstripe/places/star-icons@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..a6b1100148c4c956301096f5e66e0a18e1ca8a93
GIT binary patch
literal 4458
zcmV-w5tZ(VP)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz000p&Nkl<Zc-p<2
z30RG38^`mhqdMudFH$PsFyk9z#y2BthJ?=&GX`ylLbgOwvQANC8C$8O$XZ%dq7*fi
zBt;m^SR$ch$rxiS*K~jX`^@WHD4bL3T-Wb9Z_oSO_kEq~e?RxLyl+Yk{frqi#$xK!
zsby|%ZWnNEtkldO?FnfXpbT69%^qL*o2eEmJw3`)dU#yGb+gAOB2$nJ(t&|ebAR03
z-BXg2lPNJVkz8C{qMJVfQd6}j93+8ek1y)wnIaw;LSnm3gd}M8_(T*2&VW*|s#$}N
z9Xqz`wr$&LfBEGXI)DB=g@%T{L|gl26MuY4S5ON`;3a6b_$pS@yQ&XcSF7n9M~wQA
z)i2T3z8S^;4>$*k1<nGqW=nusvt}jb=jYR{Teqm9qJpxsvuX0=$x+Rg0OJlE&>oje
z-vpIX*MJh@Yi;KP%{B^KS^FeuI_@Ry$wxp2X*%pCQE#uPW=wz(Py&hsPJ^Ik32tw1
z-z6$4s`kp2D|F}19VwSDU#76Iu$Q=J+0^m1#wB$DwSXpNJtgO~-wD^uOJLdbqkl#h
zl>J&3Uw6iFkWbof86+OQ{w3~NHiP(|fl@*ElZ<eE2ADQ^0?eE_Gm%IC?c2Ahva*ul
zN+7KQSP(`wc>*{mBxyM(($|3{WS{+<9I{`~m;Ob>ZCXwV+nRjz_w`MbjEg7TSp}pw
zr$mbG%;T5}Vz~-LHbVkz0;fRXTNHy8O+EU*z}znz{XzoBs=$^lTeu2XG@1BL@n3*i
zKogHVA)CX0k!|`ja!Rcsv@tJ1lf_r*KI04V$j!Cd?nkA<>wBMPa9vE=Q?sxj-0%{8
zESgaKjzYOV0SexN+e$#&CQE=BGiL1P(a(ZcRaLzKSA?9L9IgTpO_l(TvGH1tarE_y
zQ)GYiIrU9@D#hX0bNX^wA@MyehuE!6H~M|{OI+ef&+`Ns%s)#83obE8g0rMIyMQF)
z<4DxUE20S#V7*ZCkG})H=igMLzcc3kzcKoG)YnM>ZsRHt5fSkMea%0*_zwFzgTDc}
zq(3H`v_Huz<q7pj{gZ4DJtfEF2ZVdf3-Hn7tMr)JS^Ry--#Rmnk^a2X5dI<=F8qzb
z^#!z*kk0g@Bp$ix1^Svdf%qN3DM9G`cfj|GfXT<$>a_soV5pOmllPi6Yl=>sIKd;G
z1+N#rcl`Kq3JMC!LlStwb`UUYkl^-vS^#q}6nKLoKwk$Gl6}@Q>I>o9$3AAH*A8g=
za!Ed+50eMHz#!0|_{!bfTL5zvt7$`3dd~7zAGW$k%Qczw=AI-2-}C>7zxaw216=F-
zoWoR5NRo+3q&8$_o=T4yUa%bmA7%{{yag};-vU>#3lxC74{!oRfr+3uFqTJb6JQ5?
zaJm=c=jT@(931>4JUpCs?%YW!DJfJ~SV-5eUzZAf_wL<#;d^CeWmHg5KsY2~TizWI
zd_DH{^(~q*Wl9ucc!MFpNGA5!ohHBz_<$Ht44wdb9m`p1<o@#uvVq`MNl&Q#zTc(v
zIPio99(+n}*cF&hPvO3A^B5F?DBul-09kxxD|ZuMr))LNN7Q>xjB0<sVzt2mPt=F6
zA&u`glcwVitn^b*=JUzG=PVg6`jw29TqUEW*BD%1LE9zVD@C6?^gV#BVKj+hi^L)L
zdJLaMqTZfSh~bS`Lx9n1VjF_~zzqa}Js_WCD}9;pKg$W*o)BzL3AVdIfRIeqK<}0K
zVQbf}rCqyrNl*2T963Tf&zF>xNDp}~Uc4wR?Kf`R;4;rbzZdSqec6U>*++44G3Dju
zQAS1vB_t$pVsKK_BK9iDm>pq&>Z6ToJbmV!N!^2rX!!Q)Qt`(g`HQTRpOEFAM{mGw
z4w=uSeTGGskyYSH>gbh0#;*J69sX;<D&_9e!_@w_971oT)?>mU_I8p?z*ORzNZM0U
zNoQI*R{Yr*`6n>)OIc`$eua#FyavhyI1z*-@I8aR1+Y2Bw(Ns_!RKD~%`uP|8%S+X
zK&^83X{(5687KyYpg<5WR}eDiBf-9M1>Xg)?Hat47A;!z7nk-+mo7;~yLRoGbflM;
zm-8VHZ}DV{zUu1g4<b|owvinau`l*{_3BlQ!Lg(X;qC2RB^e$43{WTUBM|x|4G#a6
z#_X>ox6D7uJ?HrwOhB2pPWpo^ch%HOzXN}e%h6|b>|C*97#(|u25z}X-2)5h(|H+$
zm>}w|s_o)uk_mfA$2}E$dKNniqZoqE$t8WSd@S$^A!;#7{#lIlOAz}C8T(%&<AAa^
zL7UOC%iM?iq8b#lE&E_!?2~<S4332b<1T8|e?gTXMh-aE%=`?FDvcjMJ{+T-OSepD
zq0Gx8xFSg*+cI*JrKP3OxN+lxB_p>)Nk&DI(fHlum~@Y(W<QrP31T{7#Q$*kDfNT!
zpFm`bn1}DBBl`45BCw4!Y~kY#pAL!Dq-(#OIHu-^koBTIbHXJPc9X7W4(ZRw{Jx-=
z4E#=GUN6P`evS;6T!64F{BIEYDj6?__$$i5^|wG9?iryE`mzmde?e6^$G+Gn`$mjH
z#5zWr<96WOV0JJOEd}|4C`X$Kj&)pG0VYhCAeujaei9aMyoh7LniQ@Ixw*MCd-m)Y
z#BM2S-(OQQGBj24eFPa{Bo5e9MFSyV--O3xx#Iy@Y;PQ&ASu3uFZMZLcO~gzKId4H
z5g~h3jJv3dtmlZ-2m2@K%s2$W&qBOQ7|ks9We9o&!d{~`5VuVr2)ZtCqki~aAXCOR
zY|B2_7yD%2NQhEQ4F^eW;Nlp>Zb?KcV4W}`vp{AO!!dHfa_}!D{!E-WQG}`B(8-f0
zrK9xTy?adpCm63UkZ^H`*;4jo&Ag8Uf*g^27e)rC1l^)<Q}6x1OEHhS-(W1G@5}sr
z6Lm`}K4L)p&56neoy4;JegF9)v0d;X{du`$wEQx)SqTwW-4G~m9D*PCM0NNL>w{xh
z7zV~6rtJ3%Nw5jz2qGP6A~J<U3w|ZO>@#W7B=sdrmShzb6*Wl`aOvmW0d@liIN|CX
zvUIZ3)f}-YTN9614N#J;qVG`e*hf;#Bkwf?nSHly5Z`$Rv2RVg4F^T$y(MqQR~@iG
zUE}+8Sq8oZ7|GYjWOX^X`H?7x&#PDy<l&qk_<*X7uc)4FpDG9y%5w%t|H!b<Y_Jxn
z$O6Be1pfa1xx545Is5+o`yU1N#nlB><}hN2l<NPqX!Yq3JqUChi9m)fNP;L-f_*ho
z+C@|=g3PX4WCiJCzGa`9!`Eku%zMeiuag9}e(D;dH|82FEX1h2P9|$Bz^z77A@#+H
zrSbjR!>R-PWWWC%Ne}^!3ZfnUNTdrsH`W!uZW2gVtXNTa`t)gDynPh$Pn|kNOP4M^
z$_e(~;79_suN;juhyQd6i9kjZcT>+@52)9k8v17E12PM{D;M2&KV%zJkxEP{F~q*$
zGpE&O!*rEC@KGD+CuwcJxzKRYDQb(6+xDkh;C2H+0<6A)dB2cak6wS26HJZ+APuk$
zWP(E=t&toOe1!s4S)dOk0nP?Wuw83(0`N;Cd@@)^{P!h67Y8HFp=(MthpnS_9;ws|
zf-+{IRq`O~Z#pf3*av(SwCXTOk9~6hd6Gcl98qGt{2ZCCzeT1SZi71t0vp&G`<IfY
zeMp|#YvRk91koTJ9Bd@)BTNuq{*SAxYX^SB`{2QYM!{Q5_%c)|ID``SnbQTrk-mKd
z^^AES#dK4pJjnX%jM_}>L%o}uxxC`bl3>uH4*K55sO|a+GTnHG{VE1**jC>wli<s+
z0Y|~@Kqg3OBw0X5Nzo79^Xr|Sp5EvLIC$_N!Pn=C#&111(7N@IU^1H&Lp^ugXXG7y
zvi@zHB8h#p9vswJ(fFzZ7xdQmIt+j1WEOIVD~n>lhHdrcq!N66-hc%7Qb>U0Mv?^-
ze_ag+M6UdJ_u<2bjRF;b4}3-`o&d`yxBg!cb)K6{J)-Y3^3J`o{-4f_Blti9toT9U
z1hDmS)yL^%+YL7$XeF;L6v8z04s5TJ9+F6P!2D4SNPrRGFi2`7>7c)&@p&Dv3M=<U
zCjj>SoB#_HPJlrHt05d&Ez6-EQTNDdTeWOu-EngzeZ94s+og1kxJ&;=$rbL)+W+g9
zLF@y*7AhDXQ^0~%1`Bgg%5Ol>N`-eJuz@YF{<BEcX8wW(B*09N1`-<y`*2Y>0epOX
zk}q7i(C7pxEiEMv504!RC&0iTQz0DnU3-RlMBb$@FbdmaQHAUGVu_XaS7DXX>s~7h
ziG9G=PDSI3M+PPv|9FDTHs64tRSKU$unpT9Ey=^d&$1m2NPv|f1tc^Q_OV#u1X#U#
z^{@O8r>3T+QSbwxfPjDk#S>uJZxD`b!md&Gt#|9t!50fO*WF|~Wgm6)`}vJ~RuNUw
z?|z#u68mUvyR=Zz_?nIze{Hk!44G}Ipmvef3ZFv422;mP919oY3E-N71|&cXNCfeX
zBngBn6dW&rDC6y)7dX4GS5$28_~8-n@A*+LKmO&mdi&x8kpFL>Mv?dsOc}fYWE%}p
z!>eR`3bBnG!&%ffFmj5ZPK%Gf(bsm{?N|37DK!80pR26x7WJa-PZu$gZ<9szz1N;E
z+{fP#Hv|Vo!KFAWI7{t9%ejs3$@;NPyKtN#th+#3F5xu_ir*5Xf&Cz^F5E5~-O0jr
z+<W>aDVhKs;^X7Fgx3+Cs{%jD-LPT9WxW6Afd2<@2?+@)=ehpo&6~XPuVb@!?_PpW
zeYq20z>*Gt+WhbnSw~_-qojWZag7`!h})&uEWWB?J#V5$-+Au1u6WgM?6j5sv$RlZ
z(=V!;^o9q$vXMK!s*P6%-C40@y7?-ZZ>uB=ekc{g!a~%ray;ZYN!so^FN;U`JBUXH
zxadsZQ*InsgnKtR3AiuYpbGHz@iJZ&+l_U=Tzv%+zziG$vGouSQb7!`1w+AJkiz%g
zVRIO0$(;bs&d$T|@`g-Ah|1#fSw4^En-G37_V&uJof(MG=7IMCEAi$KzXKpk9{x^E
zO(pp3BX4{Sn}x$Q1}vfulcVYLWhbShoBtN55cl<()l$bog03ozveD<-;%~jZajyyx
zW9%GBU6z-S#rUv)>}>q3<xYSB^M>iqOM#%*At=@rF%WYrAL$n3dH$Z85Pq`QZkg=&
z<649^4_%MgN|WFctO0J3<xZ{?cd6Z$GSZ)$MDW>1fduF!h`jGL_Jd@w2iSqPA0~|k
zu|l7?w`>oBE^;RTR_&g=1!MvF2_EkTwr<^8jnVE2q2GC;gnMH2@r{m-e#lb;mw)z=
znVCuO=^}Rm^j|O+NkE^tZ72Q~xF_yA&qu}ND?Jvy9y5{1(%JxhmZEPBAg1Hg80j~B
zPLlr&z}wTnFC8VE7l3#uwB`(6=!mO^$es}UoxdOV#Nv_uzIt;LADXN^i=-)s58er+
zk*ck?ivkHS790S31yPg0exY6T9y>KK4kQRRv4W3eFjSE<02hczoCNrO1W^}5Tn%~c
z(N_!qJQ^4i6Y~e2{d4jVe2$dY9%bDPf|0=QV(YofMV5UHS>z9$AOcaVj)P5*2y0;b
zMCRvP?@<aQ0LuDKywt&O2E{*usEZ-4+`k`vwKTq45vb>t@CW<Qao<kxDfjOe%6hsW
zTq2kV)D%2Qb_Yp<j|?Dp1(d!dg0emj!g~N+r3QXrYY4pH%M(6Z%4^r^-~Gg5>p2U7
zw`!+hW-O|LN4YK7jcVubEaAfs_^7n~Zz}~7K%_Rr&s%-?5)XB|r49c5ur-7aFZl9=
wPq}};P|_WRvMy=FtK>SsL8u)6s;|%g0sF`}u#;6NT>t<807*qoM6N<$f`1!xSpWb4

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/tag@2x.png b/browser/themes/pinstripe/places/tag@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..673814bb5c3ce861368b9bfce05176ee9c3144be
GIT binary patch
literal 1593
zcmXAo2{e>z7{{mRlIrTv9WBZ*GiKkrjZjG=WXV=^Do5J1DAmjeU2C%M%#dvwvW+^0
z3}$R6gR%|cmM}^&V;Q^3a?gFM@BF{#d*A2#p7;4Z&-=Ym4)&JYG<Iu1Adqd=RtzWb
zg#EnLRe)vWM>j(t8|4nRE*4;V1-UPSM%=EY9Yexq>?bCWabODFx!YVH1}v9G3?rbx
z04R=(<x&YL6oRiWn@c6$^7aN!e}BJp8sYYh>%gW_3E>1Z2nPf3%FfO%iGuqb=!S%A
z?STIFUqR|cld$PDqV``pA$SzXy927jp%IfP_!J8MI#Mr=jPpbz!Gc^G!G-eE&!G{(
z2Q*#XK%601A1IQD0sa^gCX|2z%qdj-4J0gqf{P$wz{>Zq$g=W^030%vN_bgTcG6%U
zmz$PK#S2PHg9+%O;*#Rxl2|gfAR{9@EHsvcd&1A-^YhLj^zLI3j|dombRBH~U=qmK
zn<$v0fgb<yV>Si>G6EzZkTEwsor!@v!(kCbGynzwEDZb(+Ta#SpJlv1ok|2GpmhMo
z4FS7h2uq{k6OWm>!eOAUQ*gbr2>ok@`aUTAheUJ|84vs(NCR&)oP{;Ke}Lj=W)gri
z3^;x?kb(yVhFLSh578q))ie@lT{IaRN5X;ah^G=jEZ|Ie^e`nk5fsY-ijCqPJIqZ>
z;c`+z_Kb8+W(GGmJCm1_mG>k!?+GuD&nqm*7nBs020wVl=RGeKyzpn2y?jw#US1Ir
zSXogn6bfsqt3)-`B9TZe7T4F;H`LWOG&D3eHokuSx~Zv2B9XMTw6wOiwiOq)wY9b9
z^V{3oJ32Z#J3G6&x};KRcXxMBPfu@e@4I*J`ouMTeSQ7?{qNtu|M20%z`(%Aj~@pI
z2ZuV^hK7cQhlgcvT4gfX2++vLr%#_gfBrl=3N$)4Ha0#EG%lCR6$-_~#Kh#}<kZyE
z^z^h+shpXanVp@To12@TpI=y5SX^9OT3T9OUjFv&+xPF^fBg8dva+(ey1KTuw!XgZ
zniKyK{Oe&%Cwpheh7GD}>YF!fXlg@u>F(8o8NlI4LqilAgQe2w2M-=T#;~-pv9)(_
za5;6})AQn0pL;A8+dnuYGAcSgH8ZbRAP|&Q)riEkb@dHD8v!~X?e6XE?+29)4a-J8
zfBEutT&@7DfN^I27uQdsRY3CJuPgA7iwQV_|5!7Qx)_}d@4D>f?5Nu^cM)g2M_Wb0
zX8Q_v?kpFH&Q2+tPrEQ2@w)e*p~ev^S)p>5FUsZWgSz6SK}W7hZi`H`@Zd;SkO;CC
z6mHDMeVvp^X+g4N_gbHs%Qh_u9dAFh4!HBj;*s8T_mv4JL(yPfEn{-Tu~24ewBpD?
zRs=-`YG18A%%16NyyvRCn2dhw?%6zB8cVYLQ}4Zw*4=3#TBAoV&W%EI<|vittLt7@
zwP|kJ?+CB-ev_KNN2l-r)@j_o2sUd<y0l|^n{N$LaoX!|2sUDvkuhr2_!PQ@UTraF
z?dBoDhFnPS%L!~d+A5GtvDDYL*2h7WBl4>xn4~Q0gzdltbdxfG$zUwfIW|$WL$6+L
zRrzX4x#U`aR!{WtG}@wXTWL|}-z8<%$!h{aY-ZQ!R+1$A>cInZepox_o6o%}gSu6B
zvD7gsgq}t+Lp*dz=!Ae@j-f^@Gbyd&yF(YEP*T>QS3;Dv{$^uKTX&k(?L;Ha<qU@N
zO=CMp`$-eQF1XK$-RGbo`vk&&EjLoPE^MJ&tn;jrZ4YF2D2(*CI-4zM$Ee8{|44dz
z&A7vhDQ0e0U2gPhy5r?lvc{-Rsg0)}H}^nCuY4h+JXAwQt*;eLvT`)Dhp)D$@}qg(
zEQDvW&!D1xhBuz&UpN3k+>b^?s>b|CdTOTjtn;+|NPU%ok=9<}8NO4t{VBCqo%EuB
z0_3c^dG)Op4W@&_d<*#*sTEpu@$vAbzJU^tCWk}<ujdR)EpTYvEN)x2S&ozmc`KYT
z^>x3Nh~gE5v0dq!r8%ooMOf(my}?=%7tQl#!Id}0M)LyKH@&OQn(Keq%m?QJVr^m1
Jcy8_y`agOR`||(*

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/places/unfiledBookmarks.png b/browser/themes/pinstripe/places/unfiledBookmarks.png
index cf97942445c8413dfe678f9fca452a187e65f047..69495dac0f98c528bc1f12514de6f61ec41ed2d4 100644
GIT binary patch
delta 562
zcmV-20?qx;1<C}FBYy%BNkl<Zc-p1T-Ahw(90u^;eSe8vL?C$8g?15%F)fxT7VB*0
znlg)CXlu4Lo#q>83)^DrB1SJ-v=V}}=)EOz%EC7=a9PtacaHA$xaIWed<Pp1Mj>8&
z;NkiHp2J}+?KgLX{S*>8R2XFZe;EGW<U_O7S#s6&Xjabn7k_#qzulexz%Mb8b;@$X
zH1=^i{B&X(`x{L~c|S~H^!>N6);wg+?O0$n$(k+??P~3GP5M`&o6Vh0lvb;Y(%BrC
z4TzhqHrFI=Xv>z@lC05mU3vS-n?*UJteQhf`Qf6<6dV>-Vz}jfwWzsdKT2B`ib{+#
zUb{Er4@#qNKYwFyWdpeGJ7^ks2%Y^gp-f%&=6%iM%lCkE!Z0{YTc)}=u*c?nFc*%c
zpf>hmU!5NHW*1al9%%aR6Ux+OZ=9hA@~@-AF)~M6cI<q=<>jXtL5QbNT6G*1oDnq_
z2B9=LP-k%y%GA*<`z9EXFg`IQG@R?Rvih^V&&BxqR(~X!LeAZ1K2+*^P<5uCP^OM<
zc|uIulD98d?dfhlCZ+Ks6v6zGnDy@KJj&H=sL+@RW$NfwfVNDj@8T2dY4}5Hc?&@i
zBjY}BZT76;F&}kwD?nRzq{YTd=?yHe#tZo6!IBUqlyiLn+Ois5yE~GQGD0kg?Ffp|
zj6!?G!z&b8>p_`Y#&5@=lNQebm9dun-pK68ALCNB{B;sWHvj+t07*qoM6N<$f+o}$
A=l}o!

delta 696
zcmV;p0!RJI1kVMKBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!
zaY;l$RCwB)QcY+RK^T3z*=9H0C5@#>Z2jqv+6t+tpfm}J6oRx>krEUFB6v}$g2jv8
zJbLsZ=+UDh?XgOsic-<~L)AmINMlRW*u>~&w_DQg%&s$A41boS9{k`j-^{%C_S<hh
z!F63!i*r{$#v%A_c^j8rzkhr0cr~7g4Z?Aq%h8_gkt2OOB0S%SSJfbO<^8dSCar_Y
zO2`uA&}NqNvua%7&o7)Fn1~Ayk}M5#MElzJSx`chxKN#vJ~28y$<DuXxNsjmymM&0
zY|wx4r78d;iGP!=UBOM7Pw*?^T+YGLvI|N8*#~TE5J6W;P9e8M-;AeUvCsAl-Hlo0
z3i>aMPVI^x*zK#;M8{!0AZub?0kr|L>cZx*EXT}zm>#;9*i-Joz_lA{Q2tyr(_fKE
z>sTr}uuPYMt;X7F8V>RcIuw!y=W<QifKr+~+|^ju+kYJvf6lyxo}<WT2y$}-*%=#)
zvjl~C0>_-hi9}fBT(0p9&JPT#HX+G)Jk}hnB`E3!^0TX0{AQz&B`|f$Dxz?xi(iI;
zpi05HT*I{@B{Ug}Mt9bS>Xf08=MW?XrdKk-kG$c*G;HY1Nb)Nfe*6NQ%Qajp5$2TW
zKHBV;e1Et(nDQDLJvD_@yNH1L$=e&nPSn)Y<H>Mu`Te<OZ0u=LvWcykHWag9lrP)b
zUt>ONKo+tP*!xOK36ahgWD4QGXGq~%UI7ArY29>PO2zPC>>ZX@LI~8V2sbw2_`$Xc
z9@lyXioa&v#r}>KXqtvEISYYcJ=z;&Yz@g3V==sDU~>bh;<B@K3j_WcT+4bua3*#3
e8U8bV3orm7i#Ocw^eD^#0000<MNUMnLSTYbz))%c

diff --git a/browser/themes/pinstripe/places/unfiledBookmarks@2x.png b/browser/themes/pinstripe/places/unfiledBookmarks@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..44efd6aba3ac683c3fe49b32bd4665489d652cd4
GIT binary patch
literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EgNkl<Zc-qaC
z>r<3v7>A!e<{wZqP5(g6G&Pz{Q<IuBBxeypP)@tTF2_L52Ze`&vVfdc5OEk$5>m6s
z#=>!$aZ+pgkcZ0YpaBWUvMjso!Y)uc+}*!-dYO%OkwZowu9;`<!}YuO#Ti9vdE1)u
zzdqm@M$5=mqJ_)r0V!q2yphPre~HAwai{QvxA2#-Xzc23;~`oN>^Ke=oE{HImaU$M
zX5{tn`fjZD065@+)8he2rAHU?EF*JkPFD4s9l!r#veSjH@6fwxmCFJ<*o6ZwIN=_$
zI)ytzUvhLI{*3Ioa`R%pd6Mp$9F$StNt-qK%K|&tg##`)nSddyOSmI+2U-@A%*Y=H
z$42jsItch^^Xc`7)MeqrN2vQh4O&LwgnQWL67Gn^{mt&IXJm6%Z#({eeYpPWEm|KO
zzap>;2VBkFz3p%#V`Rc5R767Y5qDx3`OTgFTfbSRsDEsdbfrdm$v1LEU>6R!;Dj3)
ze>*^1WK?;Mky(ZlhC%Dp!vS6buLW!9g)N~gVk3VA)dOdCb%y~N$THcd1rVCTCY2yY
zUc7p<ci85n`{Ps8^X0dS=oP<ciZ^u8-rBRIt3OZr#*Zo4_z5K+xuB55Z`9Dk3}&%|
zT{z%^6K-T6%j}pIK*Sd`f~S~NM)r-^#s;lU0(*-NE0WF8SrmJ)leE>{lu&n$bPXR-
zQd19(0C=N@9%e9$9c5QrR7<Ll-4<jpX~;BB&Il2g-vBl;vZcHC#Hf9muXQQB8W^ic
z{8K7uw``}_%2T9KzQh?ytosnZ7~qW>dYDmW{ZlKj3&*?<?v@WObs!6wmdRNmVsh(1
zEF*9HeE)ls-9`M5gFgN1^S`(?jCSN2DWa&AqDtB+y8I;n!uR<zcax_248R*T^e}^2
z>|hrTxD+Sc$Uqh{$EWy!=$ymPGjd;5d(D_*`jLsR1eyYavb-T!OCj0y6q?&aI}2NA
z*MT;Q;$OI@yn~`EP6518Lk}~U#SV5AhbG@Zsuvl^LMF1s?(AAWM)qF6eVIQAnH@6<
z8v<gK<u@ZUC?LI>wrAI~w1GnNj1<Np;l;-&Vt*UJ8#VMW!?ShR!7dzd&3lo7EMy{E
zL}k_J898jRTPIwzWcR{=$x43d1`5cmrJ#Lv6wE;(IgJ2s)X>8WX1#il!C5wBGD#vb
zvpR>7cIWJzgPWePJ7;LnY@>Jd<>Z^p|JkG-qHSqaw2i|6-l(C68O&nGn-5vYM7D^?
zFi2o=xae1tjqX0M{)2lXRvNO{$yZ-SZzq(})<nsak&jLRZ`9Dk3}&(8(S;0TsktKj
zy($U%%@b&P<$-mQPJecd-ij-vO>srEDZbbp)Rf-o&#z&2Q5Uk*T(L9#kOTu<T#O-$
zgGN|<{QMWRCBBH>*pufDYUp7`nSGp3%@tv32PMGL<A5Ce&^Ju2XD?AfLnpu+wfX*1
zTxzb^ky<Iih;53N00I_esU9^~gr-zTV75DHshB(*g4%K%YOdIxT%N<o@k!SlL(9Pe
z@LoQ1$V9dXNh%9x<mIn!U$ITi%rW$YnL`#bnFtZAFI&fCGV(tr6WJn2FTuKi#FD5$
zU1=V_<&%Unaye@kzn}i&;Uggeb#g6P`vd+29PtP&ubU;^00000NkvXXu0mjfMw)Hk

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/preferences/aboutPermissions.css b/browser/themes/pinstripe/preferences/aboutPermissions.css
index a73d18496493..6177d6850dad 100644
--- a/browser/themes/pinstripe/preferences/aboutPermissions.css
+++ b/browser/themes/pinstripe/preferences/aboutPermissions.css
@@ -36,6 +36,12 @@
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .site-favicon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+}
+
 #all-sites-item > .site-container > .site-favicon {
   list-style-image: none;
 }
@@ -102,6 +108,12 @@
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 
+@media (min-resolution: 2dppx) {
+  .pref-icon[type="geo"] {
+    list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
+  }
+}
+
 .pref-title {
   font-size: 125%;
   margin-bottom: 0;
diff --git a/browser/themes/pinstripe/reload-stop-go@2x.png b/browser/themes/pinstripe/reload-stop-go@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..704c7a894af75b78a5016c08623da06ad64a31f3
GIT binary patch
literal 1850
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
Zg4VS0iBIo(ae+S(<m2Jz-hd6y`45*9b8r9v

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/searchbar-dropmarker@2x.png b/browser/themes/pinstripe/searchbar-dropmarker@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..4e677b0e63ce18cc67033e4211c823747e4efa0a
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^>!3HEx3Z6Ryq*^>(978H@O+CGl_mF`I%LV<5
z7t^^Tl(JJMUYVw|v*6*OuBV2ZT+0$Tqon$*H3L}OCp?;~^WS>)R=<{JHSMKyGSvQL
zUOUDRaqg!N_rrGA*jyh)&82;LEwZ~x-|u^*e5_)jb)s{9c<C%>PQ@=@6i)nlx83%r
p`1`*O=dWIPr7>$x@!~gk<E>0}BOUblB!KQ=@O1TaS?83{1ONhnONRge

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/searchbar.css b/browser/themes/pinstripe/searchbar.css
index 3c028703f164..0a45f7510b04 100644
--- a/browser/themes/pinstripe/searchbar.css
+++ b/browser/themes/pinstripe/searchbar.css
@@ -45,3 +45,19 @@
 .search-go-button {
   list-style-image: url("chrome://browser/skin/Search.png");
 }
+
+@media (min-resolution: 2dppx) {
+  .searchbar-engine-image {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  .searchbar-dropmarker-image {
+    list-style-image: url("chrome://browser/skin/searchbar-dropmarker@2x.png");
+    width: 7px;
+  }
+
+  .search-go-button {
+    list-style-image: url("chrome://browser/skin/Search@2x.png");
+    width: 14px;
+  }
+}
diff --git a/browser/themes/pinstripe/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png b/browser/themes/pinstripe/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..875f73c5e2080b247f9345f10677fdf42f33039a
GIT binary patch
literal 1350
zcmV-M1-bf(P)<h;3K|Lk000e1NJLTq003qH001Zm1^@s642_R|000FINkl<ZXx{CZ
zO-Ni<6vyv;Iinc^8Z}PEDXC<U%%Uk23nhy}x)DU`s?dmwG6cGC)y1?39YYr(b|FGZ
z5ld;a>Y^1S&@}yk23ydYU=v%^IHPEjT9w2wZFC&x&FlHgeQ>?J=jhCPI@o*QhsX2I
zy`Fi0&;1y;uIo%udbpXgk~AfZ5=NO4MhSED?D9{gff7b_%#kpcfV)7%Ig~Iqh~YL7
z#KZA&d=f_7$dd(fTZyEE$uEjor-*_WB9vJmiX;jocaBR5Q~dHJb_rg-Um(B{V`WnJ
z<XzU3F#8io>=v<0@bb$o@Jrnzca7R(Z0s1XAWT3Ip+drl2Lxffs$=ZkW8`JbCv;0d
z5at-CLJ-9-2_r9OYL6*E6lSvV8^TzLVkM3&jLYQj>`NF-cAPj#g!afuKE`X~%Q}oY
zT)PNUCJ7^VOohc#=CNxj^ENg%zT<Mat`S#>D|tZ9HH@)anELwq%QW|G;#=Zo9*}bz
zV{E8n$5Qt32bVs)`fkT$Z!G$2?|YX<h#!et#5bH<JT`(H<YJ7;QdZRFpPiVPxE>CN
zACR9SR)}Q_@GON~jKNqNg~^VOkAD;jh3=BSPCO;nEWopM<YG*bb;$P_cl7<fE5Q??
z5ns(I<`11AA{Lxs$U!c~<l9^JElf>KjeBft?7OC>rX~7)j`*FJlt63_ImpEryM>`H
zbd8RVe%8>?FipSD5ci1RBoLcH4stQ3$U1a6aK7nS<0rlGuWRe-7Rp0sS@2Xd3%>Bm
zPAG<F$U!c~n9Qdadt81*OTzr{@bDe_S;=FYM4AJi;Tg}F#~24T<ww+w$)Ta4ud1u7
zef)!^C3HMP4sva(Ll>F&n=O=;2UlWmzwv3MYvXbG@oE;V4HM6E!VEDyLk@B=MxMv6
zd(2`a5}6+y983g*!74uSCPznXU|=AL9OOE9Vp?o&Zl3M$@Bcm!2vo{-AlBE{_XBc@
zs6#gsgp<>9Oq*O`iMqPlrHijeKKG;+(mra+fWK@T_=sJ+5cvW*$i*0pwU~29_v}{~
zOgh)v+WLS#_^Qw6tKzX7e8k$?+GhAtmvc~<?K(O-I_~%M^o)5t9-O-Hp*8r3b#`{%
zv!M=IoSgA@urzLIY;$UrO`kh^I@$7K?R8gbQS*Cp48TY1T;y~DImqS9sWCohB}$?9
z7)(AFjYg;9@py*(697J9{AFaB^R`__EEXH@>gr06kAIRX_=wq9hbW2x=G`JP=`4FT
z|CCK%c=e_GFF(h=%&aDL03R_tLk@EJ7)_eXbV)1pg1JE?y1TpoATc}uK4SdYLD_a4
z)TuwWx3@0?_zu+}cgz-l*_&${?8(Cvn|ib5{4Y%vYc~LV#PEzSv4${Nsbg&auIyhT
zN&C%R0H4PW+P3SUjs7NZpbp(+DKk38IQ(oZ{lk`5*V%N}TP-&Le8l)ah;cYF6UNq#
zF%0*Ghn%%T{QAVHI&`U9WMMLfFt{_#K4yQWHdz9|=XWhb7_*Ma*}2Ea_JniT=2RV4
z9g`7Gf@v<ovpavWSpc8M(n4P5pgQLNV!B1whytaB?%9y;cNrmH%eV0>VG0*VlTT;j
zVL;mK#U(6faa2~qI3SRCN;5;-<?h0iFwX2ZatCQ9LTFO1z87(nFgAQ|W^w^FyFluD
z?G`1BGXm|#o=pi;qNapV!YEV16k+k#N&_W~>KJ88m?L2S0cs2?Tl1;c0RR9107*qo
IM6N<$f|C1(vH$=8

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/connecting@2x.png b/browser/themes/pinstripe/tabbrowser/connecting@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..97e2b2eb67ecc58e98dd839187143ab6870699e5
GIT binary patch
literal 30143
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

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/loading@2x.png b/browser/themes/pinstripe/tabbrowser/loading@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac928c585372bd72707d895c37c9e11931b327bd
GIT binary patch
literal 40165
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
LqWB+CWB>mG4ll9t

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/newtab@2x.png b/browser/themes/pinstripe/tabbrowser/newtab@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..ffde5f05086c366c5873e0d5fa383f45982ae002
GIT binary patch
literal 1742
zcmV;<1~K`GP)<h;3K|Lk000e1NJLTq003+N001Zm1^@s68?PU?000J+Nkl<Zc-rlo
z-)kII6vyw*?Cj3|NKB1_Z4LO~iwb?QFTU+R;ftV%V8MV73N8Aew4x9F1y(5v72=Bq
zjMN_w4G3bzh))qo)nFy4wG}0eZMvKNF*`pzXL4tIa&zy_taGzjbOyfc>76roF8j&%
z-g|CRBM1VPX}gYoF`6=1cJ0KKOQ?ab448gMh7ijn%guo8qN7AWCYK6aVrUsKy|84E
z@`_jmE(12?=}?4)vbgdJXqm%?42mUy6$gza0ha;Oa~Z^8CIMC8Dsn~twg@!(Z04{b
zPluwjC@cz1bXwwRF)c8B`6OsB*CcNn-nW&@^`sgP%@L((lVM6A*<58oQF~G0w!WK?
zw7|xy)#?Z1<Kyq3FvhlB{AnKp2=kyhu6d2)$;H5;ZYps&mE+Gn_Tz~c4t<Zp7~A;0
zlHj_2&~n-wRxB2;RVtOAP#6!}VG_r$f_~##)ifTl&^7zGDsmEnshSh}n03#Cp)kfa
z0<GM~ZKkZaPQ8X1hH<M<D6F9{9)UGw1GLVyu>;OB70$AWv#MNU`H3l3oO(DE#@zAI
z{m5yy!fB@XejS?*9}Y`B6viU}%on6{a}l>@m8iQyhn4PN*2Ml$7!z0(1u)f`re~Mv
z`@TyxBEUQ@e+L{U0<$E*B2^9WglTNb*z`wL$f3Y2#g<>6!@ybSFqiAU=CE9XlZ>dg
zihxm<l?^k;Ow$O3F}+9fZPHKQlaS0|>FO=9*0M!#29yrB9o7RzLD`BLO<JGD0Tb&Q
zQIp^*CxV4>Tz<-3+qUt*JA2~yx&&C4k8!U;NygJ}D=&jqqR{fiO3z^!3$RKF3Tk7J
zDRB(8>gR0RJ|$DRT%Lwn=N7=~qA<obRX+BWvM$0p>pbXPg^oc^lK^XCTc7;%1B^!o
z%{qPL@$X)Ld3pgf51IqbfX;$Wo<05QD~0j9d%!TpHoV7kX81Gs>;m@1p(ziBV;yFi
z<_c`t7iF?6YZ<okHzHsdW1A`;`_kaBtDwsYT>&)+um*2a<zG!W9@ScA*mq8`>b(b~
zs_c7!6{>q!9^Hk&AjURTKK8}rzjk4X*D&}g{2RXLKV<?yYcQ>}$duT^HdQ|MrC}|p
zgVq$n+N(o=b$FX9zn*q5_Fea}@%tZ<s=EInR;cWO^~(%}F}A7lv9GjeiH_%aR=3-=
zWpZ6N5BL4ZVHjhZDj)m8K2v-@4xcUx3gNu~<Z=ZG@{^1wAfEx<g$A7l3tBg%Von2I
z;Po7aF}A7lu`gkV8wl@?1y*mj+Y60G<C;wMdc6&RiV-l3u}zhaeWm=Vu7itbL0>9#
ziLU{X!z^s;lRrDactlv?rsk73o`3P&v$dmdK2tk>>QL>>YfshQKK5j7=A|cU?;n2j
z;GA1uh4sq}g)z3_J<P#ed<LJzKCmycX_7&UcNm{it}C<-t|<|RmE!U>I4rJzn*g&l
zj3-dQ3SFExm}`M`;IoT@IQ#@dITn0+t((0~2gVk^M{{|MeYj+HkU<NQ)M1N#v;?3G
zQioxGOEJ%+y|(lR>tav*-8ljb<0YCSYLGJm0xbg8{b-qeJpVKM^y05<{+r*~XN!NZ
z&zJsU7nfJrSC`k=*R0#>0mB&E@E+!1E<S_LVjtKScNhgWki(Lkba>>X!yAFZIUv9S
z4SlJm!w8zg)dsb=n*89o$pW`mIAgr!-tGK0>Bkic|1HpT9RAW%j!`-3(0TY9NT$V}
z!?-#GSd*v`o^(V<Q=2Cp4Iw82)*=1L9F}-Wj60h0$&@$>XNjI5ozC?oz#Iv%4GyMZ
z807HRFd|?L!DSIJM*_^(IwfMq<ku_S|G;6M08Iugf>K9Q85|b>i-bD4F9YTZ@6hTn
zd_fUlRZ;v*%-Ka)4mr;&X&euo4g+Bg6J6G%E^A%C!fyWZZ77TdcQyOC%M;$IWeuyt
zEVu$PxmI+X9;B?(E`WaEx}b49LCh9Eg4Ur^<J^hq!*4x(@CXWHVJhq>oaIa2r)5eM
z>!S7DbQo;Yw~dFl>E49~3D>lC$zmO<s6D}&707nEI@U1Vb=II|#TJR<iTi(Gnx{*T
z6uu$6_m<e)>?QUg3S$A1vflc)XNlRBe4`U6+~x>VpQG5iC)yxo!1TC_DT-=Zt92#L
z@`T-NtjjWBdcnm(bK_1jGKUQhRv^@W6q+pdlWa0FU^@>jkQDDSNXo5y25k7#q6(ZZ
kxt|zT25fkaQ)%GqALCVo4dAKT@c;k-07*qoM6N<$g0bmK6aWAK

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/tab-arrow-left@2x.png b/browser/themes/pinstripe/tabbrowser/tab-arrow-left@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..20bf78db21347a968e519564dc6aa39f4cc5fa78
GIT binary patch
literal 2768
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
W%1!dCU^AQm0000<MNUMnLSTZhvqmuh

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/tab-arrow-right@2x.png b/browser/themes/pinstripe/tabbrowser/tab-arrow-right@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..d319accc51cf1b9d0dc2cf4224f1349def1eeab6
GIT binary patch
literal 2732
zcmV;d3RCroP)<h;3K|Lk000e1NJLTq002$^001Zm1^@s6PzTIf000VeNkl<Zc-rln
zc~DeW7Kb$|8iAI5Z9r%QlzoUn1Y}b|P*I~X$+$12xS)XSvLoOU1Vq9_iIXX(%4p1p
zqG)PH!&Hr988iv5D8nZ15v2@;HCl7#_pI}(x?Tln`^g`PzN)Xfn{NB`{XFNM``){Q
zi0C&<_L)8z{42bpPA{JsqzS)AaZ*V`n4!JE?@MI9N#dl!Sj;e>1BNprMEJE1e`csu
z;F~9og{g^p7w7^#pfAFI8_DmpL>9>M-UM-?v>~E2HDL;10E~b!FyTidV8HL|stFvX
zF7HhdH&jiU9vH=f%zy>30@jQrFlUj5Y63?{<^A5piP<(nO`0(aQ-aYz1swU&0od_-
z7A$a7@A5PkHw-A4VFNLE;gH4|q}kD%I31q16l&6JSduev1@4R+7z@U*RBK?y<*V11
zy#AzFT3J~YnVFdt<GIy<$m2NX=H^w##>V@_I9iBPFH>D$z!H=|#e%$yCN4W?Fkwjp
zo=*V2;6308#sNo`Yz7SblGoQ@tRZY0eqXr&23Gjm<#8Mc`wL>!3gG!ZF^-nv#4<Gk
zmYhj0z{@ajb%S1L3h9TYl5x=5pYXR(5CkT&KzHB-Y=L=Snb+HZ3~-d<x0QhnU_B^<
zyaFLRUZXq%eSQ6d`0f+n3s414Kwgy?M@w<~T&C8XZElJQOPUms`DC={z)KX<^2sE4
z-6gyi38t{X37mb-{mJ{)0X=#0#89D72+}rz<zN}hE48$=+#*MwG>)F0-XVPNm!Jad
zW_ia=O-=WTakLa?!e#21`S%x|hC%CFj2G-Di}-r7NVrI*%d2S=M4E-h3i4*Lz%b4}
zFR46f!|1hyo<Dyc>g42<g5MVdmVzZ<E!YWp`Euk*<Jj8T{t4eJP!4v1J>VGR?GfY1
z$T&yfak}|`2~I2ieAja0ze$<aNLEQdlG%!CGKktj7GWE&;4|~U3@}+uo|8D|smU7-
zhW0fm&u7n`P4o5j6|!y>SPT}i$YRLLl_O6Y$IZ=6$neiVsQ`;Sig~tDjH79Dkj!xo
zz`d@O6286pqQGnY!4~U;@5wf!iIgb~WU=xX8A6`rlsG}&M<5zZVR@e1ah06G3SJ-T
z^fxH??(Xg=l}eR_-?;)T1PfT?4s_fcx$=ZVjALzWUCHITQ-DPtk;v0@Iby(NHkv!;
z`=^>H`RLW>#m=h_JhDyxf$X!I$u9LWS*@xeqv-`?H8uV!KKBXBo6K{bJIl8OMnDe?
z?{8p(!8i;m(%#-aflKxi@G)2kwkeg$Y&r6TLyXha)fI*RjNROnb}+laHx?Ea6%u)U
zEr8$U>@ek0a|S-S-%;?9Yn1kN!+&?X#2o4zo%$20a$3kf{R$~pA1C7(1!Nr_FJ#`w
zT(%+HZC!Z2GZnLr2hguP&(6-y>2`K@@m#VWf%)7xw#tzw9%7t(_wLPvBtcdQ*v9Mv
zho$nQ;(A$<SOG^ayMUbUDDs=DRJi{_PnFA>!(FQMOXQT-PO6NnWV7Z3na(UC>xh@~
zJ_HfKA9w&2XPqG!$pg?xp0_Y4NZP>VIuFd{rcsE$XAzMF7^;Ohb$Q<H?d`MB7zA0L
zf<mSQ91^68arzJ^EmwQs2K+!c<jwo)GVR=Zu6w`Bx+71WGOp0rEgj^Pb)D?io+PvA
zt;oED%UrS{z=yL|$xTP^RkGt9mKP04v0SbnfH~YW3LG6BlX*}YXP)#B<FvN6&Vjr#
z&bTd1F*u0K-!8_{uv~4$d5-6<IVjs@e{G=3%Co;592a}^7nkho<XUuxTyk!Z{rXd6
zK5Hx4Mkbx*M&Zl<-j<t$zQ*F1A;71tt!=K2jg7Fjn+>9wg`j}TR-u(RKEybUjg9k7
zOiToEc_5eB4!+{DRrDrKvYxZyd1^ce1GB;6ygG{g@<-ZNR@YVSnf|YC_pNuxWBYw_
z&1)i6>?yLCRY;a0Yc6u8x&k|Kp3|li>bA7BL_^$C7B+*41~Ib5@gc;ycI}#wbwzlY
z1G1SMP!4hBa>aqQke5<?=J6rVl)7%O?RUw$_-FF|^dY(BHj@2{1DNkNy%ur9PoF;R
zjI)XyZVpi(k{{<sMMbS4qKR@!m8A`@si_&OtE*eZ^IIm!;Ku@gfB!9F9O+t4(^3UX
zz`D4@_cQJ07Cj!9a+Z9GAJBWHo#eCgA-X{W1tlK3ajcOx$t~64b#--PSXv603Bo}H
z_#iMaFouYx0vBzYgD9=Gw$_=Y31opZkPh-ZJv|G>I2tww3vLeXVsij<!P2<H4-(M?
zezsry1$pIOrT0r8y~I2JI{7D6->SVyJ5Jo7I62Kh=hCH1DxCOdv9#%63YZFJPntAo
z6%mC4Coo7xSJk<2;esPh{6ELby&!|*rGjiPFRubIjuy)iFAxYK!H0>}k5?-r67SnD
ztR&CP=gGI^9{H6c+X@;fFy&ZBO(T{5?Ha|)S&ry5G&DFsnouT*T$-UE49rBPt>nRs
z)ph|aN~^E0S3#O^swId^=XgmV6PcDL#?fK{?7~?S45n{7(zzH5-Fps@=9O`t{7UbW
zf5j6TUvv}FYC4Wyr(KYiCT9VxbNlvfTSG%baS#z87=(c7khVf=X^beXxw+X6(?A7F
zO9csF6W9!Cxndj*Pq}o}%5*ev<@qf%<@nP%%7}yx)xyu{51HpFVAlhhRM|zo+nOjS
z^`*3OERZ*Af6B$uaBVD&2Qd`{f*>$0ARu5F4`!UKlYEwjj20HWl^_{x1aTnM!^0z6
zjHAU#z7<f3^ILLFSA<P?e4FE<O7hA2o&w7sQt;<b$!|w9q#YNel_AqI<ecQ|;1o-c
zCd@DKU^4J$ap91*RE{)h97q$dj3k0sumL1PT9z0`o9l7vmzB~^_V_Eq<Nh-S(#B`k
zQ*gy23ft370mZEpoOWE8(@G$1GfUI%vJy_Vjd)Ir<GIX_#ZAFdV6hx&(l{tjL0AQ6
z^*XQ~B)Yr1XR1qkMR5wX3z=imPd)Rp42fxTT2w*4IrS7;*-4YDx@l5LJB6g5=s@=@
zuD(ubvM*$^xD4)|eoPoki;zf@E3Sf<8*7;amKLEdO-9D4AkM=!GNsig<sTFVX;b(0
zP;glXq}6tO+eBNDZAsiX<Xt)kI>MD%Ov(!cVFG@Bev5c8u5x5a<Mj0OggH1kWD3Fr
zTwPr=#5n9nD{<;KYjAcj_Ma`!Hv}Xexf@c_Mj@r`6uP<g)|nQ{KY5elc*!vyct~#6
z7{1cY8padyB0@q!mU(-7FYjBL{42mdK0cYaRG%Zpd7ZZhA<nV>HpQH4e~}iJ^!3ev
zxC6J&wo}IGW?I+F?Ll*`ZVxhpfji^{;StD^)^8kSUa%NvAZ|zt@-Ez=mGvDjQZC-1
zWQbceP&cH-L5&elqXq)uP>(Z6^P}G_5G=ri<tg*)$R5)E_`_XV!r3)YTOe4Td_gke
z$lG+o@{Bo?EFn+%cGHb!+r0EN+~%d%+cvK^d1K+oUN#o$z1>)-*;dvO{cUAcm-cq^
m^xMtTvbO8L(+gT{*Z)6|$e+*Bx)>$^0000<MNUMnLSTX-F*Ygy

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/tab-top-hover-active@2x.png b/browser/themes/pinstripe/tabbrowser/tab-top-hover-active@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..a8215a283d57a01334bd53c4a864ad373cfc4cd8
GIT binary patch
literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-0009*Nkl<ZXx{Bw
z(M}ps5Z!xsy9icEL1PRL7L&H|0r&@FjQFSzeuS?+@Bt=%gP*_?KhlIi`qYxP35J?h
z5~D`j7<W6z%q9Z?VPV-#=}vO8T*A&dvom*gmwUDAy2d<08^V-QejrT?m=i+!kT$j^
zX+43BX^PLo(Ii-mR|K1nlfXOI^Jn&P`7-S@ASK8=0T7g6EHIKj;hpFCv4wx##~o;3
zO8njw0j(0=61E6Mfr3xSbGO*%stC{&T2;^)lR+&K-V^eKEMM(O%6bsT0{hG}$KrtC
z0trl(ADk}}J`i57tgNWBvoovNY}(y!cY(UmRDciof=~Dc2Xifpz{V;`?W0-1af+~s
zD|m2lV6|GUM5R)(3Wb8sWHM8y3qIfrKH(c2oUKjfHpguy+DEoPuz}8XczCF*)vA?F
zryUw!6Mhidgzr<L&AzVT8yw)`Zn-g_nFNxtH-sgW$octs!m_Lf8eec=e+W+j%&{l-
z1)mq-02i0#5^K;wmLf_ZjluEpv6anc@95(t3vp)z_`U=eI9W?t+}{E#MNDM1x3`D!
zl@Xp@F{jr|0xd<wH%=p;&)?F)2{AB-IStkjcvpPBQnqd18zCEW_UH(r6nih9<2=rA
zUJV3uj?^~kBh@opyc2|M%<1cSQ5$n=abU7CBErny$D*>CypPRwDax)GD*C!&T#9ii
zGNS5=amM1n;;tBX#kdqhDaE<JkIn5Io4ePRxD@}jQjEJ|T#6BwVvn;3OL3^CIAf!-
z7O_qJPp~p3*oF{d=3dk_&Z303Osf)!gh6n^o@3wyH|vqhwZ1YY7yIN+0V9{oImu))
z^hF79f}4kO2f@%qKs_Q;CSx66Zf|ctMim&idAKfg4b7Y$GBIV=-VrjXRLVFxIk}5!
zVu2ePpoKN{XG;wY%w^*`#_pJ+m#x#&)BClxwYyHIqoV-0p+RJ=$Qmu7`{h!k-(X7u
zQvZvt(k<<jdD!3If2!B(zZ;E)9R<J*4bTEj&<2gHb^NYKCtMM})M~YF<#M^(ZnuAu
zxi>dAW)uK7G(Zb9K^rtqe1qQI-ThiBl|Jt5?0h;pI{F+XpaEK->A!ut{|kuaLIcUb
R+(7^U002ovPDHLkV1gobpZWj*

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/tab-top-normal-active@2x.png b/browser/themes/pinstripe/tabbrowser/tab-top-normal-active@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..658b291d3940b0a53d321f54ff86e2ade53cf82f
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-000AzNkl<Zc-rln
zu}<4i7=^Ko?Igs;K-$7kAyo<sv{HlALP|qI)25*<bjd3q!HC4d!aMK+?2K%PfdPaV
zcml-00t;`zLjO}8WHmyCVBdQYilq-JQuLqm+1D3EcF)bt&9mg64;>yBAT}V*Be4Oo
zVjg@X6KfOc6<om+d?Aw%pR-)fjztxUS>#s8W0^i75JDj$1052PkhA(Y+lvL6pR$-m
z9KmI1UU)5x3m=3Tp^}gp&Kl?JJhNP8TOe&Qhi5P=3<)KaQA~+hS!O%wiN(v$Wxy+;
zjNl*$KCiB>P8}Q^OkQ4ImSo2JBwz++VJ2o%u8d4(yX;~m7mM$y4A0&)0&BI}r>m<g
z%A^lwBZG3&%+9cjokXmC3Fd_orOMaW*C_B#7!_U!kq{&#;;d23Mh3DdS7L{FNhT8G
z)#A-O8%0s&;^G2VYD@@)ydpwmAPbquW(Qui<YF$j-w6y~US6J-?-miRi6Sy7Ho-1#
zQZbvCJ`kpa>dwy2WPGKx5F!)V>=3Y%om9*hLY}ee>FMbk1nLBt6q{uiKMk>r5D7JK
zc6Rnsw-_>!O(JwkD(19{ot&KX%Xj;9g3LR_oHWD+ggJ10d>rZ)LngAxKv%32vBSed
z{3Ffj1esm2M~Hm^#>AMfOl*IDA6sx%C&*MORtLt!n6E<YD=;R;d}U(0ySvzeGde-0
zO0jRim>BcBVx5Y~PY7(mzD|&-Qmg@ti7{V=*mqz|jQPsMwzs#j1$#O{rb@9UFeb))
zWnx=fTiB^wogh=C*gP;M#{8~Wr(&C%o7ky(b%IQlVn2W}G3Kif`w5JRF<+V3#>NJ=
zU`Hp&R4Mig7!zZDnqt`}D3(oAYym7SEny3`b%M;>{ItaepODyKGO_rfUrrc$Dq`%C
zV>j!uVi=g`!|g@i_ZM2N7S_F`6J#PA9ngiH+)l+T;t0ObFBCC!czAeTZe&}x7&4Jf
zu_8P9>}Y|9irG9PIj-pnhBg|F83dUC*%Yg=Q;r?&hlp8syeaTe_>H9??_i9X5<@mR
zpbI*+zd-=*6SH}lM}#s4fwi@@sq^#mk!rQtYXW4W1G<nhJNoE+zgT<}gretpb1N$=
z<)fpcx6NiV#1b$8ve5xu&<Wkxk;nhVoWFk@r>9UT^wjHhPksxH?CtFp*Vota95^ru
qI-m<Wp&L4)D-Wk#>^brL#r^;aVB9|VL(Vk-0000<MNUMnLSTZo*|tRh

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/tabbrowser/tab-top-selected-active@2x.png b/browser/themes/pinstripe/tabbrowser/tab-top-selected-active@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..7de41e77b273e66b7578c11c96efbe054b1655fc
GIT binary patch
literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-000CLNkl<ZXx{Bw
zO-LI-6yBL^^J9pyq0y9DgqA{W)rzsj(nG--C`fwrBJ|K>@tRxdwFn-1@72<K%_$Um
z@Z>=~6h)*69@9gGVinpn>HF*(9oNk!n^iZ|9r&2tVfTCAoA+jRVV*QxG%2O9fl~`L
zfKxkR%av9)PHDHe7PVSU5>y}3U@}4tVE5c1r?OK=gEz;lv!xjh(JgRELxd4_3H6@N
zr5sgG+UoHfG36A$1BXl&0AW!=OzS&bB4*(TGq=gMr0$&Oh-ovUW=)S$n8tbuLxe|!
zaYBwTL3rX46a4NtbAhv0b1=jaRO#6;EoC!n3hAIZg;`9}*aPZE2-gV-9{1Wz<^tyk
z+em7W3$d1lYfidIKNYbQjXk73-QV9IFO^Eq%H{H_{r&y7H2%&DzyU6Bf*Us2R!XI0
zvuP<CrJ&Y>xRXflW1-K^&JL}vuD;3Ta{2D=?!IU=8uuD5aDWS(;D!y@Vw;_;;h461
zQIid#CG^dL?gwCKZf@>gp-^}kiA1ml%7m|kb;1{qSZA&>xM2gf*tr4AW+J@qih_wU
z)L$7K9E{J*%)Agn?9%-PJGMutU@knO!d&3ofDPD!P1t4)QvbHK;+W8$!7TM)jAn40
zX7d+aZxMbIs%HdnZ^0I9vYsAotr<=Z%4YsBnCvnJhKGmmQn!5y(P<XjY|~&3p=SO_
zWD{wq*4e@4kV>V@Gmg}W$gxd>HJtd>YITiC%{gJ3=I%L0>i}$1ShSqVFO@z!d*>J}
zg}pjjT6Rp>kX3wetkOV}r=MVz*EOFYnvIr|V@@PhpWsSoD-rX{u~UhdQ){P)1&#%&
z_&-MMk53397Ob(0vfcZ&#)4D~A{J~O!3R3{KnD>EB6blXCfabj7iW=*!3VnCKhRb}
zzc&xzIu&hBEo2*S9*)|j8nhhG3d{LeyG2aeY1REeX^-PcCIiJKBArf${c?<L3)Ui?
zPB!6_thcpWN+57*Z;XwNCH+c8wrv<k6$Gj@!uAuO*Fqh;=7a2m>KnShffuKyrf&Kb
zF}5vOi>lf&?X=@sTGo=aoG3~UWvRbPEt1dYZ~5gIY(oRIu%@VCDNEAVp5!AMJrz}y
zGF)HLhXuK?u<$gQOn&prG1!I%-W>X%jjIThb9yQsmgA}Nx)`B@fYbSFC_%_%GLfaF
zrF=G<MJg=&xZN*91GGRBv_T`ZvgVjxCMb>LRcvTxS65eca&j_0KR<tGb93|g=;-Ke
z8ZQxk__*D}b_rUb3EH3$T8*PRuEVN1L~N1pned76ac5`eL$O$VJv}}BIFU&Fqz8+}
zzp9z4&wz#^G(j6QLMt?D`r*r>H0oE#d?&0B-V@f^z$t|_*0jPJZ7YKQ0=|nxD8hth
Q`2YX_07*qoM6N<$f{=0vr2qf`

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/toolbarbutton-dropmarker-lion@2x.png b/browser/themes/pinstripe/toolbarbutton-dropmarker-lion@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..631fb1352eb5c64e6840cc082bcabf48ff7304d6
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000gE000UI1ONa4F3_h;0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyz)3_wR2b7^kSS+a%dm)H0UBJyuofuu
z&01#y!xV-thE62d#V|##{k0^+f34?^%GC@R46zI`P#DXQAyIl>;Xf<Gf4ToUSKK8^
zfkL4SAwU?)5Gzo)N#j2|0|Uc<=Ko6n^)?6c<N+mofiQ$Ur`!BL=YK{95ctpjU-iHK
z>`2yB25$y$=9DtW|2$ABur$|y_5VgK@eFYcamn8Q`TjF8AOoO)#($H5Fz0~(f@o4;
kX`%n3K$|%KGcyne0KZ&E_-Ym1ZU6uP07*qoM6N<$g4Tz0M*si-

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/urlbar-arrow@2x.png b/browser/themes/pinstripe/urlbar-arrow@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..59b5118ff601cb8f98ca52a9a28703cc2ce0240e
GIT binary patch
literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq000mG001lq1^@s6Y)d$|0003oNkl<Zc-p;|
zJ!*zP5QZhB&JA*i@Es%M9v?YLZjuA22#UBC7NQ`C@u#y%tSo|s9~iUQ3|LJeuLHgy
zRz8e7&+d+uWtp~ZTbE_|X5JS1So1t<&-1kJ`#){lKEeQP()T@8k)~;N1VBlWgdkN_
zT@L}KY0|Fi>M#s%UDrLJ0E+pLs>t&^Is{nPRYy@omDF|pi~=a*I8qgH9DkdN?oa^5
zI6;u2DBceNmSxdF5d8b`+ceD+3ZM+bKvkIbe!_q)Omh^#G)Dnka~!}m#{pb(48S#4
z0ANS+J;0vkAb@L*1GwfF5WqE;0=~q*AYDYfjgI4NZM=s?Qc7(iy@*s6Zzjohew7?3
zAL1kJtV5OSD!o`PqO0x9%a!XY88DQ1#5r%sV!EC^Xo^SOKU%wdS+xUyr~m)}07*qo
IM6N<$g2d35#{d8T

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/urlbar-history-dropmarker@2x.png b/browser/themes/pinstripe/urlbar-history-dropmarker@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..e7d4937b8d15d764dde4440cc0abd2f7152b9610
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq001li000~a1^@s68vb3Z0008+Nkl<Zc-rmP
zT}V@590u?+M@lFN3oMngR0=ALqL3`23ok6_s_3Sx=prJzO_DCW2r4L|n*zJ&B0>-%
zw`o}x&6GfC-(T*Gv$?bFZ0I6WM~>F{_q?$aG1=FdguyO;V>{>F;bG@F@B5A;qW?-I
za3ydh@IS`A9M+ek61bSaT9_Iie@7ooCNh~ORAJv8d-IlXts!>d_7^K!m;zcSL%#zL
z>kXX2IMOybIkoI^xybAFs^WAyX=37|glp-PU!!eksSTEa$|QkKdFV87&|<aSce_0l
z3WZ1%#gfd;%^|Q$c6&U%M6?e$MeE?V%Rpt2;q;$M=nV$;X0t5ICoC50Gz%P$$BPz=
z#V8mI(r2^9NJL$*2{^^BXJ0k&8c3yq><%Nek$q@NBob#GPUli25-mD#I2<Os-65?c
zlc$Ji3vk(XK20>j7oZXeP`4&9>#=cUlpW}Bd%XQT&$C~yU|30#$U8gxQwRjE5z!vt
za%mZuKMz!bG#t-0ttr*0hGVG4`yhIW(0Qv62m}aY2Z^W?w7})F<57GNs7QAU&BIDH
z8WtB9&)_yEB9TbWz@iu?tIZ~?uBN()s2;dNwm+0~5Ctm00X6voXIEpdkLR!Ze7ua?
zz9wum8YPd%`y(WZmoT;!xMDTm3-^EwltT&*6ur{1(3vOwsM&1Mvl&3ChEfGV5D3%Y
z6O1_mRlt>^=}zb|P!4^iF3n0cbjf70$7ZufFcbV$1(EgEl}@KmVoV)yrE0tttOY+%
zmQSEnwU@w(#Rlva0>P_nCScWIRdBoA-z6z_0q0sWV^rDJFLXf~C}RcM)oy;2YG|R;
zY_UFPHQ@bzayXn1aO@ChGGkQRdeeU!DC0`GyESF1t52m;-P1EO!ZcpkipW+*oGW{`
z)^LNb20M&_Mn&M9)o2yN;fwPN3+LF1h>ow@_OhYZw;!5S?1%GKqY4f~$H?d_c1$_H
lq5mS)LQUmAT_x}a^9x6Q`jGJYHVps(002ovPDHLkV1nR^Y}Eh&

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/urlbar-popup-blocked@2x.png b/browser/themes/pinstripe/urlbar-popup-blocked@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..4d6aa6f2009e0f025f4b759ed3014c199de36ee0
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0008WNkl<ZcwXh%
zPe>GT7>Ds48_l$f2Q4zF4&8zbO{ENttO&EB^dfc<EQGq`K~L2#U7|mRP|Jp41Vx5X
z9m>ceFrtJYi=d;mqGlaBL>Sr5^js!hrX7DY?(!ab;B)@M>+CYDRw9vzXm+-wRdwG+
zx^l4;ndlpS!H~|r?YgcUD90JpA_ti$g{SDm+lVjieH&gIFoFVPvPG!JGgRX}#07Ns
zt#~}{4Gg0m+3XJX%Yk#nt*ZO-BT$2ESLYva9o>B!Uirv&MIga()%N8RpvHBy_RR-)
zh&D_kOv}-S1_bA5?VAtKA;!b_gf`3=o&cqN^8r3!p?$__9K;I40TlML^Bs^2SG;|7
z;{-Yo1qmsI{R|%<2Tf>34VJ;h3`TGh_izFC|9%1-)qSg{r$@e%$t;-Kh|4I$e7!<D
z#vtM<OIlR-Z72L+U^fP_7^W)l98DPVeFrG+hyMtaVIW|94i;?43NVN&yz>U!l-7Ru
z16b%o0c8E?#T!I$635dVp&ylCm>j+Rum{+Ka>&}z2d};8p679_$1r#T9JT$h2WW=u
zMw;<k$U{)ge-7Yi?T0@=9b~<R@f5D$5WH$ZNa^jH4zLOz;ja|3F~fK}Zp#D6w=%tb
z^8w;Gj0wnoARk_qVZ0wjkj;7{+WYbV-%$v!T}Z-fB_=U}weUKHqk-duD#)fma2(Zr
zd4OT;Ls086iBaDHIzfTs7P=sNAzp-3_vHaPu?ZzeR|6j4Dq2A>kDo^!WY<7&boZ@T
zEG9=*BZjRggzPKUVHS_E4gRj93l=JI44WZ)gq_~t#km&MeJdJ`Mnbd(qbSC|^aU02
zvwi7ji|W3OFpZ-TLns0nO`#D<-#<na_A~Q)z$nU*z;*=X;x3M03M4qX`!*KRICh{K
z2e1XD$U_oOFo4&==h5A_k%?XcAyVGY!GGOvvX^pLD+X0H00000NkvXXu0mjfOv+qA

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/webapps-16@2x.png b/browser/themes/pinstripe/webapps-16@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..95dd0c90ebab375affc051166e25e5c2c953a1d8
GIT binary patch
literal 481
zcmV<70UrK|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004~Nkl<Zc-rmP
zJ4+l<9ENelCL|yhCP)x$wh-)Wv{Mk5G+J4>UqB=T@e7Ev_X~Sv@0}r~ooO~7LIe>k
zRxHw}D}qf5Z}aylPB9F#yPVy#D*=mNbKaRbPdg(b@}~aZfO@^Yj3zFyGSq-tt>(uA
zM0vp4Py)DU26qsbd-w((P_0&fL)!Q=(11#%vIObEKd^vux!izs(J&sME}zB=#KFRz
z>+A(zjR%xUrCo@_DaMo&*S2jupja#(K^y{(ZNs%48Vx8E3ZrO2lv_+=4zrlTjblGI
z8j#QDLl6x%wu}Via=9R+2R6R<6_CwlEl3}1{OBnllgaEu46w1I9gt3^#UNWdAeBmq
zN!kI)WKs;$4@e{uVvv47JRTQ=^aEnCn6z=#VY_a(X$M53QSs2kXIy%0m-vEHk4--y
z5{ZaQ3qG}Ndh7wUO`+-9^aH}-usHm~g4(*`Ssz*uML!@E3W@TJb&vfRi&(|6$3BmH
z2s#F63kHLe5G>;xY)o`|$8^9aJmL(0@r3c=1Spne6(P!jIv;Al2mHcMeC+i*?|;Xy
XVUtHDW|gfX00000NkvXXu0mjfaw*F#

literal 0
HcmV?d00001

diff --git a/toolkit/themes/pinstripe/global/findBar.css b/toolkit/themes/pinstripe/global/findBar.css
index 2815ac4ee81d..0f31def98e12 100644
--- a/toolkit/themes/pinstripe/global/findBar.css
+++ b/toolkit/themes/pinstripe/global/findBar.css
@@ -47,6 +47,25 @@ label.findbar-find-fast:-moz-lwtheme,
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+@media (min-resolution: 2dppx) {
+  .findbar-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .findbar-closebutton:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .findbar-closebutton:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+
+  .findbar-closebutton > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 .findbar-find-next,
 .findbar-find-previous,
 .findbar-highlight {
diff --git a/toolkit/themes/pinstripe/global/icons/chevron.png b/toolkit/themes/pinstripe/global/icons/chevron.png
index 49bc32bda36446a10e73d6126bbe30e3d2cc3f9d..b2d31e38f56dda9807001c84e1d2bc31ced0eb0e 100644
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp@K+MU(0wkS_^Bw{z$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gb3I)gLpY+769m#DP8#$lDmE(!aWnnnj?GQcNI#J_!_JZK
zSki-L&#st^6pbX0)ERpM_)ciCY+7dU;eg6f|7*r7MlMD^_q6zv4GWx9jn7Cdl4z1B
z(qa+R>FCjM)@_z|{`0y@Hq}7;Vd>v`z6mWV&Z^DU&PP65rK`4aalE!S_i$=i*sM53
v@t0$66I0LE`TVbb{O3*3Xi0F)VPtr}*M4EaiEoTRhcbA&`njxgN@xNAvglRU

literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq000XB000OG1^@s6FE|B=00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkPGf6~2R2b7^(AL(L5fT!b$jHdJ1c<$W
zY-Jf4naM!*A|@s#4+doL|NnpX<HwKtTUuIf1S;HOVqy}qX3d&lM@Pp^Vq#*Off`(p
z6@xJ2sZ*!Ct*orp^YQU*)YsSdUcY{Qke!{~25D*O4L}V}V8y?G{{~}_rgiJq1!`$&
z?c?R;-Q?xvr8R&4{17!YwS$t9lIvMnSrr&qSXjWAnVFeeKtP~DMMdRcd3kw9a&oe|
zu&{8ml9JNFqN1X<j~_n@!d%10&CT7YprCLtCnu+C(xgd-Qc_Z_Kztx8E350nhYvC!
zn?XPvh&zCuIi8S^&{thuZO6gE(F1h*(e(86p7-zH%R&9cz;NZt74aK4ZY12keLD$g
vg39B^k0mc&yqI|B&Yi^1pFb<Z6oN1Sf`5WO!l0~+00000NkvXXu0mjf%%`(R

diff --git a/toolkit/themes/pinstripe/global/icons/chevron@2x.png b/toolkit/themes/pinstripe/global/icons/chevron@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd91178030e5f6b315f642909617cce898cdfb7d
GIT binary patch
literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq000^Q000sQ1ONa4?+^wk0004%Nkl<ZD9>$^
zOG`pg6opriQi44uc1tt8r9@FC5s@kOen~Hiuqb=bLo32bl9XV9^iU%L8y7U{r!?ya
z)TBw1AP8#EV7GO2@AaI;oqT((v-dgN1JY3yNmN^qM3qzuh?r`Tq2dltc)&gD(VStM
zPQ=t99o1T{kV6J({&G^5E#(5H?nd&Tw=IEvY_OupS<iVSr+{g?HT?D=g)r8ziap#)
zSG;qRfN5g#*MR*55v*XDEjQ97Tbu%>iM4+Fo8#EVB7)dLw(f!latWC7Y*a!`9|MjU
zLYQZ*BP}P{(p<!9w6Vtb3G85|pb*lwQ>qX!qk6=$w_$8zvY=@k<P9RGjOd@`>J;WM
z&I(}37bO=Nideg1Jkr0|O=md92!=6=g^nnBNEWbq#eeZ?H6^(`fqo2P)_p*|Bny~T
z5&5)m`H0It_%Y?$CoegQSTEUB5px1D9>4=H0$mX<I|NJ_`7vALIK&XT(Sxy;Fn4hZ
zm|gWWj4536r3P6mp56S8BBp&B)#PTJmxnq@7Bl7g2l9gkHglVrp8x;=07*qoM6N<$
Eg7Z<y8UO$Q

literal 0
HcmV?d00001

diff --git a/toolkit/themes/pinstripe/global/icons/close@2x.png b/toolkit/themes/pinstripe/global/icons/close@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..6486132e6a9e8af4c7c07f2c64f1c49f322c24af
GIT binary patch
literal 1788
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

literal 0
HcmV?d00001

diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index 8f0612132e97..38ba57fe1af7 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -94,9 +94,11 @@ toolkit.jar:
   skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
   skin/classic/global/icons/chevron.png                              (icons/chevron.png)
+  skin/classic/global/icons/chevron@2x.png                           (icons/chevron@2x.png)
   skin/classic/global/icons/checkbox.png                             (icons/checkbox.png)
   skin/classic/global/icons/close-sidebar.png                        (icons/close-sidebar.png)
   skin/classic/global/icons/close.png                                (icons/close.png)
+  skin/classic/global/icons/close@2x.png                             (icons/close@2x.png)
   skin/classic/global/icons/information-16.png                       (icons/information-16.png)
   skin/classic/global/icons/information-24.png                       (icons/information-24.png)
   skin/classic/global/icons/information-32.png                       (icons/information-32.png)
@@ -168,3 +170,4 @@ toolkit.jar:
   skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
   skin/classic/global/tree/folder.png                                (tree/folder.png)
+  skin/classic/global/tree/folder@2x.png                             (tree/folder@2x.png)
diff --git a/toolkit/themes/pinstripe/global/notification.css b/toolkit/themes/pinstripe/global/notification.css
index 89a5ad677ac2..17ede50a8636 100644
--- a/toolkit/themes/pinstripe/global/notification.css
+++ b/toolkit/themes/pinstripe/global/notification.css
@@ -88,6 +88,25 @@ notification[type="critical"] {
               0 0 0 2px -moz-mac-focusring inset;
 }
 
+@media (min-resolution: 2dppx) {
+  .messageCloseButton {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .messageCloseButton:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .messageCloseButton:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+
+  .messageCloseButton > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* Popup notification */
 
 .popup-notification-description {
diff --git a/toolkit/themes/pinstripe/global/tree/folder@2x.png b/toolkit/themes/pinstripe/global/tree/folder@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..c07acf5ffbb3a4a30fe550fe5d9d3db1770bcfdd
GIT binary patch
literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006MNkl<ZSi{9v
z%Ps^#6us5mGlTJp2u4JZi1$V!u@fs1K0?^A^9A?>E3x4VELmAt+DX_*BrK5;GE6Yj
z-Bs7Eer385laZ>a<fOW%bMHC#Ro%muH+G<&%YZsB5`Yk3k#JAIDsV%Xsj#gXl^Hl7
z<f;@tOgJTs{Wk+v#kEI1Gq>=k(cSeGJm(+U=<-OK5I+7P0O8{71g7Vgf}ikDqruTh
zu<a5Q3oqkzyGQmbwUA3rw!FTzDAWH@e9bjAx5B{4L{-L4xdgY@mms*PDe|V4wg=kQ
z42t)FkZUCJp8mnA9i%c1Bz6j<U5zc6liacdUhOwGR-rwc(K334_cHA6A9{Ufg(cTT
z9&uq}3W}dLxKvNu<scB15F3m^+A_g1jrbIJO~tvlb0L&P&M7c?^!QvpuN4L>61%Du
z`bSJ;K#2IROhDux<2`^V0);}U08IF&64WOHA#aoc9z5WR1tk4jVK;EpBmm=GXeCpl
zatwbev4wzjDFH@PfDnsZbp|5;znueI_c;*u1V>F72zb7ogpT7supO>cK-x6p83=3f
z>A3!GyGjL^;hPW>Q&0|wONs@g0s-Hqz;^u-logjCllo-}Y}W<TFtm)J&k<yRzJBtI
zv99yeW6-_mh4f^0^$oqH8?&<vAgh`DvH1MB%{se#`{}-ez%(a7)}bI@MtRu+p#Pt;
b?Dp3$*0oXLT<)bF00000NkvXXu0mjf+@=j<

literal 0
HcmV?d00001

diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn
index c406b80eb2bb..ed7368ab8c08 100644
--- a/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -80,5 +80,6 @@ toolkit.jar:
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
 #ifdef MOZ_PLACES
   skin/classic/mozapps/places/defaultFavicon.png                  (places/defaultFavicon.png)
+  skin/classic/mozapps/places/defaultFavicon@2x.png               (places/defaultFavicon@2x.png)
 #endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
diff --git a/toolkit/themes/pinstripe/mozapps/places/defaultFavicon@2x.png b/toolkit/themes/pinstripe/mozapps/places/defaultFavicon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..052bfd301d8188f1ebd3234eb1421794fe527353
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004`Nkl<Zc-rlk
zv1$TA5Qg&vSEkUUI7oWeE^tXI6RQ~SB;oK7wNeqpNAR&!#5YiEEPW0|!OSOFSJ>tX
z@36SyhuxiHzMq}FW%kZ>-II>Tqa(_tBu8^KJU5@upS#`eN2AfGMp0DteLs|Sg&4DD
zWXI#g$PEJ)OxVDk*=+U{hGDhUYJD}E%?cl0+W<Mq4FeWT*ciz5`~6P>!{IPkE|>NF
zeqWb$q!43UCLSk7PI3<hgBmQDuulfWnUA~0V(}w$PxL6t6GMz`nRv_?Ila|t^$SZB
zoDJwL+U<64GJi<$@Z}GOgQw5g*#LDyGA{B_k_KRC-r2xq-IymVWq8JbLTMQ=vP+;+
zD1ov{p#R^r3}{|v;8qNze+aXCAiD>$-!QuevU}h*?*SUc?RHyCp(#~XQ`&B~16t+D
zWb!KW0wxk@%TZxEoqASVJ{pYz9t*u*uQDEwz5kt1*AzL)-RX3`VZqb}ob`JBj-#}m
zX0Tww){j$nv)Pn!CFQ6k^*ALr3|KH>Up~+8MK7X~sEkY<85>#g_^}cUSep9>l>ICo
TwZ!z800000NkvXXu0mjfjK0|C

literal 0
HcmV?d00001


From 4e97ee62c286f075b09a2d2ddee56e6a8f27d987 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 30 Sep 2012 19:20:24 +1300
Subject: [PATCH 14/64] Bug 795631 - Update BasicLayerManager::mPhase variable
 in release mode as well as debug. r=cjones

---
 gfx/layers/basic/BasicLayerManager.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index 206f2d34e7d1..5634045c1b82 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -210,9 +210,7 @@ public:
 };
 
 BasicLayerManager::BasicLayerManager(nsIWidget* aWidget) :
-#ifdef DEBUG
   mPhase(PHASE_NONE),
-#endif
   mWidget(aWidget)
   , mDoubleBuffering(BUFFER_NONE), mUsingDefaultTarget(false)
   , mCachedSurfaceInUse(false)
@@ -224,9 +222,7 @@ BasicLayerManager::BasicLayerManager(nsIWidget* aWidget) :
 }
 
 BasicLayerManager::BasicLayerManager() :
-#ifdef DEBUG
   mPhase(PHASE_NONE),
-#endif
   mWidget(nullptr)
   , mDoubleBuffering(BUFFER_NONE), mUsingDefaultTarget(false)
   , mCachedSurfaceInUse(false)
@@ -324,9 +320,7 @@ BasicLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
 #endif
 
   NS_ASSERTION(!InTransaction(), "Nested transactions not allowed");
-#ifdef DEBUG
   mPhase = PHASE_CONSTRUCTION;
-#endif
   mTarget = aTarget;
 }
 
@@ -513,9 +507,7 @@ void
 BasicLayerManager::AbortTransaction()
 {
   NS_ASSERTION(InConstruction(), "Should be in construction phase");
-#ifdef DEBUG
   mPhase = PHASE_NONE;
-#endif
   mUsingDefaultTarget = false;
   mInTransaction = false;
 }
@@ -532,9 +524,7 @@ BasicLayerManager::EndTransactionInternal(DrawThebesLayerCallback aCallback,
 #endif
 
   NS_ASSERTION(InConstruction(), "Should be in construction phase");
-#ifdef DEBUG
   mPhase = PHASE_DRAWING;
-#endif
 
   Layer* aLayer = GetRoot();
   RenderTraceLayers(aLayer, "FF00");
@@ -602,11 +592,9 @@ BasicLayerManager::EndTransactionInternal(DrawThebesLayerCallback aCallback,
   MOZ_LAYERS_LOG(("]----- EndTransaction"));
 #endif
 
-#ifdef DEBUG
   // Go back to the construction phase if the transaction isn't complete.
   // Layout will update the layer tree and call EndTransaction().
   mPhase = mTransactionIncomplete ? PHASE_CONSTRUCTION : PHASE_NONE;
-#endif
 
   if (!mTransactionIncomplete) {
     // This is still valid if the transaction was incomplete.
@@ -1157,9 +1145,7 @@ void
 BasicShadowLayerManager::ForwardTransaction()
 {
   RenderTraceScope rendertrace("Foward Transaction", "000090");
-#ifdef DEBUG
   mPhase = PHASE_FORWARD;
-#endif
 
   // forward this transaction's changeset to our ShadowLayerManager
   AutoInfallibleTArray<EditReply, 10> replies;
@@ -1223,9 +1209,7 @@ BasicShadowLayerManager::ForwardTransaction()
     NS_WARNING("failed to forward Layers transaction");
   }
 
-#ifdef DEBUG
   mPhase = PHASE_NONE;
-#endif
 
   // this may result in Layers being deleted, which results in
   // PLayer::Send__delete__() and DeallocShmem()

From ae64d70a132cb50b1920927e9d90f02e7a6e1393 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 30 Sep 2012 19:20:24 +1300
Subject: [PATCH 15/64] Bug 795646 - Add crashtest for merged
 nsDisplayFixedPosition items. r=cjones

---
 layout/base/crashtests/795646.html     | 7 +++++++
 layout/base/crashtests/crashtests.list | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 layout/base/crashtests/795646.html

diff --git a/layout/base/crashtests/795646.html b/layout/base/crashtests/795646.html
new file mode 100644
index 000000000000..5ef210f115a1
--- /dev/null
+++ b/layout/base/crashtests/795646.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html style="position: fixed; backface-visibility: hidden;">
+<body onload="setTimeout(function() { document.documentElement.style.MozBackfaceVisibility = 'hidden'; }, 0);">
+<div style="position: fixed; height: 8px; width: 200px; background-color: yellow;"></div>
+V
+
+</body></html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index b05211700630..718a7341f580 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -369,3 +369,4 @@ load 749816-1.html
 load 763223-1.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.lineThreshold,100) load 763702.xhtml
 load 770381-1.html
+load 795646.html

From 6f574cafa6615c12c79e58b7e5c7262f660231a1 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 30 Sep 2012 19:20:24 +1300
Subject: [PATCH 16/64] Bug 795576 - Correctly add the
 NS_FRAME_UPDATE_LAYER_TREE when invalidating inside a popup. r=cjones

---
 layout/generic/nsFrame.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 43f6b3112955..b312e014cdd2 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -4770,17 +4770,24 @@ static void InvalidateFrameInternal(nsIFrame *aFrame, bool aHasDisplayItem = tru
   }
   nsSVGEffects::InvalidateDirectRenderingObservers(aFrame);
   nsIFrame *parent = nsLayoutUtils::GetCrossDocParentFrame(aFrame);
+  bool needsSchedulePaint = false;
   while (parent && !parent->HasAnyStateBits(NS_FRAME_DESCENDANT_NEEDS_PAINT)) {
     if (aHasDisplayItem) {
       parent->AddStateBits(NS_FRAME_DESCENDANT_NEEDS_PAINT);
     }
+    // If we're inside a popup, then we need to make sure that we
+    // call schedule paint so that the NS_FRAME_UPDATE_LAYER_TREE
+    // flag gets added to the popup display root frame.
+    if (nsLayoutUtils::IsPopup(parent)) {
+      needsSchedulePaint = true;
+    }
     nsSVGEffects::InvalidateDirectRenderingObservers(parent);
     parent = nsLayoutUtils::GetCrossDocParentFrame(parent);
   }
   if (!aHasDisplayItem) {
     return;
   }
-  if (!parent) {
+  if (!parent || needsSchedulePaint) {
     aFrame->SchedulePaint();
   }
   if (aFrame->HasAnyStateBits(NS_FRAME_HAS_INVALID_RECT)) {

From 930cae2bd23a367de4c822db427d5fd8c329a3fe Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 30 Sep 2012 19:20:25 +1300
Subject: [PATCH 17/64] Bug 795611 - Call virtual InvalidateFrame from
 InvalidateFrameSubtree since nsTable*Frame overloads it. r=cjones

---
 layout/generic/nsFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index b312e014cdd2..f80d231ac33d 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -4801,7 +4801,7 @@ nsIFrame::InvalidateFrameSubtree(uint32_t aDisplayItemKey)
 {
   bool hasDisplayItem = 
     !aDisplayItemKey || FrameLayerBuilder::HasRetainedDataFor(this, aDisplayItemKey);
-  InvalidateFrameInternal(this, hasDisplayItem);
+  InvalidateFrame(aDisplayItemKey);
 
   if (HasAnyStateBits(NS_FRAME_ALL_DESCENDANTS_NEED_PAINT) || !hasDisplayItem) {
     return;

From 202bc0e49e85ad57073356d0377bcf8b3c777b7f Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 30 Sep 2012 19:20:25 +1300
Subject: [PATCH 18/64] Bug 770617 - Always mark inactive CanvasLayers as being
 dirty. r=cjones

---
 gfx/layers/Layers.h                   | 22 ++++++++++++++++++++++
 gfx/layers/basic/BasicCanvasLayer.cpp |  6 +++---
 gfx/layers/d3d10/CanvasLayerD3D10.cpp |  4 ++--
 gfx/layers/d3d9/CanvasLayerD3D9.cpp   |  4 ++--
 gfx/layers/opengl/CanvasLayerOGL.cpp  |  4 ++--
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index c2060c926f15..199954b2da80 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -1389,6 +1389,26 @@ public:
    */
   void Updated() { mDirty = true; SetInvalidRectToVisibleRegion(); }
 
+  /**
+   * Notify this CanvasLayer that the canvas surface contents have
+   * been painted since the last change.
+   */
+  void Painted() { mDirty = false; }
+
+  /**
+   * Returns true if the canvas surface contents have changed since the
+   * last paint.
+   */
+  bool IsDirty() 
+  { 
+    // We can only tell if we are dirty if we're part of the
+    // widget's retained layer tree.
+    if (!mManager || !mManager->IsWidgetLayerManager()) {
+      return true;
+    }
+    return mDirty; 
+  }
+
   /**
    * Register a callback to be called at the end of each transaction.
    */
@@ -1443,6 +1463,8 @@ protected:
   DidTransactionCallback mCallback;
   void* mCallbackData;
   gfxPattern::GraphicsFilter mFilter;
+
+private:
   /**
    * Set to true in Updated(), cleared during a transaction.
    */
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index 50ad498ef415..d434d10f2b32 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -120,9 +120,9 @@ BasicCanvasLayer::Initialize(const Data& aData)
 void
 BasicCanvasLayer::UpdateSurface(gfxASurface* aDestSurface, Layer* aMaskLayer)
 {
-  if (!mDirty)
+  if (!IsDirty())
     return;
-  mDirty = false;
+  Painted();
 
   if (mDrawTarget) {
     mDrawTarget->Flush();
@@ -393,7 +393,7 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
     return;
   }
 
-  if (!mDirty)
+  if (!IsDirty())
     return;
 
   if (mGLContext &&
diff --git a/gfx/layers/d3d10/CanvasLayerD3D10.cpp b/gfx/layers/d3d10/CanvasLayerD3D10.cpp
index 56882d960655..7f61d44cbcdf 100644
--- a/gfx/layers/d3d10/CanvasLayerD3D10.cpp
+++ b/gfx/layers/d3d10/CanvasLayerD3D10.cpp
@@ -103,9 +103,9 @@ CanvasLayerD3D10::Initialize(const Data& aData)
 void
 CanvasLayerD3D10::UpdateSurface()
 {
-  if (!mDirty)
+  if (!IsDirty())
     return;
-  mDirty = false;
+  Painted();
 
   if (mDrawTarget) {
     mDrawTarget->Flush();
diff --git a/gfx/layers/d3d9/CanvasLayerD3D9.cpp b/gfx/layers/d3d9/CanvasLayerD3D9.cpp
index b8a545db14cf..8ded717659ef 100644
--- a/gfx/layers/d3d9/CanvasLayerD3D9.cpp
+++ b/gfx/layers/d3d9/CanvasLayerD3D9.cpp
@@ -58,9 +58,9 @@ CanvasLayerD3D9::Initialize(const Data& aData)
 void
 CanvasLayerD3D9::UpdateSurface()
 {
-  if (!mDirty && mTexture)
+  if (!IsDirty() && mTexture)
     return;
-  mDirty = false;
+  Painted();
 
   if (!mTexture) {
     CreateTexture();
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 95229d37b06c..ca468e578194 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -172,9 +172,9 @@ MakeIOSurfaceTexture(void* aCGIOSurfaceContext, mozilla::gl::GLContext* aGL)
 void
 CanvasLayerOGL::UpdateSurface()
 {
-  if (!mDirty)
+  if (!IsDirty())
     return;
-  mDirty = false;
+  Painted();
 
   if (mDestroyed || mDelayedUpdates) {
     return;

From 682d9b310b634d33b4a4c8340e3a4bbfcf0e7e5a Mon Sep 17 00:00:00 2001
From: Gary Kwong <gary@rumblingedge.com>
Date: Sat, 29 Sep 2012 23:28:54 -0700
Subject: [PATCH 19/64] Bug 696305 - Removing suppression from Valgrind files.
 DONTBUILD

--HG--
rename : dom/tests/mochitest/localstorage/test_clear_browser_data.html => dom/tests/mochitest/localstorage/test_app_uninstall.html
extra : rebase_source : 5a6769cf1f4ccd569ad0325785ebb9635f048f54
---
 build/valgrind/cross-architecture.sup | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build/valgrind/cross-architecture.sup b/build/valgrind/cross-architecture.sup
index 8ed85ca1d3aa..e75efd17bf12 100644
--- a/build/valgrind/cross-architecture.sup
+++ b/build/valgrind/cross-architecture.sup
@@ -260,10 +260,3 @@
    fun:_ZL29nsGSettingsServiceConstructorP11nsISupportsRK4nsIDPPv
    ...
 }
-{
-   Bug 795631
-   Memcheck:Cond
-   fun:_ZN7mozilla17FrameLayerBuilder18ClippedDisplayItemD1Ev
-   fun:_ZN12nsTHashtableIN7mozilla17FrameLayerBuilder21ThebesLayerItemsEntryEE12s_ClearEntryEP12PLDHashTableP15PLDHashEntryHdr
-   ...
-}

From 2b5268c071bd531eab83787d28acc8b48718a238 Mon Sep 17 00:00:00 2001
From: Gary Kwong <gary@rumblingedge.com>
Date: Sat, 29 Sep 2012 23:30:47 -0700
Subject: [PATCH 20/64] Bug 696305 - Removing another suppression from Valgrind
 files. DONTBUILD

---
 build/valgrind/cross-architecture.sup | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/build/valgrind/cross-architecture.sup b/build/valgrind/cross-architecture.sup
index e75efd17bf12..e2e97b8b3fce 100644
--- a/build/valgrind/cross-architecture.sup
+++ b/build/valgrind/cross-architecture.sup
@@ -251,12 +251,3 @@
    fun:_ZN22nsComponentManagerImpl17ManifestComponentERNS_25ManifestProcessingContextEiPKPc
    ...
 }
-{
-   Bug 795395
-   Memcheck:Addr4
-   fun:PR_UnloadLibrary
-   fun:_ZN18nsGSettingsServiceD1Ev
-   fun:_ZN18nsGSettingsService7ReleaseEv
-   fun:_ZL29nsGSettingsServiceConstructorP11nsISupportsRK4nsIDPPv
-   ...
-}

From 8f5c5c9f3fe902d71484ce6cb5f5c16029712bc8 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 29 Sep 2012 23:38:46 -0700
Subject: [PATCH 21/64] Bug 666041 patch 6.5: Add flag to nsHTMLReflowState &
 ComputeSize for measuring auto height. r=dbaron

---
 layout/generic/nsFrame.cpp           |  6 +++++-
 layout/generic/nsHTMLReflowState.cpp | 20 +++++++++++++++++---
 layout/generic/nsHTMLReflowState.h   |  3 +++
 layout/generic/nsIFrame.h            |  6 +++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 43f6b3112955..f61c40fd782d 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -4004,7 +4004,11 @@ nsFrame::ComputeSize(nsRenderingContext *aRenderingContext,
   result.width = NS_MAX(minWidth, result.width);
 
   // Compute height
-  if (!nsLayoutUtils::IsAutoHeight(*heightStyleCoord, aCBSize.height)) {
+  // (but not if we're auto-height or if we recieved the "eUseAutoHeight"
+  // flag -- then, we'll just stick with the height that we already calculated
+  // in the initial ComputeAutoSize() call.)
+  if (!nsLayoutUtils::IsAutoHeight(*heightStyleCoord, aCBSize.height) &&
+      !(aFlags & nsIFrame::eUseAutoHeight)) {
     result.height =
       nsLayoutUtils::ComputeHeightValue(aCBSize.height, 
                                         boxSizingAdjust.height,
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 7b0ceddca10a..5bb75837dfca 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -174,6 +174,7 @@ nsHTMLReflowState::nsHTMLReflowState(nsPresContext*           aPresContext,
   mFlags.mAssumingHScrollbar = mFlags.mAssumingVScrollbar = false;
   mFlags.mHasClearance = false;
   mFlags.mIsColumnBalancing = false;
+  mFlags.mIsFlexContainerMeasuringHeight = false;
   mFlags.mDummyParentReflowState = false;
 
   mDiscoveredClearance = nullptr;
@@ -2009,6 +2010,12 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
         computeSizeFlags |= nsIFrame::eShrinkWrap;
       }
 
+      // If we're inside of a flexbox that needs to measure our auto height,
+      // pass that information along to ComputeSize().
+      if (mFlags.mIsFlexContainerMeasuringHeight) {
+        computeSizeFlags |= nsIFrame::eUseAutoHeight;
+      }
+
       nsSize size =
         frame->ComputeSize(rendContext,
                            nsSize(aContainingBlockWidth,
@@ -2487,6 +2494,9 @@ nsHTMLReflowState::ComputeMinMaxValues(nscoord aContainingBlockWidth,
   // depends on the content height. Treat them like 'auto'
   // Likewise, check for calc() on internal table elements; calc() on
   // such elements is unsupported.
+  // Likewise, if we're a child of a flex container who's measuring our
+  // intrinsic height, then we want to disregard our min-height.
+
   // NOTE: We treat "min-height:auto" as "0" for the purpose of this code,
   // since that's what it means in all cases except for on flex items -- and
   // even there, we're supposed to ignore it (i.e. treat it as 0) until the
@@ -2496,7 +2506,8 @@ nsHTMLReflowState::ComputeMinMaxValues(nscoord aContainingBlockWidth,
       (NS_AUTOHEIGHT == aContainingBlockHeight &&
        minHeight.HasPercent()) ||
       (mFrameType == NS_CSS_FRAME_TYPE_INTERNAL_TABLE &&
-       minHeight.IsCalcUnit())) {
+       minHeight.IsCalcUnit()) ||
+      mFlags.mIsFlexContainerMeasuringHeight) {
     mComputedMinHeight = 0;
   } else {
     mComputedMinHeight = ComputeHeightValue(aContainingBlockHeight, 
@@ -2510,13 +2521,16 @@ nsHTMLReflowState::ComputeMinMaxValues(nscoord aContainingBlockWidth,
     mComputedMaxHeight = NS_UNCONSTRAINEDSIZE;  // no limit
   } else {
     // Check for percentage based values and a containing block height that
-    // depends on the content height. Treat them like 'auto'
+    // depends on the content height. Treat them like 'none'
     // Likewise, check for calc() on internal table elements; calc() on
     // such elements is unsupported.
+    // Likewise, if we're a child of a flex container who's measuring our
+    // intrinsic height, then we want to disregard our max-height.
     if ((NS_AUTOHEIGHT == aContainingBlockHeight && 
          maxHeight.HasPercent()) ||
         (mFrameType == NS_CSS_FRAME_TYPE_INTERNAL_TABLE &&
-         maxHeight.IsCalcUnit())) {
+         maxHeight.IsCalcUnit()) ||
+        mFlags.mIsFlexContainerMeasuringHeight) {
       mComputedMaxHeight = NS_UNCONSTRAINEDSIZE;
     } else {
       mComputedMaxHeight = ComputeHeightValue(aContainingBlockHeight, 
diff --git a/layout/generic/nsHTMLReflowState.h b/layout/generic/nsHTMLReflowState.h
index e8be0f17ccce..941d26743123 100644
--- a/layout/generic/nsHTMLReflowState.h
+++ b/layout/generic/nsHTMLReflowState.h
@@ -349,6 +349,9 @@ public:
     uint16_t mHeightDependsOnAncestorCell:1;   // Does frame height depend on
                                                // an ancestor table-cell?
     uint16_t mIsColumnBalancing:1;   // nsColumnSetFrame is balancing columns
+    uint16_t mIsFlexContainerMeasuringHeight:1; // nsFlexContainerFrame is
+                                                // reflowing this child to
+                                                // measure its intrinsic height.
     uint16_t mDummyParentReflowState:1; // a "fake" reflow state made
                                         // in order to be the parent
                                         // of a real one
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 39996ffbd9ae..7eba85572320 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1738,7 +1738,11 @@ public:
     /* Set if the frame is in a context where non-replaced blocks should
      * shrink-wrap (e.g., it's floating, absolutely positioned, or
      * inline-block). */
-    eShrinkWrap =        1 << 0
+    eShrinkWrap =        1 << 0,
+    /* Set if we'd like to compute our 'auto' height, regardless of our actual
+     * computed value of 'height'. (e.g. to get an intrinsic height for flex
+     * items with "min-height: auto" to use during flexbox layout.) */
+    eUseAutoHeight =     1 << 1
   };
 
   /**

From e71e5f416143cfcaceb2d9383ae8feaded2363f8 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 29 Sep 2012 23:38:46 -0700
Subject: [PATCH 22/64] Bug 666041 patch 7: implementation of flex container
 class for CSS3 flexbox. r=dbaron

---
 layout/generic/nsFlexContainerFrame.cpp | 2172 ++++++++++++++++++++++-
 layout/generic/nsFlexContainerFrame.h   |   79 +-
 layout/generic/nsFrameIdList.h          |    2 -
 layout/generic/nsHTMLReflowState.cpp    |   51 +-
 layout/style/ua.css                     |    1 +
 5 files changed, 2289 insertions(+), 16 deletions(-)

diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index 59f65142740e..d04a26a0bba2 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -8,14 +8,900 @@
 /* rendering object for CSS display: -moz-flex */
 
 #include "nsFlexContainerFrame.h"
+#include "nsLayoutUtils.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "prlog.h"
 
-#ifdef PR_LOGGING 
+using namespace mozilla::css;
+
+#ifdef PR_LOGGING
 static PRLogModuleInfo* nsFlexContainerFrameLM = PR_NewLogModule("nsFlexContainerFrame");
 #endif /* PR_LOGGING */
 
+// XXXdholbert Some of this helper-stuff should be separated out into a general
+// "LogicalAxisUtils.h" helper.  Should that be a class, or a namespace (under
+// what super-namespace?), or what?
+
+// Helper enums
+// ============
+
+// Represents a physical orientation for an axis.
+// The directional suffix indicates the direction in which the axis *grows*.
+// So e.g. eAxis_LR means a horizontal left-to-right axis, whereas eAxis_BT
+// means a vertical bottom-to-top axis.
+// NOTE: The order here is important -- these values are used as indices into
+// the static array 'kAxisOrientationToSidesMap', defined below.
+enum AxisOrientationType {
+  eAxis_LR,
+  eAxis_RL,
+  eAxis_TB,
+  eAxis_BT,
+  eNumAxisOrientationTypes // For sizing arrays that use these values as indices
+};
+
+// Represents one or the other extreme of an axis (e.g. for the main axis, the
+// main-start vs. main-end edge.
+// NOTE: The order here is important -- these values are used as indices into
+// the sub-arrays in 'kAxisOrientationToSidesMap', defined below.
+enum AxisEdgeType {
+  eAxisEdge_Start,
+  eAxisEdge_End,
+  eNumAxisEdges // For sizing arrays that use these values as indices
+};
+
+// This array maps each axis orientation to a pair of corresponding
+// [start, end] physical mozilla::css::Side values.
+static const Side
+kAxisOrientationToSidesMap[eNumAxisOrientationTypes][eNumAxisEdges] = {
+  { eSideLeft,   eSideRight  },  // eAxis_LR
+  { eSideRight,  eSideLeft   },  // eAxis_RL
+  { eSideTop,    eSideBottom },  // eAxis_TB
+  { eSideBottom, eSideTop }      // eAxis_BT
+};
+
+// Helper structs / classes / methods
+// ==================================
+
+// Indicates whether advancing along the given axis is equivalent to
+// increasing our X or Y position (as opposed to decreasing it).
+static inline bool
+AxisGrowsInPositiveDirection(AxisOrientationType aAxis)
+{
+  return eAxis_LR == aAxis || eAxis_TB == aAxis;
+}
+
+// Indicates whether the given axis is horizontal.
+static inline bool
+IsAxisHorizontal(AxisOrientationType aAxis)
+{
+  return eAxis_LR == aAxis || eAxis_RL == aAxis;
+}
+
+// Given an AxisOrientationType, returns the "reverse" AxisOrientationType
+// (in the same dimension, but the opposite direction)
+static inline AxisOrientationType
+GetReverseAxis(AxisOrientationType aAxis)
+{
+  AxisOrientationType reversedAxis;
+
+  if (aAxis % 2 == 0) {
+    // even enum value. Add 1 to reverse.
+    reversedAxis = AxisOrientationType(aAxis + 1);
+  } else {
+    // odd enum value. Subtract 1 to reverse.
+    reversedAxis = AxisOrientationType(aAxis - 1);
+  }
+
+  // Check that we're still in the enum's valid range
+  MOZ_ASSERT(reversedAxis >= eAxis_LR &&
+             reversedAxis <= eAxis_BT);
+
+  return reversedAxis;
+}
+
+// Returns aFrame's computed value for 'height' or 'width' -- whichever is in
+// the same dimension as aAxis.
+static inline const nsStyleCoord&
+GetSizePropertyForAxis(const nsIFrame* aFrame, AxisOrientationType aAxis)
+{
+  const nsStylePosition* stylePos = aFrame->GetStylePosition();
+
+  return IsAxisHorizontal(aAxis) ?
+    stylePos->mWidth :
+    stylePos->mHeight;
+}
+
+static nscoord
+MarginComponentForSide(const nsMargin& aMargin, Side aSide)
+{
+  switch (aSide) {
+    case eSideLeft:
+      return aMargin.left;
+    case eSideRight:
+      return aMargin.right;
+    case eSideTop:
+      return aMargin.top;
+    case eSideBottom:
+      return aMargin.bottom;
+  }
+
+  NS_NOTREACHED("unexpected Side enum");
+  return aMargin.left; // have to return something
+                       // (but something's busted if we got here)
+}
+
+static nscoord&
+MarginComponentForSide(nsMargin& aMargin, Side aSide)
+{
+  switch (aSide) {
+    case eSideLeft:
+      return aMargin.left;
+    case eSideRight:
+      return aMargin.right;
+    case eSideTop:
+      return aMargin.top;
+    case eSideBottom:
+      return aMargin.bottom;
+  }
+
+  NS_NOTREACHED("unexpected Side enum");
+  return aMargin.left; // have to return something
+                       // (but something's busted if we got here)
+}
+
+// Encapsulates our flex container's main & cross axes.
+NS_STACK_CLASS class FlexboxAxisTracker {
+public:
+  FlexboxAxisTracker(nsFlexContainerFrame* aFlexContainerFrame);
+
+  // Accessors:
+  AxisOrientationType GetMainAxis() const  { return mMainAxis;  }
+  AxisOrientationType GetCrossAxis() const { return mCrossAxis; }
+
+  nscoord GetMainComponent(const nsSize& aSize) const {
+    return IsAxisHorizontal(mMainAxis) ?
+      aSize.width : aSize.height;
+  }
+  int32_t GetMainComponent(const nsIntSize& aIntSize) const {
+    return IsAxisHorizontal(mMainAxis) ?
+      aIntSize.width : aIntSize.height;
+  }
+  nscoord GetMainComponent(const nsHTMLReflowMetrics& aMetrics) const {
+    return IsAxisHorizontal(mMainAxis) ?
+      aMetrics.width : aMetrics.height;
+  }
+
+  nscoord GetCrossComponent(const nsSize& aSize) const {
+    return IsAxisHorizontal(mCrossAxis) ?
+      aSize.width : aSize.height;
+  }
+  int32_t GetCrossComponent(const nsIntSize& aIntSize) const {
+    return IsAxisHorizontal(mCrossAxis) ?
+      aIntSize.width : aIntSize.height;
+  }
+  nscoord GetCrossComponent(const nsHTMLReflowMetrics& aMetrics) const {
+    return IsAxisHorizontal(mCrossAxis) ?
+      aMetrics.width : aMetrics.height;
+  }
+
+  nscoord GetMarginSizeInMainAxis(const nsMargin& aMargin) const {
+    return IsAxisHorizontal(mMainAxis) ?
+      aMargin.LeftRight() :
+      aMargin.TopBottom();
+  }
+  nscoord GetMarginSizeInCrossAxis(const nsMargin& aMargin) const {
+    return IsAxisHorizontal(mCrossAxis) ?
+      aMargin.LeftRight() :
+      aMargin.TopBottom();
+  }
+
+  nsPoint PhysicalPositionFromLogicalPosition(nscoord aMainPosn,
+                                              nscoord aCrossPosn) const {
+    return IsAxisHorizontal(mMainAxis) ?
+      nsPoint(aMainPosn, aCrossPosn) :
+      nsPoint(aCrossPosn, aMainPosn);
+  }
+  nsSize PhysicalSizeFromLogicalSizes(nscoord aMainSize,
+                                      nscoord aCrossSize) const {
+    return IsAxisHorizontal(mMainAxis) ?
+      nsSize(aMainSize, aCrossSize) :
+      nsSize(aCrossSize, aMainSize);
+  }
+
+private:
+  AxisOrientationType mMainAxis;
+  AxisOrientationType mCrossAxis;
+};
+
+// Encapsulates a frame for a flex item, with enough information for us to
+// sort by 'order' (and by the frame's actual index inside the parent's
+// child-frames array, among frames with the same 'order').
+class SortableFrame {
+public:
+  SortableFrame(nsIFrame* aFrame,
+                int32_t aOrderValue,
+                uint32_t aIndexInFrameList)
+  : mFrame(aFrame),
+    mOrderValue(aOrderValue),
+    mIndexInFrameList(aIndexInFrameList)
+  {
+    MOZ_ASSERT(aFrame, "expecting a non-null child frame");
+  }
+
+  // Implement operator== and operator< so that we can use nsDefaultComparator
+  bool operator==(const SortableFrame& rhs) const {
+    MOZ_ASSERT(mFrame != rhs.mFrame ||
+               (mOrderValue == rhs.mOrderValue &&
+                mIndexInFrameList == rhs.mIndexInFrameList),
+               "if frames are equal, the other member data should be too");
+    return mFrame == rhs.mFrame;
+  }
+
+  bool operator<(const SortableFrame& rhs) const {
+    if (mOrderValue == rhs.mOrderValue) {
+      return mIndexInFrameList < rhs.mIndexInFrameList;
+    }
+    return mOrderValue < rhs.mOrderValue;
+  }
+
+  // Accessor for the frame
+  inline nsIFrame* Frame() const { return mFrame; }
+
+protected:
+  nsIFrame* const mFrame;     // The flex item's frame
+  int32_t   const mOrderValue; // mFrame's computed value of 'order' property
+  uint32_t  const mIndexInFrameList; // mFrame's idx in parent's child frames
+};
+
+// Represents a flex item.
+// Includes the various pieces of input that the Flexbox Layout Algorithm uses
+// to resolve a flexible width.
+class FlexItem {
+public:
+  FlexItem(nsIFrame* aChildFrame,
+           float aFlexGrow, float aFlexShrink, nscoord aMainBaseSize,
+           nscoord aMainMinSize, nscoord aMainMaxSize,
+           nscoord aCrossMinSize, nscoord aCrossMaxSize,
+           nsMargin aMargin, nsMargin aBorderPadding,
+           const FlexboxAxisTracker& aAxisTracker);
+
+  // Accessors
+  nsIFrame* Frame() const          { return mFrame; }
+  nscoord GetFlexBaseSize() const  { return mFlexBaseSize; }
+
+  nscoord GetMainMinSize() const   { return mMainMinSize; }
+  nscoord GetMainMaxSize() const   { return mMainMaxSize; }
+
+  // Note: These return the main-axis position and size of our *content box*.
+  nscoord GetMainSize() const      { return mMainSize; }
+  nscoord GetMainPosition() const  { return mMainPosn; }
+
+  nscoord GetCrossMinSize() const  { return mCrossMinSize; }
+  nscoord GetCrossMaxSize() const  { return mCrossMaxSize; }
+
+  // Note: These return the cross-axis position and size of our *content box*.
+  nscoord GetCrossSize() const     { return mCrossSize;  }
+  nscoord GetCrossPosition() const { return mCrossPosn; }
+
+  nscoord GetAscent() const        { return mAscent; }
+
+  float GetShareOfFlexWeightSoFar() const { return mShareOfFlexWeightSoFar; }
+
+  bool IsFrozen() const            { return mIsFrozen; }
+
+  bool HadMinViolation() const     { return mHadMinViolation; }
+  bool HadMaxViolation() const     { return mHadMaxViolation; }
+
+  // Indicates whether this item's cross-size has been stretched (from having
+  // "align-self: stretch" with an auto cross-size and no auto margins in the
+  // cross axis).
+  bool IsStretched() const         { return mIsStretched; }
+
+  uint8_t GetAlignSelf() const     { return mAlignSelf; }
+
+  // Returns the flex weight that we should use in the "resolving flexible
+  // lengths" algorithm.  If we've got a positive amount of free space, we use
+  // the flex-grow weight; otherwise, we use the "scaled flex shrink weight"
+  // (scaled by our flex base size)
+  float GetFlexWeightToUse(bool aHavePositiveFreeSpace)
+  {
+    if (IsFrozen()) {
+      return 0.0f;
+    }
+
+    return aHavePositiveFreeSpace ?
+      mFlexGrow :
+      mFlexShrink * mFlexBaseSize;
+  }
+
+  // Getters for margin:
+  // ===================
+  const nsMargin& GetMargin() const { return mMargin; }
+
+  // Returns the margin component for a given mozilla::css::Side
+  nscoord GetMarginComponentForSide(Side aSide) const
+  { return MarginComponentForSide(mMargin, aSide); }
+
+  // Returns the total space occupied by this item's margins in the given axis
+  nscoord GetMarginSizeInAxis(AxisOrientationType aAxis) const
+  {
+    Side startSide = kAxisOrientationToSidesMap[aAxis][eAxisEdge_Start];
+    Side endSide = kAxisOrientationToSidesMap[aAxis][eAxisEdge_End];
+    return GetMarginComponentForSide(startSide) +
+      GetMarginComponentForSide(endSide);
+  }
+
+  // Getters for border/padding
+  // ==========================
+  // Returns the border+padding component for a given mozilla::css::Side
+  nscoord GetBorderPaddingComponentForSide(Side aSide) const
+  { return MarginComponentForSide(mBorderPadding, aSide); }
+
+  // Returns the total space occupied by this item's borders and padding in
+  // the given axis
+  nscoord GetBorderPaddingSizeInAxis(AxisOrientationType aAxis) const
+  {
+    Side startSide = kAxisOrientationToSidesMap[aAxis][eAxisEdge_Start];
+    Side endSide = kAxisOrientationToSidesMap[aAxis][eAxisEdge_End];
+    return GetBorderPaddingComponentForSide(startSide) +
+      GetBorderPaddingComponentForSide(endSide);
+  }
+
+  // Getter for combined margin/border/padding
+  // =========================================
+  // Returns the total space occupied by this item's margins, borders and
+  // padding in the given axis
+  nscoord GetMarginBorderPaddingSizeInAxis(AxisOrientationType aAxis) const
+  {
+    return GetMarginSizeInAxis(aAxis) + GetBorderPaddingSizeInAxis(aAxis);
+  }
+
+  // Setters
+  // =======
+
+  // Setters used while we're resolving flexible lengths
+  // ---------------------------------------------------
+
+  // Sets the main-size of our flex item's content-box.
+  void SetMainSize(nscoord aNewMainSize)
+  {
+    MOZ_ASSERT(!mIsFrozen, "main size shouldn't change after we're frozen");
+    mMainSize = aNewMainSize;
+  }
+
+  void SetShareOfFlexWeightSoFar(float aNewShare)
+  {
+    MOZ_ASSERT(!mIsFrozen || aNewShare == 0.0f,
+               "shouldn't be giving this item any share of the weight "
+               "after it's frozen");
+    mShareOfFlexWeightSoFar = aNewShare;
+  }
+
+  void Freeze() { mIsFrozen = true; }
+
+  void SetHadMinViolation()
+  {
+    MOZ_ASSERT(!mIsFrozen,
+               "shouldn't be changing main size & having violations "
+               "after we're frozen");
+    mHadMinViolation = true;
+  }
+  void SetHadMaxViolation()
+  {
+    MOZ_ASSERT(!mIsFrozen,
+               "shouldn't be changing main size & having violations "
+               "after we're frozen");
+    mHadMaxViolation = true;
+  }
+  void ClearViolationFlags()
+  { mHadMinViolation = mHadMaxViolation = false; }
+
+  // Setters for values that are determined after we've resolved our main size
+  // -------------------------------------------------------------------------
+
+  // Sets the main-axis position of our flex item's content-box.
+  // (This is the distance between the main-start edge of the flex container
+  // and the main-start edge of the flex item's content-box.)
+  void SetMainPosition(nscoord aPosn) {
+    MOZ_ASSERT(mIsFrozen, "main size should be resolved before this");
+    mMainPosn  = aPosn;
+  }
+
+  // Sets the cross-size of our flex item's content-box.
+  void SetCrossSize(nscoord aCrossSize) {
+    MOZ_ASSERT(mIsFrozen, "main size should be resolved before this");
+    mCrossSize = aCrossSize;
+  }
+
+  // Sets the cross-axis position of our flex item's content-box.
+  // (This is the distance between the cross-start edge of the flex container
+  // and the cross-start edge of the flex item.)
+  void SetCrossPosition(nscoord aPosn) {
+    MOZ_ASSERT(mIsFrozen, "main size should be resolved before this");
+    mCrossPosn = aPosn;
+  }
+
+  void SetAscent(nscoord aAscent) {
+    mAscent = aAscent;
+  }
+
+  void SetIsStretched() {
+    MOZ_ASSERT(mIsFrozen, "main size should be resolved before this");
+    mIsStretched = true;
+  }
+
+  // Setter for margin components (for resolving "auto" margins)
+  void SetMarginComponentForSide(Side aSide, nscoord aLength)
+  {
+    MOZ_ASSERT(mIsFrozen, "main size should be resolved before this");
+    MarginComponentForSide(mMargin, aSide) = aLength;
+  }
+
+  uint32_t GetNumAutoMarginsInAxis(AxisOrientationType aAxis) const;
+
+protected:
+  // Our frame:
+  nsIFrame* const mFrame;
+
+  // Values that we already know in constructor: (and are hence mostly 'const')
+  const float mFlexGrow;
+  const float mFlexShrink;
+
+  const nsMargin mBorderPadding;
+  nsMargin mMargin; // non-const because we need to resolve auto margins
+
+  const nscoord mFlexBaseSize;
+
+  const nscoord mMainMinSize;
+  const nscoord mMainMaxSize;
+  const nscoord mCrossMinSize;
+  const nscoord mCrossMaxSize;
+
+  // Values that we compute after constructor:
+  nscoord mMainSize;
+  nscoord mMainPosn;
+  nscoord mCrossSize;
+  nscoord mCrossPosn;
+  nscoord mAscent;
+
+  // Temporary state, while we're resolving flexible widths (for our main size)
+  // XXXdholbert To save space, we could use a union to make these variables
+  // overlay the same memory as some other member vars that aren't touched
+  // until after main-size has been resolved. In particular, these could share
+  // memory with mMainPosn through mAscent, and mIsStretched.
+  float mShareOfFlexWeightSoFar;
+  bool mIsFrozen;
+  bool mHadMinViolation;
+  bool mHadMaxViolation;
+
+  // Misc:
+  bool mIsStretched; // See IsStretched() documentation
+  uint8_t mAlignSelf; // My "align-self" computed value (with "auto"
+                      // swapped out for parent"s "align-items" value,
+                      // in our constructor).
+};
+
+bool
+nsFlexContainerFrame::IsHorizontal()
+{
+  const FlexboxAxisTracker axisTracker(this);
+  return IsAxisHorizontal(axisTracker.GetMainAxis());
+}
+
+nsresult
+nsFlexContainerFrame::AppendFlexItemForChild(
+  nsPresContext* aPresContext,
+  nsIFrame*      aChildFrame,
+  const nsHTMLReflowState& aParentReflowState,
+  const FlexboxAxisTracker& aAxisTracker,
+  nsTArray<FlexItem>& aFlexItems)
+{
+  // Create temporary reflow state just for sizing -- to get hypothetical
+  // main-size and the computed values of min / max main-size property.
+  // (This reflow state will _not_ be used for reflow.)
+  nsHTMLReflowState childRS(aPresContext, aParentReflowState, aChildFrame,
+                            nsSize(aParentReflowState.ComputedWidth(),
+                                   aParentReflowState.ComputedHeight()));
+
+  // MAIN SIZES (flex base size, min/max size)
+  // -----------------------------------------
+  nscoord flexBaseSize =
+    aAxisTracker.GetMainComponent(nsSize(childRS.ComputedWidth(),
+                                         childRS.ComputedHeight()));
+  nscoord mainMinSize =
+    aAxisTracker.GetMainComponent(nsSize(childRS.mComputedMinWidth,
+                                         childRS.mComputedMinHeight));
+  nscoord mainMaxSize =
+    aAxisTracker.GetMainComponent(nsSize(childRS.mComputedMaxWidth,
+                                         childRS.mComputedMaxHeight));
+  // This is enforced by the nsHTMLReflowState where these values come from:
+  MOZ_ASSERT(mainMinSize <= mainMaxSize, "min size is larger than max size");
+
+  // SPECIAL MAIN-SIZING FOR VERTICAL FLEX CONTAINERS
+  // If we're vertical and our main size ended up being unconstrained
+  // (e.g. because we had height:auto), we need to instead use our
+  // "max-content" height, which is what we get from reflowing into our
+  // available width.  This is the same as our "min-content" height --
+  // so if we have "min-height:auto", we need to use this value as our
+  // min-height.
+  if (!IsAxisHorizontal(aAxisTracker.GetMainAxis())) {
+    bool isMainSizeAuto = (NS_UNCONSTRAINEDSIZE == flexBaseSize);
+    bool isMainMinSizeAuto =
+      (eStyleUnit_Auto ==
+       aChildFrame->GetStylePosition()->mMinHeight.GetUnit());
+
+    if (isMainSizeAuto || isMainMinSizeAuto) {
+      // Give the item a special reflow with "mIsFlexContainerMeasuringHeight"
+      // set.  This tells it to behave as if it had "height: auto", regardless
+      // of what the "height" property is actually set to.
+      nsHTMLReflowState
+        childRSForMeasuringHeight(aPresContext, aParentReflowState,
+                                  aChildFrame,
+                                  nsSize(aParentReflowState.ComputedWidth(),
+                                         NS_UNCONSTRAINEDSIZE),
+                                  -1, -1, false);
+      childRSForMeasuringHeight.mFlags.mIsFlexContainerMeasuringHeight = true;
+      childRSForMeasuringHeight.Init(aPresContext);
+
+      nsHTMLReflowMetrics childDesiredSize;
+      nsReflowStatus childReflowStatus;
+      nsresult rv = ReflowChild(aChildFrame, aPresContext,
+                                childDesiredSize, childRSForMeasuringHeight,
+                                0, 0, NS_FRAME_NO_MOVE_FRAME,
+                                childReflowStatus);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      MOZ_ASSERT(NS_FRAME_IS_COMPLETE(childReflowStatus),
+                 "We gave flex item unconstrained available height, so it "
+                 "should be complete");
+
+      // Subtract border/padding in vertical axis, to get _just_
+      // the effective computed value of the "height" property.
+      nscoord childDesiredHeight = childDesiredSize.height -
+        childRS.mComputedBorderPadding.TopBottom();
+      childDesiredHeight = NS_MAX(0, childDesiredHeight);
+
+      if (isMainSizeAuto) {
+        flexBaseSize = childDesiredHeight;
+      }
+      if (isMainMinSizeAuto) {
+        mainMinSize = childDesiredHeight;
+        mainMaxSize = NS_MAX(mainMaxSize, mainMinSize);
+      }
+    }
+  }
+
+  // CROSS MIN/MAX SIZE
+  // ------------------
+
+  nscoord crossMinSize =
+    aAxisTracker.GetCrossComponent(nsSize(childRS.mComputedMinWidth,
+                                          childRS.mComputedMinHeight));
+  nscoord crossMaxSize =
+    aAxisTracker.GetCrossComponent(nsSize(childRS.mComputedMaxWidth,
+                                          childRS.mComputedMaxHeight));
+
+  // SPECIAL-CASE FOR WIDGET-IMPOSED SIZES
+  // Check if we're a themed widget, in which case we might have a minimum
+  // main & cross size imposed by our widget (which we can't go below), or
+  // (more severe) our widget might have only a single valid size.
+  bool isFixedSizeWidget = false;
+  const nsStyleDisplay* disp = aChildFrame->GetStyleDisplay();
+  if (aChildFrame->IsThemed(disp)) {
+    nsIntSize widgetMinSize(0, 0);
+    bool canOverride = true;
+    aPresContext->GetTheme()->
+      GetMinimumWidgetSize(childRS.rendContext, aChildFrame,
+                           disp->mAppearance,
+                           &widgetMinSize, &canOverride);
+
+    nscoord widgetMainMinSize =
+      aPresContext->DevPixelsToAppUnits(
+        aAxisTracker.GetMainComponent(widgetMinSize));
+    nscoord widgetCrossMinSize =
+      aPresContext->DevPixelsToAppUnits(
+        aAxisTracker.GetCrossComponent(widgetMinSize));
+
+    // GMWS() returns border-box; we need content-box
+    widgetMainMinSize -=
+      aAxisTracker.GetMarginSizeInMainAxis(childRS.mComputedBorderPadding);
+    widgetCrossMinSize -=
+      aAxisTracker.GetMarginSizeInCrossAxis(childRS.mComputedBorderPadding);
+
+    if (!canOverride) {
+      // Fixed-size widget: freeze our main-size at the widget's mandated size.
+      // (Set min and max main-sizes to that size, too, to keep us from
+      // clamping to any other size later on.)
+      flexBaseSize = mainMinSize = mainMaxSize = widgetMainMinSize;
+      crossMinSize = crossMaxSize = widgetCrossMinSize;
+      isFixedSizeWidget = true;
+    } else {
+      // Variable-size widget: ensure our min/max sizes are at least as large
+      // as the widget's mandated minimum size, so we don't flex below that.
+      mainMinSize = NS_MAX(mainMinSize, widgetMainMinSize);
+      mainMaxSize = NS_MAX(mainMaxSize, widgetMainMinSize);
+
+      crossMinSize = NS_MAX(crossMinSize, widgetCrossMinSize);
+      crossMaxSize = NS_MAX(crossMaxSize, widgetCrossMinSize);
+    }
+  }
+
+  // FLEX GROW & SHRINK WEIGHTS
+  const nsStylePosition* stylePos = aChildFrame->GetStylePosition();
+  float flexGrow   = stylePos->mFlexGrow;
+  float flexShrink = stylePos->mFlexShrink;
+
+  aFlexItems.AppendElement(FlexItem(aChildFrame,
+                                    flexGrow, flexShrink, flexBaseSize,
+                                    mainMinSize, mainMaxSize,
+                                    crossMinSize, crossMaxSize,
+                                    childRS.mComputedMargin,
+                                    childRS.mComputedBorderPadding,
+                                    aAxisTracker));
+
+  // If we're inflexible, we can just freeze to our hypothetical main-size
+  // up-front. Similarly, if we're a fixed-size widget, we only have one
+  // valid size, so we freeze to keep ourselves from flexing.
+  if (isFixedSizeWidget || (flexGrow == 0.0f && flexShrink == 0.0f)) {
+    aFlexItems.LastElement().Freeze();
+  }
+
+  return NS_OK;
+}
+
+FlexItem::FlexItem(nsIFrame* aChildFrame,
+                   float aFlexGrow, float aFlexShrink, nscoord aFlexBaseSize,
+                   nscoord aMainMinSize,  nscoord aMainMaxSize,
+                   nscoord aCrossMinSize, nscoord aCrossMaxSize,
+                   nsMargin aMargin, nsMargin aBorderPadding,
+                   const FlexboxAxisTracker& aAxisTracker)
+  : mFrame(aChildFrame),
+    mFlexGrow(aFlexGrow),
+    mFlexShrink(aFlexShrink),
+    mBorderPadding(aBorderPadding),
+    mMargin(aMargin),
+    mFlexBaseSize(aFlexBaseSize),
+    mMainMinSize(aMainMinSize),
+    mMainMaxSize(aMainMaxSize),
+    mCrossMinSize(aCrossMinSize),
+    mCrossMaxSize(aCrossMaxSize),
+    // Init main-size to 'hypothetical main size', which is flex base size
+    // clamped to [min,max] range:
+    mMainSize(NS_CSS_MINMAX(aFlexBaseSize, aMainMinSize, aMainMaxSize)),
+    mMainPosn(0),
+    mCrossSize(0),
+    mCrossPosn(0),
+    mAscent(0),
+    mShareOfFlexWeightSoFar(0.0f),
+    mIsFrozen(false),
+    mHadMinViolation(false),
+    mHadMaxViolation(false),
+    mIsStretched(false),
+    mAlignSelf(aChildFrame->GetStylePosition()->mAlignSelf)
+{
+  MOZ_ASSERT(aChildFrame, "expecting a non-null child frame");
+
+  // Assert that any "auto" margin components are set to 0.
+  // (We'll resolve them later; until then, we want to treat them as 0-sized.)
+#ifdef DEBUG
+  {
+    const nsStyleSides& styleMargin = mFrame->GetStyleMargin()->mMargin;
+    NS_FOR_CSS_SIDES(side) {
+      if (styleMargin.GetUnit(side) == eStyleUnit_Auto) {
+        MOZ_ASSERT(GetMarginComponentForSide(side) == 0,
+                   "Someone else tried to resolve our auto margin");
+      }
+    }
+  }
+#endif // DEBUG
+
+  // Resolve "align-self: auto" to parent's "align-items" value.
+  if (mAlignSelf == NS_STYLE_ALIGN_SELF_AUTO) {
+    mAlignSelf = mFrame->GetParent()->GetStylePosition()->mAlignItems;
+  }
+
+  // If the flex item's inline axis is the same as the cross axis, then
+  // 'align-self:baseline' is identical to 'flex-start'. If that's the case, we
+  // just directly convert our align-self value here, so that we don't have to
+  // handle this with special cases elsewhere.
+  // Moreover: for the time being (until we support writing-modes),
+  // all inline axes are horizontal -- so we can just check if the cross axis
+  // is horizontal.
+  // FIXME: Once we support writing-mode (vertical text), this IsAxisHorizontal
+  // check won't be sufficient anymore -- we'll actually need to compare our
+  // inline axis vs. the cross axis.
+  if (mAlignSelf == NS_STYLE_ALIGN_ITEMS_BASELINE &&
+      IsAxisHorizontal(aAxisTracker.GetCrossAxis())) {
+    mAlignSelf = NS_STYLE_ALIGN_ITEMS_FLEX_START;
+  }
+}
+
+uint32_t
+FlexItem::GetNumAutoMarginsInAxis(AxisOrientationType aAxis) const
+{
+  uint32_t numAutoMargins = 0;
+  const nsStyleSides& styleMargin = mFrame->GetStyleMargin()->mMargin;
+  for (uint32_t i = 0; i < eNumAxisEdges; i++) {
+    Side side = kAxisOrientationToSidesMap[aAxis][i];
+    if (styleMargin.GetUnit(side) == eStyleUnit_Auto) {
+      numAutoMargins++;
+    }
+  }
+
+  // Mostly for clarity:
+  MOZ_ASSERT(numAutoMargins <= 2,
+             "We're just looking at one item along one dimension, so we "
+             "should only have examined 2 margins");
+
+  return numAutoMargins;
+}
+
+// Keeps track of our position along a particular axis (where a '0' position
+// corresponds to the 'start' edge of that axis).
+// This class shouldn't be instantiated directly -- rather, it should only be
+// instantiated via its subclasses defined below.
+NS_STACK_CLASS
+class PositionTracker {
+public:
+  // Accessor for the current value of the position that we're tracking.
+  inline nscoord GetPosition() const { return mPosition; }
+  inline AxisOrientationType GetAxis() const { return mAxis; }
+
+  // Advances our position across the start edge of the given margin, in the
+  // axis we're tracking.
+  void EnterMargin(const nsMargin& aMargin)
+  {
+    Side side = kAxisOrientationToSidesMap[mAxis][eAxisEdge_Start];
+    mPosition += MarginComponentForSide(aMargin, side);
+  }
+
+  // Advances our position across the end edge of the given margin, in the axis
+  // we're tracking.
+  void ExitMargin(const nsMargin& aMargin)
+  {
+    Side side = kAxisOrientationToSidesMap[mAxis][eAxisEdge_End];
+    mPosition += MarginComponentForSide(aMargin, side);
+  }
+
+  // Advances our current position from the start side of a child frame's
+  // border-box to the frame's upper or left edge (depending on our axis).
+  // (Note that this is a no-op if our axis grows in positive direction.)
+  void EnterChildFrame(nscoord aChildFrameSize)
+  {
+    if (!AxisGrowsInPositiveDirection(mAxis))
+      mPosition += aChildFrameSize;
+  }
+
+  // Advances our current position from a frame's upper or left border-box edge
+  // (whichever is in the axis we're tracking) to the 'end' side of the frame
+  // in the axis that we're tracking. (Note that this is a no-op if our axis
+  // grows in the negative direction.)
+  void ExitChildFrame(nscoord aChildFrameSize)
+  {
+    if (AxisGrowsInPositiveDirection(mAxis))
+      mPosition += aChildFrameSize;
+  }
+
+protected:
+  // Protected constructor, to be sure we're only instantiated via a subclass.
+  PositionTracker(AxisOrientationType aAxis)
+    : mPosition(0),
+      mAxis(aAxis)
+  {}
+
+private:
+  // Private copy-constructor, since we don't want any instances of our
+  // subclasses to be accidentally copied.
+  PositionTracker(const PositionTracker& aOther)
+    : mPosition(aOther.mPosition),
+      mAxis(aOther.mAxis)
+  {}
+
+protected:
+  // Member data:
+  nscoord mPosition;               // The position we're tracking
+  const AxisOrientationType mAxis; // The axis along which we're moving
+};
+
+// Tracks our position in the main axis, when we're laying out flex items.
+NS_STACK_CLASS
+class MainAxisPositionTracker : public PositionTracker {
+public:
+  MainAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
+                          const FlexboxAxisTracker& aAxisTracker,
+                          const nsHTMLReflowState& aReflowState,
+                          const nsTArray<FlexItem>& aItems);
+
+  ~MainAxisPositionTracker() {
+    MOZ_ASSERT(mNumPackingSpacesRemaining == 0,
+               "miscounted the number of packing spaces");
+    MOZ_ASSERT(mNumAutoMarginsInMainAxis == 0,
+               "miscounted the number of auto margins");
+  }
+
+  // Advances past the packing space (if any) between two flex items
+  void TraversePackingSpace();
+
+  // If aItem has any 'auto' margins in the main axis, this method updates the
+  // corresponding values in its margin.
+  void ResolveAutoMarginsInMainAxis(FlexItem& aItem);
+
+private:
+  nscoord  mPackingSpaceRemaining;
+  uint32_t mNumAutoMarginsInMainAxis;
+  uint32_t mNumPackingSpacesRemaining;
+  uint8_t  mJustifyContent;
+};
+
+// Utility class for managing our position along the cross axis along
+// the whole flex container (at a higher level than a single line)
+class SingleLineCrossAxisPositionTracker;
+NS_STACK_CLASS
+class CrossAxisPositionTracker : public PositionTracker {
+public:
+  CrossAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
+                           const FlexboxAxisTracker& aAxisTracker,
+                           const nsHTMLReflowState& aReflowState);
+
+  // XXXdholbert This probably needs a ResolveStretchedLines() method,
+  // (which takes an array of SingleLineCrossAxisPositionTracker objects
+  // and distributes an equal amount of space to each one).
+  // For now, we just have Reflow directly call
+  // SingleLineCrossAxisPositionTracker::SetLineCrossSize().
+};
+
+// Utility class for managing our position along the cross axis, *within* a
+// single flex line.
+NS_STACK_CLASS
+class SingleLineCrossAxisPositionTracker : public PositionTracker {
+public:
+  SingleLineCrossAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
+                                     const FlexboxAxisTracker& aAxisTracker,
+                                     const nsTArray<FlexItem>& aItems);
+
+  void ComputeLineCrossSize(const nsTArray<FlexItem>& aItems);
+  inline nscoord GetLineCrossSize() const { return mLineCrossSize; }
+
+  // Used to override the flex line's size, for cases when the flex container is
+  // single-line and has a fixed size, and also in cases where
+  // "align-self: stretch" triggers some space-distribution between lines
+  // (when we support that property).
+  inline void SetLineCrossSize(nscoord aNewLineCrossSize) {
+    mLineCrossSize = aNewLineCrossSize;
+  }
+
+  void ResolveStretchedCrossSize(FlexItem& aItem);
+  void ResolveAutoMarginsInCrossAxis(FlexItem& aItem);
+
+  void EnterAlignPackingSpace(const FlexItem& aItem);
+
+  // Resets our position to the cross-start edge of this line.
+  inline void ResetPosition() { mPosition = 0; }
+
+private:
+  // Returns the distance from the cross-start side of the given flex item's
+  // margin-box to its baseline. (Used in baseline alignment.)
+  nscoord GetBaselineOffsetFromCrossStart(const FlexItem& aItem) const;
+
+  nscoord mLineCrossSize;
+
+  // Largest distance from an item's cross-start margin-box edge to its
+  // baseline.  Computed in ComputeLineCrossSize, and used for alignment of any
+  // "align-self: baseline" items in this line (and possibly used for computing
+  // the baseline of the flex container, as well).
+  nscoord mCrossStartToFurthestBaseline;
+};
+
+//----------------------------------------------------------------------
+
+// Frame class boilerplate
+// =======================
+
+NS_QUERYFRAME_HEAD(nsFlexContainerFrame)
+  NS_QUERYFRAME_ENTRY(nsFlexContainerFrame)
+NS_QUERYFRAME_TAIL_INHERITING(nsFlexContainerFrameSuper)
+
 NS_IMPL_FRAMEARENA_HELPERS(nsFlexContainerFrame)
 
 nsIFrame*
@@ -27,15 +913,15 @@ NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
 
 //----------------------------------------------------------------------
 
+// nsFlexContainerFrame Method Implementations
+// ===========================================
+
 /* virtual */
 nsFlexContainerFrame::~nsFlexContainerFrame()
 {
 }
 
-NS_QUERYFRAME_HEAD(nsFlexContainerFrame)
-  NS_QUERYFRAME_ENTRY(nsFlexContainerFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsFlexContainerFrameSuper)
-
+/* virtual */
 void
 nsFlexContainerFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
@@ -43,6 +929,7 @@ nsFlexContainerFrame::DestroyFrom(nsIFrame* aDestructRoot)
   nsFlexContainerFrameSuper::DestroyFrom(aDestructRoot);
 }
 
+/* virtual */
 nsIAtom*
 nsFlexContainerFrame::GetType() const
 {
@@ -56,3 +943,1278 @@ nsFlexContainerFrame::GetFrameName(nsAString& aResult) const
   return MakeFrameName(NS_LITERAL_STRING("FlexContainer"), aResult);
 }
 #endif // DEBUG
+
+NS_IMETHODIMP
+nsFlexContainerFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
+                                       const nsRect&           aDirtyRect,
+                                       const nsDisplayListSet& aLists)
+{
+  nsresult rv = DisplayBorderBackgroundOutline(aBuilder, aLists);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
+    rv = BuildDisplayListForChild(aBuilder, e.get(), aDirtyRect, aLists);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  return NS_OK;
+}
+
+#ifdef DEBUG
+// helper for the debugging method below
+bool
+FrameWantsToBeInAnonymousFlexItem(nsIFrame* aFrame)
+{
+  // Note: This needs to match the logic in
+  // nsCSSFrameConstructor::FrameConstructionItem::NeedsAnonFlexItem()
+  return (aFrame->IsFrameOfType(nsIFrame::eLineParticipant) ||
+          nsGkAtoms::placeholderFrame == aFrame->GetType());
+}
+
+// Debugging method, to let us assert that our anonymous flex items are
+// set up correctly -- in particular, we assert:
+//  (1) we don't have any inline non-replaced children
+//  (2) we don't have any consecutive anonymous flex items
+//  (3) we don't have any empty anonymous flex items
+//
+// XXXdholbert This matches what nsCSSFrameConstructor currently does, and what
+// the spec used to say.  However, the spec has now changed regarding what
+// types of content get wrapped in an anonymous flexbox item.  The patch that
+// implements those changes (in nsCSSFrameConstructor) will need to change
+// this method as well.
+void
+nsFlexContainerFrame::SanityCheckAnonymousFlexItems() const
+{
+  bool prevChildWasAnonFlexItem = false;
+  for (nsIFrame* child = mFrames.FirstChild(); child;
+       child = child->GetNextSibling()) {
+    MOZ_ASSERT(!FrameWantsToBeInAnonymousFlexItem(child),
+               "frame wants to be inside an anonymous flex item, "
+               "but it isn't");
+    if (child->GetStyleContext()->GetPseudo() ==
+        nsCSSAnonBoxes::anonymousFlexItem) {
+      MOZ_ASSERT(!prevChildWasAnonFlexItem,
+                 "two anon flex items in a row (shouldn't happen)");
+
+      nsIFrame* firstWrappedChild = child->GetFirstPrincipalChild();
+      MOZ_ASSERT(firstWrappedChild,
+                 "anonymous flex item is empty (shouldn't happen)");
+      prevChildWasAnonFlexItem = true;
+    } else {
+      prevChildWasAnonFlexItem = false;
+    }
+  }
+}
+#endif // DEBUG
+
+// Based on the sign of aTotalViolation, this function freezes a subset of our
+// flexible sizes, and restores the remaining ones to their initial pref sizes.
+static void
+FreezeOrRestoreEachFlexibleSize(
+  const nscoord aTotalViolation,
+  nsTArray<FlexItem>& aItems)
+{
+  enum FreezeType {
+    eFreezeEverything,
+    eFreezeMinViolations,
+    eFreezeMaxViolations
+  };
+
+  FreezeType freezeType;
+  if (aTotalViolation == 0) {
+    freezeType = eFreezeEverything;
+  } else if (aTotalViolation > 0) {
+    freezeType = eFreezeMinViolations;
+  } else { // aTotalViolation < 0
+    freezeType = eFreezeMaxViolations;
+  }
+
+  for (uint32_t i = 0; i < aItems.Length(); i++) {
+    FlexItem& item = aItems[i];
+    MOZ_ASSERT(!item.HadMinViolation() || !item.HadMaxViolation(),
+               "Can have either min or max violation, but not both");
+
+    if (!item.IsFrozen()) {
+      if (eFreezeEverything == freezeType ||
+          (eFreezeMinViolations == freezeType && item.HadMinViolation()) ||
+          (eFreezeMaxViolations == freezeType && item.HadMaxViolation())) {
+
+        MOZ_ASSERT(item.GetMainSize() >= item.GetMainMinSize(),
+                   "Freezing item at a size below its minimum");
+        MOZ_ASSERT(item.GetMainSize() <= item.GetMainMaxSize(),
+                   "Freezing item at a size above its maximum");
+
+        item.Freeze();
+      } // else, we'll reset this item's main size to its flex base size on the
+        // next iteration of this algorithm.
+
+      // Clear this item's violation(s), now that we've dealt with them
+      item.ClearViolationFlags();
+    }
+  }
+}
+
+// Implementation of flexbox spec's "Determine sign of flexibility" step.
+// NOTE: aTotalFreeSpace should already have the flex items' margin, border,
+// & padding values subtracted out.
+static bool
+ShouldUseFlexGrow(nscoord aTotalFreeSpace,
+                  nsTArray<FlexItem>& aItems)
+{
+  // NOTE: The FlexItem constructor sets its main-size to the
+  // *hypothetical main size*, which is the flex base size, clamped
+  // to the min/max range.  That's what we want here. Good.
+  for (uint32_t i = 0; i < aItems.Length(); i++) {
+    aTotalFreeSpace -= aItems[i].GetMainSize();
+    if (aTotalFreeSpace <= 0) {
+      return false;
+    }
+  }
+  MOZ_ASSERT(aTotalFreeSpace > 0,
+             "if we used up all the space, should've already returned");
+  return true;
+}
+
+// Implementation of flexbox spec's "resolve the flexible lengths" algorithm.
+// NOTE: aTotalFreeSpace should already have the flex items' margin, border,
+// & padding values subtracted out, so that all we need to do is distribute the
+// remaining free space among content-box sizes.  (The spec deals with
+// margin-box sizes, but we can have fewer values in play & a simpler algorithm
+// if we subtract margin/border/padding up front.)
+void
+nsFlexContainerFrame::ResolveFlexibleLengths(
+  const FlexboxAxisTracker& aAxisTracker,
+  nscoord aFlexContainerMainSize,
+  nsTArray<FlexItem>& aItems)
+{
+  PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG, ("ResolveFlexibleLengths\n"));
+  if (aItems.IsEmpty()) {
+    return;
+  }
+
+  // Subtract space occupied by our items' margins/borders/padding, so we can
+  // just be dealing with the space available for our flex items' content
+  // boxes.
+  nscoord spaceAvailableForFlexItemsContentBoxes = aFlexContainerMainSize;
+  for (uint32_t i = 0; i < aItems.Length(); i++) {
+    spaceAvailableForFlexItemsContentBoxes -=
+      aItems[i].GetMarginBorderPaddingSizeInAxis(aAxisTracker.GetMainAxis());
+  }
+
+  // Determine whether we're going to be growing or shrinking items.
+  bool havePositiveFreeSpace =
+    ShouldUseFlexGrow(spaceAvailableForFlexItemsContentBoxes, aItems);
+
+  // NOTE: I claim that this chunk of the algorithm (the looping part) needs to
+  // run the loop at MOST aItems.Length() times.  This claim should hold up
+  // because we'll freeze at least one item on each loop iteration, and once
+  // we've run out of items to freeze, there's nothing left to do.  However,
+  // in most cases, we'll break out of this loop long before we hit that many
+  // iterations.
+  for (uint32_t iterationCounter = 0;
+       iterationCounter < aItems.Length(); iterationCounter++) {
+    // Set every not-yet-frozen item's used main size to its
+    // flex base size, and subtract all the used main sizes from our
+    // total amount of space to determine the 'available free space'
+    // (positive or negative) to be distributed among our flexible items.
+    nscoord availableFreeSpace = spaceAvailableForFlexItemsContentBoxes;
+    for (uint32_t i = 0; i < aItems.Length(); i++) {
+      FlexItem& item = aItems[i];
+      if (!item.IsFrozen()) {
+        item.SetMainSize(item.GetFlexBaseSize());
+      }
+      availableFreeSpace -= item.GetMainSize();
+    }
+
+    PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG,
+           (" available free space = %d\n", availableFreeSpace));
+
+    // If sign of free space matches flexType, give each flexible
+    // item a portion of availableFreeSpace.
+    if ((availableFreeSpace > 0 && havePositiveFreeSpace) ||
+        (availableFreeSpace < 0 && !havePositiveFreeSpace)) {
+
+      // STRATEGY: On each item, we compute & store its "share" of the total
+      // flex weight that we've seen so far:
+      //   curFlexWeight / runningFlexWeightSum
+      //
+      // Then, when we go to actually distribute the space (in the next loop),
+      // we can simply walk backwards through the elements and give each item
+      // its "share" multiplied by the remaining available space.
+      //
+      // SPECIAL CASE: If the sum of the flex weights is larger than the
+      // maximum representable float (overflowing to infinity), then we can't
+      // sensibly divide out proportional shares anymore. In that case, we
+      // simply treat the flex item(s) with the largest flex weights as if
+      // their weights were infinite (dwarfing all the others), and we
+      // distribute all of the available space among them.
+      float runningFlexWeightSum = 0.0f;
+      float largestFlexWeight = 0.0f;
+      uint32_t numItemsWithLargestFlexWeight = 0;
+      for (uint32_t i = 0; i < aItems.Length(); i++) {
+        FlexItem& item = aItems[i];
+        float curFlexWeight = item.GetFlexWeightToUse(havePositiveFreeSpace);
+        MOZ_ASSERT(curFlexWeight >= 0.0f, "weights are non-negative");
+
+        runningFlexWeightSum += curFlexWeight;
+        if (NS_finite(runningFlexWeightSum)) {
+          if (curFlexWeight == 0.0f) {
+            item.SetShareOfFlexWeightSoFar(0.0f);
+          } else {
+            item.SetShareOfFlexWeightSoFar(curFlexWeight /
+                                           runningFlexWeightSum);
+          }
+        } // else, the sum of weights overflows to infinity, in which
+          // case we don't bother with "SetShareOfFlexWeightSoFar" since
+          // we know we won't use it. (instead, we'll just give every
+          // item with the largest flex weight an equal share of space.)
+
+        // Update our largest-flex-weight tracking vars
+        if (curFlexWeight > largestFlexWeight) {
+          largestFlexWeight = curFlexWeight;
+          numItemsWithLargestFlexWeight = 1;
+        } else if (curFlexWeight == largestFlexWeight) {
+          numItemsWithLargestFlexWeight++;
+        }
+      }
+
+      if (runningFlexWeightSum != 0.0f) { // no distribution if no flexibility
+        PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG,
+               (" Distributing available space:"));
+        for (uint32_t i = aItems.Length() - 1; i < aItems.Length(); --i) {
+          FlexItem& item = aItems[i];
+
+          if (!item.IsFrozen()) {
+            // To avoid rounding issues, we compute the change in size for this
+            // item, and then subtract it from the remaining available space.
+            nscoord sizeDelta = 0;
+            if (NS_finite(runningFlexWeightSum)) {
+              float myShareOfRemainingSpace =
+                item.GetShareOfFlexWeightSoFar();
+
+              MOZ_ASSERT(myShareOfRemainingSpace >= 0.0f &&
+                         myShareOfRemainingSpace <= 1.0f,
+                         "my share should be nonnegative fractional amount");
+
+              if (myShareOfRemainingSpace == 1.0f) {
+                // (We special-case 1.0f to avoid float error from converting
+                // availableFreeSpace from integer*1.0f --> float --> integer)
+                sizeDelta = availableFreeSpace;
+              } else if (myShareOfRemainingSpace > 0.0f) {
+                sizeDelta = NSToCoordRound(availableFreeSpace *
+                                           myShareOfRemainingSpace);
+              }
+            } else if (item.GetFlexWeightToUse(havePositiveFreeSpace) ==
+                       largestFlexWeight) {
+              // Total flexibility is infinite, so we're just distributing
+              // the available space equally among the items that are tied for
+              // having the largest weight (and this is one of those items).
+              sizeDelta =
+                NSToCoordRound(availableFreeSpace /
+                               float(numItemsWithLargestFlexWeight));
+              numItemsWithLargestFlexWeight--;
+            }
+
+            availableFreeSpace -= sizeDelta;
+
+            item.SetMainSize(item.GetMainSize() + sizeDelta);
+            PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG,
+                   ("  child %d receives %d, for a total of %d\n",
+                    i, sizeDelta, item.GetMainSize()));
+          }
+        }
+      }
+    }
+
+    // Fix min/max violations:
+    nscoord totalViolation = 0; // keeps track of adjustments for min/max
+    PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG,
+           (" Checking for violations:"));
+
+    for (uint32_t i = 0; i < aItems.Length(); i++) {
+      FlexItem& item = aItems[i];
+      if (!item.IsFrozen()) {
+        if (item.GetMainSize() < item.GetMainMinSize()) {
+          // min violation
+          totalViolation += item.GetMainMinSize() - item.GetMainSize();
+          item.SetMainSize(item.GetMainMinSize());
+          item.SetHadMinViolation();
+        } else if (item.GetMainSize() > item.GetMainMaxSize()) {
+          // max violation
+          totalViolation += item.GetMainMaxSize() - item.GetMainSize();
+          item.SetMainSize(item.GetMainMaxSize());
+          item.SetHadMaxViolation();
+        }
+      }
+    }
+
+    FreezeOrRestoreEachFlexibleSize(totalViolation, aItems);
+
+    PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG,
+           (" Total violation: %d\n", totalViolation));
+
+    if (totalViolation == 0) {
+      break;
+    }
+  }
+
+  // Post-condition: all lengths should've been frozen.
+#ifdef DEBUG
+  for (uint32_t i = 0; i < aItems.Length(); ++i) {
+    MOZ_ASSERT(aItems[i].IsFrozen(),
+               "All flexible lengths should've been resolved");
+  }
+#endif // DEBUG
+}
+
+const nsTArray<SortableFrame>
+BuildSortedChildArray(const nsFrameList& aChildren)
+{
+  // NOTE: To benefit from Return Value Optimization, we must only return
+  // this value:
+  nsTArray<SortableFrame> sortedChildArray(aChildren.GetLength());
+
+  // Throw all our children in the array...
+  uint32_t indexInFrameList = 0;
+  for (nsFrameList::Enumerator e(aChildren); !e.AtEnd(); e.Next()) {
+    int32_t orderValue = e.get()->GetStylePosition()->mOrder;
+    sortedChildArray.AppendElement(SortableFrame(e.get(), orderValue,
+                                                 indexInFrameList));
+    indexInFrameList++;
+  }
+
+  // ... and sort (by 'order' property)
+  sortedChildArray.Sort();
+
+  return sortedChildArray;
+}
+
+MainAxisPositionTracker::
+  MainAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
+                          const FlexboxAxisTracker& aAxisTracker,
+                          const nsHTMLReflowState& aReflowState,
+                          const nsTArray<FlexItem>& aItems)
+  : PositionTracker(aAxisTracker.GetMainAxis()),
+    mNumAutoMarginsInMainAxis(0),
+    mNumPackingSpacesRemaining(0)
+{
+  MOZ_ASSERT(aReflowState.frame == aFlexContainerFrame,
+             "Expecting the reflow state for the flex container frame");
+
+  // Step over flex container's own main-start border/padding.
+  // XXXdholbert Check GetSkipSides() here when we support pagination.
+  EnterMargin(aReflowState.mComputedBorderPadding);
+
+  // Set up our state for managing packing space & auto margins.
+  //   * If our main-size is unconstrained, then we just shrinkwrap our
+  // contents, and we don't have any packing space.
+  //   * Otherwise, we subtract our items' margin-box main-sizes from our
+  // computed main-size to get our available packing space.
+  mPackingSpaceRemaining =
+    aAxisTracker.GetMainComponent(nsSize(aReflowState.ComputedWidth(),
+                                         aReflowState.ComputedHeight()));
+  if (mPackingSpaceRemaining == NS_UNCONSTRAINEDSIZE) {
+    mPackingSpaceRemaining = 0;
+  } else {
+    for (uint32_t i = 0; i < aItems.Length(); i++) {
+      nscoord itemMarginBoxMainSize =
+        aItems[i].GetMainSize() +
+        aItems[i].GetMarginBorderPaddingSizeInAxis(aAxisTracker.GetMainAxis());
+      mPackingSpaceRemaining -= itemMarginBoxMainSize;
+    }
+  }
+
+  if (mPackingSpaceRemaining > 0) {
+    for (uint32_t i = 0; i < aItems.Length(); i++) {
+      mNumAutoMarginsInMainAxis += aItems[i].GetNumAutoMarginsInAxis(mAxis);
+    }
+  }
+
+  mJustifyContent = aFlexContainerFrame->GetStylePosition()->mJustifyContent;
+  // If packing space is negative, 'justify' behaves like 'start', and
+  // 'distribute' behaves like 'center'.  In those cases, it's simplest to
+  // just pretend we have a different 'justify-content' value and share code.
+  if (mPackingSpaceRemaining < 0) {
+    if (mJustifyContent == NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN) {
+      mJustifyContent = NS_STYLE_JUSTIFY_CONTENT_FLEX_START;
+    } else if (mJustifyContent == NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND) {
+      mJustifyContent = NS_STYLE_JUSTIFY_CONTENT_CENTER;
+    }
+  }
+
+  // Figure out how much space we'll set aside for auto margins or
+  // packing spaces, and advance past any leading packing-space.
+  if (mNumAutoMarginsInMainAxis == 0 &&
+      mPackingSpaceRemaining != 0 &&
+      !aItems.IsEmpty()) {
+    switch (mJustifyContent) {
+      case NS_STYLE_JUSTIFY_CONTENT_FLEX_START:
+        // All packing space should go at the end --> nothing to do here.
+        break;
+      case NS_STYLE_JUSTIFY_CONTENT_FLEX_END:
+        // All packing space goes at the beginning
+        mPosition += mPackingSpaceRemaining;
+        break;
+      case NS_STYLE_JUSTIFY_CONTENT_CENTER:
+        // Half the packing space goes at the beginning
+        mPosition += mPackingSpaceRemaining / 2;
+        break;
+      case NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN:
+        MOZ_ASSERT(mPackingSpaceRemaining >= 0,
+                   "negative packing space should make us use 'flex-start' "
+                   "instead of 'space-between'");
+        // 1 packing space between each flex item, no packing space at ends.
+        mNumPackingSpacesRemaining = aItems.Length() - 1;
+        break;
+      case NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND:
+        MOZ_ASSERT(mPackingSpaceRemaining >= 0,
+                   "negative packing space should make us use 'center' "
+                   "instead of 'space-around'");
+        // 1 packing space between each flex item, plus half a packing space
+        // at beginning & end.  So our number of full packing-spaces is equal
+        // to the number of flex items.
+        mNumPackingSpacesRemaining = aItems.Length();
+        if (mNumPackingSpacesRemaining > 0) {
+          // The edges (start/end) share one full packing space
+          nscoord totalEdgePackingSpace =
+            mPackingSpaceRemaining / mNumPackingSpacesRemaining;
+
+          // ...and we'll use half of that right now, at the start
+          mPosition += totalEdgePackingSpace / 2;
+          // ...but we need to subtract all of it right away, so that we won't
+          // hand out any of it to intermediate packing spaces.
+          mPackingSpaceRemaining -= totalEdgePackingSpace;
+          mNumPackingSpacesRemaining--;
+        }
+        break;
+      default:
+        MOZ_NOT_REACHED("Unexpected justify-content value");
+    }
+  }
+
+  MOZ_ASSERT(mNumPackingSpacesRemaining == 0 ||
+             mNumAutoMarginsInMainAxis == 0,
+             "extra space should either go to packing space or to "
+             "auto margins, but not to both");
+}
+
+void
+MainAxisPositionTracker::ResolveAutoMarginsInMainAxis(FlexItem& aItem)
+{
+  if (mNumAutoMarginsInMainAxis) {
+    const nsStyleSides& styleMargin = aItem.Frame()->GetStyleMargin()->mMargin;
+    for (uint32_t i = 0; i < eNumAxisEdges; i++) {
+      Side side = kAxisOrientationToSidesMap[mAxis][i];
+      if (styleMargin.GetUnit(side) == eStyleUnit_Auto) {
+        // NOTE: This integer math will skew the distribution of remainder
+        // app-units towards the end, which is fine.
+        nscoord curAutoMarginSize =
+          mPackingSpaceRemaining / mNumAutoMarginsInMainAxis;
+
+        MOZ_ASSERT(aItem.GetMarginComponentForSide(side) == 0,
+                   "Expecting auto margins to have value '0' before we "
+                   "resolve them");
+        aItem.SetMarginComponentForSide(side, curAutoMarginSize);
+
+        mNumAutoMarginsInMainAxis--;
+        mPackingSpaceRemaining -= curAutoMarginSize;
+      }
+    }
+  }
+}
+
+void
+MainAxisPositionTracker::TraversePackingSpace()
+{
+  if (mNumPackingSpacesRemaining) {
+    MOZ_ASSERT(mJustifyContent == NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN ||
+               mJustifyContent == NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND,
+               "mNumPackingSpacesRemaining only applies for "
+               "space-between/space-around");
+
+    MOZ_ASSERT(mPackingSpaceRemaining >= 0,
+               "ran out of packing space earlier than we expected");
+
+    // NOTE: This integer math will skew the distribution of remainder
+    // app-units towards the end, which is fine.
+    nscoord curPackingSpace =
+      mPackingSpaceRemaining / mNumPackingSpacesRemaining;
+
+    mPosition += curPackingSpace;
+    mNumPackingSpacesRemaining--;
+    mPackingSpaceRemaining -= curPackingSpace;
+  }
+}
+
+CrossAxisPositionTracker::
+  CrossAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
+                           const FlexboxAxisTracker& aAxisTracker,
+                           const nsHTMLReflowState& aReflowState)
+    : PositionTracker(aAxisTracker.GetCrossAxis())
+{
+  // Step over flex container's cross-start border/padding.
+  EnterMargin(aReflowState.mComputedBorderPadding);
+}
+
+SingleLineCrossAxisPositionTracker::
+  SingleLineCrossAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
+                                     const FlexboxAxisTracker& aAxisTracker,
+                                     const nsTArray<FlexItem>& aItems)
+  : PositionTracker(aAxisTracker.GetCrossAxis()),
+    mLineCrossSize(0),
+    mCrossStartToFurthestBaseline(nscoord_MIN) // Starts at -infinity, and then
+                                               // we progressively increase it.
+{
+}
+
+void
+SingleLineCrossAxisPositionTracker::
+  ComputeLineCrossSize(const nsTArray<FlexItem>& aItems)
+{
+  // NOTE: mCrossStartToFurthestBaseline is a member var rather than a local
+  // var, because we'll need it when we're baseline-aligning our children, and
+  // we'd prefer to not have to recompute it.
+  MOZ_ASSERT(mCrossStartToFurthestBaseline == nscoord_MIN,
+             "Computing largest baseline offset more than once");
+
+  nscoord crossEndToFurthestBaseline = nscoord_MIN;
+  nscoord largestOuterCrossSize = 0;
+  for (uint32_t i = 0; i < aItems.Length(); ++i) {
+    const FlexItem& curItem = aItems[i];
+    nscoord curOuterCrossSize = curItem.GetCrossSize() +
+      curItem.GetMarginBorderPaddingSizeInAxis(mAxis);
+
+    if (curItem.GetAlignSelf() == NS_STYLE_ALIGN_ITEMS_BASELINE &&
+        curItem.GetNumAutoMarginsInAxis(mAxis) == 0) {
+      // FIXME: Once we support multi-line flexbox with "wrap-reverse", that'll
+      // give us bottom-to-top cross axes. (But for now, we assume eAxis_TB.)
+      // FIXME: Once we support "writing-mode", we'll have to do baseline
+      // alignment in vertical flex containers here (w/ horizontal cross-axes).
+      MOZ_ASSERT(mAxis == eAxis_TB,
+                 "Only expecting to do baseline-alignment in horizontal "
+                 "flex containers, with top-to-bottom cross axis");
+
+      // Find distance from our item's cross-start and cross-end margin-box
+      // edges to its baseline.
+      //
+      // Here's a diagram of a flex-item that we might be doing this on.
+      // "mmm" is the margin-box, "bbb" is the border-box. The bottom of
+      // the text "BASE" is the baseline.
+      //
+      // ---(cross-start)---
+      //                ___              ___            ___
+      //   mmmmmmmmmmmm  |                |margin-start  |
+      //   m          m  |               _|_   ___       |
+      //   m bbbbbbbb m  |curOuterCrossSize     |        |crossStartToBaseline
+      //   m b      b m  |                      |ascent  |
+      //   m b BASE b m  |                     _|_      _|_
+      //   m b      b m  |                               |
+      //   m bbbbbbbb m  |                               |crossEndToBaseline
+      //   m          m  |                               |
+      //   mmmmmmmmmmmm _|_                             _|_
+      //
+      // ---(cross-end)---
+      //
+      // We already have the curOuterCrossSize, margin-start, and the ascent.
+      // * We can get crossStartToBaseline by adding margin-start + ascent.
+      // * If we subtract that from the curOuterCrossSize, we get
+      //   crossEndToBaseline.
+
+      nscoord crossStartToBaseline = GetBaselineOffsetFromCrossStart(curItem);
+      nscoord crossEndToBaseline = curOuterCrossSize - crossStartToBaseline;
+
+      // Now, update our "largest" values for these (across all the flex items
+      // in this flex line), so we can use them in computing mLineCrossSize
+      // below:
+      mCrossStartToFurthestBaseline = NS_MAX(mCrossStartToFurthestBaseline,
+                                             crossStartToBaseline);
+      crossEndToFurthestBaseline = NS_MAX(crossEndToFurthestBaseline,
+                                          crossEndToBaseline);
+    } else {
+      largestOuterCrossSize = NS_MAX(largestOuterCrossSize, curOuterCrossSize);
+    }
+  }
+
+  // The line's cross-size is the larger of:
+  //  (a) [largest cross-start-to-baseline + largest baseline-to-cross-end] of
+  //      all baseline-aligned items with no cross-axis auto margins...
+  // and
+  //  (b) largest cross-size of all other children.
+  mLineCrossSize = NS_MAX(mCrossStartToFurthestBaseline +
+                          crossEndToFurthestBaseline,
+                          largestOuterCrossSize);
+}
+
+nscoord
+SingleLineCrossAxisPositionTracker::
+  GetBaselineOffsetFromCrossStart(const FlexItem& aItem) const
+{
+  Side crossStartSide = kAxisOrientationToSidesMap[mAxis][eAxisEdge_Start];
+
+  // XXXdholbert This assumes cross axis is Top-To-Bottom.
+  // For bottom-to-top support, probably want to make this depend on
+  //   AxisGrowsInPositiveDirection(mAxis)
+  return aItem.GetAscent() + aItem.GetMarginComponentForSide(crossStartSide);
+}
+
+void
+SingleLineCrossAxisPositionTracker::
+  ResolveStretchedCrossSize(FlexItem& aItem)
+{
+  // We stretch IFF we are align-self:stretch, have no auto margins in
+  // cross axis, and have cross-axis size property == "auto". If any of those
+  // conditions don't hold up, we can just return.
+  if (aItem.GetAlignSelf() != NS_STYLE_ALIGN_ITEMS_STRETCH ||
+      aItem.GetNumAutoMarginsInAxis(mAxis) != 0 ||
+      GetSizePropertyForAxis(aItem.Frame(), mAxis).GetUnit() !=
+        eStyleUnit_Auto) {
+    return;
+  }
+
+  // Reserve space for margins & border & padding, and then use whatever
+  // remains as our item's cross-size (clamped to its min/max range).
+  nscoord stretchedSize = mLineCrossSize -
+    aItem.GetMarginBorderPaddingSizeInAxis(mAxis);
+
+  stretchedSize = NS_CSS_MINMAX(stretchedSize,
+                                aItem.GetCrossMinSize(),
+                                aItem.GetCrossMaxSize());
+
+  // Update the cross-size & make a note that it's stretched, so we know to
+  // override the reflow state's computed cross-size in our final reflow.
+  aItem.SetCrossSize(stretchedSize);
+  aItem.SetIsStretched();
+}
+
+void
+SingleLineCrossAxisPositionTracker::
+  ResolveAutoMarginsInCrossAxis(FlexItem& aItem)
+{
+  // Subtract the space that our item is already occupying, to see how much
+  // space (if any) is available for its auto margins.
+  nscoord spaceForAutoMargins = mLineCrossSize -
+    (aItem.GetCrossSize() + aItem.GetMarginBorderPaddingSizeInAxis(mAxis));
+
+  if (spaceForAutoMargins <= 0) {
+    return; // No available space  --> nothing to do
+  }
+
+  uint32_t numAutoMargins = aItem.GetNumAutoMarginsInAxis(mAxis);
+  if (numAutoMargins == 0) {
+    return; // No auto margins --> nothing to do.
+  }
+
+  // OK, we have at least one auto margin and we have some available space.
+  // Give each auto margin a share of the space.
+  const nsStyleSides& styleMargin = aItem.Frame()->GetStyleMargin()->mMargin;
+  for (uint32_t i = 0; i < eNumAxisEdges; i++) {
+    Side side = kAxisOrientationToSidesMap[mAxis][i];
+    if (styleMargin.GetUnit(side) == eStyleUnit_Auto) {
+      MOZ_ASSERT(aItem.GetMarginComponentForSide(side) == 0,
+                 "Expecting auto margins to have value '0' before we "
+                 "update them");
+
+      // NOTE: integer divison is fine here; numAutoMargins is either 1 or 2.
+      // If it's 2 & spaceForAutoMargins is odd, 1st margin gets smaller half.
+      nscoord curAutoMarginSize = spaceForAutoMargins / numAutoMargins;
+      aItem.SetMarginComponentForSide(side, curAutoMarginSize);
+      numAutoMargins--;
+      spaceForAutoMargins -= curAutoMarginSize;
+    }
+  }
+}
+
+void
+SingleLineCrossAxisPositionTracker::
+  EnterAlignPackingSpace(const FlexItem& aItem)
+{
+  // We don't do align-self alignment on items that have auto margins
+  // in the cross axis.
+  if (aItem.GetNumAutoMarginsInAxis(mAxis)) {
+    return;
+  }
+
+  switch (aItem.GetAlignSelf()) {
+    case NS_STYLE_ALIGN_ITEMS_FLEX_START:
+    case NS_STYLE_ALIGN_ITEMS_STRETCH:
+      // No space to skip over -- we're done.
+      // NOTE: 'stretch' behaves like 'start' once we've stretched any
+      // auto-sized items (which we've already done).
+      break;
+    case NS_STYLE_ALIGN_ITEMS_FLEX_END:
+      mPosition +=
+        mLineCrossSize -
+        (aItem.GetCrossSize() +
+         aItem.GetMarginBorderPaddingSizeInAxis(mAxis));
+      break;
+    case NS_STYLE_ALIGN_ITEMS_CENTER:
+      // Note: If cross-size is odd, the "after" space will get the extra unit.
+      mPosition +=
+        (mLineCrossSize -
+         (aItem.GetCrossSize() +
+          aItem.GetMarginBorderPaddingSizeInAxis(mAxis))) / 2;
+      break;
+    case NS_STYLE_ALIGN_ITEMS_BASELINE:
+      MOZ_ASSERT(mCrossStartToFurthestBaseline != nscoord_MIN,
+                 "using uninitialized baseline offset");
+      MOZ_ASSERT(mCrossStartToFurthestBaseline >=
+                 GetBaselineOffsetFromCrossStart(aItem),
+                 "failed at finding largest ascent");
+
+      // Advance so that aItem's baseline is aligned with
+      // largest baseline offset.
+      mPosition += (mCrossStartToFurthestBaseline -
+                    GetBaselineOffsetFromCrossStart(aItem));
+      break;
+    default:
+      NS_NOTREACHED("Unexpected align-self value");
+      break;
+  }
+}
+
+FlexboxAxisTracker::FlexboxAxisTracker(nsFlexContainerFrame* aFlexContainerFrame)
+{
+  uint32_t flexDirection =
+    aFlexContainerFrame->GetStylePosition()->mFlexDirection;
+  uint32_t cssDirection =
+    aFlexContainerFrame->GetStyleVisibility()->mDirection;
+
+  MOZ_ASSERT(cssDirection == NS_STYLE_DIRECTION_LTR ||
+             cssDirection == NS_STYLE_DIRECTION_RTL,
+             "Unexpected computed value for 'direction' property");
+  // (Not asserting for flexDirection here; it's checked by the switch below.)
+
+  // These are defined according to writing-modes' definitions of
+  // start/end (for the inline dimension) and before/after (for the block
+  // dimension), here:
+  //   http://www.w3.org/TR/css3-writing-modes/#logical-directions
+  // (NOTE: I'm intentionally not calling this "inlineAxis"/"blockAxis", since
+  // those terms have explicit definition in the writing-modes spec, which are
+  // the opposite of how I'd be using them here.)
+  // XXXdholbert Once we support the 'writing-mode' property, use its value
+  // here to further customize inlineDimension & blockDimension.
+
+  // Inline dimension ("start-to-end"):
+  AxisOrientationType inlineDimension =
+    cssDirection == NS_STYLE_DIRECTION_RTL ? eAxis_RL : eAxis_LR;
+
+  // Block dimension ("before-to-after"):
+  AxisOrientationType blockDimension = eAxis_TB;
+
+  // Determine main axis:
+  switch (flexDirection) {
+    case NS_STYLE_FLEX_DIRECTION_ROW:
+      mMainAxis = inlineDimension;
+      break;
+    case NS_STYLE_FLEX_DIRECTION_ROW_REVERSE:
+      mMainAxis = GetReverseAxis(inlineDimension);
+      break;
+    case NS_STYLE_FLEX_DIRECTION_COLUMN:
+      mMainAxis = blockDimension;
+      break;
+    case NS_STYLE_FLEX_DIRECTION_COLUMN_REVERSE:
+      mMainAxis = GetReverseAxis(blockDimension);
+      break;
+    default:
+      MOZ_NOT_REACHED("Unexpected computed value for 'flex-flow' property");
+      mMainAxis = inlineDimension;
+      break;
+  }
+
+  // Determine cross axis:
+  // (This is set up so that a bogus |flexDirection| value will
+  // give us blockDimension.
+  if (flexDirection == NS_STYLE_FLEX_DIRECTION_COLUMN ||
+      flexDirection == NS_STYLE_FLEX_DIRECTION_COLUMN_REVERSE) {
+    mCrossAxis = inlineDimension;
+  } else {
+    mCrossAxis = blockDimension;
+  }
+      
+  // FIXME: Once we support "flex-wrap", check if it's "wrap-reverse"
+  // here to determine whether we should reverse mCrossAxis.
+  MOZ_ASSERT(IsAxisHorizontal(mMainAxis) != IsAxisHorizontal(mCrossAxis),
+             "main & cross axes should be in different dimensions");
+
+
+  // NOTE: Right now, cross axis is never bottom-to-top.
+  // The only way for it to be different would be if we used a vertical
+  // "writing-mode" or if we had "flex-wrap: wrap-reverse" -- but we don't
+  // support either of those yet, so that can't happen right now.
+  // (When we add support for either of those properties, this assert will
+  // no longer hold.)
+  MOZ_ASSERT(mCrossAxis != eAxis_BT, "Not expecting bottom-to-top cross axis");
+}
+
+nsresult
+nsFlexContainerFrame::GenerateFlexItems(
+  nsPresContext* aPresContext,
+  const nsHTMLReflowState& aReflowState,
+  const FlexboxAxisTracker& aAxisTracker,
+  nsTArray<FlexItem>& aFlexItems)
+{
+  MOZ_ASSERT(aFlexItems.IsEmpty(), "Expecting outparam to start out empty");
+
+  // Sort by 'order' property:
+  const nsTArray<SortableFrame> sortedChildren = BuildSortedChildArray(mFrames);
+
+  // Build list of unresolved flex items:
+
+  // XXXdholbert When we support multi-line, we  might want this to be a linked
+  // list, so we can easily split into multiple lines.
+  aFlexItems.SetCapacity(sortedChildren.Length());
+  for (uint32_t i = 0; i < sortedChildren.Length(); ++i) {
+    nsresult rv = AppendFlexItemForChild(aPresContext,
+                                         sortedChildren[i].Frame(),
+                                         aReflowState, aAxisTracker,
+                                         aFlexItems);
+    NS_ENSURE_SUCCESS(rv,rv);
+  }
+
+  return NS_OK;
+}
+
+// Computes the content-box main-size of our flex container.
+nscoord
+nsFlexContainerFrame::ComputeFlexContainerMainSize(
+  const nsHTMLReflowState& aReflowState,
+  const FlexboxAxisTracker& aAxisTracker,
+  const nsTArray<FlexItem>& aItems)
+{
+  // If we've got a finite computed main-size, use that.
+  nscoord mainSize =
+    aAxisTracker.GetMainComponent(nsSize(aReflowState.ComputedWidth(),
+                                         aReflowState.ComputedHeight()));
+  if (mainSize != NS_UNCONSTRAINEDSIZE) {
+    return mainSize;
+  }
+
+  MOZ_ASSERT(!IsAxisHorizontal(aAxisTracker.GetMainAxis()),
+             "Computed width should always be constrained, so horizontal "
+             "flex containers should always have a constrained main-size");
+
+  // Otherwise, use the sum of our items' hypothetical main sizes, clamped
+  // to our computed min/max main-size properties.
+  mainSize = 0;
+  for (uint32_t i = 0; i < aItems.Length(); ++i) {
+    mainSize +=
+      aItems[i].GetMainSize() +
+      aItems[i].GetMarginBorderPaddingSizeInAxis(aAxisTracker.GetMainAxis());
+  }
+
+  nscoord minMainSize =
+    aAxisTracker.GetMainComponent(nsSize(aReflowState.mComputedMinWidth,
+                                         aReflowState.mComputedMinHeight));
+  nscoord maxMainSize =
+    aAxisTracker.GetMainComponent(nsSize(aReflowState.mComputedMaxWidth,
+                                         aReflowState.mComputedMaxHeight));
+
+  return NS_CSS_MINMAX(mainSize, minMainSize, maxMainSize);
+}
+
+void
+nsFlexContainerFrame::PositionItemInMainAxis(
+  MainAxisPositionTracker& aMainAxisPosnTracker,
+  FlexItem& aItem)
+{
+  nscoord itemMainBorderBoxSize =
+    aItem.GetMainSize() +
+    aItem.GetBorderPaddingSizeInAxis(aMainAxisPosnTracker.GetAxis());
+
+  // Resolve any main-axis 'auto' margins on aChild to an actual value.
+  aMainAxisPosnTracker.ResolveAutoMarginsInMainAxis(aItem);
+
+  // Advance our position tracker to child's upper-left content-box corner,
+  // and use that as its position in the main axis.
+  aMainAxisPosnTracker.EnterMargin(aItem.GetMargin());
+  aMainAxisPosnTracker.EnterChildFrame(itemMainBorderBoxSize);
+
+  aItem.SetMainPosition(aMainAxisPosnTracker.GetPosition());
+
+  aMainAxisPosnTracker.ExitChildFrame(itemMainBorderBoxSize);
+  aMainAxisPosnTracker.ExitMargin(aItem.GetMargin());
+  aMainAxisPosnTracker.TraversePackingSpace();
+}
+
+nsresult
+nsFlexContainerFrame::SizeItemInCrossAxis(
+  nsPresContext* aPresContext,
+  const FlexboxAxisTracker& aAxisTracker,
+  const nsHTMLReflowState& aChildReflowState,
+  FlexItem& aItem)
+{
+  // In vertical flexbox (with horizontal cross-axis), we can just trust the
+  // reflow state's computed-width as our cross-size. We also don't need to
+  // record the baseline because we'll have converted any "align-self:baseline"
+  // items to be "align-self:flex-start" in the FlexItem constructor.
+  // FIXME: Once we support writing-mode (vertical text), we will be able to
+  // have baseline-aligned items in a vertical flexbox, and we'll need to
+  // record baseline information here.
+  if (IsAxisHorizontal(aAxisTracker.GetCrossAxis())) {
+    MOZ_ASSERT(aItem.GetAlignSelf() != NS_STYLE_ALIGN_ITEMS_BASELINE,
+               "In vert flex container, we depend on FlexItem constructor to "
+               "convert 'align-self: baseline' to 'align-self: flex-start'");
+    aItem.SetCrossSize(aChildReflowState.ComputedWidth());
+    return NS_OK;
+  }
+
+  nsHTMLReflowMetrics childDesiredSize;
+  nsReflowStatus childReflowStatus;
+  nsresult rv = ReflowChild(aItem.Frame(), aPresContext,
+                            childDesiredSize, aChildReflowState,
+                            0, 0, NS_FRAME_NO_MOVE_FRAME,
+                            childReflowStatus);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // XXXdholbert Once we do pagination / splitting, we'll need to actually
+  // handle incomplete childReflowStatuses. But for now, we give our kids
+  // unconstrained available height, which means they should always complete.
+  MOZ_ASSERT(NS_FRAME_IS_COMPLETE(childReflowStatus),
+             "We gave flex item unconstrained available height, so it "
+             "should be complete");
+
+  // Tell the child we're done with its initial reflow.
+  // (Necessary for e.g. GetBaseline() to work below w/out asserting)
+  rv = FinishReflowChild(aItem.Frame(), aPresContext,
+                         &aChildReflowState, childDesiredSize, 0, 0, 0);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Save the sizing info that we learned from this reflow
+  // -----------------------------------------------------
+
+  // Tentatively accept the child's desired size, minus border/padding, as its
+  // cross-size:
+  MOZ_ASSERT(childDesiredSize.height >=
+             aItem.GetBorderPaddingSizeInAxis(aAxisTracker.GetCrossAxis()),
+             "Child should ask for at least enough space for border/padding");
+  nscoord crossSize =
+    aAxisTracker.GetCrossComponent(childDesiredSize) -
+    aItem.GetBorderPaddingSizeInAxis(aAxisTracker.GetCrossAxis());
+  aItem.SetCrossSize(crossSize);
+
+  // If we need to do baseline-alignment, store the child's ascent.
+  if (aItem.GetAlignSelf() == NS_STYLE_ALIGN_ITEMS_BASELINE) {
+    if (childDesiredSize.ascent == nsHTMLReflowMetrics::ASK_FOR_BASELINE) {
+      // Use GetFirstLineBaseline(), or just GetBaseline() if that fails.
+      if (!nsLayoutUtils::GetFirstLineBaseline(aItem.Frame(),
+                                               &childDesiredSize.ascent)) {
+        childDesiredSize.ascent = aItem.Frame()->GetBaseline();
+      }
+    }
+    aItem.SetAscent(childDesiredSize.ascent);
+  }
+
+  return NS_OK;
+}
+
+void
+nsFlexContainerFrame::PositionItemInCrossAxis(
+  nscoord aLineStartPosition,
+  SingleLineCrossAxisPositionTracker& aLineCrossAxisPosnTracker,
+  FlexItem& aItem)
+{
+  MOZ_ASSERT(aLineCrossAxisPosnTracker.GetPosition() == 0,
+             "per-line cross-axis position tracker wasn't correctly reset");
+
+  // Resolve any to-be-stretched cross-sizes & auto margins in cross axis.
+  aLineCrossAxisPosnTracker.ResolveStretchedCrossSize(aItem);
+  aLineCrossAxisPosnTracker.ResolveAutoMarginsInCrossAxis(aItem);
+
+  // Compute the cross-axis position of this item
+  nscoord itemCrossBorderBoxSize =
+    aItem.GetCrossSize() +
+    aItem.GetBorderPaddingSizeInAxis(aLineCrossAxisPosnTracker.GetAxis());
+  aLineCrossAxisPosnTracker.EnterAlignPackingSpace(aItem);
+  aLineCrossAxisPosnTracker.EnterMargin(aItem.GetMargin());
+  aLineCrossAxisPosnTracker.EnterChildFrame(itemCrossBorderBoxSize);
+
+  aItem.SetCrossPosition(aLineStartPosition +
+                         aLineCrossAxisPosnTracker.GetPosition());
+
+  // Back out to cross-axis edge of the line.
+  aLineCrossAxisPosnTracker.ResetPosition();
+}
+
+NS_IMETHODIMP
+nsFlexContainerFrame::Reflow(nsPresContext*           aPresContext,
+                             nsHTMLReflowMetrics&     aDesiredSize,
+                             const nsHTMLReflowState& aReflowState,
+                             nsReflowStatus&          aStatus)
+{
+  DO_GLOBAL_REFLOW_COUNT("nsFlexContainerFrame");
+  DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
+  PR_LOG(nsFlexContainerFrameLM, PR_LOG_DEBUG,
+         ("Reflow() for nsFlexContainerFrame %p\n", this));
+
+  // We (and our children) can only depend on our ancestor's height if we have
+  // a percent-height.  (There are actually other cases, too -- e.g. if our
+  // parent is itself a vertical flex container and we're flexible -- but we'll
+  // let our ancestors handle those sorts of cases.)
+  if (GetStylePosition()->mHeight.HasPercent()) {
+    AddStateBits(NS_FRAME_CONTAINS_RELATIVE_HEIGHT);
+  }
+
+#ifdef DEBUG
+  SanityCheckAnonymousFlexItems();
+#endif // DEBUG
+
+  // If our subtree is dirty (i.e. some of our descendants have changed), we
+  // reflow _all_ of our children.  We have to do this -- we can't just reflow
+  // select children, as we would in other frame classes.  This is because flex
+  // items' sizes (in both axes) are highly dependent on their siblings' sizes.
+  bool shouldReflowChildren =
+    NS_SUBTREE_DIRTY(this) || aReflowState.ShouldReflowAllKids();
+
+  const FlexboxAxisTracker axisTracker(this);
+
+  // Generate a list of our flex items (already sorted), and get our main
+  // size (which may depend on those items).
+  nsTArray<FlexItem> items;
+  nsresult rv = GenerateFlexItems(aPresContext, aReflowState,
+                                  axisTracker, items);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // XXXdholbert FOR MULTI-LINE FLEX CONTAINERS: Do line-breaking here.
+  // This would produce an array of arrays, or a list of arrays,
+  // or something like that. (one list/array per line)
+
+  nscoord flexContainerMainSize =
+    ComputeFlexContainerMainSize(aReflowState, axisTracker, items);
+
+  ResolveFlexibleLengths(axisTracker, flexContainerMainSize, items);
+
+  // Our frame's main-size is the content-box size plus border and padding.
+  nscoord frameMainSize = flexContainerMainSize +
+    axisTracker.GetMarginSizeInMainAxis(aReflowState.mComputedBorderPadding);
+
+  nscoord frameCrossSize;
+
+  if (!shouldReflowChildren) {
+    // Children don't need reflow --> assume our content-box size is the same
+    // since our last reflow.
+    frameCrossSize = mCachedContentBoxCrossSize +
+      axisTracker.GetMarginSizeInCrossAxis(aReflowState.mComputedBorderPadding);
+  } else {
+    MainAxisPositionTracker mainAxisPosnTracker(this, axisTracker,
+                                                aReflowState, items);
+
+    // First loop: Compute main axis position & cross-axis size of each item
+    for (uint32_t i = 0; i < items.Length(); ++i) {
+      FlexItem& curItem = items[i];
+
+      nsHTMLReflowState childReflowState(aPresContext, aReflowState,
+                                         curItem.Frame(),
+                                         nsSize(aReflowState.ComputedWidth(),
+                                                NS_UNCONSTRAINEDSIZE));
+      // Override computed main-size
+      if (IsAxisHorizontal(axisTracker.GetMainAxis())) {
+        childReflowState.SetComputedWidth(curItem.GetMainSize());
+      } else {
+        childReflowState.SetComputedHeight(curItem.GetMainSize());
+      }
+
+      PositionItemInMainAxis(mainAxisPosnTracker, curItem);
+
+      nsresult rv =
+        SizeItemInCrossAxis(aPresContext, axisTracker,
+                            childReflowState, curItem);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    // SIZE & POSITION THE FLEX LINE (IN CROSS AXIS)
+    // Set up state for cross-axis alignment, at a high level (outside the
+    // scope of a particular flex line)
+    CrossAxisPositionTracker
+      crossAxisPosnTracker(this, axisTracker, aReflowState);
+
+    // Set up state for cross-axis-positioning of children _within_ a single
+    // flex line.
+    SingleLineCrossAxisPositionTracker
+      lineCrossAxisPosnTracker(this, axisTracker, items);
+
+    lineCrossAxisPosnTracker.ComputeLineCrossSize(items);
+    // XXXdholbert Once we've got multi-line flexbox support: here, after we've
+    // computed the cross size of all lines, we need to check if if
+    // 'align-content' is 'stretch' -- if it is, we need to give each line an
+    // additional share of our flex container's desired cross-size. (if it's
+    // not NS_AUTOHEIGHT and there's any cross-size left over to distribute)
+
+    // Figure out our flex container's cross size
+    mCachedContentBoxCrossSize =
+      axisTracker.GetCrossComponent(nsSize(aReflowState.ComputedWidth(),
+                                           aReflowState.ComputedHeight()));
+
+    if (mCachedContentBoxCrossSize == NS_AUTOHEIGHT) {
+      // unconstrained 'auto' cross-size: shrink-wrap our line(s)
+      mCachedContentBoxCrossSize =
+        lineCrossAxisPosnTracker.GetLineCrossSize();
+    } else {
+      // XXXdholbert When we support multi-line flex containers, we should
+      // distribute any extra space among or between our lines here according
+      // to 'align-content'. For now, we do the single-line special behavior:
+      // "If the flex container has only a single line (even if it's a
+      // multi-line flex container), the cross size of the flex line is the
+      // flex container's inner cross size."
+      lineCrossAxisPosnTracker.SetLineCrossSize(mCachedContentBoxCrossSize);
+    }
+    frameCrossSize = mCachedContentBoxCrossSize +
+      axisTracker.GetMarginSizeInCrossAxis(aReflowState.mComputedBorderPadding);
+
+    // XXXdholbert FOLLOW ACTUAL RULES FOR FLEX CONTAINER BASELINE
+    // If we have any baseline-aligned items on first line, use their baseline.
+    // ...ELSE if we have at least one flex item and our first flex item's
+    //         baseline is parallel to main axis, then use that baseline.
+    // ...ELSE use "after" edge of content box.
+    // Default baseline: the "after" edge of content box. (Note: if we have any
+    // flex items, they'll override this.)
+    mCachedAscent = mCachedContentBoxCrossSize +
+      aReflowState.mComputedBorderPadding.top;
+
+    // Position the items in cross axis, within their line
+    for (uint32_t i = 0; i < items.Length(); ++i) {
+      PositionItemInCrossAxis(crossAxisPosnTracker.GetPosition(),
+                              lineCrossAxisPosnTracker, items[i]);
+    }
+
+    // FINAL REFLOW: Give each child frame another chance to reflow, now that
+    // we know its final size and position.
+    for (uint32_t i = 0; i < items.Length(); ++i) {
+      FlexItem& curItem = items[i];
+      nsHTMLReflowState childReflowState(aPresContext, aReflowState,
+                                         curItem.Frame(),
+                                         nsSize(aReflowState.ComputedWidth(),
+                                                NS_UNCONSTRAINEDSIZE));
+
+      // Override computed main-size
+      if (IsAxisHorizontal(axisTracker.GetMainAxis())) {
+        childReflowState.SetComputedWidth(curItem.GetMainSize());
+      } else {
+        childReflowState.SetComputedHeight(curItem.GetMainSize());
+      }
+
+      // Override reflow state's computed cross-size, for stretched items.
+      if (curItem.IsStretched()) {
+        MOZ_ASSERT(curItem.GetAlignSelf() == NS_STYLE_ALIGN_ITEMS_STRETCH,
+                   "stretched item w/o 'align-self: stretch'?");
+        if (IsAxisHorizontal(axisTracker.GetCrossAxis())) {
+          childReflowState.SetComputedWidth(curItem.GetCrossSize());
+        } else {
+          childReflowState.SetComputedHeight(curItem.GetCrossSize());
+        }
+      }
+
+      // XXXdholbert Might need to actually set the correct margins in the
+      // reflow state at some point, so that they can be saved on the frame for
+      // UsedMarginPropeorty().  Maybe doesn't matter though...?
+
+      // XXXdholbert Assuming horizontal
+      nscoord mainPosn = curItem.GetMainPosition();
+      nscoord crossPosn = curItem.GetCrossPosition();
+      if (!AxisGrowsInPositiveDirection(axisTracker.GetMainAxis())) {
+        mainPosn = frameMainSize - mainPosn;
+      }
+      if (!AxisGrowsInPositiveDirection(axisTracker.GetCrossAxis())) {
+        crossPosn = frameCrossSize - crossPosn;
+      }
+
+      nsPoint physicalPosn =
+        axisTracker.PhysicalPositionFromLogicalPosition(mainPosn, crossPosn);
+
+      nsHTMLReflowMetrics childDesiredSize;
+      nsReflowStatus childReflowStatus;
+      nsresult rv = ReflowChild(curItem.Frame(), aPresContext,
+                                childDesiredSize, childReflowState,
+                                physicalPosn.x, physicalPosn.y,
+                                0, childReflowStatus);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      // XXXdholbert Once we do pagination / splitting, we'll need to actually
+      // handle incomplete childReflowStatuses. But for now, we give our kids
+      // unconstrained available height, which means they should always
+      // complete.
+      MOZ_ASSERT(NS_FRAME_IS_COMPLETE(childReflowStatus),
+                 "We gave flex item unconstrained available height, so it "
+                 "should be complete");
+
+      // Apply CSS relative positioning
+      const nsStyleDisplay* styleDisp = curItem.Frame()->GetStyleDisplay();
+      if (NS_STYLE_POSITION_RELATIVE == styleDisp->mPosition) {
+        physicalPosn.x += childReflowState.mComputedOffsets.left;
+        physicalPosn.y += childReflowState.mComputedOffsets.top;
+      }
+
+      rv = FinishReflowChild(curItem.Frame(), aPresContext,
+                             &childReflowState, childDesiredSize,
+                             physicalPosn.x, physicalPosn.y, 0);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  }
+
+  // XXXdholbert This could be more elegant
+  aDesiredSize.width =
+    IsAxisHorizontal(axisTracker.GetMainAxis()) ?
+    frameMainSize : frameCrossSize;
+  aDesiredSize.height =
+    IsAxisHorizontal(axisTracker.GetCrossAxis()) ?
+    frameMainSize : frameCrossSize;
+
+  aDesiredSize.ascent = mCachedAscent;
+
+  // Overflow area = union(my overflow area, kids' overflow areas)
+  aDesiredSize.SetOverflowAreasToDesiredBounds();
+  for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
+    ConsiderChildOverflow(aDesiredSize.mOverflowAreas, e.get());
+  }
+
+  NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize)
+
+  aStatus = NS_FRAME_COMPLETE;
+
+  FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize,
+                                 aReflowState, aStatus);
+
+  return NS_OK;
+}
+
+/* virtual */ nscoord
+nsFlexContainerFrame::GetMinWidth(nsRenderingContext* aRenderingContext)
+{
+  FlexboxAxisTracker axisTracker(this);
+
+  nscoord minWidth = 0;
+  for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
+    nscoord childMinWidth =
+      nsLayoutUtils::IntrinsicForContainer(aRenderingContext, e.get(),
+                                           nsLayoutUtils::MIN_WIDTH);
+    if (IsAxisHorizontal(axisTracker.GetMainAxis())) {
+      minWidth += childMinWidth;
+    } else {
+      minWidth = NS_MAX(minWidth, childMinWidth);
+    }
+  }
+  return minWidth;
+}
+
+/* virtual */ nscoord
+nsFlexContainerFrame::GetPrefWidth(nsRenderingContext* aRenderingContext)
+{
+  // XXXdholbert Optimization: We could cache our intrinsic widths like
+  // nsBlockFrame does (and return it early from this function if it's set).
+  // Whenever anything happens that might change it, set it to
+  // NS_INTRINSIC_WIDTH_UNKNOWN (like nsBlockFrame::MarkIntrinsicWidthsDirty
+  // does)
+  FlexboxAxisTracker axisTracker(this);
+
+  nscoord prefWidth = 0;
+  for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
+    nscoord childPrefWidth =
+      nsLayoutUtils::IntrinsicForContainer(aRenderingContext, e.get(),
+                                           nsLayoutUtils::PREF_WIDTH);
+    if (IsAxisHorizontal(axisTracker.GetMainAxis())) {
+      prefWidth += childPrefWidth;
+    } else {
+      prefWidth = NS_MAX(prefWidth, childPrefWidth);
+    }
+  }
+  return prefWidth;
+}
diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h
index dcbbbca46535..bcb218aca736 100644
--- a/layout/generic/nsFlexContainerFrame.h
+++ b/layout/generic/nsFlexContainerFrame.h
@@ -11,6 +11,7 @@
 #define nsFlexContainerFrame_h___
 
 #include "nsContainerFrame.h"
+#include "nsTArray.h"
 #include "mozilla/Types.h"
 
 nsIFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
@@ -18,6 +19,11 @@ nsIFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
 
 typedef nsContainerFrame nsFlexContainerFrameSuper;
 
+class FlexItem;
+class FlexboxAxisTracker;
+class MainAxisPositionTracker;
+class SingleLineCrossAxisPositionTracker;
+
 class nsFlexContainerFrame : public nsFlexContainerFrameSuper {
   NS_DECL_FRAMEARENA_HELPERS
   NS_DECL_QUERYFRAME_TARGET(nsFlexContainerFrame)
@@ -27,20 +33,89 @@ class nsFlexContainerFrame : public nsFlexContainerFrameSuper {
   friend nsIFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
                                             nsStyleContext* aContext);
 
+public:
   // nsIFrame overrides
+  NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
+                              const nsRect&           aDirtyRect,
+                              const nsDisplayListSet& aLists) MOZ_OVERRIDE;
+
+  NS_IMETHOD Reflow(nsPresContext*           aPresContext,
+                    nsHTMLReflowMetrics&     aDesiredSize,
+                    const nsHTMLReflowState& aReflowState,
+                    nsReflowStatus&          aStatus) MOZ_OVERRIDE;
+
+  virtual nscoord
+    GetMinWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
+  virtual nscoord
+    GetPrefWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
+
   virtual nsIAtom* GetType() const MOZ_OVERRIDE;
 #ifdef DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
-#endif
+#endif // DEBUG
+  // Flexbox-specific public methods
+  bool IsHorizontal();
 
 protected:
   // Protected constructor & destructor
-  nsFlexContainerFrame(nsStyleContext* aContext) : nsFlexContainerFrameSuper(aContext) {}
+  nsFlexContainerFrame(nsStyleContext* aContext) :
+    nsFlexContainerFrameSuper(aContext),
+    mCachedContentBoxCrossSize(nscoord_MIN),
+    mCachedAscent(nscoord_MIN)
+  {}
   virtual ~nsFlexContainerFrame();
 
   // Protected nsIFrame overrides:
   virtual void DestroyFrom(nsIFrame* aDestructRoot);
 
+  // Protected flex-container-specific methods / member-vars
+#ifdef DEBUG
+  void SanityCheckAnonymousFlexItems() const;
+#endif // DEBUG
+
+
+  // Returns nsresult because we might have to reflow aChildFrame (to get its
+  // vertical intrinsic size in a vertical flexbox), and if that reflow fails
+  // (returns a failure nsresult), we want to bail out.
+  nsresult AppendFlexItemForChild(nsPresContext* aPresContext,
+                                  nsIFrame* aChildFrame,
+                                  const nsHTMLReflowState& aParentReflowState,
+                                  const FlexboxAxisTracker& aAxisTracker,
+                                  nsTArray<FlexItem>& aFlexItems);
+
+  // Runs the "resolve the flexible lengths" algorithm, distributing
+  // |aFlexContainerMainSize| among the |aItems| and freezing them.
+  void ResolveFlexibleLengths(const FlexboxAxisTracker& aAxisTracker,
+                              nscoord aFlexContainerMainSize,
+                              nsTArray<FlexItem>& aItems);
+
+  nsresult GenerateFlexItems(nsPresContext* aPresContext,
+                             const nsHTMLReflowState& aReflowState,
+                             const FlexboxAxisTracker& aAxisTracker,
+                             nsTArray<FlexItem>& aItems);
+
+  nscoord ComputeFlexContainerMainSize(const nsHTMLReflowState& aReflowState,
+                                       const FlexboxAxisTracker& aAxisTracker,
+                                       const nsTArray<FlexItem>& aFlexItems);
+
+  void PositionItemInMainAxis(MainAxisPositionTracker& aMainAxisPosnTracker,
+                              FlexItem& aItem);
+
+  nsresult SizeItemInCrossAxis(nsPresContext* aPresContext,
+                               const FlexboxAxisTracker& aAxisTracker,
+                               const nsHTMLReflowState& aChildReflowState,
+                               FlexItem& aItem);
+
+  void PositionItemInCrossAxis(
+    nscoord aLineStartPosition,
+    SingleLineCrossAxisPositionTracker& aLineCrossAxisPosnTracker,
+    FlexItem& aItem);
+
+  // Cached values from running flexbox layout algorithm, used in setting our
+  // reflow metrics w/out actually reflowing all of our children, in any
+  // reflows where we're not dirty:
+  nscoord mCachedContentBoxCrossSize; // cross size of our content-box size
+  nscoord mCachedAscent;              // our ascent, in prev. reflow.
 };
 
 #endif /* nsFlexContainerFrame_h___ */
diff --git a/layout/generic/nsFrameIdList.h b/layout/generic/nsFrameIdList.h
index d592e149b471..b0ca1531cf40 100644
--- a/layout/generic/nsFrameIdList.h
+++ b/layout/generic/nsFrameIdList.h
@@ -22,9 +22,7 @@ FRAME_ID(nsFieldSetFrame)
 FRAME_ID(nsFileControlFrame)
 FRAME_ID(nsFirstLetterFrame)
 FRAME_ID(nsFirstLineFrame)
-#ifdef MOZ_FLEXBOX
 FRAME_ID(nsFlexContainerFrame)
-#endif // MOZ_FLEXBOX
 FRAME_ID(nsFormControlFrame)
 FRAME_ID(nsFrame)
 FRAME_ID(nsGfxButtonControlFrame)
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 5bb75837dfca..b4a57f8a4ddb 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -16,6 +16,7 @@
 #include "nsFontMetrics.h"
 #include "nsBlockFrame.h"
 #include "nsLineBox.h"
+#include "nsFlexContainerFrame.h"
 #include "nsImageFrame.h"
 #include "nsTableFrame.h"
 #include "nsTableCellFrame.h"
@@ -687,6 +688,9 @@ nsHTMLReflowState::InitFrameType(nsIAtom* aFrameType)
     case NS_STYLE_DISPLAY_LIST_ITEM:
     case NS_STYLE_DISPLAY_TABLE:
     case NS_STYLE_DISPLAY_TABLE_CAPTION:
+#ifdef MOZ_FLEXBOX
+    case NS_STYLE_DISPLAY_FLEX:
+#endif // MOZ_FLEXBOX
       frameType = NS_CSS_FRAME_TYPE_BLOCK;
       break;
 
@@ -696,6 +700,9 @@ nsHTMLReflowState::InitFrameType(nsIAtom* aFrameType)
     case NS_STYLE_DISPLAY_INLINE_BOX:
     case NS_STYLE_DISPLAY_INLINE_GRID:
     case NS_STYLE_DISPLAY_INLINE_STACK:
+#ifdef MOZ_FLEXBOX
+    case NS_STYLE_DISPLAY_INLINE_FLEX:
+#endif // MOZ_FLEXBOX
       frameType = NS_CSS_FRAME_TYPE_INLINE;
       break;
 
@@ -1799,6 +1806,20 @@ IsSideCaption(nsIFrame* aFrame, const nsStyleDisplay* aStyleDisplay)
          captionSide == NS_STYLE_CAPTION_SIDE_RIGHT;
 }
 
+#ifdef MOZ_FLEXBOX
+static nsFlexContainerFrame*
+GetFlexContainer(nsIFrame* aFrame)
+{
+  nsIFrame* parent = aFrame->GetParent();
+  if (!parent ||
+      parent->GetType() != nsGkAtoms::flexContainerFrame) {
+    return nullptr;
+  }
+
+  return static_cast<nsFlexContainerFrame*>(parent);
+}
+#endif // MOZ_FLEXBOX
+
 // XXX refactor this code to have methods for each set of properties
 // we are computing: width,height,line-height; margin; offsets
 
@@ -2010,11 +2031,22 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
         computeSizeFlags |= nsIFrame::eShrinkWrap;
       }
 
-      // If we're inside of a flexbox that needs to measure our auto height,
-      // pass that information along to ComputeSize().
-      if (mFlags.mIsFlexContainerMeasuringHeight) {
-        computeSizeFlags |= nsIFrame::eUseAutoHeight;
+#ifdef MOZ_FLEXBOX
+      const nsFlexContainerFrame* flexContainerFrame = GetFlexContainer(frame);
+      if (flexContainerFrame) {
+        computeSizeFlags |= nsIFrame::eShrinkWrap;
+
+        // If we're inside of a flex container that needs to measure our
+        // auto height, pass that information along to ComputeSize().
+        if (mFlags.mIsFlexContainerMeasuringHeight) {
+          computeSizeFlags |= nsIFrame::eUseAutoHeight;
+        }
+      } else {
+        MOZ_ASSERT(!mFlags.mIsFlexContainerMeasuringHeight,
+                   "We're not in a flex container, so the flag "
+                   "'mIsFlexContainerMeasuringHeight' shouldn't be set");
       }
+#endif // MOZ_FLEXBOX
 
       nsSize size =
         frame->ComputeSize(rendContext,
@@ -2037,9 +2069,14 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
       NS_ASSERTION(mComputedHeight == NS_UNCONSTRAINEDSIZE ||
                    mComputedHeight >= 0, "Bogus height");
 
-      // Exclude inline tables from the block margin calculations
-      if (isBlock && !IsSideCaption(frame, mStyleDisplay) &&
-          frame->GetStyleDisplay()->mDisplay != NS_STYLE_DISPLAY_INLINE_TABLE)
+      // Exclude inline tables and flex items from the block margin calculations
+      if (isBlock &&
+          !IsSideCaption(frame, mStyleDisplay) &&
+          mStyleDisplay->mDisplay != NS_STYLE_DISPLAY_INLINE_TABLE
+#ifdef MOZ_FLEXBOX
+          && !flexContainerFrame
+#endif // MOZ_FLEXBOX
+          )
         CalculateBlockSideMargins(availableWidth, mComputedWidth, aFrameType);
     }
   }
diff --git a/layout/style/ua.css b/layout/style/ua.css
index e818300cddf6..e3f87a8731f2 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -41,6 +41,7 @@
   page-break-after: inherit;
   vertical-align: inherit; /* needed for inline-table */
   line-height: inherit; /* needed for vertical-align on inline-table */
+  -moz-align-self: inherit; /* needed for "align-self: auto" to work on table */
   /* Bug 722777 */
   -moz-transform: inherit;
   -moz-transform-origin: inherit;

From 8d95ac617b3c16e75222be15c0637c2ebc66cd4d Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 29 Sep 2012 23:38:46 -0700
Subject: [PATCH 23/64] Bug 666041 patch 8: Add special handling for
 "min-width: auto" value on flex items. r=dbaron

---
 layout/generic/nsHTMLReflowState.cpp | 14 +++++++++++++-
 layout/style/nsComputedDOMStyle.cpp  | 19 +++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index b4a57f8a4ddb..7bde97c420f5 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -2502,10 +2502,22 @@ nsHTMLReflowState::ComputeMinMaxValues(nscoord aContainingBlockWidth,
                                        nscoord aContainingBlockHeight,
                                        const nsHTMLReflowState* aContainingBlockRS)
 {
+#ifdef MOZ_FLEXBOX
+  nsFlexContainerFrame* flexContainerFrame = GetFlexContainer(frame);
+#endif // MOZ_FLEXBOX
+
   // Handle "min-width: auto"
   if (eStyleUnit_Auto == mStylePosition->mMinWidth.GetUnit()) {
-    // XXXdholbert For flex items, this needs to behave like -moz-min-content.
     mComputedMinWidth = 0;
+#ifdef MOZ_FLEXBOX
+    if (flexContainerFrame && flexContainerFrame->IsHorizontal()) {
+      mComputedMinWidth =
+        ComputeWidthValue(aContainingBlockWidth,
+                          mStylePosition->mBoxSizing,
+                          nsStyleCoord(NS_STYLE_WIDTH_MIN_CONTENT,
+                                       eStyleUnit_Enumerated));
+    }
+#endif // MOZ_FLEXBOX
   } else {
     mComputedMinWidth = ComputeWidthValue(aContainingBlockWidth,
                                           mStylePosition->mBoxSizing,
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 2e84d420f0df..8b9d4ca2f02b 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -23,6 +23,7 @@
 #include "nsCSSProps.h"
 #include "nsCSSKeywords.h"
 #include "nsDOMCSSRect.h"
+#include "nsFlexContainerFrame.h"
 #include "nsGkAtoms.h"
 #include "nsHTMLReflowState.h"
 #include "nsThemeConstants.h"
@@ -3388,12 +3389,22 @@ nsComputedDOMStyle::DoGetMinWidth()
   nsStyleCoord minWidth = GetStylePosition()->mMinWidth;
 
   if (eStyleUnit_Auto == minWidth.GetUnit()) {
-    // In non-flexbox contexts, "min-width: auto" means "min-width: 0".
-    // XXXdholbert For flex items, we should set |minWidth| to the
-    // -moz-min-content keyword, instead of 0.
+    // "min-width: auto" means "0", unless we're a flex item in a horizontal
+    // flex container, in which case it means "min-content"
     minWidth.SetCoordValue(0);
-  }
+#ifdef MOZ_FLEXBOX
+    if (mOuterFrame && mOuterFrame->IsFlexItem()) {
+      nsIFrame* flexContainer = mOuterFrame->GetParent();
+      MOZ_ASSERT(flexContainer &&
+                 flexContainer->GetType() == nsGkAtoms::flexContainerFrame,
+                 "IsFlexItem() lied...?");
 
+      if (static_cast<nsFlexContainerFrame*>(flexContainer)->IsHorizontal()) {
+        minWidth.SetIntValue(NS_STYLE_WIDTH_MIN_CONTENT, eStyleUnit_Enumerated);
+      }
+    }
+#endif // MOZ_FLEXBOX
+  }
   SetValueToCoord(val, minWidth, true,
                   &nsComputedDOMStyle::GetCBContentWidth,
                   nsCSSProps::kWidthKTable);

From a3cb31110c9a909166d48602a33995e6b086b915 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 29 Sep 2012 23:42:29 -0700
Subject: [PATCH 24/64] Bug 666041: Reftests for css3-flexbox. (tests-only)

--HG--
rename : layout/reftests/bugs/solidblue.png => layout/reftests/flexbox/solidblue.png
---
 layout/reftests/flexbox/ahem.css              |   4 +
 ...xbox-align-self-baseline-horiz-1-ref.xhtml |  67 ++++++++
 .../flexbox-align-self-baseline-horiz-1.xhtml |  63 +++++++
 ...xbox-align-self-baseline-horiz-2-ref.xhtml |  52 ++++++
 .../flexbox-align-self-baseline-horiz-2.xhtml |  56 ++++++
 ...xbox-align-self-baseline-horiz-3-ref.xhtml |  58 +++++++
 .../flexbox-align-self-baseline-horiz-3.xhtml |  54 ++++++
 .../flexbox-align-self-horiz-1-ref.xhtml      |  89 ++++++++++
 .../flexbox/flexbox-align-self-horiz-1.xhtml  |  94 ++++++++++
 .../flexbox-align-self-horiz-2-ref.xhtml      |  81 +++++++++
 .../flexbox/flexbox-align-self-horiz-2.xhtml  |  75 ++++++++
 .../flexbox-align-self-horiz-3-ref.xhtml      |  91 ++++++++++
 .../flexbox/flexbox-align-self-horiz-3.xhtml  |  89 ++++++++++
 .../flexbox-align-self-horiz-4-ref.xhtml      |  85 +++++++++
 .../flexbox/flexbox-align-self-horiz-4.xhtml  |  80 +++++++++
 .../flexbox-align-self-horiz-5-ref.xhtml      |  96 +++++++++++
 .../flexbox/flexbox-align-self-horiz-5.xhtml  | 100 +++++++++++
 .../flexbox-align-self-vert-1-ref.xhtml       |  94 ++++++++++
 .../flexbox/flexbox-align-self-vert-1.xhtml   |  88 ++++++++++
 .../flexbox-align-self-vert-2-ref.xhtml       |  92 ++++++++++
 .../flexbox/flexbox-align-self-vert-2.xhtml   |  73 ++++++++
 .../flexbox-align-self-vert-3-ref.xhtml       |  76 ++++++++
 .../flexbox/flexbox-align-self-vert-3.xhtml   |  64 +++++++
 .../flexbox-align-self-vert-4-ref.xhtml       | 102 +++++++++++
 .../flexbox/flexbox-align-self-vert-4.xhtml   |  75 ++++++++
 .../flexbox-align-self-vert-rtl-1-ref.xhtml   |  97 +++++++++++
 .../flexbox-align-self-vert-rtl-1.xhtml       |  91 ++++++++++
 .../flexbox-align-self-vert-rtl-2-ref.xhtml   |  95 ++++++++++
 .../flexbox-align-self-vert-rtl-2.xhtml       |  76 ++++++++
 .../flexbox-align-self-vert-rtl-3-ref.xhtml   |  78 +++++++++
 .../flexbox-align-self-vert-rtl-3.xhtml       |  66 +++++++
 .../flexbox-align-self-vert-rtl-4-ref.xhtml   | 103 +++++++++++
 .../flexbox-align-self-vert-rtl-4.xhtml       |  84 +++++++++
 .../flexbox-basic-block-horiz-1-ref.xhtml     |  63 +++++++
 .../flexbox/flexbox-basic-block-horiz-1.xhtml |  61 +++++++
 .../flexbox-basic-block-vert-1-ref.xhtml      |  58 +++++++
 .../flexbox/flexbox-basic-block-vert-1.xhtml  |  62 +++++++
 .../flexbox-basic-canvas-horiz-1-ref.xhtml    |  58 +++++++
 .../flexbox-basic-canvas-horiz-1.xhtml        |  97 +++++++++++
 .../flexbox-basic-canvas-horiz-2-ref.xhtml    |  27 +++
 .../flexbox-basic-canvas-horiz-2.xhtml        |  31 ++++
 .../flexbox-basic-canvas-vert-1-ref.xhtml     |  62 +++++++
 .../flexbox/flexbox-basic-canvas-vert-1.xhtml |  99 +++++++++++
 .../flexbox-basic-canvas-vert-2-ref.xhtml     |  28 +++
 .../flexbox/flexbox-basic-canvas-vert-2.xhtml |  32 ++++
 .../flexbox-basic-fieldset-horiz-1-ref.xhtml  |  63 +++++++
 .../flexbox-basic-fieldset-horiz-1.xhtml      | 101 +++++++++++
 .../flexbox-basic-fieldset-horiz-2-ref.xhtml  |  27 +++
 .../flexbox-basic-fieldset-horiz-2.xhtml      |  31 ++++
 .../flexbox-basic-fieldset-vert-1-ref.xhtml   |  64 +++++++
 .../flexbox-basic-fieldset-vert-1.xhtml       | 103 +++++++++++
 .../flexbox-basic-fieldset-vert-2-ref.xhtml   |  28 +++
 .../flexbox-basic-fieldset-vert-2.xhtml       |  33 ++++
 .../flexbox-basic-iframe-horiz-1-ref.xhtml    |  58 +++++++
 .../flexbox-basic-iframe-horiz-1.xhtml        |  98 +++++++++++
 .../flexbox-basic-iframe-horiz-2-ref.xhtml    |  27 +++
 .../flexbox-basic-iframe-horiz-2.xhtml        |  31 ++++
 .../flexbox-basic-iframe-vert-1-ref.xhtml     |  62 +++++++
 .../flexbox/flexbox-basic-iframe-vert-1.xhtml | 100 +++++++++++
 .../flexbox-basic-iframe-vert-2-ref.xhtml     |  28 +++
 .../flexbox/flexbox-basic-iframe-vert-2.xhtml |  32 ++++
 .../flexbox-basic-img-horiz-1-ref.xhtml       |  58 +++++++
 .../flexbox/flexbox-basic-img-horiz-1.xhtml   |  99 +++++++++++
 .../flexbox-basic-img-horiz-2-ref.xhtml       |  27 +++
 .../flexbox/flexbox-basic-img-horiz-2.xhtml   |  31 ++++
 .../flexbox-basic-img-vert-1-ref.xhtml        |  62 +++++++
 .../flexbox/flexbox-basic-img-vert-1.xhtml    | 101 +++++++++++
 .../flexbox-basic-img-vert-2-ref.xhtml        |  28 +++
 .../flexbox/flexbox-basic-img-vert-2.xhtml    |  32 ++++
 .../flexbox-basic-textarea-horiz-1-ref.xhtml  |  61 +++++++
 .../flexbox-basic-textarea-horiz-1.xhtml      | 104 +++++++++++
 .../flexbox-basic-textarea-horiz-2-ref.xhtml  |  27 +++
 .../flexbox-basic-textarea-horiz-2.xhtml      |  31 ++++
 .../flexbox-basic-textarea-vert-1-ref.xhtml   |  66 +++++++
 .../flexbox-basic-textarea-vert-1.xhtml       | 107 ++++++++++++
 .../flexbox-basic-textarea-vert-2-ref.xhtml   |  28 +++
 .../flexbox-basic-textarea-vert-2.xhtml       |  33 ++++
 .../flexbox-basic-video-horiz-1-ref.xhtml     |  58 +++++++
 .../flexbox/flexbox-basic-video-horiz-1.xhtml |  97 +++++++++++
 .../flexbox-basic-video-horiz-2-ref.xhtml     |  27 +++
 .../flexbox/flexbox-basic-video-horiz-2.xhtml |  31 ++++
 .../flexbox-basic-video-vert-1-ref.xhtml      |  62 +++++++
 .../flexbox/flexbox-basic-video-vert-1.xhtml  |  99 +++++++++++
 .../flexbox-basic-video-vert-2-ref.xhtml      |  28 +++
 .../flexbox/flexbox-basic-video-vert-2.xhtml  |  32 ++++
 .../flexbox-dyn-insertAroundDiv-1-ref.xhtml   |  39 +++++
 .../flexbox-dyn-insertAroundDiv-1.xhtml       |  87 ++++++++++
 .../flexbox-dyn-insertAroundDiv-2-ref.xhtml   |  41 +++++
 .../flexbox-dyn-insertAroundDiv-2.xhtml       | 104 +++++++++++
 .../flexbox-dyn-insertAroundDiv-3-ref.xhtml   |  40 +++++
 .../flexbox-dyn-insertAroundDiv-3.xhtml       | 104 +++++++++++
 .../flexbox-dyn-insertAroundSpan-1.xhtml      |  87 ++++++++++
 .../flexbox-dyn-insertAroundSpan-2.xhtml      | 107 ++++++++++++
 .../flexbox-dyn-insertAroundSpan-3.xhtml      | 107 ++++++++++++
 .../flexbox-dyn-insertAroundText-1-ref.xhtml  |  39 +++++
 .../flexbox-dyn-insertAroundText-1.xhtml      |  87 ++++++++++
 .../flexbox-dyn-insertAroundText-2-ref.xhtml  |  44 +++++
 .../flexbox-dyn-insertAroundText-2.xhtml      | 107 ++++++++++++
 .../flexbox-dyn-insertAroundText-3-ref.xhtml  |  43 +++++
 .../flexbox-dyn-insertAroundText-3.xhtml      | 107 ++++++++++++
 .../flexbox-dyn-insertEmptySpan-1-ref.xhtml   |  43 +++++
 .../flexbox-dyn-insertEmptySpan-1.xhtml       | 103 +++++++++++
 .../flexbox/flexbox-empty-1-ref.xhtml         |  38 ++++
 .../reftests/flexbox/flexbox-empty-1a.xhtml   |  39 +++++
 .../reftests/flexbox/flexbox-empty-1b.xhtml   |  45 +++++
 .../flexbox/flexbox-float-1-ref.xhtml         |  39 +++++
 .../reftests/flexbox/flexbox-float-1a.xhtml   |  47 +++++
 .../reftests/flexbox/flexbox-float-1b.xhtml   |  43 +++++
 .../reftests/flexbox/flexbox-float-1c.xhtml   |  75 ++++++++
 .../reftests/flexbox/flexbox-float-1d.xhtml   |  75 ++++++++
 .../flexbox/flexbox-float-2-ref.xhtml         |  39 +++++
 .../reftests/flexbox/flexbox-float-2a.xhtml   |  42 +++++
 .../reftests/flexbox/flexbox-float-2b.xhtml   |  46 +++++
 .../flexbox-inlinecontent-horiz-1-ref.xhtml   |  45 +++++
 .../flexbox-inlinecontent-horiz-1a.xhtml      |  39 +++++
 .../flexbox-inlinecontent-horiz-1b.xhtml      |  55 ++++++
 .../flexbox-inlinecontent-horiz-2-ref.xhtml   |  34 ++++
 .../flexbox-inlinecontent-horiz-2.xhtml       |  46 +++++
 .../flexbox-inlinecontent-horiz-3-ref.xhtml   |  22 +++
 .../flexbox-inlinecontent-horiz-3a.xhtml      |  24 +++
 .../flexbox-inlinecontent-horiz-3b.xhtml      |  39 +++++
 .../flexbox-inlinecontent-horiz-3c.xhtml      |  39 +++++
 .../flexbox-inlinecontent-horiz-4-ref.xhtml   |  21 +++
 .../flexbox-inlinecontent-horiz-4.xhtml       |  27 +++
 .../flexbox-inlinecontent-horiz-5-ref.xhtml   |  25 +++
 .../flexbox-inlinecontent-horiz-5.xhtml       |  36 ++++
 .../flexbox-inlinecontent-horiz-6-ref.xhtml   |  39 +++++
 .../flexbox-inlinecontent-horiz-6.xhtml       |  40 +++++
 ...flexbox-intrinsic-sizing-horiz-1-ref.xhtml |  91 ++++++++++
 .../flexbox-intrinsic-sizing-horiz-1a.xhtml   | 102 +++++++++++
 .../flexbox-intrinsic-sizing-horiz-1b.xhtml   | 102 +++++++++++
 ...flexbox-intrinsic-sizing-horiz-2-ref.xhtml |  45 +++++
 .../flexbox-intrinsic-sizing-horiz-2a.xhtml   |  38 ++++
 .../flexbox-intrinsic-sizing-horiz-2b.xhtml   |  44 +++++
 .../flexbox/flexbox-invalidation-1-ref.html   |  36 ++++
 .../flexbox/flexbox-invalidation-1.html       |  47 +++++
 .../flexbox-justify-content-horiz-1-ref.xhtml | 107 ++++++++++++
 .../flexbox-justify-content-horiz-1.xhtml     | 102 +++++++++++
 .../flexbox-justify-content-horiz-2-ref.xhtml | 121 +++++++++++++
 .../flexbox-justify-content-horiz-2.xhtml     | 115 +++++++++++++
 .../flexbox-justify-content-horiz-3-ref.xhtml | 103 +++++++++++
 .../flexbox-justify-content-horiz-3.xhtml     | 110 ++++++++++++
 .../flexbox-justify-content-horiz-4-ref.xhtml | 115 +++++++++++++
 .../flexbox-justify-content-horiz-4.xhtml     | 121 +++++++++++++
 .../flexbox-justify-content-horiz-5-ref.xhtml | 128 ++++++++++++++
 .../flexbox-justify-content-horiz-5.xhtml     | 100 +++++++++++
 .../flexbox-justify-content-vert-1-ref.xhtml  | 105 ++++++++++++
 .../flexbox-justify-content-vert-1.xhtml      | 104 +++++++++++
 .../flexbox-justify-content-vert-2-ref.xhtml  | 118 +++++++++++++
 .../flexbox-justify-content-vert-2.xhtml      | 117 +++++++++++++
 .../flexbox-justify-content-vert-3-ref.xhtml  | 101 +++++++++++
 .../flexbox-justify-content-vert-3.xhtml      | 113 ++++++++++++
 .../flexbox-justify-content-vert-4-ref.xhtml  | 112 ++++++++++++
 .../flexbox-justify-content-vert-4.xhtml      | 124 ++++++++++++++
 .../flexbox-justify-content-vert-5-ref.xhtml  | 100 +++++++++++
 .../flexbox-justify-content-vert-5.xhtml      | 107 ++++++++++++
 .../flexbox-margin-auto-horiz-1-ref.xhtml     |  85 +++++++++
 .../flexbox/flexbox-margin-auto-horiz-1.xhtml |  79 +++++++++
 .../flexbox-margin-auto-horiz-2-ref.xhtml     |  59 +++++++
 .../flexbox/flexbox-margin-auto-horiz-2.xhtml |  64 +++++++
 .../flexbox/flexbox-mbp-horiz-1-ref.xhtml     |  69 ++++++++
 .../flexbox-mbp-horiz-1-reverse-ref.xhtml     |  72 ++++++++
 .../flexbox/flexbox-mbp-horiz-1-reverse.xhtml |  68 ++++++++
 .../flexbox-mbp-horiz-1-rtl-reverse.xhtml     |  70 ++++++++
 .../flexbox/flexbox-mbp-horiz-1-rtl.xhtml     |  68 ++++++++
 .../flexbox/flexbox-mbp-horiz-1.xhtml         |  66 +++++++
 .../flexbox/flexbox-mbp-horiz-2-ref.xhtml     |  73 ++++++++
 .../flexbox/flexbox-mbp-horiz-2a.xhtml        |  70 ++++++++
 .../flexbox/flexbox-mbp-horiz-2b.xhtml        |  77 +++++++++
 .../flexbox/flexbox-mbp-horiz-3-ref.xhtml     |  79 +++++++++
 .../flexbox-mbp-horiz-3-reverse-ref.xhtml     |  79 +++++++++
 .../flexbox/flexbox-mbp-horiz-3-reverse.xhtml |  79 +++++++++
 .../flexbox/flexbox-mbp-horiz-3.xhtml         |  79 +++++++++
 .../flexbox/flexbox-minSize-horiz-1-ref.xhtml |  78 +++++++++
 .../flexbox/flexbox-minSize-horiz-1.xhtml     |  71 ++++++++
 .../flexbox/flexbox-minSize-vert-1-ref.xhtml  |  55 ++++++
 .../flexbox/flexbox-minSize-vert-1.xhtml      |  73 ++++++++
 .../flexbox-position-absolute-1-ref.xhtml     |  74 ++++++++
 .../flexbox/flexbox-position-absolute-1.xhtml |  70 ++++++++
 .../flexbox-position-absolute-2-ref.xhtml     |  73 ++++++++
 .../flexbox/flexbox-position-absolute-2.xhtml |  71 ++++++++
 .../flexbox-position-absolute-3-ref.xhtml     |  44 +++++
 .../flexbox/flexbox-position-absolute-3.xhtml |  46 +++++
 .../flexbox-position-absolute-4-ref.xhtml     |  50 ++++++
 .../flexbox/flexbox-position-absolute-4.xhtml |  52 ++++++
 .../flexbox-position-fixed-1-ref.xhtml        |  74 ++++++++
 .../flexbox/flexbox-position-fixed-1.xhtml    |  70 ++++++++
 .../flexbox-position-fixed-2-ref.xhtml        |  73 ++++++++
 .../flexbox/flexbox-position-fixed-2.xhtml    |  71 ++++++++
 .../flexbox-position-fixed-3-ref.xhtml        |  44 +++++
 .../flexbox/flexbox-position-fixed-3.xhtml    |  46 +++++
 .../flexbox-position-fixed-4-ref.xhtml        |  51 ++++++
 .../flexbox/flexbox-position-fixed-4.xhtml    |  52 ++++++
 .../flexbox-resizeviewport-1-helper.html      |  31 ++++
 .../flexbox-resizeviewport-1-ref.xhtml        |  22 +++
 .../flexbox/flexbox-resizeviewport-1.xhtml    |  40 +++++
 .../flexbox/flexbox-sizing-horiz-1-ref.xhtml  |  73 ++++++++
 .../flexbox/flexbox-sizing-horiz-1.xhtml      |  80 +++++++++
 .../flexbox/flexbox-sizing-vert-1-ref.xhtml   |  79 +++++++++
 .../flexbox/flexbox-sizing-vert-1.xhtml       |  94 ++++++++++
 .../flexbox/flexbox-table-fixup-1-ref.xhtml   |  59 +++++++
 .../flexbox/flexbox-table-fixup-1a.xhtml      |  62 +++++++
 .../flexbox/flexbox-table-fixup-1b.xhtml      |  70 ++++++++
 .../flexbox-whitespace-handling-1-ref.xhtml   |  50 ++++++
 .../flexbox-whitespace-handling-1a.xhtml      |  53 ++++++
 .../flexbox-whitespace-handling-1b.xhtml      |  42 +++++
 .../flexbox-whitespace-handling-2-ref.xhtml   |  50 ++++++
 .../flexbox-whitespace-handling-2.xhtml       |  50 ++++++
 .../flexbox-whitespace-handling-3-ref.xhtml   |  32 ++++
 .../flexbox-whitespace-handling-3.xhtml       |  36 ++++
 .../flexbox-widget-flex-items-1-ref.html      |  34 ++++
 .../flexbox/flexbox-widget-flex-items-1.html  |  46 +++++
 .../flexbox-widget-flex-items-2-ref.html      |  34 ++++
 .../flexbox/flexbox-widget-flex-items-2.html  |  42 +++++
 .../flexbox-widget-flex-items-3-ref.html      |  34 ++++
 .../flexbox/flexbox-widget-flex-items-3.html  |  43 +++++
 .../flexbox-widget-flex-items-4-ref.html      |  36 ++++
 .../flexbox/flexbox-widget-flex-items-4.html  |  42 +++++
 layout/reftests/flexbox/reftest.list          | 162 ++++++++++++++++++
 layout/reftests/flexbox/solidblue.png         | Bin 0 -> 135 bytes
 layout/reftests/reftest.list                  |   4 +
 221 files changed, 14431 insertions(+)
 create mode 100644 layout/reftests/flexbox/ahem.css
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-5-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-horiz-5.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-align-self-vert-rtl-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-block-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-block-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-block-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-block-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundText-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundText-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundText-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundText-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundText-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertAroundText-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-empty-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-empty-1a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-empty-1b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-1a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-1b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-1c.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-1d.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-2a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-float-2b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-1a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-1b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-3a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-3b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-3c.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-5-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-5.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-6-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-inlinecontent-horiz-6.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-invalidation-1-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-invalidation-1.html
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-5-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-horiz-5.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-5-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-justify-content-vert-5.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-margin-auto-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-margin-auto-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-margin-auto-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-margin-auto-horiz-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl-reverse.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-2a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-2b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-mbp-horiz-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-minSize-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-minSize-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-absolute-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-4-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-position-fixed-4.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-resizeviewport-1-helper.html
 create mode 100644 layout/reftests/flexbox/flexbox-resizeviewport-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-resizeviewport-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-sizing-horiz-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-sizing-horiz-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-sizing-vert-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-sizing-vert-1.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-table-fixup-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-table-fixup-1a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-table-fixup-1b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-1-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-1a.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-1b.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-2-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-2.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-3-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-whitespace-handling-3.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-1-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-1.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-2-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-2.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-3-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-3.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-4-ref.html
 create mode 100644 layout/reftests/flexbox/flexbox-widget-flex-items-4.html
 create mode 100644 layout/reftests/flexbox/reftest.list
 create mode 100644 layout/reftests/flexbox/solidblue.png

diff --git a/layout/reftests/flexbox/ahem.css b/layout/reftests/flexbox/ahem.css
new file mode 100644
index 000000000000..884a41198b8b
--- /dev/null
+++ b/layout/reftests/flexbox/ahem.css
@@ -0,0 +1,4 @@
+@font-face {
+  font-family: "Ahem";
+  src: url(../fonts/Ahem.ttf);
+}
diff --git a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..5e86a376a33a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1-ref.xhtml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for behavior of the 'baseline' value for align-items and
+     align-self.
+
+     NOTE: For multi-line 'display: block' elements in the testcase (and inline
+     content that gets wrapped in an anonymous block), we add an inline-table
+     wrapper here in the reference case, so that we get first-line baseline
+     alignment instead of the last-line baseline-alignment that an inline-block
+     would give us.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        display: block;
+        border: 1px dashed blue;
+        font: 14px sans-serif;
+      }
+
+      div   { display: inline-block; }
+      table { display: inline-table; }
+
+      .big {
+        height: 100px;
+        font: 24px sans-serif;
+        margin-top: 20px;
+      }
+      .super {
+        vertical-align: super;
+        font-size: 12px;
+      }
+      .sub {
+        vertical-align: sub;
+        font-size: 12px;
+      }
+
+      .lime   { background: lime;   }
+      .yellow { background: yellow; }
+      .orange { background: orange; }
+      .pink   { background: pink;   }
+      .aqua   { background: aqua;   }
+      .violet { background: violet; }
+      .tan    { background: tan;    }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="lime">blk_1line</div
+      ><table cellspacing="0" cellpadding="0"
+              class="yellow">blk<br/>2lines</table
+      ><div class="orange"><span class="super">super</span></div
+      ><div class="pink"><span class="sub">sub</span></div
+      ><table cellspacing="0" cellpadding="0"
+              class="aqua big">big<br/>text<br/>3lines</table
+      ><table class="violet" border="1">
+        <tr><td>tr1</td></tr>
+        <tr><td>tr2</td></tr></table
+      ><table class="tan" cellspacing="0" cellpadding="0">
+        <i>ital<br/>ic</i>
+      </table>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1.xhtml
new file mode 100644
index 000000000000..96c2b55a98ce
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-1.xhtml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for behavior of the 'baseline' value for align-items (and
+     align-self, implicitly). This test baseline-aligns various types of
+     content, and the flexbox's vertical size depends on the aggregate
+     post-alignment height of its children.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        display: -moz-flex;
+        -moz-align-items: baseline;
+        border: 1px dashed blue;
+        font: 14px sans-serif;
+      }
+
+      i {
+        /* XXXdholbert HACK - REMOVEME after bug 783415 lands (which will
+           make this display:block conversion happen automatically). */
+        display: block;
+      }
+
+      .big {
+        height: 100px;
+        font: 24px sans-serif;
+        margin-top: 20px;
+      }
+      .super {
+        vertical-align: super;
+        font-size: 12px;
+      }
+      .sub {
+        vertical-align: sub;
+        font-size: 12px;
+      }
+
+      .lime   { background: lime;   }
+      .yellow { background: yellow; }
+      .orange { background: orange; }
+      .pink   { background: pink;   }
+      .aqua   { background: aqua;   }
+      .violet { background: violet; }
+      .tan    { background: tan;    }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="lime">blk_1line</div>
+      <div class="yellow">blk<br/>2lines</div>
+      <div class="orange"><span class="super">super</span></div>
+      <div class="pink"><span class="sub">sub</span></div>
+      <div class="aqua big">big<br/>text<br/>3lines</div>
+      <table class="violet" border="1">
+        <tr><td>tr1</td></tr>
+        <tr><td>tr2</td></tr></table>
+      <i class="tan">ital<br/>ic</i>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..26033bf78f82
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2-ref.xhtml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for behavior of the 'baseline' value for align-items and
+     align-self.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        display: block;
+        border: 1px dashed blue;
+        font: 14px sans-serif;
+      }
+
+      input { height: 30px; }
+
+      textarea {
+        width: 30px;
+        height: 50px;
+      }
+
+      div.multilinebutton {
+        /* For comparison vs. "button.multilinebutton" in the testcase: */
+        -moz-appearance: button;
+        display: block;
+        text-align: center;
+        font: 20px sans-serif;
+        padding-top: 1px;
+        height: 49px;
+        width: 20px;
+      }
+
+      div   { display: inline-block; }
+      table { display: inline-table; }
+
+      .lime   { background: lime;   }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="lime">text</div
+      ><input type="text" style="width: 20px; min-width: 0;" value="input"
+     /><textarea style="width: 30px">t e x t a r e a </textarea
+      ><table cellspacing="0" cellpadding="0">
+        <div class="multilinebutton">b<br/>t<br/>n</div>
+      </table>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
new file mode 100644
index 000000000000..33cddfd459ad
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for behavior of the 'baseline' value for align-items (and
+     align-self, implicitly). This test baseline-aligns various types of
+     content, and the flexbox's vertical size depends on the aggregate
+     post-alignment height of its children.
+
+     This test checks baseline-alignment for a text <input> field, a
+     <textarea>, and a <button> with a multi-line label.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        display: -moz-flex;
+        -moz-align-items: baseline;
+        border: 1px dashed blue;
+        font: 14px sans-serif;
+      }
+
+      input { height: 30px; }
+
+      textarea {
+        width: 30px;
+        height: 50px;
+      }
+
+      button.multilinebutton {
+        font: 20px sans-serif;
+        color: black;
+        padding: 0;
+        height: 50px;
+        width: 20px;
+        -moz-box-sizing: content-box;
+      }
+
+      .lime   { background: lime;   }
+      .orange { background: orange; }
+      .pink   { background: pink;   }
+      .aqua   { background: aqua;   }
+      .violet { background: violet; }
+      .tan    { background: tan;    }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="lime">text</div>
+      <input type="text" style="width: 20px; min-width: 0;" value="input"/>
+      <textarea style="width: 30px">t e x t a r e a </textarea>
+      <button class="multilinebutton">b<br/>t<br/>n</button>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml
new file mode 100644
index 000000000000..34a1b081c35a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for behavior of the 'baseline' value for align-items and
+     align-self.
+
+     NOTE: For multi-line 'display: block' flex items in the testcase, we use
+     an inline-table here in the reference case, so that we get first-line
+     baseline alignment. (If we used an inline-block instead, that would give
+     us *last-line* baseline alignment.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        display: block;
+        border: 1px dashed blue;
+        font: 14px sans-serif;
+      }
+
+      div   { display: inline-block; }
+      table { display: inline-table; }
+
+      .big {
+        height: 100px;
+        font: 24px sans-serif;
+        margin-top: 20px;
+      }
+
+      .lime   { background: lime;   }
+      .pink   { background: pink;   }
+      .aqua   { background: aqua;   }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="lime">text</div
+      ><button>btn</button
+      ><input type="radio"
+     /><input type="checkbox"
+     /><label class="pink">label</label
+      ><table cellspacing="0" cellpadding="0"  class="aqua">
+        <label>lab<br/>el</label>
+      </table
+      ><table cellspacing="0" cellpadding="0">
+        <fieldset>field<br/>set</fieldset>
+      </table
+      ><table cellspacing="0" cellpadding="0">
+        <fieldset><legend>leg</legend>field<br/>set</fieldset>
+      </table
+      ><table cellspacing="0" cellpadding="0">
+        <fieldset><legend>leg<br/>end</legend>field<br/>set</fieldset>
+      </table>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3.xhtml b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3.xhtml
new file mode 100644
index 000000000000..4a87ae97de51
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-baseline-horiz-3.xhtml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for behavior of the 'baseline' value for align-items (and
+     align-self, implicitly).  This test has various types of baseline-aligned
+     content, and the flexbox's vertical size depends on the aggregate
+     post-alignment height of its children.
+
+     This test checks baseline-alignment for text <button>, for
+     various <input> fields, for <label>, and for <fieldset>.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        display: -moz-flex;
+        -moz-align-items: baseline;
+        border: 1px dashed blue;
+        font: 14px sans-serif;
+      }
+
+      input, label {
+        /* XXXdholbert HACK - REMOVEME after bug 783415 lands (which will
+           make this display:block conversion happen automatically). */
+        display: block;
+      }
+
+      .big {
+        height: 100px;
+        font: 24px sans-serif;
+        margin-top: 20px;
+      }
+
+      .lime   { background: lime;   }
+      .pink   { background: pink;   }
+      .aqua   { background: aqua;   }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="lime">text</div>
+      <button>btn</button>
+      <input type="radio"/>
+      <input type="checkbox"/>
+      <label class="pink">label</label>
+      <label class="aqua">lab<br/>el</label>
+      <fieldset>field<br/>set</fieldset>
+      <fieldset><legend>leg</legend>field<br/>set</fieldset>
+      <fieldset><legend>leg<br/>end</legend>field<br/>set</fieldset>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..7de7df769dd3
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-1-ref.xhtml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using floated divs
+     in place of flex items and using margin-top in place of the align-items /
+     align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        height: 200px;
+        width: 560px;
+        font-size: 10px;
+        line-height: 10px;
+      }
+
+      .flexbox > div {
+        width: 40px;
+        float: left;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+      }
+      .flex-end {
+        background: orange;
+      }
+      .center {
+        background: lightblue;
+      }
+      .baseline {
+        background: teal;
+      }
+      .stretch {
+        background: pink;
+      }
+      .auto {
+        background: yellow;
+      }
+      .unspecified {
+        background: lightgreen;
+      }
+      .initial {
+        background: aqua;
+      }
+      .inherit {
+        background: violet;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end" style="margin-top: 190px">end</div>
+      <div class="flex-end big"  style="margin-top: 100px">a b c d e f</div>
+      <div class="center" style="margin-top: 95px">center</div>
+      <div class="center big" style="margin-top: 50px">a b c d e f</div>
+      <!-- We use inline-blocks inside of a wrapper-block as references for the
+           baseline-aligned flex items, since inline-blocks get
+           baseline-aligned in block layout. We also need to specify the widths
+           manually here since the "flexbox > div" child-selector doesn't
+           handle these guys (since they're grandchildren).
+        -->
+      <div style="width: 80px">
+        <div class="baseline"
+             style="width: 40px; display: inline-block">base</div
+       ><div class="baseline big"
+             style="width: 40px; display: inline-block">abc</div>
+      </div>
+      <div class="stretch" style="height: 100%">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto" style="margin-top: 95px">auto</div>
+      <div class="unspecified" style="margin-top: 95px">unspec</div>
+      <div class="initial" style="margin-top: 95px">initial</div>
+      <div class="inherit" style="margin-top: 190px">inherit</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
new file mode 100644
index 000000000000..0211b25bc264
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        height: 200px;
+        width: -moz-fit-content;
+        display: -moz-flex;
+        font-size: 10px;
+        line-height: 10px;
+
+        /* Any children whose align-self is 'auto' (or unspecified, or
+           -moz-initial) will end up taking this value from us: */
+        -moz-align-items: center;
+
+        /* Any children whose align-self is 'inherit' will end up
+           inheriting this value from us: */
+        -moz-align-self: flex-end;
+      }
+
+      .flexbox > div {
+        width: 40px;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+      .auto {
+        background: yellow;
+        -moz-align-self: auto;
+      }
+      .unspecified {
+        background: lightgreen;
+      }
+      .initial {
+        background: aqua;
+        -moz-align-self: -moz-initial;
+      }
+      .inherit {
+        background: violet;
+        -moz-align-self: inherit;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto">auto</div>
+      <div class="unspecified">unspec</div>
+      <div class="initial">initial</div>
+      <div class="inherit">inherit</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..673043aacb9f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-2-ref.xhtml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using floated divs
+     in place of flex items and using relative positioning in place of the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        height: 200px;
+        width: -moz-fit-content;
+        font-size: 10px;
+        line-height: 10px;
+      }
+
+      .flexbox > div {  float: left }
+      .flex-start, .flex-end, .center, .baseline, .stretch,
+      .auto, .unspecified, .initial, .inherit {
+        width: 40px;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+        position: relative;
+        border-style: dotted;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+      }
+      .flex-end {
+        background: orange;
+      }
+      .center {
+        background: lightblue;
+      }
+      .baseline {
+        background: teal;
+      }
+      .stretch {
+        background: pink;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end" style="top: 172px">end</div>
+      <div class="flex-end big"  style="top: 82px">a b c d e f</div>
+      <div class="center" style="top: 86px">center</div>
+      <div class="center big" style="top: 41px">a b c d e f</div>
+    </div>
+    <div class="flexbox">
+      <!-- We use inline-blocks inside of a wrapper-block as references for the
+           baseline-aligned flex items, since inline-blocks get
+           baseline-aligned in block layout. We also need to specify the widths
+           manually here since the "flexbox > div" child-selector doesn't
+           handle these guys (since they're grandchildren).
+        -->
+      <div style="width: -moz-fit-content;">
+        <div class="baseline"
+             style="display: inline-block">base</div
+       ><div class="baseline big"
+             style="display: inline-block">abc</div>
+      </div>
+      <div class="stretch" style="height: 182px">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-2.xhtml
new file mode 100644
index 000000000000..46cb58bcd122
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-2.xhtml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with
+     margin/border/padding values on each item. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        height: 200px;
+        width: -moz-fit-content;
+        display: -moz-flex;
+        font-size: 10px;
+        line-height: 10px;
+      }
+
+      .flexbox > div {
+        width: 40px;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+
+        border-style: dotted;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-3-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-3-ref.xhtml
new file mode 100644
index 000000000000..f65d1df82b3e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-3-ref.xhtml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using floated divs
+     in place of flex items and using relative positioning in place of the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        padding: 3px;
+        width: 560px;
+        height: 4px;
+        font-size: 10px;
+        line-height: 10px;
+        font-family: sans-serif;
+      }
+
+      .flexbox > div {
+        width: 40px;
+        float: left;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+      }
+      .flex-end {
+        background: orange;
+      }
+      .center {
+        background: lightblue;
+      }
+      .baseline {
+        background: teal;
+      }
+      .stretch {
+        background: pink;
+      }
+      .auto {
+        background: yellow;
+      }
+      .unspecified {
+        background: lightgreen;
+      }
+      .initial {
+        background: aqua;
+      }
+      .inherit {
+        background: violet;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end" style="position: relative; top: -6px">end</div>
+      <div class="flex-end big"  style="position: relative; top: -96px">a b c d e f</div>
+      <div class="center" style="position: relative; top: -3px">center</div>
+      <div class="center big" style="position: relative; top: -48px">a b c d e f</div>
+      <!-- We use inline-blocks inside of a wrapper-block as references for the
+           baseline-aligned flex items, since inline-blocks get
+           baseline-aligned in block layout. We also need to specify the widths
+           manually here since the "flexbox > div" child-selector doesn't
+           handle these guys (since they're grandchildren).
+        -->
+      <div style="width: 80px">
+        <div class="baseline"
+             style="width: 40px; display: inline-block">base</div
+       ><div class="baseline big"
+             style="width: 40px; display: inline-block">abc</div>
+      </div>
+      <div class="stretch" style="height: 100%">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto" style="height: 100%">auto</div>
+      <div class="unspecified" style="height: 100%">unspec</div>
+      <div class="initial" style="height: 100%">initial</div>
+      <div class="inherit" style="height: 100%">inherit</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml
new file mode 100644
index 000000000000..a5d0369476b1
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-3.xhtml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with the
+     flex container being shorter than its items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        padding: 3px;
+        height: 4px;
+        width: -moz-fit-content;
+        display: -moz-flex;
+        font-size: 10px;
+        line-height: 10px;
+        font-family: sans-serif;
+      }
+
+      .flexbox > div {
+        width: 40px;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+      .auto {
+        background: yellow;
+        -moz-align-self: auto;
+      }
+      .unspecified {
+        background: lightgreen;
+      }
+      .initial {
+        background: aqua;
+        -moz-align-self: -moz-initial;
+      }
+      .inherit {
+        background: violet;
+        -moz-align-self: inherit;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto">auto</div>
+      <div class="unspecified">unspec</div>
+      <div class="initial">initial</div>
+      <div class="inherit">inherit</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-4-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-4-ref.xhtml
new file mode 100644
index 000000000000..092287918da7
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-4-ref.xhtml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using floated divs
+     in place of flex items and using relative positioning in place of the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        padding: 3px;
+        height: 4px;
+        width: -moz-fit-content;
+        font-size: 10px;
+        line-height: 10px;
+        font-family: sans-serif;
+        margin-top: 20px;
+        margin-bottom: 120px;
+      }
+
+      .flexbox > div {  float: left }
+      .flex-start, .flex-end, .center, .baseline, .stretch,
+      .auto, .unspecified, .initial, .inherit {
+        width: 40px;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+        position: relative;
+        border-style: dotted;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+      }
+      .flex-end {
+        background: orange;
+      }
+      .center {
+        background: lightblue;
+      }
+      .baseline {
+        background: teal;
+      }
+      .stretch {
+        background: pink;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end" style="top: -24px">end</div>
+      <div class="flex-end big"  style="top: -114px">a b c d e f</div>
+      <div class="center" style="top: -12px">center</div>
+      <div class="center big" style="top: -57px">a b c d e f</div>
+    </div>
+    <div class="flexbox">
+      <!-- We use inline-blocks inside of a wrapper-block as references for the
+           baseline-aligned flex items, since inline-blocks get
+           baseline-aligned in block layout. We also need to specify the widths
+           manually here since the "flexbox > div" child-selector doesn't
+           handle these guys (since they're grandchildren).
+        -->
+      <div style="width: -moz-fit-content;">
+        <div class="baseline"
+             style="display: inline-block">base</div
+       ><div class="baseline big"
+             style="display: inline-block">abc</div>
+      </div>
+      <div class="stretch" style="height: 2px">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-4.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-4.xhtml
new file mode 100644
index 000000000000..88619e864c96
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-4.xhtml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with the
+     flex container being shorter than its items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        padding: 3px;
+        height: 4px;
+        width: -moz-fit-content;
+        display: -moz-flex;
+        font-size: 10px;
+        line-height: 10px;
+        font-family: sans-serif;
+        margin-top: 20px;
+        margin-bottom: 120px;
+      }
+
+      .flexbox > div {
+        width: 40px;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+
+        border-style: dotted;
+      }
+
+      .big {
+        height: 100px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        min-height: 2px;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-5-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-5-ref.xhtml
new file mode 100644
index 000000000000..98410f9f5da0
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-5-ref.xhtml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior with auto
+     margins in play. This reference case uses fixed margin-top values
+     in place of the testcase's auto margins. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        height: 140px;
+        width: 400px;
+        display: -moz-flex;
+        font-size: 10px;
+        line-height: 10px;
+        margin-bottom: 10px;
+      }
+
+      .kidsAutoTop > div      { margin-top: 130px;   }
+      .kidsAutoTop > div.big  { margin-top: 60px;   }
+      .kidsAutoBoth > div     { margin-top: 65px; }
+      .kidsAutoBoth > div.big { margin-top: 30px; }
+
+      .flexbox > div {
+        width: 40px;
+        height: 10px;
+      }
+
+      .flexbox > div.big {
+        height: 80px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+      }
+      .flex-end {
+        background: orange;
+      }
+      .center {
+        background: lightblue;
+      }
+      .baseline {
+        background: teal;
+      }
+      .stretch {
+        background: pink;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox kidsAutoTop">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">a b c d e f</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+
+    <div class="flexbox kidsAutoBottom">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">a b c d e f</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+
+    <div class="flexbox kidsAutoBoth">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">a b c d e f</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-horiz-5.xhtml b/layout/reftests/flexbox/flexbox-align-self-horiz-5.xhtml
new file mode 100644
index 000000000000..7fdb428d056c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-5.xhtml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior with auto margins in
+     play (which should negate the effects of align-items / align-self,
+     because there won't be any available space in which to align the item
+     after the auto margins are resolved).  -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        height: 140px;
+        width: 400px;
+        display: -moz-flex;
+        font-size: 10px;
+        line-height: 10px;
+        margin-bottom: 10px;
+      }
+
+      .kidsAutoTop > div    { margin-top: auto;    }
+      .kidsAutoBottom > div { margin-bottom: auto; }
+      .kidsAutoBoth > div   { margin: auto 0; }
+
+      .flexbox > div {
+        width: 40px;
+      }
+
+      .flexbox > div.big {
+        height: 80px;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox kidsAutoTop">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">a b c d e f</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+
+    <div class="flexbox kidsAutoBottom">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">a b c d e f</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+
+    <div class="flexbox kidsAutoBoth">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">a b c d e f</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-1-ref.xhtml
new file mode 100644
index 000000000000..d1d51a69ec1b
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-1-ref.xhtml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using blocks in
+     place of flex items and using float and width keywords to emulate the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        font-size: 10px;
+      }
+
+      div.big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      .flexbox > * {
+        clear: both;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+      }
+      .flex-end {
+        background: orange;
+        float: right;
+        width: -moz-max-content;
+      }
+      .center {
+        background: lightblue;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+        width: 100%;
+      }
+      .auto {
+        background: yellow;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .unspecified {
+        background: lightgreen;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .initial {
+        background: aqua;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .inherit {
+        background: violet;
+        float: right;
+        width: -moz-max-content;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto">auto</div>
+      <div class="unspecified">unspec</div>
+      <div class="initial">initial</div>
+      <div class="inherit">inherit</div>
+      <!-- Since that last div is floated right, the container doesn't include
+           its height by default. So we add some invisible hacky text (of the
+           same font) to make sure our container is tall enough. -->
+      <span style="visibility:hidden">hacky text</span>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml
new file mode 100644
index 000000000000..7362a4ccf32d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-1.xhtml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        font-size: 10px;
+
+        /* Any children whose align-self is 'auto' (or unspecified, or
+           -moz-initial) will end up taking this value from us: */
+        -moz-align-items: center;
+
+        /* Any children whose align-self is 'inherit' will end up
+           inheriting this value from us: */
+        -moz-align-self: flex-end;
+      }
+
+      .big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+      .auto {
+        background: yellow;
+        -moz-align-self: auto;
+      }
+      .unspecified {
+        background: lightgreen;
+      }
+      .initial {
+        background: aqua;
+        -moz-align-self: -moz-initial;
+      }
+      .inherit {
+        background: violet;
+        -moz-align-self: inherit;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto">auto</div>
+      <div class="unspecified">unspec</div>
+      <div class="initial">initial</div>
+      <div class="inherit">inherit</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-2-ref.xhtml
new file mode 100644
index 000000000000..0001f50bb90a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-2-ref.xhtml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using blocks in
+     place of flex items and using float and width keywords to emulate the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        float: left;
+        font-size: 10px;
+      }
+
+      .flex-start, .flex-end, .center, .baseline, .stretch {
+        clear: both;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+        float: left;
+      }
+      .flex-end {
+        background: orange;
+        width: -moz-max-content;
+        float: right;
+      }
+      .center {
+        background: lightblue;
+        width: -moz-max-content;
+        float: left;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+        width: auto;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div style="margin: auto; width: -moz-max-content">
+        <div class="center">center</div>
+      </div>
+      <div style="margin: auto; width: -moz-max-content">
+        <div class="center big">a b c d e f</div>
+      </div>
+    </div>
+    <!-- NOTE: I'm not using floats in this flex container, since floating
+         makes it harder to emulate the "stretch" behavior.
+         (We need to use width: auto - not width:100% - because we need to
+         allow space for our margins/borders/padding. And width:auto doesn't do
+         what we want if we're floated.)
+
+         However, since our children aren't floated, their adjacent vertical
+         margins will collapse by default (which doesn't match what happens in
+         the testcase, since margins don't collapse in a flexbox).  So, we
+         compensate for that by bumping up the margin-top value on every
+         collapsed top-margin to "4px", which is the total amount of vertical
+         margin we're expecting between consecutive flex items in the testcase.
+         (4px = 3px margin-bottom + 1px margin-top)
+      -->
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big" style="margin-top: 4px">abc</div>
+      <div class="stretch" style="margin-top: 4px">stretch</div>
+      <div class="stretch big" style="margin-top: 4px">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-2.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-2.xhtml
new file mode 100644
index 000000000000..9f5ab1064053
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-2.xhtml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with
+     margin/border/padding values on each item. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        float: left;
+        font-size: 10px;
+      }
+
+      .flexbox > div {
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-3-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-3-ref.xhtml
new file mode 100644
index 000000000000..cdfa5006dd9e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-3-ref.xhtml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using blocks in
+     place of flex items and using float and width keywords to emulate the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      .flexbox > * {
+        clear: both;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+      }
+      .flex-end {
+        background: orange;
+        float: right;
+        width: -moz-max-content;
+      }
+      .center {
+        background: lightblue;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+      <!-- We're using auto margins as references for "align-self:center", but
+           auto margins only work if we've got extra space available, and we
+           don't have extra space available in this case.  So, we create a
+           wide wrapper-div that _will_ have space available.  We position
+           that wrapper-div using a negative margin, so that centering in it
+           is equivalent to centering in our reference for the flex container.
+        -->
+      <div style="width: 100px; margin-left: -48px">
+        <div class="center">center</div>
+        <div class="center big">a b</div>
+      </div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-3.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-3.xhtml
new file mode 100644
index 000000000000..37708d4dbcaf
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-3.xhtml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with the
+     flex container being skinnier than its items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+      <div class="center">center</div>
+      <div class="center big">a b</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-4-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-4-ref.xhtml
new file mode 100644
index 000000000000..6e2522e935ea
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-4-ref.xhtml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior, using blocks in
+     place of flex items and using float and width keywords to emulate the
+     align-items / align-self properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        float: left;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      .flex-start, .flex-end, .center, .baseline, .stretch {
+        clear: both;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+        float: left;
+      }
+      .flex-end {
+        background: orange;
+        width: -moz-max-content;
+        float: right;
+      }
+      .center {
+        background: lightblue;
+        width: -moz-max-content;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+        width: auto;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big" style="margin-bottom: 4px">a b</div>
+      <!-- We're using auto margins as references for "align-self:center", but
+           auto margins only work if we've got extra space available, and we
+           don't have extra space available in this case.  So, we create a
+           wide wrapper-div that _will_ have space available.  We position
+           that wrapper-div using a negative margin, so that centering in it
+           is equivalent to centering in our reference for the flex container.
+        -->
+      <div style="width: 100px; margin-left: -48px">
+        <div style="margin: auto; width: -moz-max-content">
+          <div class="center">center</div>
+        </div>
+        <div style="margin: auto; width: -moz-max-content">
+          <div class="center big" style="margin-top: 4px">a b</div>
+        </div>
+      </div>
+    </div>
+    <!-- NOTE: I'm not using floats in this flex container, since floating
+         makes it harder to emulate the "stretch" behavior.
+         (We need to use width: auto - not width:100% - because we need to
+         allow space for our margins/borders/padding. And width:auto doesn't do
+         what we want if we're floated.)
+
+         However, since our children aren't floated, their adjacent vertical
+         margins will collapse by default (which doesn't match what happens in
+         the testcase, since margins don't collapse in a flexbox).  So, we
+         compensate for that by bumping up the margin-top value on every
+         collapsed top-margin to "4px", which is the total amount of vertical
+         margin we're expecting between consecutive flex items in the testcase.
+         (4px = 3px margin-bottom + 1px margin-top)
+      -->
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big" style="margin-top: 4px">abc</div>
+      <div class="stretch" style="margin-top: 4px">stretch</div>
+      <div class="stretch big" style="margin-top: 4px">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-4.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-4.xhtml
new file mode 100644
index 000000000000..f3724711f442
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-4.xhtml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with the
+     flex container being skinnier than its items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        float: left;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      .flexbox > div {
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+      <div class="center">center</div>
+      <div class="center big">a b</div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1-ref.xhtml
new file mode 100644
index 000000000000..9dab46d03726
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1-ref.xhtml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior in a vertical
+     "direction: rtl" flex container, using blocks in place of flex items and
+     using float and width keywords to emulate the align-items / align-self
+     properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        direction: rtl;
+        font-family: sans-serif;
+        font-size: 10px;
+      }
+
+      div.big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      .flexbox > * {
+        clear: both;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+      }
+      .flex-end {
+        background: orange;
+        float: left;
+        width: -moz-max-content;
+      }
+      .center {
+        background: lightblue;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+        width: 100%;
+      }
+      .auto {
+        background: yellow;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .unspecified {
+        background: lightgreen;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .initial {
+        background: aqua;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .inherit {
+        background: violet;
+        float: left;
+        width: -moz-max-content;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto">auto</div>
+      <div class="unspecified">unspec</div>
+      <div class="initial">initial</div>
+      <div class="inherit">inherit</div>
+      <!-- Since that last div is floated right, the container doesn't include
+           its height by default. So we add some invisible hacky text (of the
+           same font) to make sure our container is tall enough. -->
+      <span style="visibility:hidden">hacky text</span>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml
new file mode 100644
index 000000000000..268b1f41fbba
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-1.xhtml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with
+     "direction: rtl" to swap the horizontal (cross) axis. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        direction: rtl;
+        font-family: sans-serif;
+        font-size: 10px;
+
+        /* Any children whose align-self is 'auto' (or unspecified, or
+           -moz-initial) will end up taking this value from us: */
+        -moz-align-items: center;
+
+        /* Any children whose align-self is 'inherit' will end up
+           inheriting this value from us: */
+        -moz-align-self: flex-end;
+      }
+
+      .big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+      .auto {
+        background: yellow;
+        -moz-align-self: auto;
+      }
+      .unspecified {
+        background: lightgreen;
+      }
+      .initial {
+        background: aqua;
+        -moz-align-self: -moz-initial;
+      }
+      .inherit {
+        background: violet;
+        -moz-align-self: inherit;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+      <div class="auto">auto</div>
+      <div class="unspecified">unspec</div>
+      <div class="initial">initial</div>
+      <div class="inherit">inherit</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-2-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-2-ref.xhtml
new file mode 100644
index 000000000000..ffaee61d881d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-2-ref.xhtml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior in a vertical
+     "direction: rtl" flex container, using blocks in place of flex items and
+     using float and width keywords to emulate the align-items / align-self
+     properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        float: left;
+        direction: rtl;
+        font-family: sans-serif;
+        font-size: 10px;
+      }
+
+      .flex-start, .flex-end, .center, .baseline, .stretch {
+        clear: both;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+        float: right;
+      }
+      .flex-end {
+        background: orange;
+        width: -moz-max-content;
+        float: left;
+      }
+      .center {
+        background: lightblue;
+        width: -moz-max-content;
+        float: right;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+        width: auto;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div style="margin: auto; width: -moz-max-content">
+        <div class="center">center</div>
+      </div>
+      <div style="margin: auto; width: -moz-max-content">
+        <div class="center big">a b c d e f</div>
+      </div>
+    </div>
+    <!-- NOTE: I'm not using floats in this flex container, since floating
+         makes it harder to emulate the "stretch" behavior.
+         (We need to use width: auto - not width:100% - because we need to
+         allow space for our margins/borders/padding. And width:auto doesn't do
+         what we want if we're floated.)
+
+         However, since our children aren't floated, their adjacent vertical
+         margins will collapse by default (which doesn't match what happens in
+         the testcase, since margins don't collapse in a flexbox).  So, we
+         compensate for that by bumping up the margin-top value on every
+         collapsed top-margin to "4px", which is the total amount of vertical
+         margin we're expecting between consecutive flex items in the testcase.
+         (4px = 3px margin-bottom + 1px margin-top)
+      -->
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big" style="margin-top: 4px">abc</div>
+      <div class="stretch" style="margin-top: 4px">stretch</div>
+      <div class="stretch big" style="margin-top: 4px">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-2.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-2.xhtml
new file mode 100644
index 000000000000..514f0cd31881
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-2.xhtml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with
+     margin/border/padding values on each, and with "direction: rtl" to swap
+     the horizontal (cross) axis item. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        direction: rtl;
+        float: left;
+        font-family: sans-serif;
+        font-size: 10px;
+      }
+
+      .flexbox > div {
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 20px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b c d e f</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b c d e f</div>
+      <div class="center">center</div>
+      <div class="center big">a b c d e f</div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b c d e f</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-3-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-3-ref.xhtml
new file mode 100644
index 000000000000..4c9fe8ae0c10
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-3-ref.xhtml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior in a vertical
+     "direction: rtl" flex container, using blocks in place of flex items and
+     using float and width keywords to emulate the align-items / align-self
+     properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        font-family: sans-serif;
+        direction: rtl;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      .flexbox > * {
+        clear: both;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+      }
+      .flex-end {
+        background: orange;
+        float: left;
+        width: -moz-max-content;
+      }
+      .center {
+        background: lightblue;
+        margin: auto;
+        width: -moz-max-content;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+      <!-- We're using auto margins as references for "align-self:center", but
+           auto margins only work if we've got extra space available, and we
+           don't have extra space available in this case.  So, we create a
+           wide wrapper-div that _will_ have space available.  We position
+           that wrapper-div using a negative margin, so that centering in it
+           is equivalent to centering in our reference for the flex container.
+        -->
+      <div style="width: 100px; margin-right: -48px">
+        <div class="center">center</div>
+        <div class="center big">a b</div>
+      </div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-3.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-3.xhtml
new file mode 100644
index 000000000000..522d0fe2a336
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-3.xhtml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with the
+     flex container being skinnier than its items, and with "direction: rtl" to
+     swap the horizontal (cross) axis. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        direction: rtl;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+      <div class="center">center</div>
+      <div class="center big">a b</div>
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-4-ref.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-4-ref.xhtml
new file mode 100644
index 000000000000..e2f2441ece1d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-4-ref.xhtml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for align-items / align-self behavior in a vertical
+     "direction: rtl" flex container, using blocks in place of flex items and
+     using float and width keywords to emulate the align-items / align-self
+     properties. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        float: left;
+        direction: rtl;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      .flex-start, .flex-end, .center, .baseline, .stretch {
+        clear: both;
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        width: -moz-max-content;
+      }
+      .flex-end {
+        background: orange;
+        width: -moz-max-content;
+        float: left;
+      }
+      .center {
+        background: lightblue;
+        width: -moz-max-content;
+      }
+      .baseline {
+        background: teal;
+        width: -moz-max-content;
+      }
+      .stretch {
+        background: pink;
+        width: auto;
+      }
+   </style>
+  </head>
+  <body>
+    <!-- NOTE: I'm not using floats in this flex container, since floating
+         makes it harder to emulate the "stretch" behavior.
+         (We need to use width: auto - not width:100% - because we need to
+         allow space for our margins/borders/padding. And width:auto doesn't do
+         what we want if we're floated.)
+
+         However, since our children aren't floated, their adjacent vertical
+         margins will collapse by default (which doesn't match what happens in
+         the testcase, since margins don't collapse in a flexbox).  So, we
+         compensate for that by bumping up the margin-top value on every
+         collapsed top-margin to "4px", which is the total amount of vertical
+         margin we're expecting between consecutive flex items in the testcase.
+         (4px = 3px margin-bottom + 1px margin-top)
+      -->
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big" style="margin-top: 4px">a b</div>
+      <div class="stretch"  style="margin-top: 4px">stretch</div>
+      <div class="stretch big" style="margin-top: 4px">a b</div>
+      <!-- We're using auto margins as references for "align-self:center", but
+           auto margins only work if we've got extra space available, and we
+           don't have extra space available in this case.  So, we create a
+           wide wrapper-div that _will_ have space available.  We position
+           that wrapper-div using a negative margin, so that centering in it
+           is equivalent to centering in our reference for the flex container.
+        -->
+      <div style="width: 100px; margin-right: -48px">
+        <div style="margin: auto; width: -moz-max-content">
+          <div class="center" style="margin-top: 4px">center</div>
+        </div>
+        <div style="margin: auto; width: -moz-max-content">
+          <div class="center big" style="margin-top: 4px">a b</div>
+        </div>
+      </div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big" style="margin-top: 4px">abc</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-align-self-vert-rtl-4.xhtml b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-4.xhtml
new file mode 100644
index 000000000000..528a809ab5a4
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-align-self-vert-rtl-4.xhtml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for align-items / align-self behavior, with all the possible
+     values included on different items within a flex container, and with the
+     flex container being skinnier than its items, and with "direction: rtl" to
+     swap the horizontal (cross) axis. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      .flexbox {
+        border: 1px dashed blue;
+        width: 4px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        direction: rtl;
+        float: left;
+        font-family: sans-serif;
+        font-size: 10px;
+        margin-left: 80px;
+      }
+
+      .flexbox > div {
+        margin:       1px 2px 3px 4px;
+        border-width: 2px 3px 4px 5px;
+        padding:      3px 4px 5px 6px;
+
+        border-style: dotted;
+      }
+
+      div.big {
+        font-size: 18px;
+        width: 50px;
+      }
+
+      /* Classes for each of the various align-self values */
+      .flex-start {
+        background: lime;
+        -moz-align-self: flex-start;
+      }
+      .flex-end {
+        background: orange;
+        -moz-align-self: flex-end;
+      }
+      .center {
+        background: lightblue;
+        -moz-align-self: center;
+      }
+      .baseline {
+        background: teal;
+        -moz-align-self: baseline;
+      }
+      .stretch {
+        background: pink;
+        -moz-align-self: stretch;
+      }
+   </style>
+  </head>
+  <body>
+    <!-- (NOTE: this test has the "stretch" divs and the "flex-end" divs
+         swapped in the ordering, with respect to the other
+         flexbox-align-self-* testcases.  That's because "stretch" and
+         "flex-end" overflow in opposite directions, and in RTL mode (with 2
+         flex containers side by side), they overflow *at* each other and
+         overlap. If we swap them, they float away from each other and we can
+         still see them.)  -->
+    <div class="flexbox">
+      <div class="flex-start">start</div>
+      <div class="flex-start big">a b</div>
+      <div class="stretch">stretch</div>
+      <div class="stretch big">a b</div>
+      <div class="center">center</div>
+      <div class="center big">a b</div>
+    </div>
+    <div class="flexbox">
+      <div class="baseline">base</div>
+      <div class="baseline big">abc</div>
+      <div class="flex-end">end</div>
+      <div class="flex-end big">a b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-block-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-block-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..71c8f20ca3cb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-block-horiz-1-ref.xhtml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+      }
+      div.a {
+        display: inline-block;
+        background: lightgreen;
+      }
+      div.b {
+        display: inline-block;
+        background: yellow;
+      }
+      div.c {
+        display: inline-block;
+        background: orange;
+      }
+      div.auto   {
+        display: inline-block;
+        background: pink;
+      }
+      div.inflex {
+        display: inline-block;
+        background: gray;
+      }
+      div.spacer {
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a" style="width: 80px"/><div class="b" style="width: 120px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 62.5px"/><div class="c" style="width: 137.5px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 185px"/><div class="auto">
+        <div class="spacer" style="width: 15px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="width: 76px"/><div class="c" style="width: 124px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="width: 170px"/><div class="auto">
+        <div class="spacer" style="width: 30px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 45px"/><div class="b" style="width: 50px"
+      /><div class="inflex" style="width: 20px"/><div class="c" style="width: 85px"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-block-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-block-horiz-1.xhtml
new file mode 100644
index 000000000000..6025fc1e7317
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-block-horiz-1.xhtml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with blocks as flex items in a horizontal flex container, with
+     various "flex" values and various combinations of the items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 30px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 20px;
+        background: yellow;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-block-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-block-vert-1-ref.xhtml
new file mode 100644
index 000000000000..6e927001e59e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-block-vert-1-ref.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { width: 50px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        float: left;
+      }
+      div.a {
+        background: lightgreen;
+      }
+      div.b {
+        background: yellow;
+      }
+      div.c {
+        background: orange;
+      }
+      div.auto   {
+        background: pink;
+      }
+      div.inflex {
+        background: gray;
+      }
+      div.spacer {
+        width: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a" style="height: 80px"/><div class="b" style="height: 120px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="height: 62.5px"/><div class="c" style="height: 137.5px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="height: 185px"/><div class="auto">
+        <div class="spacer" style="height: 15px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="height: 76px"/><div class="c" style="height: 124px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="height: 170px"/><div class="auto">
+        <div class="spacer" style="height: 30px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="height: 45px"/><div class="b" style="height: 50px"
+      /><div class="inflex" style="height: 20px"/><div class="c" style="height: 85px"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-block-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-block-vert-1.xhtml
new file mode 100644
index 000000000000..3b7923a6c37e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-block-vert-1.xhtml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with blocks as flex items in a vertical flex container, with
+     various "flex" values and various combinations of the items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { width: 50px; }
+      div.flexbox {
+        float: left;
+        border: 1px dashed blue;
+        height: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      div.a {
+        -moz-flex: 1 0 30px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 20px;
+        background: yellow;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..fb5ef6cde9cc
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-1-ref.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      canvas {
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <canvas/>
+    </div>
+
+    <div class="flexbox" style="height: 22px">
+      some words
+      <canvas style="float:right"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="width: 122.5px"
+    /><canvas style="width: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="width: 93px"
+    /><canvas style="width: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="width: 114px"
+    /><canvas style="width: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="width: 106px"
+    /><canvas style="width: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="width: 46px"
+    /><canvas style="width: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-1.xhtml
new file mode 100644
index 000000000000..7efb68e78d0b
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-1.xhtml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that canvas elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      canvas {
+        min-width: 0;
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <canvas/>
+    </div>
+
+    <!-- B) Text and a canvas (ensure they aren't merged into one flex item) -->
+    <div class="flexbox">
+      some words <canvas/>
+    </div>
+
+    <!-- C) Two canvas elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <canvas style="-moz-flex: 5"/>
+      <canvas style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two canvas elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <canvas style="width: 33px; -moz-flex: 2 auto"/>
+      <canvas style="width: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <canvas style="width: 150px; -moz-flex: 1 4 auto"/>
+      <canvas style="width: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-width -->
+    <!-- Same as (D), except we've added a max-width on the second element.
+      -->
+    <div class="flexbox">
+      <canvas style="width: 33px; -moz-flex: 2 auto"/>
+      <canvas style="width: 13px; max-width: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-width -->
+    <!-- Same as (C), except we've added a min-width on the second element.
+      -->
+    <div class="flexbox">
+      <canvas style="width: 33px; -moz-flex: 2 auto"/>
+      <canvas style="width: 13px; min-width: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..38d6c71c48fc
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2-ref.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      canvas {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <canvas/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml
new file mode 100644
index 000000000000..4d1c7f9c035f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-horiz-2.xhtml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that canvas elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      canvas {
+        width: 1000px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <canvas/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-vert-1-ref.xhtml
new file mode 100644
index 000000000000..fb85eba91d94
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-vert-1-ref.xhtml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        width: -moz-min-content;
+        float: left;
+        margin-right: 10px;
+        background: lightgreen;
+        line-height: 0;
+      }
+      canvas {
+        width: 20px;
+        height: 10px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <canvas/>
+    </div>
+
+    <div class="flexbox">
+      <div style="font: 8px monospace; height: 188px">
+        a b
+      </div>
+      <canvas/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="height: 122.5px"
+    /><canvas style="height: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="height: 93px"
+    /><canvas style="height: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="height: 114px"
+    /><canvas style="height: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="height: 106px"
+    /><canvas style="height: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <canvas style="height: 46px"
+    /><canvas style="height: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-vert-1.xhtml
new file mode 100644
index 000000000000..e10feaa3bb0b
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-vert-1.xhtml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that canvas elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        -moz-flex-direction: column;
+        float: left;
+        margin-right: 10px;
+        font: 8px monospace;
+      }
+      canvas {
+        width: 20px;
+        height: 10px;
+        min-height: 0;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <canvas/>
+    </div>
+
+    <!-- B) Text and a canvas (ensure they aren't merged into one flex item) -->
+    <div class="flexbox">
+      a b <canvas/>
+    </div>
+
+    <!-- C) Two canvas elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <canvas style="-moz-flex: 5"/>
+      <canvas style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two canvas elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <canvas style="height: 33px; -moz-flex: 2 auto"/>
+      <canvas style="height: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <canvas style="height: 150px; -moz-flex: 1 4 auto"/>
+      <canvas style="height: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-height -->
+    <!-- Same as (D), except we've added a max-height on the second element.
+      -->
+    <div class="flexbox">
+      <canvas style="height: 33px; -moz-flex: 2 auto"/>
+      <canvas style="height: 13px; max-height: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-height -->
+    <!-- Same as (C), except we've added a min-height on the second element.
+      -->
+    <div class="flexbox">
+      <canvas style="height: 33px; -moz-flex: 2 auto"/>
+      <canvas style="height: 13px; min-height: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml
new file mode 100644
index 000000000000..c34d9feb54eb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-vert-2-ref.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      canvas {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <canvas/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml b/layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml
new file mode 100644
index 000000000000..57e16a4ffc75
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-canvas-vert-2.xhtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that canvas elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      canvas {
+        width: 50px;
+        height: 1000px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <canvas/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..c4daa393d3fe
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1-ref.xhtml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        margin-bottom: 5px;
+        line-height: 8px;
+        clear: all;
+        height: 22px;
+      }
+      fieldset {
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+        margin: 0;
+        padding: 0;
+        float: left;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+
+    <div class="flexbox" style="height: 22px">
+      some words
+      <fieldset style="float:right"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="width: 122.5px"
+    /><fieldset style="width: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="width: 93px"
+    /><fieldset style="width: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="width: 114px"
+    /><fieldset style="width: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="width: 106px"
+    /><fieldset style="width: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="width: 46px"
+    /><fieldset style="width: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1.xhtml
new file mode 100644
index 000000000000..375c7c2660c1
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-1.xhtml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that fieldset elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      fieldset {
+        min-width: 0;
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+
+    <!-- B) Text and a fieldset (ensure they aren't merged into one flex item)
+      -->
+    <div class="flexbox">
+      some words <fieldset/>
+    </div>
+
+    <!-- C) Two fieldset elements, getting stretched by different ratios,
+         from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <fieldset style="-moz-flex: 5"/>
+      <fieldset style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two fieldset elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <fieldset style="width: 33px; -moz-flex: 2 auto"/>
+      <fieldset style="width: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <fieldset style="width: 150px; -moz-flex: 1 4 auto"/>
+      <fieldset style="width: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-width -->
+    <!-- Same as (D), except we've added a max-width on the second element.
+      -->
+    <div class="flexbox">
+      <fieldset style="width: 33px; -moz-flex: 2 auto"/>
+      <fieldset style="width: 13px; max-width: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-width -->
+    <!-- Same as (C), except we've added a min-width on the second element.
+      -->
+    <div class="flexbox">
+      <fieldset style="width: 33px; -moz-flex: 2 auto"/>
+      <fieldset style="width: 13px; min-width: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..7bc050a92f87
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2-ref.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      fieldset {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml
new file mode 100644
index 000000000000..f06f37449994
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-horiz-2.xhtml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that fieldset elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      fieldset {
+        width: 1000px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-1-ref.xhtml
new file mode 100644
index 000000000000..19453984ed18
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-1-ref.xhtml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        width: -moz-min-content;
+        float: left;
+        margin-right: 10px;
+        background: lightgreen;
+        line-height: 0;
+      }
+      fieldset {
+        width: 20px;
+        height: 10px;
+        border: 1px dotted green;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+
+    <div class="flexbox">
+      <div style="font: 8px monospace; height: 188px">
+        a b
+      </div>
+      <fieldset/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="height: 122.5px"
+    /><fieldset style="height: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="height: 93px"
+    /><fieldset style="height: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="height: 114px"
+    /><fieldset style="height: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="height: 106px"
+    /><fieldset style="height: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <fieldset style="height: 46px"
+    /><fieldset style="height: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-1.xhtml
new file mode 100644
index 000000000000..630e7c8eae3f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-1.xhtml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that fieldset elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        -moz-flex-direction: column;
+        float: left;
+        margin-right: 10px;
+        font: 8px monospace;
+      }
+      fieldset {
+        width: 20px;
+        height: 10px;
+        min-height: 0;
+        border: 1px dotted green;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+
+    <!-- B) Text and a fieldset (ensure they aren't merged into one flex item)
+      -->
+    <div class="flexbox">
+      a b <fieldset/>
+    </div>
+
+    <!-- C) Two fieldset elements, getting stretched by different ratios,
+         from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <fieldset style="-moz-flex: 5"/>
+      <fieldset style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two fieldset elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <fieldset style="height: 33px; -moz-flex: 2 auto"/>
+      <fieldset style="height: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <fieldset style="height: 150px; -moz-flex: 1 4 auto"/>
+      <fieldset style="height: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-height -->
+    <!-- Same as (D), except we've added a max-height on the second element.
+      -->
+    <div class="flexbox">
+      <fieldset style="height: 33px; -moz-flex: 2 auto"/>
+      <fieldset style="height: 13px; max-height: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-height -->
+    <!-- Same as (C), except we've added a min-height on the second element.
+      -->
+    <div class="flexbox">
+      <fieldset style="height: 33px; -moz-flex: 2 auto"/>
+      <fieldset style="height: 13px; min-height: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml
new file mode 100644
index 000000000000..b025d7fb55b7
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2-ref.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      fieldset {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml
new file mode 100644
index 000000000000..36d0b74a18f5
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-fieldset-vert-2.xhtml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that fieldset elements' default "min-height: auto"
+     property is handled correctly (i.e. isn't influenced by the "height"
+     property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      fieldset {
+        width: 50px;
+        height: 1000px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <fieldset/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..a3a93e67f69a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-1-ref.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      iframe {
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <iframe/>
+    </div>
+
+    <div class="flexbox" style="height: 22px">
+      some words
+      <iframe style="float:right"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="width: 122.5px"
+    /><iframe style="width: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="width: 93px"
+    /><iframe style="width: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="width: 114px"
+    /><iframe style="width: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="width: 106px"
+    /><iframe style="width: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="width: 46px"
+    /><iframe style="width: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-1.xhtml
new file mode 100644
index 000000000000..cd463c751060
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-1.xhtml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that iframe elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      iframe {
+        min-width: 0;
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <iframe/>
+    </div>
+
+    <!-- B) Text and an iframe (ensure they aren't merged into one flex item)
+      -->
+    <div class="flexbox">
+      some words <iframe/>
+    </div>
+
+    <!-- C) Two iframe elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <iframe style="-moz-flex: 5"/>
+      <iframe style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two iframe elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <iframe style="width: 33px; -moz-flex: 2 auto"/>
+      <iframe style="width: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <iframe style="width: 150px; -moz-flex: 1 4 auto"/>
+      <iframe style="width: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-width -->
+    <!-- Same as (D), except we've added a max-width on the second element.
+      -->
+    <div class="flexbox">
+      <iframe style="width: 33px; -moz-flex: 2 auto"/>
+      <iframe style="width: 13px; max-width: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-width -->
+    <!-- Same as (C), except we've added a min-width on the second element.
+      -->
+    <div class="flexbox">
+      <iframe style="width: 33px; -moz-flex: 2 auto"/>
+      <iframe style="width: 13px; min-width: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..610bf030b69c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2-ref.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      iframe {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <iframe/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml
new file mode 100644
index 000000000000..87f0c7fc1c21
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-horiz-2.xhtml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that iframe elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      iframe {
+        width: 1000px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <iframe/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-vert-1-ref.xhtml
new file mode 100644
index 000000000000..8004a1c905ec
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-vert-1-ref.xhtml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        width: -moz-min-content;
+        float: left;
+        margin-right: 10px;
+        background: lightgreen;
+        line-height: 0;
+      }
+      iframe {
+        width: 20px;
+        height: 10px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <iframe/>
+    </div>
+
+    <div class="flexbox">
+      <div style="font: 8px monospace; height: 188px">
+        a b
+      </div>
+      <iframe/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="height: 122.5px"
+    /><iframe style="height: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="height: 93px"
+    /><iframe style="height: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="height: 114px"
+    /><iframe style="height: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="height: 106px"
+    /><iframe style="height: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <iframe style="height: 46px"
+    /><iframe style="height: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-vert-1.xhtml
new file mode 100644
index 000000000000..ca3c59ab2287
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-vert-1.xhtml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that iframe elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        -moz-flex-direction: column;
+        float: left;
+        margin-right: 10px;
+        font: 8px monospace;
+      }
+      iframe {
+        width: 20px;
+        height: 10px;
+        min-height: 0;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <iframe/>
+    </div>
+
+    <!-- B) Text and an iframe (ensure they aren't merged into one flex item)
+      -->
+    <div class="flexbox">
+      a b <iframe/>
+    </div>
+
+    <!-- C) Two iframe elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <iframe style="-moz-flex: 5"/>
+      <iframe style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two iframe elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <iframe style="height: 33px; -moz-flex: 2 auto"/>
+      <iframe style="height: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <iframe style="height: 150px; -moz-flex: 1 4 auto"/>
+      <iframe style="height: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-height -->
+    <!-- Same as (D), except we've added a max-height on the second element.
+      -->
+    <div class="flexbox">
+      <iframe style="height: 33px; -moz-flex: 2 auto"/>
+      <iframe style="height: 13px; max-height: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-height -->
+    <!-- Same as (C), except we've added a min-height on the second element.
+      -->
+    <div class="flexbox">
+      <iframe style="height: 33px; -moz-flex: 2 auto"/>
+      <iframe style="height: 13px; min-height: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml
new file mode 100644
index 000000000000..72f4b3464623
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-vert-2-ref.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      iframe {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <iframe/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml b/layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml
new file mode 100644
index 000000000000..25f491b89575
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-iframe-vert-2.xhtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that iframe elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      iframe {
+        width: 50px;
+        height: 1000px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <iframe/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-img-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..fb63982e6f19
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-horiz-1-ref.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      img {
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+
+    <div class="flexbox" style="height: 22px">
+      some words
+      <img src="solidblue.png" style="float:right"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 122.5px"
+    /><img src="solidblue.png" style="width: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 93px"
+    /><img src="solidblue.png" style="width: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 114px"
+    /><img src="solidblue.png" style="width: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 106px"
+    /><img src="solidblue.png" style="width: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 46px"
+    /><img src="solidblue.png" style="width: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-img-horiz-1.xhtml
new file mode 100644
index 000000000000..9c5d7f0605df
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-horiz-1.xhtml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that img elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      img {
+        min-width: 0;
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+
+    <!-- B) Text and an img (ensure they aren't merged into one flex item) -->
+    <div class="flexbox">
+      some words <img src="solidblue.png"/>
+    </div>
+
+    <!-- C) Two img elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="-moz-flex: 5"/>
+      <img src="solidblue.png" style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two img elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 33px; -moz-flex: 2 auto"/>
+      <img src="solidblue.png" style="width: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 150px; -moz-flex: 1 4 auto"/>
+      <img src="solidblue.png" style="width: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-width -->
+    <!-- Same as (D), except we've added a max-width on the second element.
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 33px; -moz-flex: 2 auto"/>
+      <img src="solidblue.png"
+           style="width: 13px; max-width: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-width -->
+    <!-- Same as (C), except we've added a min-width on the second element.
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="width: 33px; -moz-flex: 2 auto"/>
+      <img src="solidblue.png"
+           style="width: 13px; min-width: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..b2e73a004e7c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-horiz-2-ref.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      img {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml
new file mode 100644
index 000000000000..d941a01368f3
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-horiz-2.xhtml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that img elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      img {
+        width: 1000px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-img-vert-1-ref.xhtml
new file mode 100644
index 000000000000..84417ecf3097
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-vert-1-ref.xhtml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        width: -moz-min-content;
+        float: left;
+        margin-right: 10px;
+        background: lightgreen;
+        line-height: 0;
+      }
+      img {
+        width: 20px;
+        height: 10px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+
+    <div class="flexbox">
+      <div style="font: 8px monospace; height: 188px">
+        a b
+      </div>
+      <img src="solidblue.png"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 122.5px"
+    /><img src="solidblue.png" style="height: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 93px"
+    /><img src="solidblue.png" style="height: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 114px"
+    /><img src="solidblue.png" style="height: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 106px"
+    /><img src="solidblue.png" style="height: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 46px"
+    /><img src="solidblue.png" style="height: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-img-vert-1.xhtml
new file mode 100644
index 000000000000..ea71d0bb27c3
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-vert-1.xhtml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that img elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        -moz-flex-direction: column;
+        float: left;
+        margin-right: 10px;
+        font: 8px monospace;
+      }
+      img {
+        width: 20px;
+        height: 10px;
+        min-height: 0;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+
+    <!-- B) Text and an img (ensure they aren't merged into one flex item) -->
+    <div class="flexbox">
+      a b <img src="solidblue.png"/>
+    </div>
+
+    <!-- C) Two img elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="-moz-flex: 5"/>
+      <img src="solidblue.png" style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two img elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 33px; -moz-flex: 2 auto"/>
+      <img src="solidblue.png" style="height: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 150px; -moz-flex: 1 4 auto"/>
+      <img src="solidblue.png" style="height: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-height -->
+    <!-- Same as (D), except we've added a max-height on the second element.
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 33px; -moz-flex: 2 auto"/>
+      <img src="solidblue.png"
+           style="height: 13px; max-height: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-height -->
+    <!-- Same as (C), except we've added a min-height on the second element.
+      -->
+    <div class="flexbox">
+      <img src="solidblue.png" style="height: 33px; -moz-flex: 2 auto"/>
+      <img src="solidblue.png"
+           style="height: 13px; min-height: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml
new file mode 100644
index 000000000000..8b0b39c5cae9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-vert-2-ref.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      img {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml b/layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml
new file mode 100644
index 000000000000..eb2b6f2dd318
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-img-vert-2.xhtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that img elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      img {
+        width: 50px;
+        height: 1000px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <img src="solidblue.png"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..3a6b22b3f8e1
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-1-ref.xhtml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      textarea {
+        width: 10px;
+        height: 20px;
+        background: white;
+        border-radius: 0;
+        border: 1px dotted green;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <textarea/>
+    </div>
+
+    <div class="flexbox" style="height: 24px">
+      some words
+      <textarea style="float:right"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="width: 122.5px"
+    /><textarea style="width: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="width: 93px"
+    /><textarea style="width: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="width: 114px"
+    /><textarea style="width: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="width: 106px"
+    /><textarea style="width: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="width: 46px"
+    /><textarea style="width: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-1.xhtml
new file mode 100644
index 000000000000..33fa73bb0d59
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-1.xhtml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that textarea elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      textarea {
+        min-width: 0;
+        width: 10px;
+        height: 20px;
+        background: white;
+        border-radius: 0;
+        border: 1px dotted green;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <textarea/>
+    </div>
+
+    <!-- B) Text and a textarea (ensure they aren't merged into one flex item)
+      -->
+    <div class="flexbox">
+      some words <textarea/>
+    </div>
+
+    <!-- C) Two textarea elements, getting stretched by different ratios,
+         from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <textarea style="-moz-flex: 5"/>
+      <textarea style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two textarea elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <textarea style="width: 33px; -moz-flex: 2 auto"/>
+      <textarea style="width: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <textarea style="width: 150px; -moz-flex: 1 4 auto"/>
+      <textarea style="width: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-width -->
+    <!-- Same as (D), except we've added a max-width on the second element.
+      -->
+    <div class="flexbox">
+      <textarea style="width: 33px; -moz-flex: 2 auto"/>
+      <textarea
+         style="width: 13px; max-width: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-width -->
+    <!-- Same as (C), except we've added a min-width on the second element.
+      -->
+    <div class="flexbox">
+      <textarea style="width: 33px; -moz-flex: 2 auto"/>
+      <textarea
+         style="width: 13px; min-width: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..8bd164977f28
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2-ref.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      textarea {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <textarea/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml
new file mode 100644
index 000000000000..099b7711cf40
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-horiz-2.xhtml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that textarea elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      textarea {
+        width: 1000px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <textarea/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-vert-1-ref.xhtml
new file mode 100644
index 000000000000..e0c68e2bcfdc
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-vert-1-ref.xhtml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        width: -moz-min-content;
+        float: left;
+        margin-right: 10px;
+        background: lightgreen;
+        line-height: 0;
+      }
+      textarea {
+        width: 20px;
+        height: 10px;
+        background: white;
+        border-radius: 0;
+        border: 1px dotted green;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <textarea/>
+    </div>
+
+    <div class="flexbox">
+      <div style="font: 8px monospace; height: 188px">
+        a b
+      </div>
+      <textarea/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="height: 122.5px"
+    /><textarea style="height: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="height: 93px"
+    /><textarea style="height: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="height: 114px"
+    /><textarea style="height: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="height: 106px"
+    /><textarea style="height: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <textarea style="height: 46px"
+    /><textarea style="height: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-vert-1.xhtml
new file mode 100644
index 000000000000..61b918e180bf
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-vert-1.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that textarea elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        -moz-flex-direction: column;
+        float: left;
+        margin-right: 10px;
+        font: 8px monospace;
+      }
+      textarea {
+        width: 20px;
+        height: 10px;
+        min-height: 0;
+        background: white;
+        border-radius: 0;
+        border: 1px dotted green;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <textarea/>
+    </div>
+
+    <!-- B) Text and a textarea (ensure they aren't merged into one flex item)
+      -->
+    <div class="flexbox">
+      a b <textarea/>
+    </div>
+
+    <!-- C) Two textarea elements, getting stretched by different ratios,
+         from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <textarea style="-moz-flex: 5"/>
+      <textarea style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two textarea elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <textarea style="height: 33px; -moz-flex: 2 auto"/>
+      <textarea style="height: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <textarea style="height: 150px; -moz-flex: 1 4 auto"/>
+      <textarea style="height: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-height -->
+    <!-- Same as (D), except we've added a max-height on the second element.
+      -->
+    <div class="flexbox">
+      <textarea style="height: 33px; -moz-flex: 2 auto"/>
+      <textarea
+         style="height: 13px; max-height: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-height -->
+    <!-- Same as (C), except we've added a min-height on the second element.
+      -->
+    <div class="flexbox">
+      <textarea style="height: 33px; -moz-flex: 2 auto"/>
+      <textarea
+         style="height: 13px; min-height: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml
new file mode 100644
index 000000000000..5651329c5172
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-vert-2-ref.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      textarea {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <textarea/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml b/layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml
new file mode 100644
index 000000000000..dc200c404a7d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-textarea-vert-2.xhtml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that textarea elements' default "min-height: auto"
+     property is handled correctly (i.e. isn't influenced by the "height"
+     property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      textarea {
+        width: 50px;
+        height: 1000px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <textarea/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-video-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..9f7988322398
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-horiz-1-ref.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      video {
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <video/>
+    </div>
+
+    <div class="flexbox" style="height: 22px">
+      some words
+      <video style="float:right"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="width: 122.5px"
+    /><video style="width: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="width: 93px"
+    /><video style="width: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="width: 114px"
+    /><video style="width: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="width: 106px"
+    /><video style="width: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="width: 46px"
+    /><video style="width: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-basic-video-horiz-1.xhtml
new file mode 100644
index 000000000000..d99871b0c9ef
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-horiz-1.xhtml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that video elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        margin-bottom: 5px;
+        line-height: 8px;
+      }
+      video {
+        min-width: 0;
+        width: 10px;
+        height: 20px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <video/>
+    </div>
+
+    <!-- B) Text and a video (ensure they aren't merged into one flex item) -->
+    <div class="flexbox">
+      some words <video/>
+    </div>
+
+    <!-- C) Two video elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <video style="-moz-flex: 5"/>
+      <video style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two video elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <video style="width: 33px; -moz-flex: 2 auto"/>
+      <video style="width: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <video style="width: 150px; -moz-flex: 1 4 auto"/>
+      <video style="width: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-width -->
+    <!-- Same as (D), except we've added a max-width on the second element.
+      -->
+    <div class="flexbox">
+      <video style="width: 33px; -moz-flex: 2 auto"/>
+      <video style="width: 13px; max-width: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-width -->
+    <!-- Same as (C), except we've added a min-width on the second element.
+      -->
+    <div class="flexbox">
+      <video style="width: 33px; -moz-flex: 2 auto"/>
+      <video style="width: 13px; min-width: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..56c6d625de5d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-horiz-2-ref.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      video {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <video/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml
new file mode 100644
index 000000000000..0e9c4946e327
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-horiz-2.xhtml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that video elements' default "min-width: auto" property
+     is handled correctly (i.e. isn't influenced by the "width" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+      }
+      video {
+        width: 1000px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <video/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-video-vert-1-ref.xhtml
new file mode 100644
index 000000000000..4691503a9a54
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-vert-1-ref.xhtml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        width: -moz-min-content;
+        float: left;
+        margin-right: 10px;
+        background: lightgreen;
+        line-height: 0;
+      }
+      video {
+        width: 20px;
+        height: 10px;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <video/>
+    </div>
+
+    <div class="flexbox">
+      <div style="font: 8px monospace; height: 188px">
+        a b
+      </div>
+      <video/>
+    </div>
+
+    <div class="flexbox">
+      <video style="height: 122.5px"
+    /><video style="height: 73.5px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="height: 93px"
+    /><video style="height: 103px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="height: 114px"
+    /><video style="height: 82px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="height: 106px"
+    /><video style="height: 90px"/>
+    </div>
+
+    <div class="flexbox">
+      <video style="height: 46px"
+    /><video style="height: 150px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-vert-1.xhtml b/layout/reftests/flexbox/flexbox-basic-video-vert-1.xhtml
new file mode 100644
index 000000000000..2083b7f0ae9d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-vert-1.xhtml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that video elements behave correctly as flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        background: lightgreen;
+        display: -moz-flex;
+        -moz-justify-content: space-between;
+        -moz-flex-direction: column;
+        float: left;
+        margin-right: 10px;
+        font: 8px monospace;
+      }
+      video {
+        width: 20px;
+        height: 10px;
+        min-height: 0;
+        border: 1px dotted green;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- A) One flex item -->
+    <div class="flexbox">
+      <video/>
+    </div>
+
+    <!-- B) Text and a video (ensure they aren't merged into one flex item) -->
+    <div class="flexbox">
+      a b <video/>
+    </div>
+
+    <!-- C) Two video elements, getting stretched by different ratios, from 0.
+
+         Space-to-be-distributed = 200px - borders = 200 - (1 + 1) - (1 + 1)
+                                 = 196px
+
+         1st element gets 5/8 of space: 5/8 * 196px = 122.5px
+         1st element gets 3/8 of space: 3/8 * 196px = 73.5px
+      -->
+    <div class="flexbox">
+      <video style="-moz-flex: 5"/>
+      <video style="-moz-flex: 3"/>
+    </div>
+
+    <!-- D) Two video elements, getting stretched by different ratios, from
+         different flex bases.
+
+         Space-to-be-distributed = 200px - (33 + 1 + 1) - (13 + 1 + 1) = 150px
+         1st element gets 2/5 of space: 33px + 2/5 * 150px = 93px
+         1st element gets 3/5 of space: 13px + 3/5 * 150px = 103px
+      -->
+    <div class="flexbox">
+      <video style="height: 33px; -moz-flex: 2 auto"/>
+      <video style="height: 13px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- E) Two flex items, getting shrunk by different amounts.
+
+         Space-to-be-distributed = 200px - (150 + 1 + 1) - (100 + 1 + 1) = -54px
+         First element scaled flex ratio = 4 * 150 = 600
+         Second element scaled flex ratio = 3 * 100 = 300
+           * So, total flexibility is 600 + 300 = 900
+
+         1st element gets 600/900 of space: 150 + 600/900 * -54 = 114px
+         2nd element gets 300/900 of space: 100 + 300/900 * -54 = 82px
+      -->
+    <div class="flexbox">
+      <video style="height: 150px; -moz-flex: 1 4 auto"/>
+      <video style="height: 100px; -moz-flex: 1 3 auto"/>
+    </div>
+
+    <!-- F) Making sure we don't grow past max-height -->
+    <!-- Same as (D), except we've added a max-height on the second element.
+      -->
+    <div class="flexbox">
+      <video style="height: 33px; -moz-flex: 2 auto"/>
+      <video style="height: 13px; max-height: 90px; -moz-flex: 3 auto"/>
+    </div>
+
+    <!-- G) Making sure we grow at least as large as min-height -->
+    <!-- Same as (C), except we've added a min-height on the second element.
+      -->
+    <div class="flexbox">
+      <video style="height: 33px; -moz-flex: 2 auto"/>
+      <video style="height: 13px; min-height: 150px; -moz-flex: 3 auto"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml
new file mode 100644
index 000000000000..e43011cdb83e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-vert-2-ref.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      video {
+        width: 50px;
+        height: 50px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <video/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml b/layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml
new file mode 100644
index 000000000000..884b697890bb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-basic-video-vert-2.xhtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that video elements' default "min-height: auto" property
+     is handled correctly (i.e. isn't influenced by the "height" property).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 50px;
+        width: 50px;
+        border: 2px dotted black;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+      }
+      video {
+        width: 50px;
+        height: 1000px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <video/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1-ref.xhtml
new file mode 100644
index 000000000000..621130eea819
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1-ref.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f0">  <div>[OldText]</div></div>
+    <div class="flexbox" id="f1"><div>[OldText]</div>  </div>
+    <div class="flexbox" id="f2">[NewText]<div>[OldText]</div></div>
+    <div class="flexbox" id="f3">[NewText]  <div>[OldText]</div></div>
+    <div class="flexbox" id="f4">  [NewText]<div>[OldText]</div></div>
+    <div class="flexbox" id="f5"><div>[OldText]</div>[NewText]</div>
+    <div class="flexbox" id="f6"><div>[OldText]</div>[NewText]  </div>
+    <div class="flexbox" id="f7"><div>[OldText]</div>  [NewText]</div>
+    <div class="flexbox" id="f8">[NewText]  <div>[OldText]</div></div>
+    <div class="flexbox" id="f9">  [NewText]<div>[OldText]</div></div>
+    <div class="flexbox" id="f10"><div>[OldText]</div>[NewText]  </div>
+    <div class="flexbox" id="f11"><div>[OldText]</div>  [NewText]</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1.xhtml
new file mode 100644
index 000000000000..52d3c070dd20
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-1.xhtml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & text) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function tweak() {
+        // Just inserting whitespace
+        // -------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f0");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f1");
+
+        // Inserting text or text with whitespace
+        // --------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"),   0, "f2");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]  "), 0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  [NewText]"), 0, "f4");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"),   1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]  "), 1, "f6");
+        insertNodeAtPosnInElem(document.createTextNode("  [NewText]"), 1, "f7");
+
+        // Same as the whitespace cases immediately above, but now with separate
+        // text nodes for the whitespace vs. the text
+        insertNodeAtPosnInElem(document.createTextNode("  "),        0, "f8");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f8");
+
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("  "),        0, "f9");
+
+        insertNodeAtPosnInElem(document.createTextNode("  "),        1, "f10");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f10");
+
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f11");
+        insertNodeAtPosnInElem(document.createTextNode("  "),        1, "f11");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><div>[OldText]</div></div>
+    <div class="flexbox" id="f1"><div>[OldText]</div></div>
+    <div class="flexbox" id="f2"><div>[OldText]</div></div>
+    <div class="flexbox" id="f3"><div>[OldText]</div></div>
+    <div class="flexbox" id="f4"><div>[OldText]</div></div>
+    <div class="flexbox" id="f5"><div>[OldText]</div></div>
+    <div class="flexbox" id="f6"><div>[OldText]</div></div>
+    <div class="flexbox" id="f7"><div>[OldText]</div></div>
+    <div class="flexbox" id="f8"><div>[OldText]</div></div>
+    <div class="flexbox" id="f9"><div>[OldText]</div></div>
+    <div class="flexbox" id="f10"><div>[OldText]</div></div>
+    <div class="flexbox" id="f11"><div>[OldText]</div></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2-ref.xhtml
new file mode 100644
index 000000000000..36fead9450ba
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2-ref.xhtml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      <!-- to make inserted div elements stand out -->
+      div.inserted { background: teal; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f8"><div class="inserted">[NewDiv]</div><div>[OldText]</div></div>
+    <div class="flexbox" id="f9"><div>[OldText]</div><div class="inserted">[NewDiv]</div></div>
+    <div class="flexbox" id="f10"><div class="inserted">[NewDiv]</div>  <div>[OldText]</div></div>
+    <div class="flexbox" id="f11">  <div class="inserted">[NewDiv]</div><div>[OldText]</div></div>
+    <div class="flexbox" id="f12"><div>[OldText]</div><div class="inserted">[NewDiv]</div>  </div>
+    <div class="flexbox" id="f13"><div>[OldText]</div>  <div class="inserted">[NewDiv]</div></div>
+    <div class="flexbox" id="f14"><div class="inserted">[NewDiv]</div>[NewText]<div>[OldText]</div></div>
+    <div class="flexbox" id="f15">[NewText]<div class="inserted">[NewDiv]</div><div>[OldText]</div></div>
+    <div class="flexbox" id="f16"><div>[OldText]</div><div class="inserted">[NewDiv]</div>[NewText]</div>
+    <div class="flexbox" id="f17"><div>[OldText]</div>[NewText]<div class="inserted">[NewDiv]</div></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2.xhtml
new file mode 100644
index 000000000000..b982ca194cd9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-2.xhtml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & divs) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      <!-- to make inserted div elements stand out -->
+      div.inserted { background: teal; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createDivElem() {
+        var div = document.createElement("div");
+        div.setAttribute("class", "inserted");
+        div.appendChild(document.createTextNode("[NewDiv]"));
+        return div;
+      }
+
+      function tweak() {
+        // Inserting div, adjacent to inline content
+        // -----------------------------------------
+        insertNodeAtPosnInElem(createDivElem(), 0, "f0");
+        insertNodeAtPosnInElem(createDivElem(), 1, "f1");
+
+        // Inserting div and whitespace, before inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createDivElem(),               0, "f2");
+
+        insertNodeAtPosnInElem(createDivElem(),               0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting div and whitespace, after inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createDivElem(),               1, "f4");
+
+        insertNodeAtPosnInElem(createDivElem(),               1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting div and text, before inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createDivElem(),                      0, "f6");
+
+        insertNodeAtPosnInElem(createDivElem(),                      0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting div and text, after inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createDivElem(),                      1, "f8");
+
+        insertNodeAtPosnInElem(createDivElem(),                      1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><div>[OldText]</div></div>
+    <div class="flexbox" id="f1"><div>[OldText]</div></div>
+    <div class="flexbox" id="f2"><div>[OldText]</div></div>
+    <div class="flexbox" id="f3"><div>[OldText]</div></div>
+    <div class="flexbox" id="f4"><div>[OldText]</div></div>
+    <div class="flexbox" id="f5"><div>[OldText]</div></div>
+    <div class="flexbox" id="f6"><div>[OldText]</div></div>
+    <div class="flexbox" id="f7"><div>[OldText]</div></div>
+    <div class="flexbox" id="f8"><div>[OldText]</div></div>
+    <div class="flexbox" id="f9"><div>[OldText]</div></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3-ref.xhtml
new file mode 100644
index 000000000000..2573b1e09756
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3-ref.xhtml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      <!-- to make inserted span elements stand out -->
+      span.inserted { background: teal; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><span class="inserted">[NewSpan]</span><div>[OldText]</div></div>
+    <div class="flexbox" id="f1"><div>[OldText]</div><span class="inserted">[NewSpan]</span></div>
+    <div class="flexbox" id="f2"><span class="inserted">[NewSpan]</span>  <div>[OldText]</div></div>
+    <div class="flexbox" id="f3">  <span class="inserted">[NewSpan]</span><div>[OldText]</div></div>
+    <div class="flexbox" id="f4"><div>[OldText]</div><span class="inserted">[NewSpan]</span>  </div>
+    <div class="flexbox" id="f5"><div>[OldText]</div>  <span class="inserted">[NewSpan]</span></div>
+    <div class="flexbox" id="f6"><span class="inserted">[NewSpan]</span>[NewText]<div>[OldText]</div></div>
+    <div class="flexbox" id="f7">[NewText]<span class="inserted">[NewSpan]</span><div>[OldText]</div></div>
+    <div class="flexbox" id="f8"><div>[OldText]</div><span class="inserted">[NewSpan]</span>[NewText]</div>
+    <div class="flexbox" id="f9"><div>[OldText]</div>[NewText]<span class="inserted">[NewSpan]</span></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3.xhtml
new file mode 100644
index 000000000000..f153f283ae68
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundDiv-3.xhtml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & spans) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      <!-- to make inserted span elements stand out -->
+      span.inserted { background: teal; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createSpanElem() {
+        var span = document.createElement("span");
+        span.setAttribute("class", "inserted");
+        span.appendChild(document.createTextNode("[NewSpan]"));
+        return span;
+      }
+
+      function tweak() {
+        // Inserting span, on either side of existing content
+        // --------------------------------------------------
+        insertNodeAtPosnInElem(createSpanElem(), 0, "f0");
+        insertNodeAtPosnInElem(createSpanElem(), 1, "f1");
+
+        // Inserting span and whitespace, before existing content
+        // ------------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f2");
+
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting span and whitespace, after existing content
+        // -----------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f4");
+
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting span and text, before existing content
+        // ------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f6");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting span and text, after existing content
+        // -----------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f8");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><div>[OldText]</div></div>
+    <div class="flexbox" id="f1"><div>[OldText]</div></div>
+    <div class="flexbox" id="f2"><div>[OldText]</div></div>
+    <div class="flexbox" id="f3"><div>[OldText]</div></div>
+    <div class="flexbox" id="f4"><div>[OldText]</div></div>
+    <div class="flexbox" id="f5"><div>[OldText]</div></div>
+    <div class="flexbox" id="f6"><div>[OldText]</div></div>
+    <div class="flexbox" id="f7"><div>[OldText]</div></div>
+    <div class="flexbox" id="f8"><div>[OldText]</div></div>
+    <div class="flexbox" id="f9"><div>[OldText]</div></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-1.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-1.xhtml
new file mode 100644
index 000000000000..77a144050fee
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-1.xhtml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & text) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function tweak() {
+        // Just inserting whitespace
+        // -------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f0");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f1");
+
+        // Inserting text or text with whitespace
+        // --------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"),   0, "f2");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]  "), 0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  [NewText]"), 0, "f4");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"),   1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]  "), 1, "f6");
+        insertNodeAtPosnInElem(document.createTextNode("  [NewText]"), 1, "f7");
+
+        // Same as the whitespace cases immediately above, but now with separate
+        // text nodes for the whitespace vs. the text
+        insertNodeAtPosnInElem(document.createTextNode("  "),        0, "f8");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f8");
+
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("  "),        0, "f9");
+
+        insertNodeAtPosnInElem(document.createTextNode("  "),        1, "f10");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f10");
+
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f11");
+        insertNodeAtPosnInElem(document.createTextNode("  "),        1, "f11");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><span>[OldText]</span></div>
+    <div class="flexbox" id="f1"><span>[OldText]</span></div>
+    <div class="flexbox" id="f2"><span>[OldText]</span></div>
+    <div class="flexbox" id="f3"><span>[OldText]</span></div>
+    <div class="flexbox" id="f4"><span>[OldText]</span></div>
+    <div class="flexbox" id="f5"><span>[OldText]</span></div>
+    <div class="flexbox" id="f6"><span>[OldText]</span></div>
+    <div class="flexbox" id="f7"><span>[OldText]</span></div>
+    <div class="flexbox" id="f8"><span>[OldText]</span></div>
+    <div class="flexbox" id="f9"><span>[OldText]</span></div>
+    <div class="flexbox" id="f10"><span>[OldText]</span></div>
+    <div class="flexbox" id="f11"><span>[OldText]</span></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-2.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-2.xhtml
new file mode 100644
index 000000000000..1bcdd5642bba
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-2.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & divs) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body {
+        font-size: 10px;
+      }
+
+      div.inserted {
+        background: teal; /* To make inserted div elements stand out. */
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createDivElem() {
+        var div = document.createElement("div");
+        div.setAttribute("class", "inserted");
+        div.appendChild(document.createTextNode("[NewDiv]"));
+        return div;
+      }
+
+      function tweak() {
+        // Inserting div, adjacent to inline content
+        // -----------------------------------------
+        insertNodeAtPosnInElem(createDivElem(), 0, "f0");
+        insertNodeAtPosnInElem(createDivElem(), 1, "f1");
+
+        // Inserting div and whitespace, before inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createDivElem(),               0, "f2");
+
+        insertNodeAtPosnInElem(createDivElem(),               0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting div and whitespace, after inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createDivElem(),               1, "f4");
+
+        insertNodeAtPosnInElem(createDivElem(),               1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting div and text, before inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createDivElem(),                      0, "f6");
+
+        insertNodeAtPosnInElem(createDivElem(),                      0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting div and text, after inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createDivElem(),                      1, "f8");
+
+        insertNodeAtPosnInElem(createDivElem(),                      1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><span>[OldText]</span></div>
+    <div class="flexbox" id="f1"><span>[OldText]</span></div>
+    <div class="flexbox" id="f2"><span>[OldText]</span></div>
+    <div class="flexbox" id="f3"><span>[OldText]</span></div>
+    <div class="flexbox" id="f4"><span>[OldText]</span></div>
+    <div class="flexbox" id="f5"><span>[OldText]</span></div>
+    <div class="flexbox" id="f6"><span>[OldText]</span></div>
+    <div class="flexbox" id="f7"><span>[OldText]</span></div>
+    <div class="flexbox" id="f8"><span>[OldText]</span></div>
+    <div class="flexbox" id="f9"><span>[OldText]</span></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-3.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-3.xhtml
new file mode 100644
index 000000000000..d504c4c646cb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundSpan-3.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & spans) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body {
+        font-size: 10px;
+      }
+
+      span.inserted {
+        background: teal; /* To make inserted span elements stand out. */
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createSpanElem() {
+        var span = document.createElement("span");
+        span.setAttribute("class", "inserted");
+        span.appendChild(document.createTextNode("[NewSpan]"));
+        return span;
+      }
+
+      function tweak() {
+        // Inserting span, on either side of existing content
+        // --------------------------------------------------
+        insertNodeAtPosnInElem(createSpanElem(), 0, "f0");
+        insertNodeAtPosnInElem(createSpanElem(), 1, "f1");
+
+        // Inserting span and whitespace, before existing content
+        // ------------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f2");
+
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting span and whitespace, after existing content
+        // -----------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f4");
+
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting span and text, before existing content
+        // ------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f6");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting span and text, after existing content
+        // -----------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f8");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><span>[OldText]</span></div>
+    <div class="flexbox" id="f1"><span>[OldText]</span></div>
+    <div class="flexbox" id="f2"><span>[OldText]</span></div>
+    <div class="flexbox" id="f3"><span>[OldText]</span></div>
+    <div class="flexbox" id="f4"><span>[OldText]</span></div>
+    <div class="flexbox" id="f5"><span>[OldText]</span></div>
+    <div class="flexbox" id="f6"><span>[OldText]</span></div>
+    <div class="flexbox" id="f7"><span>[OldText]</span></div>
+    <div class="flexbox" id="f8"><span>[OldText]</span></div>
+    <div class="flexbox" id="f9"><span>[OldText]</span></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundText-1-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-1-ref.xhtml
new file mode 100644
index 000000000000..2334aeeb5e05
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-1-ref.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f0">  [OldText]</div>
+    <div class="flexbox" id="f1">[OldText]  </div>
+    <div class="flexbox" id="f2">[NewText][OldText]</div>
+    <div class="flexbox" id="f3">[NewText]  [OldText]</div>
+    <div class="flexbox" id="f4">  [NewText][OldText]</div>
+    <div class="flexbox" id="f5">[OldText][NewText]</div>
+    <div class="flexbox" id="f6">[OldText][NewText]  </div>
+    <div class="flexbox" id="f7">[OldText]  [NewText]</div>
+    <div class="flexbox" id="f8">[NewText]  [OldText]</div>
+    <div class="flexbox" id="f9">  [NewText][OldText]</div>
+    <div class="flexbox" id="f10">[OldText][NewText]  </div>
+    <div class="flexbox" id="f11">[OldText]  [NewText]</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundText-1.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-1.xhtml
new file mode 100644
index 000000000000..49758077fdec
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-1.xhtml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & text) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function tweak() {
+        // Just inserting whitespace
+        // -------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f0");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f1");
+
+        // Inserting text or text with whitespace
+        // --------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"),   0, "f2");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]  "), 0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  [NewText]"), 0, "f4");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"),   1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]  "), 1, "f6");
+        insertNodeAtPosnInElem(document.createTextNode("  [NewText]"), 1, "f7");
+
+        // Same as the whitespace cases immediately above, but now with separate
+        // text nodes for the whitespace vs. the text
+        insertNodeAtPosnInElem(document.createTextNode("  "),        0, "f8");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f8");
+
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("  "),        0, "f9");
+
+        insertNodeAtPosnInElem(document.createTextNode("  "),        1, "f10");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f10");
+
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f11");
+        insertNodeAtPosnInElem(document.createTextNode("  "),        1, "f11");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0">[OldText]</div>
+    <div class="flexbox" id="f1">[OldText]</div>
+    <div class="flexbox" id="f2">[OldText]</div>
+    <div class="flexbox" id="f3">[OldText]</div>
+    <div class="flexbox" id="f4">[OldText]</div>
+    <div class="flexbox" id="f5">[OldText]</div>
+    <div class="flexbox" id="f6">[OldText]</div>
+    <div class="flexbox" id="f7">[OldText]</div>
+    <div class="flexbox" id="f8">[OldText]</div>
+    <div class="flexbox" id="f9">[OldText]</div>
+    <div class="flexbox" id="f10">[OldText]</div>
+    <div class="flexbox" id="f11">[OldText]</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundText-2-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-2-ref.xhtml
new file mode 100644
index 000000000000..757d6519f41f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-2-ref.xhtml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body {
+        font-size: 10px;
+      }
+
+      div.inserted {
+        background: teal; /* To make inserted div elements stand out. */
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f8"><div class="inserted">[NewDiv]</div>[OldText]</div>
+    <div class="flexbox" id="f9">[OldText]<div class="inserted">[NewDiv]</div></div>
+    <div class="flexbox" id="f10"><div class="inserted">[NewDiv]</div>  [OldText]</div>
+    <div class="flexbox" id="f11">  <div class="inserted">[NewDiv]</div>[OldText]</div>
+    <div class="flexbox" id="f12">[OldText]<div class="inserted">[NewDiv]</div>  </div>
+    <div class="flexbox" id="f13">[OldText]  <div class="inserted">[NewDiv]</div></div>
+    <div class="flexbox" id="f14"><div class="inserted">[NewDiv]</div>[NewText][OldText]</div>
+    <div class="flexbox" id="f15">[NewText]<div class="inserted">[NewDiv]</div>[OldText]</div>
+    <div class="flexbox" id="f16">[OldText]<div class="inserted">[NewDiv]</div>[NewText]</div>
+    <div class="flexbox" id="f17">[OldText][NewText]<div class="inserted">[NewDiv]</div></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundText-2.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-2.xhtml
new file mode 100644
index 000000000000..ed7433307720
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-2.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & divs) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body {
+        font-size: 10px;
+      }
+
+      div.inserted {
+        background: teal; /* To make inserted div elements stand out. */
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createDivElem() {
+        var div = document.createElement("div");
+        div.setAttribute("class", "inserted");
+        div.appendChild(document.createTextNode("[NewDiv]"));
+        return div;
+      }
+
+      function tweak() {
+        // Inserting div, adjacent to inline content
+        // -----------------------------------------
+        insertNodeAtPosnInElem(createDivElem(), 0, "f0");
+        insertNodeAtPosnInElem(createDivElem(), 1, "f1");
+
+        // Inserting div and whitespace, before inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createDivElem(),               0, "f2");
+
+        insertNodeAtPosnInElem(createDivElem(),               0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting div and whitespace, after inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createDivElem(),               1, "f4");
+
+        insertNodeAtPosnInElem(createDivElem(),               1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting div and text, before inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createDivElem(),                      0, "f6");
+
+        insertNodeAtPosnInElem(createDivElem(),                      0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting div and text, after inline content
+        // ---------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createDivElem(),                      1, "f8");
+
+        insertNodeAtPosnInElem(createDivElem(),                      1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0">[OldText]</div>
+    <div class="flexbox" id="f1">[OldText]</div>
+    <div class="flexbox" id="f2">[OldText]</div>
+    <div class="flexbox" id="f3">[OldText]</div>
+    <div class="flexbox" id="f4">[OldText]</div>
+    <div class="flexbox" id="f5">[OldText]</div>
+    <div class="flexbox" id="f6">[OldText]</div>
+    <div class="flexbox" id="f7">[OldText]</div>
+    <div class="flexbox" id="f8">[OldText]</div>
+    <div class="flexbox" id="f9">[OldText]</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundText-3-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-3-ref.xhtml
new file mode 100644
index 000000000000..28bb4b045335
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-3-ref.xhtml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body {
+        font-size: 10px;
+      }
+
+      span.inserted {
+        background: teal; /* To make inserted span elements stand out. */
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><span class="inserted">[NewSpan]</span>[OldText]</div>
+    <div class="flexbox" id="f1">[OldText]<span class="inserted">[NewSpan]</span></div>
+    <div class="flexbox" id="f2"><span class="inserted">[NewSpan]</span>  [OldText]</div>
+    <div class="flexbox" id="f3">  <span class="inserted">[NewSpan]</span>[OldText]</div>
+    <div class="flexbox" id="f4">[OldText]<span class="inserted">[NewSpan]</span>  </div>
+    <div class="flexbox" id="f5">[OldText]  <span class="inserted">[NewSpan]</span></div>
+    <div class="flexbox" id="f6"><span class="inserted">[NewSpan]</span>[NewText][OldText]</div>
+    <div class="flexbox" id="f7">[NewText]<span class="inserted">[NewSpan]</span>[OldText]</div>
+    <div class="flexbox" id="f8">[OldText]<span class="inserted">[NewSpan]</span>[NewText]</div>
+    <div class="flexbox" id="f9">[OldText][NewText]<span class="inserted">[NewSpan]</span></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertAroundText-3.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-3.xhtml
new file mode 100644
index 000000000000..bef4539d7740
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertAroundText-3.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we reconstruct frames as necessary, after content
+     (including whitespace & spans) is dynamically inserted as a child of a
+     flexbox.  (Note that in cases where we know the whitespace is going to be
+     dropped, we don't bother reconstructing frames. This test is to be sure we
+     aren't overzealous with that optimization.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body {
+        font-size: 10px;
+      }
+
+      span.inserted {
+        background: teal; /* To make inserted span elements stand out. */
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createSpanElem() {
+        var span = document.createElement("span");
+        span.setAttribute("class", "inserted");
+        span.appendChild(document.createTextNode("[NewSpan]"));
+        return span;
+      }
+
+      function tweak() {
+        // Inserting span, on either side of existing content
+        // --------------------------------------------------
+        insertNodeAtPosnInElem(createSpanElem(), 0, "f0");
+        insertNodeAtPosnInElem(createSpanElem(), 1, "f1");
+
+        // Inserting span and whitespace, before existing content
+        // ------------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f2");
+
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting span and whitespace, after existing content
+        // -----------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f4");
+
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting span and text, before existing content
+        // ------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f6");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting span and text, after existing content
+        // -----------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f8");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0">[OldText]</div>
+    <div class="flexbox" id="f1">[OldText]</div>
+    <div class="flexbox" id="f2">[OldText]</div>
+    <div class="flexbox" id="f3">[OldText]</div>
+    <div class="flexbox" id="f4">[OldText]</div>
+    <div class="flexbox" id="f5">[OldText]</div>
+    <div class="flexbox" id="f6">[OldText]</div>
+    <div class="flexbox" id="f7">[OldText]</div>
+    <div class="flexbox" id="f8">[OldText]</div>
+    <div class="flexbox" id="f9">[OldText]</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1-ref.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1-ref.xhtml
new file mode 100644
index 000000000000..9fe16f9122c0
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1-ref.xhtml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its textcase, but with the testcase's dynamic
+     modifications already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      <!-- to make inserted span elements stand out -->
+      span {
+        background: teal;
+        padding: 3px;
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" id="f0"><span/>[orig]</div>
+    <div class="flexbox" id="f1">[orig]<span/></div>
+    <div class="flexbox" id="f2"><span/>  [orig]</div>
+    <div class="flexbox" id="f3">  <span/>[orig]</div>
+    <div class="flexbox" id="f4">[orig]<span/>  </div>
+    <div class="flexbox" id="f5">[orig]  <span/></div>
+    <div class="flexbox" id="f6"><span/>[NewText][orig]</div>
+    <div class="flexbox" id="f7">[NewText]<span/>[orig]</div>
+    <div class="flexbox" id="f8">[orig]<span/>[NewText]</div>
+    <div class="flexbox" id="f9">[orig][NewText]<span/></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1.xhtml b/layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1.xhtml
new file mode 100644
index 000000000000..cdf5b2d9ddcb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-dyn-insertEmptySpan-1.xhtml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test is a variant of flexbox-dyn-insertAroundText-3.xhtml with the
+     inserted spans being empty & having padding. This triggered invalidation
+     issues with an older work-in-progress patch, so I'm adding this reftest to
+     track that issue & prevent it from regressing.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      body { font-size: 10px; }
+
+      <!-- to make inserted span elements stand out -->
+      span {
+        background: teal;
+        padding: 3px;
+      }
+
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 300px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        margin-bottom: 1px;
+        white-space: pre;
+      }
+    </style>
+    <script>
+      function insertNodeAtPosnInElem(aNodeToInsert, aPosn, aParentId) {
+        var parent = document.getElementById(aParentId);
+        var insertBeforeTarget = parent.firstChild;
+        for (var i = 0; i &lt; aPosn; i++) {
+          insertBeforeTarget = insertBeforeTarget.nextSibling;
+        }
+        parent.insertBefore(aNodeToInsert, insertBeforeTarget);
+      }
+
+      function createSpanElem() {
+        return document.createElement("span");
+      }
+
+      function tweak() {
+        // Inserting span, on either side of existing content
+        // --------------------------------------------------
+        insertNodeAtPosnInElem(createSpanElem(), 0, "f0");
+        insertNodeAtPosnInElem(createSpanElem(), 1, "f1");
+
+        // Inserting span and whitespace, before existing content
+        // ------------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f2");
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f2");
+
+        insertNodeAtPosnInElem(createSpanElem(),              0, "f3");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 0, "f3");
+
+        // Inserting span and whitespace, after existing content
+        // -----------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f4");
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f4");
+
+        insertNodeAtPosnInElem(createSpanElem(),              1, "f5");
+        insertNodeAtPosnInElem(document.createTextNode("  "), 1, "f5");
+
+        // Inserting span and text, before existing content
+        // ------------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f6");
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f6");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     0, "f7");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 0, "f7");
+
+        // Inserting span and text, after existing content
+        // -----------------------------------------------
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f8");
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f8");
+
+        insertNodeAtPosnInElem(createSpanElem(),                     1, "f9");
+        insertNodeAtPosnInElem(document.createTextNode("[NewText]"), 1, "f9");
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <div class="flexbox" id="f0">[orig]</div>
+    <div class="flexbox" id="f1">[orig]</div>
+    <div class="flexbox" id="f2">[orig]</div>
+    <div class="flexbox" id="f3">[orig]</div>
+    <div class="flexbox" id="f4">[orig]</div>
+    <div class="flexbox" id="f5">[orig]</div>
+    <div class="flexbox" id="f6">[orig]</div>
+    <div class="flexbox" id="f7">[orig]</div>
+    <div class="flexbox" id="f8">[orig]</div>
+    <div class="flexbox" id="f9">[orig]</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-empty-1-ref.xhtml b/layout/reftests/flexbox/flexbox-empty-1-ref.xhtml
new file mode 100644
index 000000000000..074436d1129a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-empty-1-ref.xhtml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for behavior of flex containers that have no children -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 1px dotted blue;
+        background: yellow;
+      }
+
+      div.withPadding {
+        padding: 2px 3px 4px 5px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"/>
+    <div class="flexbox" style="width: 5px"/>
+    <div class="flexbox" style="width: -moz-available"/>
+    <div class="flexbox" style="width: -moz-max-content"/>
+    <div class="flexbox" style="width: -moz-min-content"/>
+    <div class="flexbox" style="height: 6px"/>
+    <div class="flexbox" style="width: 7px; height: 8px"/>
+
+    <!-- now with padding -->
+    <div class="flexbox withPadding"/>
+    <div class="flexbox withPadding" style="width: 5px"/>
+    <div class="flexbox withPadding" style="width: -moz-available"/>
+    <div class="flexbox withPadding" style="width: -moz-max-content"/>
+    <div class="flexbox withPadding" style="width: -moz-min-content"/>
+    <div class="flexbox withPadding" style="height: 6px"/>
+    <div class="flexbox withPadding" style="width: 7px; height: 8px"/>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-empty-1a.xhtml b/layout/reftests/flexbox/flexbox-empty-1a.xhtml
new file mode 100644
index 000000000000..3b7f59af43df
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-empty-1a.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase for behavior of flex containers that have no children -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 1px dotted blue;
+        background: yellow;
+        display: -moz-flex;
+      }
+
+      div.withPadding {
+        padding: 2px 3px 4px 5px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"/>
+    <div class="flexbox" style="width: 5px"/>
+    <div class="flexbox" style="width: -moz-available"/>
+    <div class="flexbox" style="width: -moz-max-content"/>
+    <div class="flexbox" style="width: -moz-min-content"/>
+    <div class="flexbox" style="height: 6px"/>
+    <div class="flexbox" style="width: 7px; height: 8px"/>
+
+    <!-- now with padding -->
+    <div class="flexbox withPadding"/>
+    <div class="flexbox withPadding" style="width: 5px"/>
+    <div class="flexbox withPadding" style="width: -moz-available"/>
+    <div class="flexbox withPadding" style="width: -moz-max-content"/>
+    <div class="flexbox withPadding" style="width: -moz-min-content"/>
+    <div class="flexbox withPadding" style="height: 6px"/>
+    <div class="flexbox withPadding" style="width: 7px; height: 8px"/>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-empty-1b.xhtml b/layout/reftests/flexbox/flexbox-empty-1b.xhtml
new file mode 100644
index 000000000000..7f34f5d6f6ef
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-empty-1b.xhtml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase for behavior of flex containers that have no children.  This
+     testcase differs from the "1a" variant in that it's got a single space
+     inside each flex container (which should be ignored, since the flexbox
+     spec says we shouldn't create a flex item for an entirely-whitespace run
+     of inline content).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 1px dotted blue;
+        background: yellow;
+        display: -moz-flex;
+      }
+
+      div.withPadding {
+        padding: 2px 3px 4px 5px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">  </div>
+    <div class="flexbox" style="width: 5px"> </div>
+    <div class="flexbox" style="width: -moz-available"> </div>
+    <div class="flexbox" style="width: -moz-max-content"> </div>
+    <div class="flexbox" style="width: -moz-min-content"> </div>
+    <div class="flexbox" style="height: 6px"> </div>
+    <div class="flexbox" style="width: 7px; height: 8px"> </div>
+
+    <!-- now with padding -->
+    <div class="flexbox withPadding"> </div>
+    <div class="flexbox withPadding" style="width: 5px"> </div>
+    <div class="flexbox withPadding" style="width: -moz-available"> </div>
+    <div class="flexbox withPadding" style="width: -moz-max-content"> </div>
+    <div class="flexbox withPadding" style="width: -moz-min-content"> </div>
+    <div class="flexbox withPadding" style="height: 6px"> </div>
+    <div class="flexbox withPadding" style="width: 7px; height: 8px"> </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-1-ref.xhtml b/layout/reftests/flexbox/flexbox-float-1-ref.xhtml
new file mode 100644
index 000000000000..e4cd6efd7e35
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-1-ref.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        width: 400px;
+        margin-bottom: 2px;
+        font-family: sans-serif;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      aaa<div>[[[</div>bbb
+    </div>
+    <div class="flexbox">
+      aaa<div>]]]</div>bbb
+    </div>
+    <div class="flexbox">
+      aaa<div>[[[</div>
+    </div>
+    <div class="flexbox">
+      aaa<div>]]]</div>
+    </div>
+    <div class="flexbox">
+      <div>[[[</div>bbb
+    </div>
+    <div class="flexbox">
+      <div>]]]</div>bbb
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-1a.xhtml b/layout/reftests/flexbox/flexbox-float-1a.xhtml
new file mode 100644
index 000000000000..b61085e11b1d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-1a.xhtml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that 'float' on a direct child of a flexbox won't
+     actually cause it to be floated.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        width: 400px;
+        margin-bottom: 2px;
+        font-family: sans-serif;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- These cases have a span as a direct child of the flexbox. The span
+         should become display:block (and hence form its own flex item),
+         but it shouldn't actually float.
+      -->
+    <div class="flexbox">
+      aaa<span style="float: left">[[[</span>bbb
+    </div>
+    <div class="flexbox">
+      aaa<span style="float: right">]]]</span>bbb
+    </div>
+    <div class="flexbox">
+      aaa<span style="float: left">[[[</span>
+    </div>
+    <div class="flexbox">
+      aaa<span style="float: right">]]]</span>
+    </div>
+    <div class="flexbox">
+      <span style="float: left">[[[</span>bbb
+    </div>
+    <div class="flexbox">
+      <span style="float: right">]]]</span>bbb
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-1b.xhtml b/layout/reftests/flexbox/flexbox-float-1b.xhtml
new file mode 100644
index 000000000000..4cafed12fcb6
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-1b.xhtml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test is like flexbox-float-1a.xhtml, but with the float-styled
+     element already being a block. (Should render the same.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        width: 400px;
+        margin-bottom: 2px;
+        font-family: sans-serif;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      aaa<div style="float: left">[[[</div>bbb
+    </div>
+    <div class="flexbox">
+      aaa<div style="float: right">]]]</div>bbb
+    </div>
+    <div class="flexbox">
+      aaa<div style="float: left">[[[</div>
+    </div>
+    <div class="flexbox">
+      aaa<div style="float: right">]]]</div>
+    </div>
+    <div class="flexbox">
+      <div style="float: left">[[[</div>bbb
+    </div>
+    <div class="flexbox">
+      <div style="float: right">]]]</div>bbb
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-1c.xhtml b/layout/reftests/flexbox/flexbox-float-1c.xhtml
new file mode 100644
index 000000000000..76646048e0f0
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-1c.xhtml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test is like flexbox-float-1a.xhtml, but with the float-styled
+     element dynamically inserted.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
+  <head>
+    <script>
+      function generateFloat(aFloatDirection) {
+        var newElem = document.createElement("span");
+        newElem.setAttribute("style", "float: " + aFloatDirection);
+        newElem.innerHTML = aFloatDirection == "left" ? "[[[" : "]]]";
+        return newElem;
+      }
+
+      function tweak() {
+        var containerList = document.getElementsByClassName("flexbox");
+        for (var i = 0; i &lt; containerList.length; i++) {
+          var container = containerList[i];
+          var newElem = generateFloat(container.getAttribute("floatValToUse"));
+
+          var nodeToInsertBefore;
+          var insertPosn = container.getAttribute("insertPosn");
+          if (insertPosn == "begin") {
+            nodeToInsertBefore = container.firstChild;
+          } else if (insertPosn == "mid") {
+            nodeToInsertBefore = container.firstChild.nextSibling;
+          } else if (insertPosn == "end") {
+            nodeToInsertBefore = null;
+          }
+
+          container.insertBefore(newElem, nodeToInsertBefore);
+        }
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        width: 400px;
+        margin-bottom: 2px;
+        font-family: sans-serif;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" floatValToUse="left" insertPosn="mid">
+      aaa<span>bbb</span>
+    </div>
+    <div class="flexbox" floatValToUse="right" insertPosn="mid">
+      aaa<span>bbb</span>
+    </div>
+    <div class="flexbox" floatValToUse="left" insertPosn="end">
+      aaa
+    </div>
+    <div class="flexbox" floatValToUse="right" insertPosn="end">
+      aaa
+    </div>
+    <div class="flexbox" floatValToUse="left" insertPosn="begin">
+      bbb
+    </div>
+    <div class="flexbox" floatValToUse="right" insertPosn="begin">
+      bbb
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-1d.xhtml b/layout/reftests/flexbox/flexbox-float-1d.xhtml
new file mode 100644
index 000000000000..be723b5ab962
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-1d.xhtml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test is like flexbox-float-1b.xhtml, but with the float-styled
+     element dynamically inserted.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
+  <head>
+    <script>
+      function generateFloat(aFloatDirection) {
+        var newElem = document.createElement("div");
+        newElem.setAttribute("style", "float: " + aFloatDirection);
+        newElem.innerHTML = aFloatDirection == "left" ? "[[[" : "]]]";
+        return newElem;
+      }
+
+      function tweak() {
+        var containerList = document.getElementsByClassName("flexbox");
+        for (var i = 0; i &lt; containerList.length; i++) {
+          var container = containerList[i];
+          var newElem = generateFloat(container.getAttribute("floatValToUse"));
+
+          var nodeToInsertBefore;
+          var insertPosn = container.getAttribute("insertPosn");
+          if (insertPosn == "begin") {
+            nodeToInsertBefore = container.firstChild;
+          } else if (insertPosn == "mid") {
+            nodeToInsertBefore = container.firstChild.nextSibling;
+          } else if (insertPosn == "end") {
+            nodeToInsertBefore = null;
+          }
+
+          container.insertBefore(newElem, nodeToInsertBefore);
+        }
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        width: 400px;
+        margin-bottom: 2px;
+        font-family: sans-serif;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox" floatValToUse="left" insertPosn="mid">
+      aaa<span>bbb</span>
+    </div>
+    <div class="flexbox" floatValToUse="right" insertPosn="mid">
+      aaa<span>bbb</span>
+    </div>
+    <div class="flexbox" floatValToUse="left" insertPosn="end">
+      aaa
+    </div>
+    <div class="flexbox" floatValToUse="right" insertPosn="end">
+      aaa
+    </div>
+    <div class="flexbox" floatValToUse="left" insertPosn="begin">
+      bbb
+    </div>
+    <div class="flexbox" floatValToUse="right" insertPosn="begin">
+      bbb
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-2-ref.xhtml b/layout/reftests/flexbox/flexbox-float-2-ref.xhtml
new file mode 100644
index 000000000000..18ec269fdfed
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-2-ref.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case uses a div with "text-align: center" in place of a
+     flex container, and has the text "lll" and "rrr" already placed at the
+     target position instead of having it positioned with the "float" property.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        text-align: center;
+        font-family: sans-serif;
+        width: 400px;
+        margin-bottom: 2px;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      lllaaabbb
+    </div>
+    <div class="flexbox">
+      aaabbbrrr
+    </div>
+
+    <div class="flexbox">
+      lllaaabbb
+    </div>
+    <div class="flexbox">
+      aaabbbrrr
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-2a.xhtml b/layout/reftests/flexbox/flexbox-float-2a.xhtml
new file mode 100644
index 000000000000..7f7ea6cd6f03
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-2a.xhtml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that 'float' on a grandchild of a flex container _will_
+     cause the element to be floated.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        font-family: sans-serif;
+        width: 400px;
+        margin-bottom: 2px;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- These cases have a floated span as a grandchild of the flex container.
+         The span should float within its flex item. -->
+    <div class="flexbox">
+      aaa<span><span style="float: left">lll</span></span>bbb
+    </div>
+    <div class="flexbox">
+      aaa<span><span style="float: right">rrr</span></span>bbb
+    </div>
+
+    <!-- These cases have a floated div as a grandchild of the flex container.
+         The div should float within its flex item. -->
+    <div class="flexbox">
+      aaa<span><div style="float: left">lll</div></span>bbb
+    </div>
+    <div class="flexbox">
+      aaa<span><div style="float: right">rrr</div></span>bbb
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-float-2b.xhtml b/layout/reftests/flexbox/flexbox-float-2b.xhtml
new file mode 100644
index 000000000000..687d87f5ee85
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-float-2b.xhtml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that 'float' on a grandchild of a flex container _will_
+     cause the element to be floated.
+
+     This differs from the "2a" variant in that the flex items are <div>s
+     rather than <span>s (though that shouldn't matter, because <span> as a
+     flex item should become "display:block").
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        font-family: sans-serif;
+        width: 400px;
+        margin-bottom: 2px;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- These cases have a floated span as a grandchild of the flex container.
+         The span should float within its flex item. -->
+    <div class="flexbox">
+      <div>aaa<span style="float: left">lll</span>bbb</div>
+    </div>
+    <div class="flexbox">
+      <div>aaa<span style="float: right">rrr</span>bbb</div>
+    </div>
+
+    <!-- These cases have a floated div as a grandchild of the flex container.
+         The div should float within its flex item. -->
+    <div class="flexbox">
+      <div>aaa<div style="float: left">lll</div>bbb</div>
+    </div>
+    <div class="flexbox">
+      <div>aaa<div style="float: right">rrr</div>bbb</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..b1008e7cc005
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1-ref.xhtml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Reference case, using a table with fixed-size cells instead of a
+     flex container.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      table {
+        font: 10px Ahem;
+        height: 100px;
+        width: 200px;
+      }
+      td { vertical-align: top; }
+      td.a {
+        width: 30px;
+        background: lightgreen;
+      }
+      td.b {
+        width: 50px;
+        background: yellow;
+      }
+      td.inflex {
+        width: 20px;
+        background: gray;
+      }
+    </style>
+  </head>
+  <body>
+    <table cellspacing="0" cellpadding="0">
+      <tr>
+        <td class="a"/>
+        <td>text</td>
+        <td class="b"/>
+        <td><i>italic</i></td>
+        <td class="inflex"></td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1a.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1a.xhtml
new file mode 100644
index 000000000000..309a29ed7bbe
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1a.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test has static inline content intermixed with flex items,
+     inside a flex container.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        font: 10px Ahem;
+        width: 200px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 20px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 30px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"
+       ><div class="a"/>text<div class="b"/><i>italic</i
+       ><div class="inflex"/></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1b.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1b.xhtml
new file mode 100644
index 000000000000..0a7c02547888
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-1b.xhtml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test inserts a new div into some inline content in a flex container.
+     That should split the inline content into two flex items.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <script>
+      function tweak() {
+        var flexbox = document.getElementsByClassName("flexbox")[0];
+        var insertionPoint = flexbox.firstChild.nextSibling.nextSibling;
+
+        var newDiv = document.createElement("div");
+        newDiv.setAttribute("class", "b");
+
+        flexbox.insertBefore(newDiv, insertionPoint);
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        font: 10px Ahem;
+        width: 200px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 20px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 30px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"
+       ><div class="a"/>text<i>italic</i
+       ><div class="inflex"/></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..d00d7dfb3622
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-2-ref.xhtml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Reference case with a stretch of inline content in a flex container.
+     (The corresponding testcase has a div interrupting the run, which gets
+     removed, hopefully making it look like this reference case.)
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 20px;
+        background: lightgreen;
+      }
+      div.inflex {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"
+       ><div class="a"/>text<i>italic</i
+       ><div class="inflex"/></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-2.xhtml
new file mode 100644
index 000000000000..227315a123a9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-2.xhtml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test removes a div from the middle of some inline content in a flex
+     container. That should merge the inline content into a single flex item.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <script>
+      function tweak() {
+        var removeMe = document.getElementById("removeMe");
+        removeMe.parentNode.removeChild(removeMe);
+        document.documentElement.removeAttribute("class");
+      }
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 20px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 30px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"
+       ><div class="a"/>text<div class="b" id="removeMe"/><i>italic</i
+       ><div class="inflex"/></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3-ref.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3-ref.xhtml
new file mode 100644
index 000000000000..d2b454539173
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3-ref.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Reference case, using a block instead of a flexbox.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div#block {
+        width: 100px;
+        font: 10px Ahem;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="block"><u>abc def ghi</u> jkl <i>mno pqr stu</i></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3a.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3a.xhtml
new file mode 100644
index 000000000000..35ef1f4385dd
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3a.xhtml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test has a few inline elements in a flex container, for comparison
+     against the "b" & "c" variants of this test (which use dynamic tweaks).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div#flexbox {
+        width: 100px;
+        display: -moz-flex;
+        font: 10px Ahem;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="flexbox"><u>abc def ghi</u> jkl <i>mno pqr stu</i></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3b.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3b.xhtml
new file mode 100644
index 000000000000..64ae6a511755
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3b.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test inserts a some inline content in a flex container, just before a
+     stretch of existing inline content. The new content should be incorporated
+     into the same anonymous flex item as the existing content.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <script>
+      function tweak() {
+        var newInlineContent = document.createElement("u");
+        newInlineContent.innerHTML = "abc def ghi";
+
+        var flexbox = document.getElementById("flexbox");
+        flexbox.insertBefore(newInlineContent, flexbox.firstChild);
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div#flexbox {
+        width: 100px;
+        display: -moz-flex;
+        font: 10px Ahem;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="flexbox"> jkl <i>mno pqr stu</i></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3c.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3c.xhtml
new file mode 100644
index 000000000000..6ce4ae5984ea
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-3c.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test inserts a some inline content in a flex container, just after a
+     stretch of existing inline content. The new content should be incorporated
+     into the same anonymous flex item as the existing content.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <script>
+      function tweak() {
+        var newInlineContent = document.createElement("i");
+        newInlineContent.innerHTML = "mno pqr stu";
+
+        var flexbox = document.getElementById("flexbox");
+        flexbox.insertBefore(newInlineContent, null);
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div#flexbox {
+        width: 100px;
+        display: -moz-flex;
+        font: 10px Ahem;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="flexbox"><u>abc def ghi</u> jkl </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-4-ref.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-4-ref.xhtml
new file mode 100644
index 000000000000..cbb99ba9f0dd
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-4-ref.xhtml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- This reference case simply has text centered within a div. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div {
+        width: 200px;
+        height: 100px;
+        background: lightgreen;
+        text-align: center;
+      }
+    </style>
+  </head>
+  <body>
+    <div>text</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-4.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-4.xhtml
new file mode 100644
index 000000000000..9695572b0962
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-4.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that a flex container which only contains text
+     will render correctly. We use -moz-justify-content to position the text
+     in the center of the flex container, as a sanity-check to be sure we
+     are in fact getting a flex container.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        background: lightgreen;
+        -moz-justify-content: center;
+        display: -moz-flex;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">text</div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-5-ref.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-5-ref.xhtml
new file mode 100644
index 000000000000..e54da9a9dabb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-5-ref.xhtml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is the same as the corresponding testcase,
+     but with the dynamic removal already performed.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+        display: -moz-flex;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">text<div>div</div></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-5.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-5.xhtml
new file mode 100644
index 000000000000..7adc4d58b763
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-5.xhtml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test removes a run of inline content from a flexbox, which
+     should trigger the removal of its now-empty anonymous flex item.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <script>
+      function tweak() {
+        var removeMe = document.getElementById("removeMe");
+        removeMe.parentNode.removeChild(removeMe);
+        document.documentElement.removeAttribute("class");
+      }
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        background: lightgreen;
+        -moz-justify-content: space-around;
+        display: -moz-flex;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">text<div>div</div>
+      <span id="removeMe">REMOVE</span>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-6-ref.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-6-ref.xhtml
new file mode 100644
index 000000000000..f5fca2f2907a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-6-ref.xhtml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its testcase, but with an explicit div
+     in the place where we expect an anonymous flex item to be generated
+     in the testcase.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        border: 1px dotted black;
+      }
+      div.a {
+        width: 30px;
+        height: 50px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 40px;
+        height: 50px;
+        background: blue;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div><span>abc<div class="a"/>def</span></div>
+      <div class="b"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-inlinecontent-horiz-6.xhtml b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-6.xhtml
new file mode 100644
index 000000000000..44c192eed0a2
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-inlinecontent-horiz-6.xhtml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test has a block inside an inline inside a flexbox.  This is like one
+     of the examples in the flexbox spec, and the desired behavior is that
+     the entire inline (including the block inside of it) gets wrapped in an
+     anonymous flex item.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+        border: 1px dotted black;
+      }
+      div.a {
+        width: 30px;
+        height: 50px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 40px;
+        height: 50px;
+        background: blue;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <span>abc<div class="a"/>def</span>
+      <div class="b"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..f11668e5962c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1-ref.xhtml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Reference case - see documentation in corresponding testcase.
+     This reference uses blocks where the testcase uses flexboxes.
+     They should be sized the same, since they're basically just text
+     with no special flex sizing properties in play.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      table {
+        width: 300px;
+        font: 10px Ahem;
+        margin-bottom: 2px;
+        border: 1px dashed black;
+      }
+
+      div.a { background: lightgreen; }
+      div.b { background: lightblue;  }
+
+      <!-- helper-classes for assigning pref / min / auto-width to our divs -->
+      div.prefWidth {
+        width: -moz-max-content;
+      }
+      div.minWidth {
+        width: -moz-min-content;
+      }
+      div.autoWidth {
+        width: auto;
+      }
+  </style>
+</head>
+<body>
+  <!-- both auto width -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b autoWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+
+   <!-- MIXING MIN WIDTH & AUTO -->
+   <!-- both min width -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b minWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- min,auto -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b autoWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- auto,min -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b minWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+
+   <!-- MIXING PREF WIDTH & AUTO -->
+   <!-- both prefWidth (NOTE: makes the table larger than it wants to be -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b prefWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- pref,auto -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b autoWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- auto,pref -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b prefWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+
+   <!-- MIXING PREF WIDTH & MIN WIDTH -->
+   <!-- min,pref -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b prefWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- pref,min -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b minWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1a.xhtml b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1a.xhtml
new file mode 100644
index 000000000000..451819aa0b7c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1a.xhtml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test has a number of tables, each with 2 flexboxes side-by-side,
+     whose "width" values depend on the flexbox's min and/or pref widths.
+
+     There's not enough space for both flexboxes to fit side-by-side, so their
+     width preferences must be balanced This exercises
+     nsFlexContainerFrame::GetPrefWidth() & ::GetMinWidth().
+
+     IN EACH CASE, div.a has these intrinsic widths:
+       Pref width: 2*40 + 1*50 + 2*10 = 150px   (2*aaaa + 1*aaaaa + 2*space)
+       Min width: 50px  (width of "aaaaa")
+     and div.b has these intrinsic widths:
+       Pref width: 5*20 + 3*10 + 7*10 = 200px   (5*bb + 3*b + 7*space)
+       Min width: 20px  (width "bb")
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      table {
+        width: 300px;
+        font: 10px Ahem;
+        margin-bottom: 2px;
+        border: 1px dashed black;
+      }
+
+      div.a, div.b { display: -moz-flex; }
+
+      div.a { background: lightgreen; }
+      div.b { background: lightblue;  }
+
+      <!-- helper-classes for assigning pref / min / auto-width to our divs -->
+      div.prefWidth {
+        width: -moz-max-content;
+      }
+      div.minWidth {
+        width: -moz-min-content;
+      }
+      div.autoWidth {
+        width: auto;
+      }
+  </style>
+</head>
+<body>
+  <!-- both auto width -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b autoWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+
+   <!-- MIXING MIN WIDTH & AUTO -->
+   <!-- both min width -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b minWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- min,auto -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b autoWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- auto,min -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b minWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+
+   <!-- MIXING PREF WIDTH & AUTO -->
+   <!-- both prefWidth (NOTE: makes the table larger than it wants to be -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b prefWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- pref,auto -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b autoWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- auto,pref -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b prefWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+
+   <!-- MIXING PREF WIDTH & MIN WIDTH -->
+   <!-- min,pref -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b prefWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+   <!-- pref,min -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth">aaaa aaaa aaaaa</div></td>
+       <td><div class="b minWidth">bb bb b bb bb b bb b</div></td>
+   </tr></table>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1b.xhtml b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1b.xhtml
new file mode 100644
index 000000000000..7ac1ec8ae409
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-1b.xhtml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test has a number of tables, each with 2 flexboxes side-by-side,
+     whose "width" values depend on the flexbox's min and/or pref widths.
+
+     There's not enough space for both flexboxes to fit side-by-side, so their
+     width preferences must be balanced. This exercises
+     nsFlexContainerFrame::GetPrefWidth() & ::GetMinWidth().
+
+     IN EACH CASE, div.a has these intrinsic widths:
+       Pref width: 2*40 + 1*50 + 2*10 = 150px   (2*aaaa + 1*aaaaa + 2*space)
+       Min width: 50px  (width of "aaaaa")
+     and div.b has these intrinsic widths:
+       Pref width: 5*20 + 3*10 + 7*10 = 200px   (5*bb + 3*b + 7*space)
+       Min width: 20px  (width "bb")
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      table {
+        width: 300px;
+        font: 10px Ahem;
+        margin-bottom: 2px;
+        border: 1px dashed black;
+      }
+
+      div.a, div.b { display: -moz-flex; }
+
+      div.a { background: lightgreen; }
+      div.b { background: lightblue;  }
+
+      <!-- helper-classes for assigning pref / min / auto-width to our divs -->
+      div.prefWidth {
+        width: -moz-max-content;
+      }
+      div.minWidth {
+        width: -moz-min-content;
+      }
+      div.autoWidth {
+        width: auto;
+      }
+  </style>
+</head>
+<body>
+  <!-- both auto width -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b autoWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+
+   <!-- MIXING MIN WIDTH & AUTO -->
+   <!-- both min width -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b minWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+   <!-- min,auto -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b autoWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+   <!-- auto,min -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b minWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+
+   <!-- MIXING PREF WIDTH & AUTO -->
+   <!-- both prefWidth (NOTE: makes the table larger than it wants to be -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b prefWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+   <!-- pref,auto -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b autoWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+   <!-- auto,pref -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a autoWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b prefWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+
+   <!-- MIXING PREF WIDTH & MIN WIDTH -->
+   <!-- min,pref -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a minWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b prefWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+   <!-- pref,min -->
+   <table cellpadding="0" cellspacing="0"><tr>
+       <td><div class="a prefWidth"><div>aaaa aaaa aaaaa</div></div></td>
+       <td><div class="b minWidth"><div>bb bb b bb bb b bb b</div></div></td>
+   </tr></table>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..fe839bdd0c49
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2-ref.xhtml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case has inline blocks in a div, in place of
+     flex items in a flex container.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin: 0; }
+
+      div.flexbox {
+        width: -moz-max-content;
+        /* We give the flex container a border and background so we can easily
+         * see how large it is. */
+        border: 2px dotted black;
+        background: lime;
+
+        font-size: 0; /* to prevent whitespace from having an effect */
+      }
+
+      div.wrapper {
+        display: inline-block;
+        border: 5px solid teal;
+        width:  40px;
+        height: 16px;
+      }
+      div.blueBlock {
+        width:  16px;
+        height: 16px;
+        background: rgb(0, 19, 127); /* matches solidblue.png */
+      }
+  </style>
+</head>
+<body>
+  <div class="flexbox">
+    <div class="wrapper"><div class="blueBlock"/></div>
+    <div class="wrapper"><div class="blueBlock"/></div>
+    <div class="wrapper"><div class="blueBlock"/></div>
+  </div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2a.xhtml b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2a.xhtml
new file mode 100644
index 000000000000..e1884a503715
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2a.xhtml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks how a flexbox sizes itself to shrinkwrap its contents'
+     preferred sizes.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin: 0; }
+      div.flexbox {
+        display: -moz-flex;
+        width: -moz-max-content;
+
+        /* We give the flexbox a border and background so we can easily see how
+         * large it is. */
+        border: 2px dotted black;
+        background: lime;
+      }
+
+      div.imgWrapper {
+        border: 5px solid teal;
+        width: 40px;
+        height: 16px;
+      }
+  </style>
+</head>
+<body>
+  <div class="flexbox">
+    <div class="imgWrapper"><img src="solidblue.png"/></div>
+    <div class="imgWrapper"><img src="solidblue.png"/></div>
+    <div class="imgWrapper"><img src="solidblue.png"/></div>
+  </div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2b.xhtml b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2b.xhtml
new file mode 100644
index 000000000000..30493f16b648
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-intrinsic-sizing-horiz-2b.xhtml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test is like the -2a variant, but with a <div> instead of an <img>
+     at the deepest level of nesting.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin: 0; }
+
+      div.flexbox {
+        display: -moz-flex;
+        width: -moz-max-content;
+
+        /* We give the flex container a border and background so we can easily
+         * see how large it is. */
+        border: 2px dotted black;
+        background: lime;
+      }
+
+      div.wrapper {
+        border: 5px solid teal;
+        width:  40px;
+        height: 16px;
+      }
+      div.blueBlock {
+        width:  16px;
+        height: 16px;
+        background: rgb(0, 19, 127); /* matches solidblue.png */
+      }
+  </style>
+</head>
+<body>
+  <div class="flexbox">
+    <div class="wrapper"><div class="blueBlock"/></div>
+    <div class="wrapper"><div class="blueBlock"/></div>
+    <div class="wrapper"><div class="blueBlock"/></div>
+  </div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-invalidation-1-ref.html b/layout/reftests/flexbox/flexbox-invalidation-1-ref.html
new file mode 100644
index 000000000000..e47b36e2d2be
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-invalidation-1-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+    Reference case, with testcase's dynamic tweak already performed.
+-->
+<html>
+  <head>
+    <style>
+      div#outer { margin-left: 40px }
+
+      div#flexContainer {
+        width: 100px;
+        height: 50px;
+        background: lightgray;
+        display: -moz-flex;
+        -moz-justify-content: center;
+      }
+
+      div#flexItem {
+        border: 1px solid black;
+        height: 200%;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="flexContainer">
+        <div id="flexItem">item</div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-invalidation-1.html b/layout/reftests/flexbox/flexbox-invalidation-1.html
new file mode 100644
index 000000000000..04b267bffbe6
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-invalidation-1.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we include our children's overflow areas in the
+     flex container's overflow area -- invalidating their old location and new
+     location when the flex container is moved, even if they stick outside the
+     flex container.
+-->
+<html class="reftest-wait">
+  <head>
+    <script>
+      function tweak() {
+        var outer = document.getElementById("outer");
+        outer.style.marginLeft = "40px";
+
+        document.documentElement.removeAttribute("class");
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+    <style>
+      div#flexContainer {
+        width: 100px;
+        height: 50px;
+        background: lightgray;
+        display: -moz-flex;
+        -moz-justify-content: center;
+      }
+
+      div#flexItem {
+        border: 1px solid black;
+        height: 200%;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="flexContainer">
+        <div id="flexItem">item</div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..8c1a5e723993
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-1-ref.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        margin-bottom: 2px;
+        line-height: 0;
+      }
+      div.flexbox > * {
+        display: inline-block;
+      }
+      div.a {
+        height: 20px;
+        width: 10px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 20px;
+        width: 50px;
+        background: pink;
+      }
+      div.c {
+        height: 20px;
+        width: 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a" style="margin-left: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 140px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 40px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a" style="margin-left: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 70px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 20px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b" style="margin-left: 140px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"
+           /><div class="b" style="margin-left: 20px"
+           /><div class="c" style="margin-left: 20px"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a" style="margin-left: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 35px"
+           /><div class="b" style="margin-left: 70px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: -moz-calc(40px / 6)"
+           /><div class="b" style="margin-left: -moz-calc(40px / 3)"
+           /><div class="c" style="margin-left: -moz-calc(40px / 3)"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-1.xhtml
new file mode 100644
index 000000000000..78eb013e0676
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-1.xhtml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a variety of 'display: -moz-flex' examples
+     testing each possible value of the '-moz-justify-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+        margin-bottom: 2px;
+      }
+      div.a {
+        height: 20px;
+        -moz-flex: 0 10px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 20px;
+        -moz-flex: 0 50px;
+        background: pink;
+      }
+      div.c {
+        height: 20px;
+        -moz-flex: 0 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..706d17839bc6
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-2-ref.xhtml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        line-height: 0;
+        margin-bottom: 4px;
+        border: 1px dotted black;
+      }
+      div.flexbox > * {
+        vertical-align: top;
+        display: inline-block;
+      }
+      div.a {
+        height: 10px;
+        width: 10px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    1px;
+        border-right-width:  2px;
+        border-bottom-width: 3px;
+        border-left-width:   4px;
+        padding: 2px;
+      }
+      div.b {
+        height: 10px;
+        width: 50px;
+        background: pink;
+        padding: 4px 3px 2px 1px;
+        margin: 2px 3px 4px 5px;
+      }
+      div.c {
+        height: 10px;
+        width: 100px;
+        background: orange;
+        margin: 3px;
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a" style="margin-left: 180px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 118px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 8px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a" style="margin-left: 90px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 59px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 4px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div style="margin-left: 118px"><div class="b"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"
+           /><div style="margin-left: 4px"><div class="b"/></div
+            ><div style="margin-left: 4px"><div class="c"/></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a" style="margin-left: 90px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 29.5px"
+           /><div style="margin-left: 59px"><div class="b"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-left: -moz-calc(8px / 6)"
+           /><div style="margin-left: -moz-calc(8px / 3)"><div class="b"/></div
+            ><div style="margin-left: -moz-calc(8px / 3)"><div class="c"/></div>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-2.xhtml
new file mode 100644
index 000000000000..26f4deaf80d9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-2.xhtml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of flex containers testing each possible value of
+     the '-moz-justify-content' property, with margin/border/padding on the
+     flex items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+        margin-bottom: 4px;
+        border: 1px dotted black;
+      }
+      div.a {
+        height: 10px;
+        -moz-flex: 0 10px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    1px;
+        border-right-width:  2px;
+        border-bottom-width: 3px;
+        border-left-width:   4px;
+        padding: 2px;
+      }
+      div.b {
+        height: 10px;
+        -moz-flex: 0 50px;
+        background: pink;
+        padding: 4px 3px 2px 1px;
+        margin: 2px 3px 4px 5px;
+      }
+      div.c {
+        height: 10px;
+        -moz-flex: 0 100px;
+        background: orange;
+        margin: 3px;
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-3-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-3-ref.xhtml
new file mode 100644
index 000000000000..4c3642bdbe61
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-3-ref.xhtml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-left: 0px; } /* We'll apply margins w/ style attribute */
+      div.flexbox {
+        margin-bottom: 2px;
+        line-height: 0;
+      }
+      div.flexbox > * {
+        display: inline-block;
+      }
+      div.a {
+        height: 20px;
+        width: 35px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 20px;
+        width: 40px;
+        background: pink;
+      }
+      div.c {
+        height: 20px;
+        width: 45px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="margin-left: 95px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 55px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 10px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="margin-left: 97.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 77.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 55px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="margin-left: 97.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 77.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 55px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-3.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-3.xhtml
new file mode 100644
index 000000000000..440486aff10d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-3.xhtml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a variety of 'display: -moz-flex' examples testing each
+     possible value of the '-moz-justify-content' property, and with each
+     individual flex item being wider than the flexbox itself (so that
+     there isn't any packing space available).
+       * For 'flex-start'/'space-between', we should overflow on the end
+         (right) side.
+       * For 'flex-end', we should overflow on the start (left) side.
+       * For 'center'/'space-around', we should overflow equally on both sides.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-left: 100px; } /* So we can see left-overflowed stuff */
+      div.flexbox {
+        width: 30px;
+        display: -moz-flex;
+        margin-bottom: 2px;
+      }
+      div.a {
+        height: 20px;
+        -moz-flex: 0 0 35px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 20px;
+        -moz-flex: 0 0 40px;
+        background: pink;
+      }
+      div.c {
+        height: 20px;
+        -moz-flex: 0 0 45px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-4-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-4-ref.xhtml
new file mode 100644
index 000000000000..a3adc5f859cf
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-4-ref.xhtml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-left: 0px; } /* We'll apply margins w/ style attribute */
+      div.flexbox {
+        line-height: 0;
+        margin-bottom: 4px;
+      }
+      div.flexbox > * {
+        vertical-align: top;
+        display: inline-block;
+      }
+      div.a {
+        height: 10px;
+        width: 35px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    1px;
+        border-right-width:  2px;
+        border-bottom-width: 3px;
+        border-left-width:   4px;
+        padding: 2px;
+      }
+      div.b {
+        height: 10px;
+        width: 40px;
+        background: pink;
+        padding: 4px 3px 2px 1px;
+        margin: 2px 3px 4px 5px;
+      }
+      div.c {
+        height: 10px;
+        width: 45px;
+        background: orange;
+        margin: 3px;
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="margin-left: 85px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 33px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: -22px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="margin-left: 92.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 66.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 39px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="margin-left: 92.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-left: 66.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-left: 39px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-4.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-4.xhtml
new file mode 100644
index 000000000000..1a01ea252343
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-4.xhtml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a variety of 'display: -moz-flex' examples testing each
+     possible value of the '-moz-justify-content' property, and with each
+     individual flex item being wider than the flexbox itself (so that
+     there isn't any packing space available).
+       * For 'flex-start'/'space-between', we should overflow on the end
+         (right) side.
+       * For 'flex-end', we should overflow on the start (left) side.
+       * For 'center'/'space-around', we should overflow equally on both sides.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-left: 100px; } /* So we can see left-overflowed stuff */
+      div.flexbox {
+        width: 30px;
+        display: -moz-flex;
+        margin-bottom: 4px;
+      }
+      div.a {
+        height: 10px;
+        -moz-flex: 0 0 35px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    1px;
+        border-right-width:  2px;
+        border-bottom-width: 3px;
+        border-left-width:   4px;
+        padding: 2px;
+      }
+      div.b {
+        height: 10px;
+        -moz-flex: 0 0 40px;
+        background: pink;
+        padding: 4px 3px 2px 1px;
+        margin: 2px 3px 4px 5px;
+      }
+      div.c {
+        height: 10px;
+        -moz-flex: 0 0 45px;
+        background: orange;
+        margin: 3px;
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-5-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-5-ref.xhtml
new file mode 100644
index 000000000000..247cb88928b9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-5-ref.xhtml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        margin-bottom: 2px;
+        line-height: 0;
+      }
+      div.flexbox > * {
+        display: inline-block;
+      }
+      div.a {
+        height: 20px;
+        width: 10px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 20px;
+        width: 50px;
+        background: pink;
+      }
+      div.c {
+        height: 20px;
+        width: 100px;
+        background: orange;
+      }
+      .center {
+        width: -moz-max-content;
+        margin-left: auto;
+        margin-right: auto;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="float:right; clear:right;">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="float:right; clear:right;">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="float:right; clear:right;">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+    <div style="clear:right;"></div>
+
+    <!-- center -->
+    <div class="flexbox center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b" style="float: right"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="display:block; float: left"/>
+      <div class="c" style="float:right"/>
+      <!-- Use fixed-size margins to subtract space for "a" and "c", and then
+           use auto margins to center 'b' within the remaining space -->
+      <div style="display: block; margin-left: 10px; margin-right: 100px">
+        <div class="b center"/>
+      </div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox center">
+      <div class="a"/>
+    </div>
+    <!-- For these, we use a flex container with invisible flexible items
+         instead of packing space. That's simpler than trying to hack up
+         a width-independent reference case for "justify-content:space-around".
+         (There are other reftests to ensure that basic flex container
+         behavior is correct, so it's safe to rely on that.) -->
+    <div class="flexbox" style="display: -moz-flex">
+      <div style="-moz-flex: 0.5"/>
+      <div class="a"/>
+      <div style="-moz-flex: 1"/>
+      <div class="b"/>
+      <div style="-moz-flex: 0.5"/>
+    </div>
+    <div class="flexbox" style="display: -moz-flex">
+      <div style="-moz-flex: 0.5"/>
+      <div class="a"/>
+      <div style="-moz-flex: 1"/>
+      <div class="b"/>
+      <div style="-moz-flex: 1"/>
+      <div class="c"/>
+      <div style="-moz-flex: 0.5"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-horiz-5.xhtml b/layout/reftests/flexbox/flexbox-justify-content-horiz-5.xhtml
new file mode 100644
index 000000000000..07f3006a3d69
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-horiz-5.xhtml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase to exercise each possible value of the '-moz-justify-content'
+     property, in an auto-sized horizontal flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        margin-bottom: 2px;
+      }
+      div.a {
+        height: 20px;
+        -moz-flex: 0 10px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 20px;
+        -moz-flex: 0 50px;
+        background: pink;
+      }
+      div.c {
+        height: 20px;
+        -moz-flex: 0 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-1-ref.xhtml
new file mode 100644
index 000000000000..7247220a8e62
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-1-ref.xhtml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        margin-right: 2px;
+        float: left;
+      }
+      div.a {
+        width: 20px;
+        height: 10px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: 50px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 140px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 40px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 70px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 20px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b" style="margin-top: 140px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"
+           /><div class="b" style="margin-top: 20px"
+           /><div class="c" style="margin-top: 20px"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 35px"
+           /><div class="b" style="margin-top: 70px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: -moz-calc(40px / 6)"
+           /><div class="b" style="margin-top: -moz-calc(40px / 3)"
+           /><div class="c" style="margin-top: -moz-calc(40px / 3)"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-1.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-1.xhtml
new file mode 100644
index 000000000000..531abdc6d5be
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-1.xhtml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of flex containers, testing each possible value of
+     the '-moz-justify-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 2px;
+        float: left;
+      }
+      div.a {
+        width: 20px;
+        -moz-flex: 0 10px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        -moz-flex: 0 50px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        -moz-flex: 0 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-2-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-2-ref.xhtml
new file mode 100644
index 000000000000..1d4ee2b424a3
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-2-ref.xhtml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        margin-right: 2px;
+        border: 1px dotted black;
+        float: left;
+      }
+      div.a {
+        width: 10px;
+        height: 10px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    4px;
+        border-right-width:  3px;
+        border-bottom-width: 2px;
+        border-left-width:   1px;
+        padding: 2px;
+      }
+      div.b {
+        width: 10px;
+        height: 50px;
+        background: pink;
+        padding: 1px 2px 3px 4px;
+        margin: 5px 4px 3px 2px;
+      }
+      div.c {
+        width: 10px;
+        height: 100px;
+        background: orange;
+        margin: 3px;
+        margin-top: 6px; /* Increased to counteract for collapsing */
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 180px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 118px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 8px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 90px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 59px"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 4px"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div style="margin-top: 123px"><div class="b"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"
+           /><div style="margin-top: 9px"><div class="b"/></div
+            ><div style="margin-top: 10px"><div class="c"/></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 90px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: 29.5px"
+           /><div style="margin-top: 64px"><div class="b"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-top: -moz-calc(8px / 6)"
+           /><div style="margin-top: -moz-calc(5px + 8px / 3)"><div class="b"/></div
+            ><div style="margin-top: -moz-calc(6px + 8px / 3)"><div class="c"/></div>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-2.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-2.xhtml
new file mode 100644
index 000000000000..28f5b8a49dce
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-2.xhtml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of flex containers testing each possible value of
+     the '-moz-justify-content' property, with margin/border/padding on the
+     flex items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 2px;
+        float: left;
+        border: 1px dotted black;
+      }
+      div.a {
+        width: 10px;
+        -moz-flex: 0 10px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    4px;
+        border-right-width:  3px;
+        border-bottom-width: 2px;
+        border-left-width:   1px;
+        padding: 2px;
+      }
+      div.b {
+        width: 10px;
+        -moz-flex: 0 50px;
+        background: pink;
+        padding: 1px 2px 3px 4px;
+        margin: 5px 4px 3px 2px;
+      }
+      div.c {
+        width: 10px;
+        -moz-flex: 0 100px;
+        background: orange;
+        margin: 3px;
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-3-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-3-ref.xhtml
new file mode 100644
index 000000000000..611af76ab43e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-3-ref.xhtml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-top: 0px; } /* We'll apply margins w/ style attribute */
+      div.flexbox {
+        height: 200px;
+        margin-right: 2px;
+        float: left;
+      }
+      div.a {
+        width: 20px;
+        height: 35px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: 40px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 45px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="margin-top: 95px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 55px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 10px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="margin-top: 97.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 77.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 55px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="margin-top: 97.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 77.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 55px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-3.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-3.xhtml
new file mode 100644
index 000000000000..714048bb99e2
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-3.xhtml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of vertical flex containers testing each possible
+     value of the '-moz-justify-content' property, and with each individual
+     flex item being larger than the flexbox itself (so that there isn't any
+     packing space available).
+
+       * For 'flex-start'/'space-between', we should overflow on the end
+         (bottom) side.
+       * For 'flex-end', we should overflow on the start (top) side.
+       * For 'center'/'space-around', we should overflow equally on both sides.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-top: 100px; } /* So we can see top-overflowed stuff */
+      div.flexbox {
+        height: 30px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 2px;
+        float: left;
+      }
+      div.a {
+        width: 20px;
+        -moz-flex: 0 0 35px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        -moz-flex: 0 0 40px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        -moz-flex: 0 0 45px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-4-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-4-ref.xhtml
new file mode 100644
index 000000000000..e6fa126d90e1
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-4-ref.xhtml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-top: 0px; } /* We'll apply margins w/ style attribute */
+      div.flexbox {
+        margin-right: 4px;
+        float: left;
+      }
+      div.a {
+        width: 10px;
+        height: 35px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    4px;
+        border-right-width:  3px;
+        border-bottom-width: 2px;
+        border-left-width:   1px;
+        padding: 2px;
+      }
+      div.b {
+        width: 10px;
+        height: 40px;
+        background: pink;
+        padding: 1px 2px 3px 4px;
+        margin: 5px 4px 3px 2px;
+      }
+      div.c {
+        width: 10px;
+        height: 45px;
+        background: orange;
+        margin: 3px;
+        margin-top: 6px; /* Increased to counteract for collapsing */
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="margin-top: 85px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 33px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: -22px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="margin-top: 92.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 66.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 39px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 100px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="margin-top: 92.5px">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="margin-top: 66.5px">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="margin-top: 39px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-4.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-4.xhtml
new file mode 100644
index 000000000000..867eb1a85850
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-4.xhtml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of vertical flex containers, testing each possible
+     value of the '-moz-justify-content' property, and with each individual
+     flex item being larger than the flexbox itself (so that there isn't any
+     packing space available).  Also, we've got margin/border/padding on the
+     flex items.
+       * For 'flex-start'/'space-between', we should overflow on the end
+         (bottom) side.
+       * For 'flex-end', we should overflow on the start (top) side.
+       * For 'center'/'space-around', we should overflow equally on both sides.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      body { margin-top: 100px; } /* So we can see top-overflowed stuff */
+      div.flexbox {
+        height: 30px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 4px;
+        float: left;
+      }
+      div.a {
+        width: 10px;
+        -moz-flex: 0 0 35px;
+        background: lightgreen;
+        border-style: solid;
+        border-color:     purple;
+        border-top-width:    4px;
+        border-right-width:  3px;
+        border-bottom-width: 2px;
+        border-left-width:   1px;
+        padding: 2px;
+      }
+      div.b {
+        width: 10px;
+        -moz-flex: 0 0 40px;
+        background: pink;
+        padding: 1px 2px 3px 4px;
+        margin: 5px 4px 3px 2px;
+      }
+      div.c {
+        width: 10px;
+        -moz-flex: 0 0 45px;
+        background: orange;
+        margin: 3px;
+        border: 2px dashed teal;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-5-ref.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-5-ref.xhtml
new file mode 100644
index 000000000000..10e402949dad
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-5-ref.xhtml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        margin-right: 2px;
+        float: left;
+        border: 1px dotted black;
+      }
+      div.a {
+        width: 20px;
+        height: 10px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: 50px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-justify-content-vert-5.xhtml b/layout/reftests/flexbox/flexbox-justify-content-vert-5.xhtml
new file mode 100644
index 000000000000..8cc65d951870
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-justify-content-vert-5.xhtml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase to exercise each possible value of the '-moz-justify-content'
+     property, in an auto-sized vertical flex container.  The flex container
+     should shrink-wrap its contents' heights, leaving no packing space
+     available.  So, the "-moz-justify-content" values should have no effect
+     in this testcase. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 2px;
+        float: left;
+        border: 1px dotted black;
+      }
+      div.a {
+        width: 20px;
+        -moz-flex: 0 10px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        -moz-flex: 0 50px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        -moz-flex: 0 100px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (start) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-start">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: flex-end">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: center">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-between">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox" style="-moz-justify-content: space-around">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-margin-auto-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-margin-auto-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..77938ca03cfa
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-margin-auto-horiz-1-ref.xhtml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 20px; }
+      div.flexbox {
+        width: 200px;
+        background: lightgray;
+        margin-bottom: 2px;
+      }
+      div.a {
+        width: 20px;
+        background: green;
+        display: inline-block;
+      }
+      div.b {
+        width: 20px;
+        background: pink;
+        display: inline-block;
+      }
+      div.c {
+        width: 20px;
+        background: purple;
+        display: inline-block;
+      }
+
+      <!-- These classes allow us to conveniently/concisely specify margin
+           values below, for exact positioning of the items on each reference
+           line. ("l" = "margin-_l_eft", and the number = number of pixels) -->
+      div.l180 { margin-left: 180px }
+      div.l90  { margin-left:  90px }
+      div.l80  { margin-left:  80px }
+      div.l70  { margin-left:  70px }
+      div.l53  { margin-left: -moz-calc(160px / 3) } <!-- == 53.33333px -->
+      div.l35  { margin-left:  35px }
+    </style>
+  </head>
+  <body>
+    <!-- just one item -->
+    <div class="flexbox">
+      <div class="a l180"/>
+    </div>
+    <div class="flexbox">
+      <div class="b l90"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/>
+    </div>
+
+    <!-- Two items -->
+    <div class="flexbox">
+      <div class="a l53"/><div class="b l53"/>
+    </div>
+    <div class="flexbox">
+      <div class="a l80"/><div class="c"/>
+    </div>
+    <div class="flexbox">
+      <div class="b l53"/><div class="c l53"/>
+    </div>
+
+    <!-- Three items -->
+    <div class="flexbox">
+      <div class="a l35"/><div class="b l35"/><div class="c l35"/>
+    </div>
+    <div class="flexbox">
+      <div class="a l35"/><div class="c"/><div class="b l70"/>
+    </div>
+    <div class="flexbox">
+      <div class="b l35"/><div class="a l70"/><div class="c"/>
+    </div>
+    <div class="flexbox">
+      <div class="b l35"/><div class="c l35"/><div class="a l70"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/><div class="a l70"/><div class="b l35"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/><div class="b l70"/><div class="a l70"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-margin-auto-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-margin-auto-horiz-1.xhtml
new file mode 100644
index 000000000000..452b418837d6
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-margin-auto-horiz-1.xhtml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a variety of 'display: -moz-flex' examples
+     with margin-left and/or margin-right set to 'auto'. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 20px;
+        background: lightgray;
+        display: -moz-flex;
+        margin-bottom: 2px;
+      }
+      div.a {
+        width: 20px;
+        background: green;
+        margin-left: auto;
+      }
+      div.b {
+        width: 20px;
+        background: pink;
+        margin-left: auto;
+        margin-right: auto;
+      }
+      div.c {
+        width: 20px;
+        background: purple;
+        margin-right: auto;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- just one item -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/>
+    </div>
+
+    <!-- Two items -->
+    <div class="flexbox">
+      <div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="c"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"/><div class="c"/>
+    </div>
+
+    <!-- Three items -->
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/><div class="c"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"/><div class="a"/><div class="c"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"/><div class="c"/><div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/><div class="a"/><div class="b"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/><div class="b"/><div class="a"/>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-margin-auto-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-margin-auto-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..04ab79554bd2
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-margin-auto-horiz-2-ref.xhtml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a variety of 'display: -moz-flex' examples
+     with margin-top and/or margin-bottom set to 'auto' on flex items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 2px dotted black;
+        display: -moz-flex;
+        margin-bottom: 2px;
+        width: 100px;
+      }
+      div.fixedSize {
+        width:  20px;
+        height: 20px;
+      }
+      div.gray        { background: gray;  }
+      div.green       { background: green; }
+      div.pink        { background: pink;  }
+      div.blue        { background: blue;  }
+    </style>
+  </head>
+  <body>
+
+    <!-- fixed-height flexbox, with items that have auto margins -->
+    <div class="flexbox" style="height: 100px">
+      <div class="fixedSize green" style="margin-top: 80px"/>
+      <div class="fixedSize pink"/>
+      <div class="fixedSize blue"  style="margin-top: 40px"/>
+    </div>
+    <!-- fixed-height flexbox, with items that have auto & fixed margins -->
+    <div class="flexbox" style="height: 100px">
+      <div class="fixedSize green" style="margin-top: 70px"/>
+      <div class="fixedSize pink"  style="margin-top: 10px"/>
+    </div>
+
+    <!-- height-shrinkwrapping flexbox, sized by item w/ fixed height & margins,
+         with other items that have auto margins -->
+    <div class="flexbox" style="height: 50px">
+      <div class="fixedSize green" style="margin-top: 30px"/>
+      <div class="fixedSize pink"/>
+      <div class="fixedSize blue"  style="margin-top: 15px"/>
+      <div class="gray" style="width: 10px; height: 30px; margin-top: 10px"/>
+    </div>
+
+    <!-- height-shrinkwrapping flexbox, sized by item w/ fixed height & margins,
+         with other items that have auto & fixed margins -->
+    <div class="flexbox" style="height: 50px">
+      <div class="fixedSize green" style="margin-top: 20px"/>
+      <div class="fixedSize pink"  style="margin-top: 10px"/>
+      <div class="gray" style="width: 10px; height: 30px; margin-top: 10px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-margin-auto-horiz-2.xhtml b/layout/reftests/flexbox/flexbox-margin-auto-horiz-2.xhtml
new file mode 100644
index 000000000000..ec834ad080f7
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-margin-auto-horiz-2.xhtml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a variety of 'display: -moz-flex' examples
+     with margin-top and/or margin-bottom set to 'auto' on flex items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 2px dotted black;
+        display: -moz-flex;
+        margin-bottom: 2px;
+        width: 100px;
+      }
+      div.fixedSize {
+        width:  20px;
+        height: 20px;
+      }
+      div.gray        { background: gray;  }
+      div.green       { background: green; }
+      div.pink        { background: pink;  }
+      div.blue        { background: blue;  }
+
+      div.autoTop     { margin-top:    auto; }
+      div.autoBottom  { margin-bottom: auto; }
+      div.fixedTop    { margin-top:    10px; }
+      div.fixedBottom { margin-bottom: 10px; }
+    </style>
+  </head>
+  <body>
+
+    <!-- fixed-height flexbox, with items that have auto margins -->
+    <div class="flexbox" style="height: 100px">
+      <div class="fixedSize green autoTop"/>
+      <div class="fixedSize pink  autoBottom"/>
+      <div class="fixedSize blue  autoTop autoBottom"/>
+    </div>
+    <!-- fixed-height flexbox, with items that have auto & fixed margins -->
+    <div class="flexbox" style="height: 100px">
+      <div class="fixedSize green autoTop fixedBottom"/>
+      <div class="fixedSize pink  autoBottom fixedTop"/>
+    </div>
+
+    <!-- height-shrinkwrapping flexbox, sized by item w/ fixed height & margins,
+         with other items that have auto margins -->
+    <div class="flexbox">
+      <div class="fixedSize green autoTop"/>
+      <div class="fixedSize pink autoBottom"/>
+      <div class="fixedSize blue autoTop autoBottom"/>
+      <div class="fixedTop fixedBottom gray" style="width: 10px; height: 30px"/>
+    </div>
+
+    <!-- height-shrinkwrapping flexbox, sized by item w/ fixed height & margins,
+         with other items that have auto & fixed margins -->
+    <div class="flexbox">
+      <div class="fixedSize green autoTop fixedBottom"/>
+      <div class="fixedSize pink  autoBottom fixedTop"/>
+      <div class="fixedTop fixedBottom gray" style="width: 10px; height: 30px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..d3df9d9644ac
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-1-ref.xhtml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+      }
+      div.a {
+        display: inline-block;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        display: inline-block;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        display: inline-block;
+        background: orange;
+      }
+      div.flexNone {
+        display: inline-block;
+        background: pink;
+      }
+      div.flexBasis {
+        display: inline-block;
+        background: gray;
+      }
+      div.spacer {
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a" style="width: 74px"/><div class="b" style="width: 110px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 56.5px"/><div class="c" style="width: 137.5px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 179px"/><div class="flexNone">
+        <div class="spacer" style="width: 15px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="width: 66px"/><div class="c" style="width: 124px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="width: 160px"/><div class="flexNone">
+        <div class="spacer" style="width: 30px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 39px"/><div class="b" style="width: 40px"
+      /><div class="flexBasis" style="width: 20px"/><div class="c" style="width: 85px"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse-ref.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse-ref.xhtml
new file mode 100644
index 000000000000..9dff0ef0dca1
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse-ref.xhtml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+      }
+      div.a {
+        display: inline-block;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        display: inline-block;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        display: inline-block;
+        background: orange;
+      }
+      div.flexNone {
+        display: inline-block;
+        background: pink;
+      }
+      div.flexBasis {
+        display: inline-block;
+        background: gray;
+      }
+      div.spacer {
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="b" style="width: 110px"/><div class="a" style="width: 74px"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="width: 137.5px"/><div class="a" style="width: 56.5px"/>
+    </div>
+    <div class="flexbox">
+      <div class="flexNone"><div class="spacer" style="width: 15px"/>
+      </div><div class="a" style="width: 179px"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="width: 124px"
+      /><div class="b" style="width: 66px"/>
+    </div>
+    <div class="flexbox">
+      <div class="flexNone"><div class="spacer" style="width: 30px"/>
+      </div><div class="b" style="width: 160px"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="width: 85px"
+      /><div class="flexBasis" style="width: 20px"
+      /><div class="b" style="width: 40px"
+      /><div class="a" style="width: 39px"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse.xhtml
new file mode 100644
index 000000000000..37a2590e7eb4
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-1-reverse.xhtml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with borders on flex items, and "flex-direction: row-reverse" to
+     reverse the flex container's main axis. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+        -moz-flex-direction: row-reverse;
+      }
+      div.a {
+        -moz-flex: 1 0 24px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        -moz-flex: 2 0 10px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl-reverse.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl-reverse.xhtml
new file mode 100644
index 000000000000..785a9583a1d3
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl-reverse.xhtml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with borders on flex items, and "direction: rtl" and
+     "flex-direction: row-reverse" to *doubly* reverse the flex container's
+     main axis. --> 
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+        -moz-flex-direction: row-reverse;
+        direction: rtl;
+      }
+      div.a {
+        -moz-flex: 1 0 24px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        -moz-flex: 2 0 10px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl.xhtml
new file mode 100644
index 000000000000..0971bcea45eb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-1-rtl.xhtml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with borders on flex items, and "direction: rtl" to reverse
+     the flex container's main axis. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+        direction: rtl;
+      }
+      div.a {
+        -moz-flex: 1 0 24px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        -moz-flex: 2 0 10px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-1.xhtml
new file mode 100644
index 000000000000..1f6a735ae00b
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-1.xhtml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with borders on flex items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 24px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        -moz-flex: 2 0 10px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-2-ref.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-2-ref.xhtml
new file mode 100644
index 000000000000..4179967d84c9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-2-ref.xhtml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+      }
+      div.a {
+        display: inline-block;
+        background: lightgreen;
+        margin-left: 1px;
+        margin-right: 3px;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        display: inline-block;
+        background: yellow;
+        margin-left: 2px;
+        margin-right: 4px;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        display: inline-block;
+        background: orange;
+      }
+      div.flexNone {
+        display: inline-block;
+        background: pink;
+      }
+      div.flexBasis {
+        display: inline-block;
+        background: gray;
+      }
+      div.spacer {
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a" style="width: 70px"/><div class="b" style="width: 104px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 52.5px"/><div class="c" style="width: 137.5px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 175px"/><div class="flexNone">
+        <div class="spacer" style="width: 15px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="width: 60px"/><div class="c" style="width: 124px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="width: 154px"/><div class="flexNone">
+        <div class="spacer" style="width: 30px"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="width: 35px"/><div class="b" style="width: 34px"
+      /><div class="flexBasis" style="width: 20px"/><div class="c" style="width: 85px"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-2a.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-2a.xhtml
new file mode 100644
index 000000000000..881d9e6c95e0
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-2a.xhtml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with margin/border on flex items. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 20px;
+        background: lightgreen;
+        margin-left: 1px;
+        margin-right: 3px;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.b {
+        -moz-flex: 2 0 4px;
+        background: yellow;
+        margin-left: 2px;
+        margin-right: 4px;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-2b.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-2b.xhtml
new file mode 100644
index 000000000000..49938936fc13
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-2b.xhtml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with margin/border/padding on flex items. (NOTE: This renders
+     the same as the "-2a" variant, which lacks padding, because we've
+     just replaced some of the "-2a" variant's content-box area with
+     padding-box area in this test.) -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        font-size: 10px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 9px;
+        background: lightgreen;
+        margin-left: 1px;
+        margin-right: 3px;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+        padding-left: 5px;
+        padding-right: 6px;
+      }
+      div.b {
+        -moz-flex: 2 0 1px;
+        background: yellow;
+        margin-left: 2px;
+        margin-right: 4px;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+        padding-left: 1px;
+        padding-right: 2px;
+      }
+      div.c {
+        -moz-flex: 3 0 40px;
+        background: orange;
+      }
+      div.flexNone {
+        -moz-flex: none;
+        background: pink;
+      }
+      div.flexBasis {
+        -moz-flex: 0 0 20px;
+        background: gray;
+      }
+      div.spacer {
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"></div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div class="c"/></div>
+    <div class="flexbox"><div class="a"/>
+      <div class="flexNone"><div class="spacer"/></div>
+    </div>
+    <div class="flexbox"><div class="b"/><div class="c"/></div>
+    <div class="flexbox"><div class="b"/>
+      <div class="flexNone"><div class="spacer"/><div class="spacer"/></div>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="flexBasis"/><div class="c"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-3-ref.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-3-ref.xhtml
new file mode 100644
index 000000000000..f6835b5f2dd5
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-3-ref.xhtml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 20px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        margin-bottom: 2px;
+      }
+
+      <!-- customizations for flexbox border/padding -->
+      .borderA {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 6px;
+        border-right-width: 4px;
+        border-bottom-width: 2px;
+        border-left-width: 8px;
+      }
+
+      .borderB {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 4px;
+        border-right-width: 5px;
+        border-bottom-width: 6px;
+        border-left-width: 7px;
+      }
+
+      .paddingA {
+        padding: 4px 3px 2px 1px;
+      }
+
+      .paddingB {
+        padding: 8px 11px 14px 17px;
+      }
+
+      div.child1 {
+        display: inline-block;
+        width: 74px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.child2 {
+        display: inline-block;
+        width: 110px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox borderA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderA paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderA paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse-ref.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse-ref.xhtml
new file mode 100644
index 000000000000..8443b12d7fed
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse-ref.xhtml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 20px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        margin-bottom: 2px;
+      }
+
+      <!-- customizations for flexbox border/padding -->
+      .borderA {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 6px;
+        border-right-width: 4px;
+        border-bottom-width: 2px;
+        border-left-width: 8px;
+      }
+
+      .borderB {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 4px;
+        border-right-width: 5px;
+        border-bottom-width: 6px;
+        border-left-width: 7px;
+      }
+
+      .paddingA {
+        padding: 4px 3px 2px 1px;
+      }
+
+      .paddingB {
+        padding: 8px 11px 14px 17px;
+      }
+
+      div.child1 {
+        display: inline-block;
+        width: 74px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.child2 {
+        display: inline-block;
+        width: 110px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox borderA"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox borderA paddingA"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox borderA paddingB"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox borderB"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox borderB paddingA"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox borderB paddingB"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox paddingA"
+         ><div class="child2"/><div class="child1"/></div>
+    <div class="flexbox paddingB"
+         ><div class="child2"/><div class="child1"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse.xhtml
new file mode 100644
index 000000000000..aceed72f6b50
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-3-reverse.xhtml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 20px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+        -moz-flex-direction: row-reverse;
+        margin-bottom: 2px;
+      }
+
+      <!-- customizations for flexbox border/padding -->
+      .borderA {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 6px;
+        border-right-width: 4px;
+        border-bottom-width: 2px;
+        border-left-width: 8px;
+      }
+
+      .borderB {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 4px;
+        border-right-width: 5px;
+        border-bottom-width: 6px;
+        border-left-width: 7px;
+      }
+
+      .paddingA {
+        padding: 4px 3px 2px 1px;
+      }
+
+      .paddingB {
+        padding: 8px 11px 14px 17px;
+      }
+
+      div.child1 {
+        -moz-flex: 1 0 24px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.child2 {
+        -moz-flex: 2 0 10px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox borderA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderA paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderA paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-mbp-horiz-3.xhtml b/layout/reftests/flexbox/flexbox-mbp-horiz-3.xhtml
new file mode 100644
index 000000000000..82f199ad8029
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-mbp-horiz-3.xhtml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with border/padding on a flex container and on its children -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 20px; border: 0; }
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+        margin-bottom: 2px;
+      }
+
+      <!-- customizations for flex container border/padding -->
+      .borderA {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 6px;
+        border-right-width: 4px;
+        border-bottom-width: 2px;
+        border-left-width: 8px;
+      }
+
+      .borderB {
+        border-style: dashed;
+        border-color: purple;
+        border-top-width: 4px;
+        border-right-width: 5px;
+        border-bottom-width: 6px;
+        border-left-width: 7px;
+      }
+
+      .paddingA {
+        padding: 4px 3px 2px 1px;
+      }
+
+      .paddingB {
+        padding: 8px 11px 14px 17px;
+      }
+
+      div.child1 {
+        -moz-flex: 1 0 24px;
+        background: lightgreen;
+        border-style: dotted;
+        border-left-width: 2px;
+        border-right-width: 4px;
+      }
+      div.child2 {
+        -moz-flex: 2 0 10px;
+        background: yellow;
+        border-style: dashed;
+        border-left-width: 7px;
+        border-right-width: 3px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox borderA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderA paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderA paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox borderB paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox paddingA"
+         ><div class="child1"/><div class="child2"/></div>
+    <div class="flexbox paddingB"
+         ><div class="child1"/><div class="child2"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-minSize-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-minSize-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..9c13e263088f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-minSize-horiz-1-ref.xhtml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        font-size: 8px;
+      }
+      div.outerContainer {
+        border: 1px dotted black;
+        height: 42px;
+        margin-bottom: 5px;
+      }
+      div.flexbox > * {
+        vertical-align: top;
+        display: inline-block;
+        margin-right: 20px;
+        border: 1px dashed green;
+        background: lightblue;
+        height: 40px;
+      }
+      div.childMinSizeIsMinContent > * {
+        min-width: -moz-min-content;
+      }
+      div.childSizeIsMinContent > * {
+        width: -moz-min-content;
+      }
+      div.smallSize      { width: 5px; }
+      div.smallFlexBasis { width: 2px; }
+      div.zeroWidth      { width: 0; }
+
+    </style>
+  </head>
+  <body>
+
+    <!-- Check that we use the min-content width as a lower-bound when sizing
+         flex items. -->
+    <div class="flexbox childMinSizeIsMinContent outerContainer">
+      <div>abc d e f</div
+      ><div class="smallSize">abc d e f</div
+      ><div class="smallFlexBasis">abc d e f</div>
+    </div>
+
+    <!-- ... EVEN if our flex container is small and we're overflowing. -->
+    <div class="outerContainer smallSize">
+      <div class="flexbox childSizeIsMinContent">
+        <div>abc d e f</div
+        ><div>abc d e f</div
+        ><div>abc d e f</div>
+      </div>
+    </div>
+
+    <!-- Test that "min-width: 0" on flex items will keep us from clamping to
+         the min-content width. (So we can now actually honor small 'width'
+         and 'flex-basis' values.) -->
+    <div class="flexbox outerContainer">
+      <div>abc d e f</div
+      ><div class="smallSize">abc d e f</div
+      ><div class="smallFlexBasis">abc d e f</div>
+    </div>
+
+    <!-- ... and similarly, when we have a small flex container and we trigger
+         shrinking behavior, flex items with "min-width: 0" are allowed to
+         shrink past their min-content width. -->
+    <div class="outerContainer smallSize">
+      <div class="flexbox">
+        <div class="zeroWidth">abc d e f</div
+        ><div class="zeroWidth">abc d e f</div
+        ><div class="zeroWidth">abc d e f</div>
+      </div>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml
new file mode 100644
index 000000000000..9768486ca2cb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-minSize-horiz-1.xhtml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that we honor the flexbox-specific behavior of the
+     new "min-width: auto" value that was introduced in the flexbox spec.
+
+     We check that flex items can't shrink below their min-content width,
+     unless we explicitly reduce their min-width with e.g. "min-width: 0".
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        width: 200px;
+        display: -moz-flex;
+        margin-bottom: 5px;
+        font-size: 8px;
+        border: 1px dotted black;
+      }
+      div.flexbox > * {
+        margin-right: 20px;
+        border: 1px dashed green;
+        background: lightblue;
+        height: 40px;
+      }
+      div.smallSize      { width: 5px; }
+      div.smallFlexBasis { -moz-flex-basis: 2px; }
+      div.zeroMinWidth   { min-width: 0; }
+
+    </style>
+  </head>
+  <body>
+
+    <!-- Check that we use the min-content width as a lower-bound when sizing
+         flex items. -->
+    <div class="flexbox">
+      <div>abc d e f</div>
+      <div class="smallSize">abc d e f</div>
+      <div class="smallFlexBasis">abc d e f</div>
+    </div>
+
+    <!-- ... EVEN if our flex container is small and we're overflowing. -->
+    <div class="flexbox smallSize">
+      <div>abc d e f</div>
+      <div class="smallSize">abc d e f</div>
+      <div class="smallFlexBasis">abc d e f</div>
+    </div>
+
+    <!-- Test that "min-width: 0" on flex items will keep us from clamping to
+         the min-content width. (So we can now actually honor small 'width'
+         and 'flex-basis' values.) -->
+    <div class="flexbox">
+      <div class="zeroMinWidth">abc d e f</div>
+      <div class="zeroMinWidth smallSize">abc d e f</div>
+      <div class="zeroMinWidth smallFlexBasis">abc d e f</div>
+    </div>
+
+    <!-- ... and similarly, when we have a small flex container and we trigger
+         shrinking behavior, flex items with "min-width: 0" are allowed to
+         shrink past their min-content width. -->
+    <div class="flexbox smallSize">
+      <div class="zeroMinWidth">abc d e f</div>
+      <div class="zeroMinWidth smallSize">abc d e f</div>
+      <div class="zeroMinWidth smallFlexBasis">abc d e f</div>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-minSize-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-minSize-vert-1-ref.xhtml
new file mode 100644
index 000000000000..f736fb8abb85
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-minSize-vert-1-ref.xhtml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 140px;
+        margin-right: 5px;
+        font-size: 8px;
+        border: 1px dotted black;
+        float: left;
+      }
+      div.flexbox > * {
+        margin-bottom: 20px;
+        border: 1px dashed green;
+        background: lightblue;
+        width: 40px;
+      }
+      div.smallSize      { height: 5px; }
+      div.smallFlexBasis { height: 2px; }
+      div.zeroHeight     { height: 0; }
+
+    </style>
+  </head>
+  <body>
+
+    <div class="flexbox">
+      <div>a b</div>
+      <div>a b</div>
+      <div>a b</div>
+    </div>
+
+    <div class="flexbox smallSize">
+      <div>a b</div>
+      <div>a b</div>
+      <div>a b</div>
+    </div>
+
+    <div class="flexbox">
+      <div>a b</div>
+      <div class="smallSize">a b</div>
+      <div class="smallFlexBasis">a b</div>
+    </div>
+
+    <div class="flexbox smallSize">
+      <div class="zeroHeight">a b</div>
+      <div class="zeroHeight">a b</div>
+      <div class="zeroHeight">a b</div>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml b/layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml
new file mode 100644
index 000000000000..937c80e149bd
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-minSize-vert-1.xhtml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test checks that we honor the flexbox-specific behavior of the
+     new "min-height: auto" value that was introduced in the flexbox spec.
+
+     We check that flex items can't shrink below their min-content height,
+     unless we explicitly reduce their min-height with e.g. "min-height: 0".
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        height: 140px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 5px;
+        font-size: 8px;
+        border: 1px dotted black;
+        float: left;
+      }
+      div.flexbox > * {
+        margin-bottom: 20px;
+        border: 1px dashed green;
+        background: lightblue;
+        width: 40px;
+      }
+      div.smallSize      { height: 5px; }
+      div.smallFlexBasis { -moz-flex-basis: 2px; }
+      div.zeroMinHeight  { min-height: 0; }
+
+    </style>
+  </head>
+  <body>
+
+    <!-- Check that we use the min-content height as a lower-bound when sizing
+         flex items. -->
+    <div class="flexbox">
+      <div>a b</div>
+      <div class="smallSize">a b</div>
+      <div class="smallFlexBasis">a b</div>
+    </div>
+
+    <!-- ... EVEN if our flex container is small and we're overflowing. -->
+    <div class="flexbox smallSize">
+      <div>a b</div>
+      <div class="smallSize">a b</div>
+      <div class="smallFlexBasis">a b</div>
+    </div>
+
+    <!-- Test that "min-height: 0" on flex items will keep us from clamping to
+         the min-content height. (So we can now actually honor small 'height'
+         and 'flex-basis' values.) -->
+    <div class="flexbox">
+      <div class="zeroMinHeight">a b</div>
+      <div class="zeroMinHeight smallSize">a b</div>
+      <div class="zeroMinHeight smallFlexBasis">a b</div>
+    </div>
+
+    <!-- ... and similarly, when we have a small flex container and we trigger
+         shrinking behavior, flex items with "min-height: 0" are allowed to
+         shrink past their min-content height. -->
+    <div class="flexbox smallSize">
+      <div class="zeroMinHeight">a b</div>
+      <div class="zeroMinHeight smallSize">a b</div>
+      <div class="zeroMinHeight smallFlexBasis">a b</div>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-1-ref.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-1-ref.xhtml
new file mode 100644
index 000000000000..20925cd5651a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-1-ref.xhtml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for absolutely positioned children of a flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .abspos {
+        position: absolute;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+      }
+      div.a {
+        width: 100%;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 100%;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+      div.inflex {
+        width: 20px;
+        height: 100px;
+        background: gray;
+        display: inline-block;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child abspos: -->
+      <div class="flexbox"
+           ><div class="a abspos" style="width: 30px"/><div class="b"/></div>
+      <!-- Second child abspos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="b abspos" style="width: 20px"/></div>
+      <!-- Middle child abspos: -->
+      <div class="flexbox"
+           ><div class="a" style="width: 80px"
+          /><div class="inflex abspos"
+          /><div class="b" style="width: 120px"/></div>
+      <!-- Third child abspos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox"
+           ><div class="inflex" style="margin-left: 12px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="noFlexFn abspos"
+          /><div class="inflex" style="margin-left: 48px"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-1.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-1.xhtml
new file mode 100644
index 000000000000..e4d8accf3a7a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-1.xhtml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with absolutely positioned children of a flex container.
+     This positioning is with respect to the containing block's left edge.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .abspos {
+        position: absolute;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 auto;
+        width: 30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 auto;
+        width: 20px;
+        height: 100px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: none;
+        width: 20px;
+        height: 100px;
+        background: gray;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child abspos: -->
+      <div class="flexbox"><div class="a abspos"/><div class="b"/></div>
+      <!-- Second child abspos: -->
+      <div class="flexbox"><div class="a"/><div class="b abspos"/></div>
+      <!-- Middle child abspos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="inflex abspos"/><div class="b"/></div>
+      <!-- Third child abspos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox" style="-moz-justify-content: space-around"
+           ><div class="inflex"/><div class="inflex"/><div class="inflex"
+          /><div class="noFlexFn abspos"/><div class="inflex"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-2-ref.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-2-ref.xhtml
new file mode 100644
index 000000000000..4e403c21977f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-2-ref.xhtml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for absolutely positioned children of a flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .abspos {
+        position: absolute;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+      }
+      div.a {
+        width: 100%;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 100%;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+      div.inflex {
+        width: 20px;
+        height: 100px;
+        background: gray;
+        display: inline-block;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child abspos: -->
+      <div class="flexbox"
+           ><div class="a abspos" style="width: 30px"/><div class="b"/></div>
+      <!-- Second child abspos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="b abspos" style="width: 20px"/></div>
+      <!-- Middle child abspos: -->
+      <div class="flexbox"
+           ><div class="a" style="width: 80px"
+          /><div class="inflex abspos"
+          /><div class="b" style="width: 120px"/></div>
+      <!-- Third child abspos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox"
+           ><div class="inflex" style="margin-left: 12px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="noFlexFn abspos" style="margin-left: 24px"
+          /><div class="inflex" style="margin-left: 48px"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-2.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-2.xhtml
new file mode 100644
index 000000000000..e60356475177
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-2.xhtml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with absolutely positioned children of a flex container.
+     In this testcase, we simply specify "position: absolute" without
+     actually doing any positioning, to test the "static position" of these
+     children.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .abspos {
+        position: absolute;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 auto;
+        width: 30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 auto;
+        width: 20px;
+        height: 100px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: none;
+        width: 20px;
+        height: 100px;
+        background: gray;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child abspos: -->
+      <div class="flexbox"><div class="a abspos"/><div class="b"/></div>
+      <!-- Second child abspos: -->
+      <div class="flexbox"><div class="a"/><div class="b abspos"/></div>
+      <!-- Middle child abspos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="inflex abspos"/><div class="b"/></div>
+      <!-- Third child abspos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox" style="-moz-justify-content: space-around"
+           ><div class="inflex"/><div class="inflex"/><div class="inflex"
+          /><div class="noFlexFn abspos"/><div class="inflex"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-3-ref.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-3-ref.xhtml
new file mode 100644
index 000000000000..9bafa1506a43
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-3-ref.xhtml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for absolutely positioned flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        position: absolute;
+        border: 1px solid black;
+      }
+      div.a {
+        width: 80px;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 120px;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"><div class="a"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-3.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-3.xhtml
new file mode 100644
index 000000000000..d2603b541824
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-3.xhtml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with absolutely positioned flex container.
+     This positioning is with respect to the containing block's left edge.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+        position: absolute;
+        border: 1px solid black;
+      }
+      div.a {
+        -moz-flex: 1 0 30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 20px;
+        height: 100px;
+        background: yellow;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"><div class="a"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-4-ref.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-4-ref.xhtml
new file mode 100644
index 000000000000..4c675fa8eecb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-4-ref.xhtml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for absolutely positioned flex container & children. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .abspos {
+        position: absolute;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        position: absolute;
+        border: 1px solid black;
+      }
+      div.a {
+        width: 30px;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 100%;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"
+           ><div class="a abspos"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-absolute-4.xhtml b/layout/reftests/flexbox/flexbox-position-absolute-4.xhtml
new file mode 100644
index 000000000000..f3445597ab15
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-absolute-4.xhtml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with absolutely positioned flex container & children.
+     The children's positioning is with respect to the flex container.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .abspos {
+        position: absolute;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+        position: absolute;
+        border: 1px solid black;
+      }
+      div.a {
+        -moz-flex: 1 0 auto;
+        width:  30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 20px;
+        height: 100px;
+        background: yellow;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"><div class="a abspos"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-1-ref.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-1-ref.xhtml
new file mode 100644
index 000000000000..27e8438b321e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-1-ref.xhtml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for fixed-position children of a flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .fixedpos {
+        position: fixed;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+      }
+      div.a {
+        width: 100%;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 100%;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+      div.inflex {
+        width: 20px;
+        height: 100px;
+        background: gray;
+        display: inline-block;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a fixedpos" style="width: 30px"/><div class="b"/></div>
+      <!-- Second child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="b fixedpos" style="width: 20px"/></div>
+      <!-- Middle child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a" style="width: 80px"
+          /><div class="inflex fixedpos"
+          /><div class="b" style="width: 120px"/></div>
+      <!-- Third child fixedpos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox"
+           ><div class="inflex" style="margin-left: 12px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="noFlexFn fixedpos"
+          /><div class="inflex" style="margin-left: 48px"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-1.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-1.xhtml
new file mode 100644
index 000000000000..c7514e209e72
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-1.xhtml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with fixed-position children of a flex container.
+     The positioning is with respect to the containing block's left edge.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .fixedpos {
+        position: fixed;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 auto;
+        width: 30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 auto;
+        width: 20px;
+        height: 100px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: none;
+        width: 20px;
+        height: 100px;
+        background: gray;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child fixedpos: -->
+      <div class="flexbox"><div class="a fixedpos"/><div class="b"/></div>
+      <!-- Second child fixedpos: -->
+      <div class="flexbox"><div class="a"/><div class="b fixedpos"/></div>
+      <!-- Middle child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="inflex fixedpos"/><div class="b"/></div>
+      <!-- Third child fixedpos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox" style="-moz-justify-content: space-around"
+           ><div class="inflex"/><div class="inflex"/><div class="inflex"
+          /><div class="noFlexFn fixedpos"/><div class="inflex"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-2-ref.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-2-ref.xhtml
new file mode 100644
index 000000000000..5dbeeeeb52ea
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-2-ref.xhtml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for fixed-position children of a flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .fixedpos {
+        position: fixed;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+      }
+      div.a {
+        width: 100%;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 100%;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+      div.inflex {
+        width: 20px;
+        height: 100px;
+        background: gray;
+        display: inline-block;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a fixedpos" style="width: 30px"/><div class="b"/></div>
+      <!-- Second child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="b fixedpos" style="width: 20px"/></div>
+      <!-- Middle child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a" style="width: 80px"
+          /><div class="inflex fixedpos"
+          /><div class="b" style="width: 120px"/></div>
+      <!-- Third child fixedpos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox"
+           ><div class="inflex" style="margin-left: 12px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="inflex" style="margin-left: 24px"
+          /><div class="noFlexFn fixedpos" style="margin-left: 24px"
+          /><div class="inflex" style="margin-left: 48px"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-2.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-2.xhtml
new file mode 100644
index 000000000000..e6bae3ad5895
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-2.xhtml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with fixed-position children of a flex container.
+     In this testcase, we simply specify "position: fixed" without
+     actually doing any positioning, to test the "static position" of these
+     children.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .fixedpos {
+        position: fixed;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+      }
+      div.a {
+        -moz-flex: 1 0 auto;
+        width: 30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 auto;
+        width: 20px;
+        height: 100px;
+        background: yellow;
+      }
+      div.inflex {
+        -moz-flex: none;
+        width: 20px;
+        height: 100px;
+        background: gray;
+      }
+      div.noFlexFn {
+        width: 15px;
+        height: 15px;
+        background: teal;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <!-- First child fixedpos: -->
+      <div class="flexbox"><div class="a fixedpos"/><div class="b"/></div>
+      <!-- Second child fixedpos: -->
+      <div class="flexbox"><div class="a"/><div class="b fixedpos"/></div>
+      <!-- Middle child fixedpos: -->
+      <div class="flexbox"
+           ><div class="a"/><div class="inflex fixedpos"/><div class="b"/></div>
+      <!-- Third child fixedpos, w/ inflexible items & justify-content: space-around: -->
+      <div class="flexbox" style="-moz-justify-content: space-around"
+           ><div class="inflex"/><div class="inflex"/><div class="inflex"
+          /><div class="noFlexFn fixedpos"/><div class="inflex"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-3-ref.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-3-ref.xhtml
new file mode 100644
index 000000000000..d0a086d60ddb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-3-ref.xhtml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for fixed-position flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        position: fixed;
+        border: 1px solid black;
+      }
+      div.a {
+        width: 80px;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 120px;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"><div class="a"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-3.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-3.xhtml
new file mode 100644
index 000000000000..c4c6847d05e7
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-3.xhtml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with fixed-position flex container.
+     This positioning is with respect to the viewport.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+        position: fixed;
+        border: 1px solid black;
+      }
+      div.a {
+        -moz-flex: 1 0 30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 20px;
+        height: 100px;
+        background: yellow;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"><div class="a"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-4-ref.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-4-ref.xhtml
new file mode 100644
index 000000000000..877832665593
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-4-ref.xhtml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for fixed-position flex container & children. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .fixedpos {
+        position: fixed;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        position: fixed;
+        border: 2px dashed teal;
+      }
+      div.a {
+        width: 30px;
+        height: 100px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 100%;
+        height: 100px;
+        background: yellow;
+        display: inline-block;
+        vertical-align: top;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"
+           ><div class="a fixedpos"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-position-fixed-4.xhtml b/layout/reftests/flexbox/flexbox-position-fixed-4.xhtml
new file mode 100644
index 000000000000..8a1e8d7c3137
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-position-fixed-4.xhtml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with fixed-position flex container & children.
+     All positioning is with respect to the viewport.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.containingBlock {
+        top: 15px;
+        left: 20px;
+        height: 400px;
+        position: absolute;
+        border: 2px dashed purple;
+      }
+      .fixedpos {
+        position: fixed;
+        left: 5px;
+        border: 2px dotted black;
+      }
+      div.flexbox {
+        top: 30px;
+        left: 40px;
+        width: 200px;
+        height: 100px;
+        display: -moz-flex;
+        position: fixed;
+        border: 2px dashed teal;
+      }
+      div.a {
+        -moz-flex: 1 0 auto;
+        width:  30px;
+        height: 100px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 2 0 20px;
+        height: 100px;
+        background: yellow;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="containingBlock">
+      <div class="flexbox"><div class="a fixedpos"/><div class="b"/></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-resizeviewport-1-helper.html b/layout/reftests/flexbox/flexbox-resizeviewport-1-helper.html
new file mode 100644
index 000000000000..7f038ed40f00
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-resizeviewport-1-helper.html
@@ -0,0 +1,31 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Helper-file for reftest flexbox-resizeviewport-1.xhtml
+     I'm intentionally using quirks-mode (no doctype), so that
+     a 100% height will work. -->
+<html>
+  <head>
+    <style>
+      div.flexbox {
+        display: -moz-flex;
+        height: 100%;
+        border: 2px dashed black;
+      }
+      div.a {
+        -moz-flex: 1;
+        background: pink;
+      }
+      div.b {
+        -moz-flex: 1;
+        background: teal;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a"></div><div class="b"></div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-resizeviewport-1-ref.xhtml b/layout/reftests/flexbox/flexbox-resizeviewport-1-ref.xhtml
new file mode 100644
index 000000000000..791d3a89f3d8
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-resizeviewport-1-ref.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      iframe {
+        width:  75px;
+        height: 75px;
+      }
+    </style>
+  </head>
+  <body onload="tweak()">
+    <iframe src="flexbox-resizeviewport-1-helper.html" style="width: 50px"/>
+    <iframe src="flexbox-resizeviewport-1-helper.html" style="width: 125px"/>
+    <br/>
+    <iframe src="flexbox-resizeviewport-1-helper.html" style="height: 50px"/>
+    <iframe src="flexbox-resizeviewport-1-helper.html" style="height: 125px"/>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-resizeviewport-1.xhtml b/layout/reftests/flexbox/flexbox-resizeviewport-1.xhtml
new file mode 100644
index 000000000000..2875e8ee3b1f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-resizeviewport-1.xhtml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase to be sure a flex container gets reflowed properly when its
+     iframe changes size. -->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      class="reftest-wait">
+  <head>
+    <style>
+      iframe {
+        width:  75px;
+        height: 75px;
+      }
+    </style>
+    <script>
+      function setElementPropertyTo(id, propertyName, propertyValue) {
+        var elem = document.getElementById(id);
+        elem.style[propertyName] = propertyValue;
+      }
+
+      function tweak() {
+        setElementPropertyTo("a", "width", "50px");
+        setElementPropertyTo("b", "width", "125px");
+        setElementPropertyTo("c", "height", "50px");
+        setElementPropertyTo("d", "height", "125px");
+        document.documentElement.removeAttribute("class");
+      }
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </head>
+  <body>
+    <iframe id="a" src="flexbox-resizeviewport-1-helper.html"/>
+    <iframe id="b" src="flexbox-resizeviewport-1-helper.html"/>
+    <br/>
+    <iframe id="c" src="flexbox-resizeviewport-1-helper.html"/>
+    <iframe id="d" src="flexbox-resizeviewport-1-helper.html"/>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-sizing-horiz-1-ref.xhtml b/layout/reftests/flexbox/flexbox-sizing-horiz-1-ref.xhtml
new file mode 100644
index 000000000000..d82e0a042593
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-sizing-horiz-1-ref.xhtml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 10px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        font-size: 10px;
+        -moz-flex-direction: column;
+        margin-bottom: 2px;
+      }
+      div.a, div.b, div.c { float: left }
+      div.a {
+        width: 20px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 40px;
+        background: purple;
+      }
+      div.c {
+        width: 40px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a" style="width: 60px"/>
+      <div class="b" style="width: 60px"/>
+      <div class="c" style="width: 60px"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a" style="width: 60px"/>
+      <div class="b" style="width: 60px"/>
+      <div class="c" style="width: 60px"/>
+    </div>
+
+    <div class="flexbox" style="width: 300px">
+      <div class="a" style="width: 60px"/>
+      <div class="b" style="width: 60px"/>
+      <div class="c" style="width: 60px"/>
+    </div>
+
+    <div class="flexbox" style="width: 70px">
+      <div class="a" style="width: 10px"/>
+      <div class="b"/>
+      <div class="c" style="width: 20px"/>
+    </div>
+
+    <div class="flexbox" style="width: 20px">
+      <div class="b"/>
+    </div>
+
+    <div class="flexbox" style="width: 58px">
+      <div class="a" style="width: 6px"/>
+      <div class="b"/>
+      <div class="c" style="width: 12px"/>
+    </div>
+
+    <div class="flexbox" style="width: 140px">
+      <div class="a" style="width: 40px"/>
+      <div class="b" style="width: 40px"/>
+      <div class="c" style="width: 60px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-sizing-horiz-1.xhtml b/layout/reftests/flexbox/flexbox-sizing-horiz-1.xhtml
new file mode 100644
index 000000000000..574951675b75
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-sizing-horiz-1.xhtml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This testcase checks how "min-width" and "max-width" affect the sizing
+     of horizontal flex containers that have no explicit "width" property.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 10px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        font-size: 10px;
+        display: -moz-flex;
+        margin-bottom: 2px;
+      }
+      div.a {
+        -moz-flex: 1 20px;
+        max-width: 60px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 1 20px;
+        min-width: 40px;
+        max-width: 60px;
+        background: purple;
+      }
+      div.c {
+        -moz-flex: 1 40px;
+        max-width: 10px;
+        max-width: 60px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- auto-sized horizontal flexbox should occupy the available width. -->
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- Adding a small min-size shouldn't affect that. -->
+    <div class="flexbox" style="min-width: 10px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- ...but a (large) max-size will limit us to that size, instead of
+         our available size.-->
+    <div class="flexbox" style="max-width: 300px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- If we set a maximum size that's even smaller, it'll limit our
+         size and compress our children. -->
+    <div class="flexbox" style="max-width: 70px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- The max-size may be small enough that our items will overflow. -->
+    <div class="flexbox" style="max-width: 20px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- But if we add a min-size, it beats the max-size. Here, we use a
+         min-size smaller than the sum of the items' base sizes... -->
+    <div class="flexbox" style="min-width: 58px; max-width: 20px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- ...and here we use a min-size larger than the sum of the items'
+         base sizes. -->
+    <div class="flexbox" style="min-width: 140px; max-width: 20px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-sizing-vert-1-ref.xhtml b/layout/reftests/flexbox/flexbox-sizing-vert-1-ref.xhtml
new file mode 100644
index 000000000000..08738efbbca9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-sizing-vert-1-ref.xhtml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { width: 10px; }
+      div.flexbox {
+        float: left;
+        border: 1px dashed blue;
+        font-size: 10px;
+        -moz-flex-direction: column;
+        margin-right: 2px;
+      }
+      div.a {
+        height: 20px;
+        background: lightgreen;
+      }
+      div.b {
+        height: 40px;
+        background: purple;
+      }
+      div.c {
+        height: 40px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a" style="height: 30px"/>
+      <div class="b"/>
+      <div class="c" style="height: 50px"/>
+    </div>
+
+    <div class="flexbox" style="height: 200px">
+      <div class="a" style="height: 60px"/>
+      <div class="b" style="height: 60px"/>
+      <div class="c" style="height: 60px"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a" style="height: 10px"/>
+      <div class="b"/>
+      <div class="c" style="height: 20px"/>
+    </div>
+
+    <div class="flexbox" style="height: 20px">
+      <div class="b"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a" style="height: 6px"/>
+      <div class="b"/>
+      <div class="c" style="height: 12px"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a" style="height: 40px"/>
+      <div class="b" style="height: 40px"/>
+      <div class="c" style="height: 60px"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-sizing-vert-1.xhtml b/layout/reftests/flexbox/flexbox-sizing-vert-1.xhtml
new file mode 100644
index 000000000000..3d4e91cb9f02
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-sizing-vert-1.xhtml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This testcase checks how "min-height" and "max-height" affect the sizing
+     of vertical flex containers that have no explicit "height" property.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { width: 10px; }
+      div.flexbox {
+        float: left;
+        border: 1px dashed blue;
+        font-size: 10px;
+        display: -moz-flex;
+        -moz-flex-direction: column;
+        margin-right: 2px;
+      }
+      div.a {
+        -moz-flex: 1 20px;
+        max-height: 60px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: 1 20px;
+        min-height: 40px;
+        max-height: 60px;
+        background: purple;
+      }
+      div.c {
+        -moz-flex: 1 40px;
+        max-height: 10px;
+        max-height: 60px;
+        background: orange;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- auto-sized flexbox should shrinkwrap its flex items' hypothetical
+         main sizes (their flex base sizes, clamped to min/max range) -->
+    <div class="flexbox">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- Adding a small min-size shouldn't affect that. -->
+    <div class="flexbox" style="min-height: 10px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- ...nor should a large max-size. -->
+    <div class="flexbox" style="max-height: 300px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- OK. Now, if we set a minimum size that's larger than the shrinkwrap
+         size, we should jump up to that size.-->
+    <div class="flexbox" style="min-height: 120px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- ...even if it's large enough that our items won't occupy all the
+         space. -->
+    <div class="flexbox" style="min-height: 200px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- If we set a maximum size that's smaller than the shrinkwrap size,
+         we should max out at that size.-->
+    <div class="flexbox" style="max-height: 70px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- The max-size may be small enough that our items will overflow. -->
+    <div class="flexbox" style="max-height: 20px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- But if we add a min-size, it beats the max-size. Here, we use a
+         min-size smaller than the sum of the items' base sizes... -->
+    <div class="flexbox" style="min-height: 58px; max-height: 20px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+    <!-- ...and here we use a min-size larger than the sum of the items'
+         base sizes. -->
+    <div class="flexbox" style="min-height: 140px; max-height: 20px">
+      <div class="a"/><div class="b"/><div class="c"/>
+    </div>
+
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-table-fixup-1-ref.xhtml b/layout/reftests/flexbox/flexbox-table-fixup-1-ref.xhtml
new file mode 100644
index 000000000000..4f8f46b7a7f9
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-table-fixup-1-ref.xhtml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Reference case for table-fixup on table parts inside of a
+     flex container. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 1px dashed blue;
+      }
+
+      <!-- NOTE: table-fixup pads each td element by 1px on each side. We
+           override that for top & bottom, for simplicity. So the td makes us
+           generate a box that's 2px wider than its contents. -->
+      td {
+        padding-top: 0px;
+        padding-bottom: 0px;
+      }
+
+      .a {
+        background: lightgreen;
+        width: 48px;
+      }
+
+      .b {
+        background: yellow;
+        width: 48px;
+      }
+
+      .c {
+        background: pink;
+        width: 48px;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- Just 2 adjacent table cells (they end up in the same table) -->
+    <div class="flexbox" style="padding-left: 50px; width: 150px"
+         ><td class="a">cell1</td
+         ><td class="b">cell2</td
+    ></div>
+
+    <!-- Table cell followed by tbody (they end up in the same table) -->
+    <div class="flexbox" style="padding-left: 75px; width: 125px"
+         ><td class="a">cell1</td
+         ><tbody class="b">t</tbody
+    ></div>
+
+    <!-- Empty table cell (ends up occupying 2px of width), followed by div,
+         followed by nonempty table cell. (3 flex items). -->
+    <div class="flexbox" style="padding-left: 52px; width: 148px"
+         ><div style="display: inline-block;"  class="c">div</div
+         ><div style="display: inline-table; margin-left: 50px"><td class="b">cell1</td></div
+    ></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-table-fixup-1a.xhtml b/layout/reftests/flexbox/flexbox-table-fixup-1a.xhtml
new file mode 100644
index 000000000000..a9eeed03daeb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-table-fixup-1a.xhtml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with table parts inside of a flex container, triggering
+     table-fixup.  We use -moz-justify-content:space-between to stick packing
+     space between flex items, so that we can verify that e.g. a contiguous
+     run of <td>s will end up in the same flex item (wrapped in a table).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+      }
+
+      <!-- NOTE: table-fixup pads each td element by 1px on each side. We
+           override that for top & bottom, for simplicity. So the td makes us
+           generate a box that's 2px wider than its contents. -->
+      td {
+        padding-top: 0px;
+        padding-bottom: 0px;
+      }
+
+      .a {
+        background: lightgreen;
+        width: 48px;
+      }
+
+      .b {
+        background: yellow;
+        width: 48px;
+      }
+
+      .c {
+        background: pink;
+        width: 48px;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- Just 2 adjacent table cells (they end up in the same table) -->
+    <div class="flexbox"
+         ><td class="a">cell1</td><td class="b">cell2</td></div>
+
+    <!-- Table cell followed by tbody (they end up in the same table) -->
+    <div class="flexbox"
+         ><td class="a">cell1</td><tbody class="b">t</tbody></div>
+
+    <!-- Empty table cell (ends up occupying 2px of width), followed by div,
+         followed by nonempty table cell. (3 flex items). -->
+    <!-- Note: We use "space-between" (instead of "space-around") here because
+         it makes the math cleaner. (100px split 2 ways instead of 3 ways.) -->
+    <div class="flexbox" style="-moz-justify-content: space-between"
+         ><td></td><div class="c">div</div><td class="b">cell1</td></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-table-fixup-1b.xhtml b/layout/reftests/flexbox/flexbox-table-fixup-1b.xhtml
new file mode 100644
index 000000000000..a574e4e7735a
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-table-fixup-1b.xhtml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Testcase with table parts inside of a flex container, triggering
+     table-fixup.  We use -moz-justify-content:space-between to stick packing
+     space between flex items, so that we can verify that e.g. a contiguous
+     run of <td>s will end up in the same flex item (wrapped in a table).
+
+     In this variant of the test, we also assign '-moz-flex' values to the
+     table parts - these values should have no effect, since these children
+     don't themselves form flex items.  The -moz-flex property _is_ honored on
+     the <div class="c">, though, because _its_ box _is_ a direct child of a
+     flexbox, so it _is_ a flex item.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+      }
+
+      <!-- NOTE: table-fixup pads each td element by 1px on each side. We
+           override that for top & bottom, for simplicity. So the td makes us
+           generate a box that's 2px wider than its contents. -->
+      td {
+        padding-top: 0px;
+        padding-bottom: 0px;
+      }
+
+      .a {
+        background: lightgreen;
+        width: 48px;
+        -moz-flex: 5 3 100px;
+      }
+
+      .b {
+        background: yellow;
+        width: 48px;
+        -moz-flex: 1 2 3px;
+      }
+
+      .c {
+        background: pink;
+        -moz-flex: 0 0 48px;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- Just 2 adjacent table cells (they end up in the same table) -->
+    <div class="flexbox"
+         ><td class="a">cell1</td><td class="b">cell2</td></div>
+
+    <!-- Table cell followed by tbody (they end up in the same table) -->
+    <div class="flexbox"
+         ><td class="a">cell1</td><tbody class="b">t</tbody></div>
+
+    <!-- Empty table cell (ends up occupying 2px of width), followed by div,
+         followed by nonempty table cell. (3 flex items). -->
+    <!-- Note: We use "space-between" (instead of "space-around") here because
+         it makes the math cleaner. (100px split 2 ways instead of 3 ways.) -->
+    <div class="flexbox" style="-moz-justify-content: space-between"
+         ><td></td><div class="c">div</div><td class="b">cell1</td></div>
+  </body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-1-ref.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-1-ref.xhtml
new file mode 100644
index 000000000000..15c7941bae3c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-1-ref.xhtml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     Reference case, with inline-blocks instead of flexbox/flex items,
+     with positioning done using margins.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+      }
+      div.a {
+        width: 30px;
+        background: lightgreen;
+        display: inline-block;
+      }
+      div.b {
+        width: 20px;
+        background: lightblue;
+        display: inline-block;
+      }
+      img {
+        width: 40px;
+        height: 100%;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">
+      <div class="a" style="margin-left: 85px"/>
+    </div>
+
+    <div class="flexbox">
+      <div class="a" style="margin-left: 37.5px"
+           /><div class="b" style="margin-left: 75px"/>
+    </div>
+
+    <div class="flexbox">
+      <img src="solidblue.png" style="margin-left: 30px"
+           /><img src="solidblue.png" style="margin-left: 60px"/>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-1a.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-1a.xhtml
new file mode 100644
index 000000000000..5e3759aca827
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-1a.xhtml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we don't create anonymous flex items around
+     runs of inline content that are _purely_ whitespace.
+
+     The test uses "white-space: pre", to try to tempt us into honoring
+     that whitespace. (but we should resist that temptation).
+
+     The test also uses '-moz-justify-content: space-around' to be sure we can
+     tell whether anonymous flex items are being created around the whitespace
+     (since they'd claim a share of the packing space if they were there).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        white-space: pre;
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+      }
+      div.a {
+        -moz-flex: none;
+        width: 30px;
+        background: lightgreen;
+      }
+      div.b {
+        -moz-flex: none;
+        width: 20px;
+        background: lightblue;
+      }
+      img { width: 40px; }
+    </style>
+  </head>
+  <body>
+    <!-- whitespace & tab after flex item -->
+    <div class="flexbox"><div class="a"/> 	</div>
+
+    <!-- 2 spaces before flex item -->
+    <div class="flexbox">  <div class="a"/><div class="b"/></div>
+
+    <!-- newline & whitespace between flex items  -->
+    <div class="flexbox"><img src="solidblue.png"/>
+      <img src="solidblue.png"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-1b.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-1b.xhtml
new file mode 100644
index 000000000000..8f407aed8c14
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-1b.xhtml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test is like the -1a variant, but with the whitespace removed between
+     flex items (since that whitespace should be ignored anyway, if we're
+     doing things right).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+      }
+      div.a {
+        width: 30px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        background: lightblue;
+      }
+      img { width: 40px; }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox"><div class="a"/></div>
+
+    <div class="flexbox"><div class="a"/><div class="b"/></div>
+
+    <div class="flexbox"
+      ><img src="solidblue.png"
+     /><img src="solidblue.png"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-2-ref.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-2-ref.xhtml
new file mode 100644
index 000000000000..2380e41fcc2f
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-2-ref.xhtml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is the same as the testcase, but with an explicit <div>
+     around each run of content that we expect to turn into an anonymous
+     flex item (to ensure that the whitespace is included).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        white-space: pre;
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+      }
+      div.a {
+        width: 30px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        background: lightblue;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- spaces around inline content at the beginning of flexbox -->
+    <div class="flexbox"><div>  abc</div><div class="a"/></div>
+    <div class="flexbox"><div>abc   </div><div class="a"/></div>
+    <div class="flexbox"><div>  abc   </div><div class="a"/></div>
+
+    <!-- spaces around inline content at the end of flexbox -->
+    <div class="flexbox"><div class="a"/><div>  abc</div></div>
+    <div class="flexbox"><div class="a"/><div>abc   </div></div>
+    <div class="flexbox"><div class="a"/><div>  abc   </div></div>
+
+    <!-- whitespace around inline content in between flex items -->
+    <div class="flexbox"><div class="a"/><div>  abc</div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div>abc   </div><div class="b"/></div>
+    <div class="flexbox"><div class="a"/><div>  abc   </div><div class="b"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-2.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-2.xhtml
new file mode 100644
index 000000000000..d879d37c0024
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-2.xhtml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we preserve whitespace at the beginning & end of
+     anonymous flex items (using "white-space: pre" so that it actually
+     occupies space and affects the rendering).
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div { height: 100px; }
+      div.flexbox {
+        white-space: pre;
+        border: 1px dashed blue;
+        width: 200px;
+        display: -moz-flex;
+        -moz-justify-content: space-around;
+      }
+      div.a {
+        width: 30px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        background: lightblue;
+      }
+    </style>
+  </head>
+  <body>
+    <!-- spaces around inline content at the beginning of flexbox -->
+    <div class="flexbox">  abc<div class="a"/></div>
+    <div class="flexbox">abc   <div class="a"/></div>
+    <div class="flexbox">  abc   <div class="a"/></div>
+
+    <!-- spaces around inline content at the end of flexbox -->
+    <div class="flexbox"><div class="a"/>  abc</div>
+    <div class="flexbox"><div class="a"/>abc   </div>
+    <div class="flexbox"><div class="a"/>  abc   </div>
+
+    <!-- whitespace around inline content in between flex items -->
+    <div class="flexbox"><div class="a"/>  abc<div class="b"/></div>
+    <div class="flexbox"><div class="a"/>abc   <div class="b"/></div>
+    <div class="flexbox"><div class="a"/>  abc   <div class="b"/></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-3-ref.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-3-ref.xhtml
new file mode 100644
index 000000000000..66cbe9787bdb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-3-ref.xhtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This reference case is like its testcase, but with all of the <span>
+     wrappers removed, since (if we're doing things right) they shouldn't
+     affect our rendering.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div.flexbox {
+        border: 1px dashed blue;
+        display: -moz-flex;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc def</div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-whitespace-handling-3.xhtml b/layout/reftests/flexbox/flexbox-whitespace-handling-3.xhtml
new file mode 100644
index 000000000000..11d5e8065013
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-whitespace-handling-3.xhtml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This test verifies that we don't drop whitespace between consecutive
+     inline boxes inside of an anonymous flex item. In other words, it
+     verifies that "<span>abc</span> <span>def</span>" renders like "abc def",
+     and more variants on that theme.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="stylesheet" type="text/css" href="ahem.css" />
+    <style>
+      div.flexbox {
+        border: 1px dashed blue;
+        display: -moz-flex;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc <span>def</span></div>
+    <div class="flexbox"><span>abc</span> def</div>
+    <div class="flexbox"><span>abc</span> <span>def</span></div>
+
+    <!-- ...and now with whitespace just inside the <span> elements, for extra
+         fun. (Shouldn't be visible.) -->
+    <div class="flexbox">abc def</div>
+    <div class="flexbox">abc <span>  def  </span></div>
+    <div class="flexbox"><span> abc </span> def</div>
+    <div class="flexbox"><span> abc </span> <span> def </span></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-1-ref.html b/layout/reftests/flexbox/flexbox-widget-flex-items-1-ref.html
new file mode 100644
index 000000000000..da38ef95331c
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-1-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      border: 2px dotted lightgray;
+      width: 400px;
+      height: 30px;
+      margin-bottom: 10px;
+    }
+    div.flexbox > * {
+      width: -moz-available;
+      outline: 1px dashed black;
+      margin: 0;
+      vertical-align: top;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <div class="flexbox"><input type="file"></div>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="password"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+  <div class="flexbox"><input type="text"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-1.html b/layout/reftests/flexbox/flexbox-widget-flex-items-1.html
new file mode 100644
index 000000000000..64e1ec1c8cb7
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-1.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+    This testcase checks that flex containers honor those widgets (if any) in
+    our system theme that have only a single valid size (and hence should
+    refuse to flex).
+
+    e.g. in Gecko with a GTK theme, checkboxes and radio buttons have a single
+    valid size, and any specified widths (and min/max-widths) will have no
+    effect on their rendering (regardless of whether they're in a flex
+    container).
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      display: -moz-flex;
+      -moz-align-items: flex-start;
+      border: 2px dotted lightgray;
+      width: 400px;
+      height: 30px;
+      margin-bottom: 10px;
+    }
+    div.flexbox > * {
+      -moz-flex: 1;
+      outline: 1px dashed black;
+      margin: 0;
+      vertical-align: top;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <div class="flexbox"><input type="file"></div>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="password"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+  <div class="flexbox"><input type="text"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-2-ref.html b/layout/reftests/flexbox/flexbox-widget-flex-items-2-ref.html
new file mode 100644
index 000000000000..8a2bd8372ec7
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-2-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      background: lightgray;
+      width: 400px;
+      height: 30px;
+      margin-bottom: 10px;
+    }
+    div.flexbox > * {
+      min-width: 350px;
+      outline: 1px dashed black;
+      margin: 0;
+      vertical-align: top;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <div class="flexbox"><input type="file"></div>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="password"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+  <div class="flexbox"><input type="text"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-2.html b/layout/reftests/flexbox/flexbox-widget-flex-items-2.html
new file mode 100644
index 000000000000..b1a1c60e64fa
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-2.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+    This testcase checks that, for any widgets that have a single valid size
+    (and hence refuse to flex), we don't honor the "min-width" property
+    when running the flex algorithm, just as we don't honor it outside
+    of flexbox contexts.
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      display: -moz-flex;
+      -moz-align-items: flex-start;
+      background: lightgray;
+      width: 400px;
+      height: 30px;
+      margin-bottom: 10px;
+    }
+    div.flexbox > * {
+      min-width: 350px;
+      outline: 1px dashed black;
+      margin: 0;
+      vertical-align: top;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <div class="flexbox"><input type="file"></div>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="password"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+  <div class="flexbox"><input type="text"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-3-ref.html b/layout/reftests/flexbox/flexbox-widget-flex-items-3-ref.html
new file mode 100644
index 000000000000..afc037801443
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-3-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      background: lightgray;
+      width: 400px;
+      height: 30px;
+      margin-bottom: 10px;
+    }
+    div.flexbox > * {
+      max-width: 3px;
+      outline: 1px dashed black;
+      margin: 0;
+      vertical-align: top;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <div class="flexbox"><input type="file"></div>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="password"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+  <div class="flexbox"><input type="text"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-3.html b/layout/reftests/flexbox/flexbox-widget-flex-items-3.html
new file mode 100644
index 000000000000..218ca297a6ee
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-3.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+    This testcase checks that, for any widgets that have a single valid size
+    (and hence refuse to flex), we don't honor the "max-width" property
+    when running the flex algorithm, just as we don't honor it outside
+    of flexbox contexts.
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      display: -moz-flex;
+      -moz-align-items: flex-start;
+      background: lightgray;
+      width: 400px;
+      height: 30px;
+      margin-bottom: 10px;
+    }
+    div.flexbox > * {
+      max-width: 3px;
+      min-width: 0; /* to override default 'min-width:auto' */
+      outline: 1px dashed black;
+      margin: 0;
+      vertical-align: top;
+    }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <div class="flexbox"><input type="file"></div>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="password"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+  <div class="flexbox"><input type="text"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-4-ref.html b/layout/reftests/flexbox/flexbox-widget-flex-items-4-ref.html
new file mode 100644
index 000000000000..b9b215b56f8e
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-4-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      background: lightgray;
+      width: -moz-max-content;
+      float: left;
+      height: 60px;
+      margin-right: 10px;
+    }
+    div.flexbox > * {
+      outline: 1px dashed black;
+      margin: 0;
+      -moz-align-self: stretch;
+      vertical-align: top;
+      height: 100%;
+    }
+    br { clear: left; }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <br>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <br>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-widget-flex-items-4.html b/layout/reftests/flexbox/flexbox-widget-flex-items-4.html
new file mode 100644
index 000000000000..299c4338daed
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-widget-flex-items-4.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+    This testcase checks that, for any widgets that have a single valid size
+    (and hence refuse to flex), we don't stretch them in the cross-axis,
+    despite the "align-self: stretch" property.
+-->
+<html>
+<head>
+  <style>
+    div.flexbox {
+      display: -moz-flex;
+      background: lightgray;
+      width: -moz-max-content;
+      float: left;
+      height: 60px;
+      margin-right: 10px;
+    }
+    div.flexbox > * {
+      outline: 1px dashed black;
+      margin: 0;
+      -moz-align-self: stretch;
+      vertical-align: top;
+      height: auto;
+    }
+    br { clear: left; }
+  </style>
+</head>
+<body>
+  <div class="flexbox"><input type="button"></div>
+  <div class="flexbox"><input type="checkbox"></div>
+  <br>
+  <div class="flexbox"><input type="image"></div>
+  <div class="flexbox"><input type="radio"></div>
+  <br>
+  <div class="flexbox"><input type="reset"></div>
+  <div class="flexbox"><input type="submit"></div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/reftest.list b/layout/reftests/flexbox/reftest.list
new file mode 100644
index 000000000000..acfafb2705bf
--- /dev/null
+++ b/layout/reftests/flexbox/reftest.list
@@ -0,0 +1,162 @@
+# Tests for cross-axis alignment (align-self / align-items properties)
+== flexbox-align-self-baseline-horiz-1.xhtml  flexbox-align-self-baseline-horiz-1-ref.xhtml
+fails == flexbox-align-self-baseline-horiz-2.xhtml  flexbox-align-self-baseline-horiz-2-ref.xhtml # bug 793456, and possibly others
+# This one fails on windows R (but not Ru, strangely). On Windows R, the
+# single-line <label> flex item has a different background size in test vs. ref
+random-if(winWidget) == flexbox-align-self-baseline-horiz-3.xhtml  flexbox-align-self-baseline-horiz-3-ref.xhtml # XXXdholbert investigate
+== flexbox-align-self-horiz-1.xhtml  flexbox-align-self-horiz-1-ref.xhtml
+== flexbox-align-self-horiz-2.xhtml  flexbox-align-self-horiz-2-ref.xhtml
+== flexbox-align-self-horiz-3.xhtml  flexbox-align-self-horiz-3-ref.xhtml
+== flexbox-align-self-horiz-4.xhtml  flexbox-align-self-horiz-4-ref.xhtml
+== flexbox-align-self-horiz-5.xhtml  flexbox-align-self-horiz-5-ref.xhtml
+== flexbox-align-self-vert-1.xhtml  flexbox-align-self-vert-1-ref.xhtml
+== flexbox-align-self-vert-2.xhtml  flexbox-align-self-vert-2-ref.xhtml
+== flexbox-align-self-vert-3.xhtml  flexbox-align-self-vert-3-ref.xhtml
+== flexbox-align-self-vert-4.xhtml  flexbox-align-self-vert-4-ref.xhtml
+== flexbox-align-self-vert-rtl-1.xhtml  flexbox-align-self-vert-rtl-1-ref.xhtml
+== flexbox-align-self-vert-rtl-2.xhtml  flexbox-align-self-vert-rtl-2-ref.xhtml
+== flexbox-align-self-vert-rtl-3.xhtml  flexbox-align-self-vert-rtl-3-ref.xhtml
+== flexbox-align-self-vert-rtl-4.xhtml  flexbox-align-self-vert-rtl-4-ref.xhtml
+
+# Basic tests with with blocks as flex items
+== flexbox-basic-block-horiz-1.xhtml flexbox-basic-block-horiz-1-ref.xhtml
+== flexbox-basic-block-vert-1.xhtml flexbox-basic-block-vert-1-ref.xhtml
+
+# Tests for basic handling of <canvas>/<img>/etc as a flex item
+== flexbox-basic-canvas-horiz-1.xhtml   flexbox-basic-canvas-horiz-1-ref.xhtml
+== flexbox-basic-canvas-horiz-2.xhtml   flexbox-basic-canvas-horiz-2-ref.xhtml
+== flexbox-basic-canvas-vert-1.xhtml    flexbox-basic-canvas-vert-1-ref.xhtml
+fails == flexbox-basic-canvas-vert-2.xhtml flexbox-basic-canvas-vert-2-ref.xhtml # bug 794660
+== flexbox-basic-fieldset-horiz-1.xhtml flexbox-basic-fieldset-horiz-1-ref.xhtml
+== flexbox-basic-fieldset-horiz-2.xhtml flexbox-basic-fieldset-horiz-2-ref.xhtml
+== flexbox-basic-fieldset-vert-1.xhtml  flexbox-basic-fieldset-vert-1-ref.xhtml
+== flexbox-basic-fieldset-vert-2.xhtml  flexbox-basic-fieldset-vert-2-ref.xhtml
+== flexbox-basic-iframe-horiz-1.xhtml   flexbox-basic-iframe-horiz-1-ref.xhtml
+== flexbox-basic-iframe-horiz-2.xhtml   flexbox-basic-iframe-horiz-2-ref.xhtml
+== flexbox-basic-iframe-vert-1.xhtml    flexbox-basic-iframe-vert-1-ref.xhtml
+== flexbox-basic-iframe-vert-2.xhtml    flexbox-basic-iframe-vert-2-ref.xhtml
+== flexbox-basic-img-horiz-1.xhtml      flexbox-basic-img-horiz-1-ref.xhtml
+== flexbox-basic-img-horiz-2.xhtml      flexbox-basic-img-horiz-2-ref.xhtml
+== flexbox-basic-img-vert-1.xhtml       flexbox-basic-img-vert-1-ref.xhtml
+fails == flexbox-basic-img-vert-2.xhtml flexbox-basic-img-vert-2-ref.xhtml # bug 794660
+== flexbox-basic-textarea-horiz-1.xhtml flexbox-basic-textarea-horiz-1-ref.xhtml
+== flexbox-basic-textarea-horiz-2.xhtml flexbox-basic-textarea-horiz-2-ref.xhtml
+== flexbox-basic-textarea-vert-1.xhtml  flexbox-basic-textarea-vert-1-ref.xhtml
+== flexbox-basic-textarea-vert-2.xhtml  flexbox-basic-textarea-vert-2-ref.xhtml
+== flexbox-basic-video-horiz-1.xhtml    flexbox-basic-video-horiz-1-ref.xhtml
+== flexbox-basic-video-horiz-2.xhtml    flexbox-basic-video-horiz-2-ref.xhtml
+== flexbox-basic-video-vert-1.xhtml     flexbox-basic-video-vert-1-ref.xhtml
+fails == flexbox-basic-video-vert-2.xhtml flexbox-basic-video-vert-2-ref.xhtml # bug 794660
+
+# Tests for dynamic modifications to flexboxes
+# (with existing [div | span | text] inside the flexbox, and new content
+# inserted adjacent to that existing content.)
+== flexbox-dyn-insertAroundDiv-1.xhtml flexbox-dyn-insertAroundDiv-1-ref.xhtml
+== flexbox-dyn-insertAroundDiv-2.xhtml flexbox-dyn-insertAroundDiv-2-ref.xhtml
+fails-if(Android) == flexbox-dyn-insertAroundDiv-3.xhtml flexbox-dyn-insertAroundDiv-3-ref.xhtml
+
+== flexbox-dyn-insertAroundSpan-1.xhtml flexbox-dyn-insertAroundText-1-ref.xhtml
+== flexbox-dyn-insertAroundSpan-2.xhtml flexbox-dyn-insertAroundText-2-ref.xhtml
+fails-if(Android) == flexbox-dyn-insertAroundSpan-3.xhtml flexbox-dyn-insertAroundText-3-ref.xhtml
+
+== flexbox-dyn-insertAroundText-1.xhtml flexbox-dyn-insertAroundText-1-ref.xhtml
+== flexbox-dyn-insertAroundText-2.xhtml flexbox-dyn-insertAroundText-2-ref.xhtml
+fails-if(Android) == flexbox-dyn-insertAroundText-3.xhtml flexbox-dyn-insertAroundText-3-ref.xhtml
+
+# Variant of one of the above tests, to regression-test an invalidation issue
+== flexbox-dyn-insertEmptySpan-1.xhtml flexbox-dyn-insertEmptySpan-1-ref.xhtml
+
+# Tests for empty flexboxes (with no flex items)
+== flexbox-empty-1a.xhtml  flexbox-empty-1-ref.xhtml
+== flexbox-empty-1b.xhtml  flexbox-empty-1-ref.xhtml
+
+# Tests for handling of floated elements inside a flexbox
+== flexbox-float-1a.xhtml  flexbox-float-1-ref.xhtml
+== flexbox-float-1b.xhtml  flexbox-float-1-ref.xhtml
+== flexbox-float-1c.xhtml  flexbox-float-1-ref.xhtml
+== flexbox-float-1d.xhtml  flexbox-float-1-ref.xhtml
+== flexbox-float-2a.xhtml  flexbox-float-2-ref.xhtml
+== flexbox-float-2b.xhtml  flexbox-float-2-ref.xhtml
+
+# Tests for (default) "min-width: auto" / "min-height: auto" in flex containers
+== flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml
+== flexbox-minSize-vert-1.xhtml  flexbox-minSize-vert-1-ref.xhtml
+
+# Tests for handling of absolutely/fixed/relatively-positioned flex items.
+== flexbox-position-absolute-1.xhtml  flexbox-position-absolute-1-ref.xhtml
+== flexbox-position-absolute-2.xhtml  flexbox-position-absolute-2-ref.xhtml
+== flexbox-position-absolute-3.xhtml  flexbox-position-absolute-3-ref.xhtml
+== flexbox-position-absolute-4.xhtml  flexbox-position-absolute-4-ref.xhtml
+== flexbox-position-fixed-3.xhtml     flexbox-position-fixed-3-ref.xhtml
+== flexbox-position-fixed-1.xhtml     flexbox-position-fixed-1-ref.xhtml
+== flexbox-position-fixed-2.xhtml     flexbox-position-fixed-2-ref.xhtml
+== flexbox-position-fixed-3.xhtml     flexbox-position-fixed-3-ref.xhtml
+== flexbox-position-fixed-4.xhtml     flexbox-position-fixed-4-ref.xhtml
+
+# Tests for main-axis alignment (jusify-content property)
+== flexbox-justify-content-horiz-1.xhtml flexbox-justify-content-horiz-1-ref.xhtml
+== flexbox-justify-content-horiz-2.xhtml flexbox-justify-content-horiz-2-ref.xhtml
+== flexbox-justify-content-horiz-3.xhtml flexbox-justify-content-horiz-3-ref.xhtml
+== flexbox-justify-content-horiz-4.xhtml flexbox-justify-content-horiz-4-ref.xhtml
+== flexbox-justify-content-horiz-5.xhtml flexbox-justify-content-horiz-5-ref.xhtml
+== flexbox-justify-content-vert-1.xhtml flexbox-justify-content-vert-1-ref.xhtml
+== flexbox-justify-content-vert-2.xhtml flexbox-justify-content-vert-2-ref.xhtml
+== flexbox-justify-content-vert-3.xhtml flexbox-justify-content-vert-3-ref.xhtml
+== flexbox-justify-content-vert-4.xhtml flexbox-justify-content-vert-4-ref.xhtml
+== flexbox-justify-content-vert-5.xhtml flexbox-justify-content-vert-5-ref.xhtml
+
+# Tests for inline content in a flexbox that gets wrapped in an anonymous block
+# XXXdholbert: These will likely need to change once bug 783415 is fixed.
+HTTP(..) == flexbox-inlinecontent-horiz-1a.xhtml flexbox-inlinecontent-horiz-1-ref.xhtml
+HTTP(..) == flexbox-inlinecontent-horiz-1b.xhtml flexbox-inlinecontent-horiz-1-ref.xhtml
+== flexbox-inlinecontent-horiz-2.xhtml  flexbox-inlinecontent-horiz-2-ref.xhtml
+HTTP(..) == flexbox-inlinecontent-horiz-3a.xhtml flexbox-inlinecontent-horiz-3-ref.xhtml
+fails-if(Android) HTTP(..) == flexbox-inlinecontent-horiz-3b.xhtml flexbox-inlinecontent-horiz-3-ref.xhtml
+HTTP(..) == flexbox-inlinecontent-horiz-3c.xhtml flexbox-inlinecontent-horiz-3-ref.xhtml
+== flexbox-inlinecontent-horiz-4.xhtml  flexbox-inlinecontent-horiz-4-ref.xhtml
+== flexbox-inlinecontent-horiz-5.xhtml  flexbox-inlinecontent-horiz-5-ref.xhtml
+== flexbox-inlinecontent-horiz-6.xhtml  flexbox-inlinecontent-horiz-6-ref.xhtml
+
+# Tests for intrinsic sizing of flexboxes
+HTTP(..) == flexbox-intrinsic-sizing-horiz-1a.xhtml flexbox-intrinsic-sizing-horiz-1-ref.xhtml
+HTTP(..) == flexbox-intrinsic-sizing-horiz-1b.xhtml flexbox-intrinsic-sizing-horiz-1-ref.xhtml
+== flexbox-intrinsic-sizing-horiz-2a.xhtml flexbox-intrinsic-sizing-horiz-2-ref.xhtml
+== flexbox-intrinsic-sizing-horiz-2b.xhtml flexbox-intrinsic-sizing-horiz-2-ref.xhtml
+
+# Tests for invalidation after dynamic modifications
+== flexbox-invalidation-1.html flexbox-invalidation-1-ref.html
+
+# Tests for flexbox with margin, border, and/or padding on flex items
+== flexbox-margin-auto-horiz-1.xhtml     flexbox-margin-auto-horiz-1-ref.xhtml
+== flexbox-margin-auto-horiz-2.xhtml     flexbox-margin-auto-horiz-2-ref.xhtml
+== flexbox-mbp-horiz-1.xhtml             flexbox-mbp-horiz-1-ref.xhtml
+== flexbox-mbp-horiz-1-reverse.xhtml     flexbox-mbp-horiz-1-reverse-ref.xhtml
+== flexbox-mbp-horiz-1-rtl.xhtml         flexbox-mbp-horiz-1-reverse-ref.xhtml
+== flexbox-mbp-horiz-1-rtl-reverse.xhtml flexbox-mbp-horiz-1-ref.xhtml
+== flexbox-mbp-horiz-2a.xhtml            flexbox-mbp-horiz-2-ref.xhtml
+== flexbox-mbp-horiz-2b.xhtml            flexbox-mbp-horiz-2-ref.xhtml
+== flexbox-mbp-horiz-3.xhtml             flexbox-mbp-horiz-3-ref.xhtml
+== flexbox-mbp-horiz-3-reverse.xhtml     flexbox-mbp-horiz-3-reverse-ref.xhtml
+
+# Tests for flexbox in an iframe that gets resized.
+== flexbox-resizeviewport-1.xhtml flexbox-resizeviewport-1-ref.xhtml
+
+# Tests for sizing of flex containers, e.g. under min/max size constraints
+== flexbox-sizing-horiz-1.xhtml flexbox-sizing-horiz-1-ref.xhtml
+== flexbox-sizing-vert-1.xhtml  flexbox-sizing-vert-1-ref.xhtml
+
+== flexbox-table-fixup-1a.xhtml flexbox-table-fixup-1-ref.xhtml
+== flexbox-table-fixup-1b.xhtml flexbox-table-fixup-1-ref.xhtml
+
+# Tests for handling of whitespace within anonymous flex items.
+# XXXdholbert: These will likely need to change once bug 783415 is fixed.
+== flexbox-whitespace-handling-1a.xhtml flexbox-whitespace-handling-1-ref.xhtml
+== flexbox-whitespace-handling-1b.xhtml flexbox-whitespace-handling-1-ref.xhtml
+== flexbox-whitespace-handling-2.xhtml  flexbox-whitespace-handling-2-ref.xhtml
+== flexbox-whitespace-handling-3.xhtml  flexbox-whitespace-handling-3-ref.xhtml
+
+# Tests with widgets as flex items
+== flexbox-widget-flex-items-1.html flexbox-widget-flex-items-1-ref.html
+== flexbox-widget-flex-items-2.html flexbox-widget-flex-items-2-ref.html
+== flexbox-widget-flex-items-3.html flexbox-widget-flex-items-3-ref.html
+== flexbox-widget-flex-items-4.html flexbox-widget-flex-items-4-ref.html
diff --git a/layout/reftests/flexbox/solidblue.png b/layout/reftests/flexbox/solidblue.png
new file mode 100644
index 0000000000000000000000000000000000000000..a64b6a4255c9f99fd7bb87449a6d798a3c7f039d
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-MC9V-A
z!TD(=<%vb93;~Imc_n&&t|1C##(D;ZGV4@afoh~YT^vI!PA8`btowi7fiXeGG~r4^
dAah$cBg3=Pl8P(8`~sQG;OXk;vd$@?2>@O)C0qai

literal 0
HcmV?d00001

diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 0d32827e525e..ea9b4e47efd4 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -141,6 +141,10 @@ skip-if(Android||B2G) include first-letter/reftest.list
 # first-line/
 include first-line/reftest.list
 
+# flexbox (display: flex, display: inline-flex)
+# XXXdholbert Uncomment if MOZ_FLEXBOX is enabled:
+# include flexbox/reftest.list
+
 # floats/
 include floats/reftest.list
 

From 37b4c0d887456df14388dfe94cb6ecce26d307ca Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 30 Sep 2012 09:52:06 +0200
Subject: [PATCH 25/64] Bug 794891 - Format known-failures JSON files according
 to local conventions for now. (NPOTB, DONTBUILD)

---
 dom/imptests/parseFailures.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dom/imptests/parseFailures.py b/dom/imptests/parseFailures.py
index af5e5cbd1961..b824d4cbf3a1 100644
--- a/dom/imptests/parseFailures.py
+++ b/dom/imptests/parseFailures.py
@@ -32,11 +32,17 @@ def dumpFailures(lines):
         if objstr == '{}\n':
             continue
 
+        # Avoid overly large diffs.
+        if url.contains("/editing/"):
+            sep = ':'
+        else:
+            sep = ': '
+
         jsonpath = 'failures/' + url + '.json'
         files.append(jsonpath)
         ensuredir(jsonpath)
         obj = json.loads(objstr, object_pairs_hook=collections.OrderedDict)
-        formattedobj = json.dumps(obj, indent=2, separators=(',', ': '))
+        formattedobj = json.dumps(obj, indent=2, separators=(',', sep))
         fp = open(jsonpath, 'w')
         fp.write(formattedobj + '\n')
         fp.close()

From 0b91d0029f21b89d7260421641dde13f40e2b561 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 30 Sep 2012 09:53:39 +0200
Subject: [PATCH 26/64] No bug - Remove some dead code from importTestsuite.py.
 (NPOTB, DONTBUILD)

---
 dom/imptests/importTestsuite.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dom/imptests/importTestsuite.py b/dom/imptests/importTestsuite.py
index 4ebcf375758d..cc39d121a0fb 100644
--- a/dom/imptests/importTestsuite.py
+++ b/dom/imptests/importTestsuite.py
@@ -12,7 +12,6 @@ Note: removes both source and destination directory before starting. Do not
 
 import os
 import shutil
-import string
 import subprocess
 import sys
 
@@ -59,8 +58,6 @@ def copy(thissrcdir, dest, directories):
   """
   print "Copying %s..." % (directories, )
   for d in directories:
-    dirtocreate = dest
-
     subdirs, mochitests, supportfiles = parseManifestFile(dest, d)
     sourcedir = makePath("hg-%s" % dest, d)
     destdir = makePath(dest, d)

From fe856de6e3a9230c233acc941444d34df94e6819 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Sun, 30 Sep 2012 14:19:34 -0400
Subject: [PATCH 27/64] Bug 795584 - Add a template parameter to clamped.
 r=Ms2ger

---
 netwerk/protocol/http/HttpChannelChild.cpp | 2 +-
 netwerk/protocol/http/nsHttpChannel.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 1ca6fdfcd7de..e51d080baee5 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -1193,7 +1193,7 @@ HttpChannelChild::ResumeAt(uint64_t startPos, const nsACString& entityID)
 NS_IMETHODIMP
 HttpChannelChild::SetPriority(int32_t aPriority)
 {
-  int16_t newValue = clamped(aPriority, INT16_MIN, INT16_MAX);
+  int16_t newValue = clamped<int32_t>(aPriority, INT16_MIN, INT16_MAX);
   if (mPriority == newValue)
     return NS_OK;
   mPriority = newValue;
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 1ffd2f333be4..43462bd87b45 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -4489,7 +4489,7 @@ nsHttpChannel::SetupFallbackChannel(const char *aFallbackKey)
 NS_IMETHODIMP
 nsHttpChannel::SetPriority(int32_t value)
 {
-    int16_t newValue = clamped(value, INT16_MIN, INT16_MAX);
+    int16_t newValue = clamped<int32_t>(value, INT16_MIN, INT16_MAX);
     if (mPriority == newValue)
         return NS_OK;
     mPriority = newValue;

From a0d60e7f8f4ce574a513a874d3854bcc731bcc69 Mon Sep 17 00:00:00 2001
From: "bobbyholley+bmo@gmail.com" <bobbyholley+bmo@gmail.com>
Date: Sun, 30 Sep 2012 22:10:37 +0300
Subject: [PATCH 28/64] Bug 793370 - crash in nsWebShellWindow::Initialize,
 r=smaug+bz

---
 xpfe/appshell/src/nsWebShellWindow.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 648473845d57..3f6886afd6e4 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -204,17 +204,18 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,
   // top-level chrome window case. See bug 789773.
   nsCOMPtr<nsIScriptSecurityManager> ssm =
     do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
-  MOZ_ASSERT(NS_SUCCEEDED(rv) && ssm);
-  nsCOMPtr<nsIPrincipal> principal;
-  ssm->GetSubjectPrincipal(getter_AddRefs(principal));
-  if (!principal) {
-    ssm->GetSystemPrincipal(getter_AddRefs(principal));
+  if (ssm) { // Sometimes this happens really early  See bug 793370.
+    nsCOMPtr<nsIPrincipal> principal;
+    ssm->GetSubjectPrincipal(getter_AddRefs(principal));
+    if (!principal) {
+      ssm->GetSystemPrincipal(getter_AddRefs(principal));
+    }
+    rv = mDocShell->CreateAboutBlankContentViewer(principal);
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsIDocument> doc = do_GetInterface(mDocShell);
+    NS_ENSURE_TRUE(!!doc, NS_ERROR_FAILURE);
+    doc->SetIsInitialDocument(true);
   }
-  rv = mDocShell->CreateAboutBlankContentViewer(principal);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDocument> doc = do_GetInterface(mDocShell);
-  NS_ENSURE_TRUE(!!doc, NS_ERROR_FAILURE);
-  doc->SetIsInitialDocument(true);
 
   if (nullptr != aUrl)  {
     nsCString tmpStr;

From a34663989daf6426e5723b538999dfa419b8f348 Mon Sep 17 00:00:00 2001
From: Kannan Vijayan <kvijayan@mozilla.com>
Date: Sun, 30 Sep 2012 15:18:47 -0400
Subject: [PATCH 29/64] Bug 786126 - part 2 - Skip IC generation for GetElems
 of int32 indexes on non-native objects. (r=dvander)

---
 js/src/ion/TypeOracle.cpp |  6 ++++++
 js/src/jsanalyze.h        |  9 +++++----
 js/src/jsinterpinlines.h  | 25 +++++++++++++++++++------
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/js/src/ion/TypeOracle.cpp b/js/src/ion/TypeOracle.cpp
index 0f102ab96e5b..3260a61a236f 100644
--- a/js/src/ion/TypeOracle.cpp
+++ b/js/src/ion/TypeOracle.cpp
@@ -373,6 +373,12 @@ TypeInferenceOracle::elementReadGeneric(JSScript *script, jsbytecode *pc, bool *
 
     *cacheable = (obj == MIRType_Object &&
                   (id == MIRType_Value || id == MIRType_Int32 || id == MIRType_String));
+
+    // Turn off cacheing if the element is int32 and we've seen non-native objects as the target
+    // of this getelem.
+    if (*cacheable && id == MIRType_Int32 && script->analysis()->getCode(pc).nonNativeGetElement)
+        *cacheable = false;
+
     if (*cacheable)
         *monitorResult = (id == MIRType_String || script->analysis()->getCode(pc).getStringElement);
     else
diff --git a/js/src/jsanalyze.h b/js/src/jsanalyze.h
index 1d37f6968531..9465228a852c 100644
--- a/js/src/jsanalyze.h
+++ b/js/src/jsanalyze.h
@@ -111,10 +111,11 @@ class Bytecode
      * Dynamically observed state about the execution of this opcode. These are
      * hints about the script for use during compilation.
      */
-    bool arrayWriteHole: 1;  /* SETELEM which has written to an array hole. */
-    bool getStringElement:1; /* GETELEM which has accessed string properties. */
-    bool accessGetter: 1;    /* Property read on a shape with a getter hook. */
-    bool notIdempotent: 1;   /* Don't use an idempotent cache for this property read. */
+    bool arrayWriteHole: 1;     /* SETELEM which has written to an array hole. */
+    bool getStringElement:1;    /* GETELEM which has accessed string properties. */
+    bool nonNativeGetElement:1; /* GETELEM on a non-native, non-array object. */
+    bool accessGetter: 1;       /* Property read on a shape with a getter hook. */
+    bool notIdempotent: 1;      /* Don't use an idempotent cache for this property read. */
 
     /* Stack depth before this opcode. */
     uint32_t stackDepth;
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index dc84c572f7a8..2000c3e73f65 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -685,9 +685,20 @@ GetObjectElementOperation(JSContext *cx, JSOp op, HandleObject obj, const Value
         return js_GetXMLMethod(cx, obj, id, res);
     }
 #endif
+    // Don't call GetPcScript (needed for analysis) from inside Ion since it's expensive.
+    bool analyze = !cx->fp()->beginsIonActivation();
 
     uint32_t index;
     if (IsDefinitelyIndex(rref, &index)) {
+        if (analyze && !obj->isNative() && !obj->isArray()) {
+            RootedScript script(cx, NULL);
+            jsbytecode *pc = NULL;
+            types::TypeScript::GetPcScript(cx, &script, &pc);
+
+            if (script->hasAnalysis())
+                script->analysis()->getCode(pc).nonNativeGetElement = true;
+        }
+
         do {
             if (obj->isDenseArray()) {
                 if (index < obj->getDenseArrayInitializedLength()) {
@@ -703,15 +714,17 @@ GetObjectElementOperation(JSContext *cx, JSOp op, HandleObject obj, const Value
                 return false;
         } while(0);
     } else {
-        if (!cx->fp()->beginsIonActivation()) {
-            // Don't update getStringElement if called from Ion code, since
-            // ion::GetPcScript is expensive.
-            RootedScript script(cx);
-            jsbytecode *pc;
+        if (analyze) {
+            RootedScript script(cx, NULL);
+            jsbytecode *pc = NULL;
             types::TypeScript::GetPcScript(cx, &script, &pc);
 
-            if (script->hasAnalysis())
+            if (script->hasAnalysis()) {
                 script->analysis()->getCode(pc).getStringElement = true;
+
+                if (!obj->isArray() && !obj->isNative())
+                    script->analysis()->getCode(pc).nonNativeGetElement = true;
+            }
         }
 
         SpecialId special;

From 4a3217211ba1c9a4fc9a48468978671e0798f3c2 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 30 Sep 2012 21:24:25 +0200
Subject: [PATCH 30/64] No bug - Fix stupid bug because I don't know Python;
 hat-tip=tbsaunde (NPOTB, DONTBUILD)

---
 dom/imptests/parseFailures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/imptests/parseFailures.py b/dom/imptests/parseFailures.py
index b824d4cbf3a1..4239c5eb5808 100644
--- a/dom/imptests/parseFailures.py
+++ b/dom/imptests/parseFailures.py
@@ -33,7 +33,7 @@ def dumpFailures(lines):
             continue
 
         # Avoid overly large diffs.
-        if url.contains("/editing/"):
+        if '/editing/' in url:
             sep = ':'
         else:
             sep = ': '

From f739f3a7f3524077a9940a1f8f114887c687a9cd Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Mon, 1 Oct 2012 09:15:29 +1300
Subject: [PATCH 31/64] Bug 794725 - Don't report pointer movement when we
 re-enter application window. r=smaug

---
 content/events/src/nsEventStateManager.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 1879d209d124..b2e0e1ca83f5 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -111,6 +111,8 @@ using namespace mozilla::dom;
 
 #define NS_USER_INTERACTION_INTERVAL 5000 // ms
 
+static const nsIntPoint kInvalidRefPoint = nsIntPoint(-1,-1);
+
 static bool sLeftClickOnly = true;
 static bool sKeyCausesActivation = true;
 static uint32_t sESMInstanceCount = 0;
@@ -120,9 +122,9 @@ bool nsEventStateManager::sNormalLMouseEventInProcess = false;
 nsEventStateManager* nsEventStateManager::sActiveESM = nullptr;
 nsIDocument* nsEventStateManager::sMouseOverDocument = nullptr;
 nsWeakFrame nsEventStateManager::sLastDragOverFrame = nullptr;
-nsIntPoint nsEventStateManager::sLastRefPoint = nsIntPoint(0,0);
+nsIntPoint nsEventStateManager::sLastRefPoint = kInvalidRefPoint;
 nsIntPoint nsEventStateManager::sLastScreenPoint = nsIntPoint(0,0);
-nsIntPoint nsEventStateManager::sSynthCenteringPoint = nsIntPoint(-1,-1);
+nsIntPoint nsEventStateManager::sSynthCenteringPoint = kInvalidRefPoint;
 nsIntPoint nsEventStateManager::sLastClientPoint = nsIntPoint(0,0);
 bool nsEventStateManager::sIsPointerLocked = false;
 // Reference to the pointer locked element.
@@ -4162,8 +4164,14 @@ nsEventStateManager::GenerateMouseEnterExit(nsGUIEvent* aEvent)
           aEvent->flags |= NS_EVENT_FLAG_STOP_DISPATCH;
           // Clear sSynthCenteringPoint so we don't cancel other events
           // targeted at the center.
-          sSynthCenteringPoint = nsIntPoint(-1,-1);
+          sSynthCenteringPoint = kInvalidRefPoint;
         }
+      } else if (sLastRefPoint == kInvalidRefPoint) {
+        // We don't have a valid previous mousemove refPoint. This is either
+        // the first move we've encountered, or the mouse has just re-entered
+        // the application window. We should report (0,0) movement for this
+        // case, so make the current and previous refPoints the same.
+        aEvent->lastRefPoint = aEvent->refPoint;
       } else {
         aEvent->lastRefPoint = sLastRefPoint;
       }
@@ -4197,6 +4205,10 @@ nsEventStateManager::GenerateMouseEnterExit(nsGUIEvent* aEvent)
         break;
       }
 
+      // Reset sLastRefPoint, so that we'll know not to report any
+      // movement the next time we re-enter the window.
+      sLastRefPoint = kInvalidRefPoint;
+
       NotifyMouseOut(aEvent, nullptr);
     }
     break;

From 737adc7dfafbb0b3c7e903da611e1f1cfe8fdddc Mon Sep 17 00:00:00 2001
From: Mike Habicher <mikeh@mozilla.com>
Date: Sun, 30 Sep 2012 20:37:47 -0400
Subject: [PATCH 32/64] Bug 779145 - Add support for unsoliciated onShutter and
 onClosed callbacks, handle OnNavigation to clean-up. r=jst

---
 dom/camera/CameraCommon.h            |  23 -----
 dom/camera/CameraControlImpl.cpp     |  82 +++++++++++++++++-
 dom/camera/CameraControlImpl.h       |  87 +++++++++++++++----
 dom/camera/DOMCameraControl.cpp      |  53 ++++++++----
 dom/camera/DOMCameraControl.h        |   6 +-
 dom/camera/DOMCameraManager.cpp      | 125 ++++++++++++++++++++++++---
 dom/camera/DOMCameraManager.h        |  35 +++++++-
 dom/camera/FallbackCameraControl.cpp |   8 +-
 dom/camera/GonkCameraControl.cpp     |  63 +++++++-------
 dom/camera/GonkCameraControl.h       |   4 +-
 dom/camera/GonkCameraHwMgr.cpp       |  10 ++-
 dom/camera/ICameraControl.h          |   6 ++
 dom/camera/nsIDOMCameraManager.idl   |  13 ++-
 13 files changed, 399 insertions(+), 116 deletions(-)

diff --git a/dom/camera/CameraCommon.h b/dom/camera/CameraCommon.h
index f0ace36f04a1..01bc81cb44fd 100644
--- a/dom/camera/CameraCommon.h
+++ b/dom/camera/CameraCommon.h
@@ -96,29 +96,6 @@ enum {
   CAMERA_PARAM_SUPPORTED_ZOOMRATIOS
 };
 
-class CameraErrorResult : public nsRunnable
-{
-public:
-  CameraErrorResult(nsICameraErrorCallback* onError, const nsString& aErrorMsg)
-    : mOnErrorCb(onError)
-    , mErrorMsg(aErrorMsg)
-  { }
-
-  NS_IMETHOD Run()
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-
-    if (mOnErrorCb) {
-      mOnErrorCb->HandleEvent(mErrorMsg);
-    }
-    return NS_OK;
-  }
-
-protected:
-  nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
-  const nsString mErrorMsg;
-};
-
 #ifdef PR_LOGGING
 
 static inline void nsLogAddRefCamera(const char *file, uint32_t line, void* p, uint32_t count, const char *clazz, uint32_t size)
diff --git a/dom/camera/CameraControlImpl.cpp b/dom/camera/CameraControlImpl.cpp
index df4a8843fd8d..5e3bbb296a7c 100644
--- a/dom/camera/CameraControlImpl.cpp
+++ b/dom/camera/CameraControlImpl.cpp
@@ -167,6 +167,86 @@ CameraControlImpl::Get(JSContext* aCx, uint32_t aKey, JS::Value* aValue)
   return NS_OK;
 }
 
+nsresult
+CameraControlImpl::Set(nsICameraShutterCallback* aOnShutter)
+{
+  mOnShutterCb = aOnShutter;
+  return NS_OK;
+}
+
+nsresult
+CameraControlImpl::Get(nsICameraShutterCallback** aOnShutter)
+{
+  *aOnShutter = mOnShutterCb;
+  return NS_OK;
+}
+
+nsresult
+CameraControlImpl::Set(nsICameraClosedCallback* aOnClosed)
+{
+  mOnClosedCb = aOnClosed;
+  return NS_OK;
+}
+
+nsresult
+CameraControlImpl::Get(nsICameraClosedCallback** aOnClosed)
+{
+  *aOnClosed = mOnClosedCb;
+  return NS_OK;
+}
+
+void
+CameraControlImpl::Shutdown()
+{
+  DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
+  mAutoFocusOnSuccessCb = nullptr;
+  mAutoFocusOnErrorCb = nullptr;
+  mTakePictureOnSuccessCb = nullptr;
+  mTakePictureOnErrorCb = nullptr;
+  mStartRecordingOnSuccessCb = nullptr;
+  mStartRecordingOnErrorCb = nullptr;
+  mOnShutterCb = nullptr;
+  mOnClosedCb = nullptr;
+}
+
+void
+CameraControlImpl::OnShutterInternal()
+{
+  DOM_CAMERA_LOGI("** SNAP **\n");
+  if (mOnShutterCb) {
+    mOnShutterCb->HandleEvent();
+  }
+}
+
+void
+CameraControlImpl::OnShutter()
+{
+  nsCOMPtr<nsIRunnable> onShutter = NS_NewRunnableMethod(this, &CameraControlImpl::OnShutterInternal);
+  nsresult rv = NS_DispatchToMainThread(onShutter);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGW("Failed to dispatch onShutter event to main thread (%d)\n", rv);
+  }
+}
+
+void
+CameraControlImpl::OnClosedInternal()
+{
+  DOM_CAMERA_LOGI("Camera hardware was closed\n");
+  if (mOnClosedCb) {
+    mOnClosedCb->HandleEvent();
+  }
+}
+
+void
+CameraControlImpl::OnClosed()
+{
+  nsCOMPtr<nsIRunnable> onClosed = NS_NewRunnableMethod(this, &CameraControlImpl::OnClosedInternal);
+  nsresult rv = NS_DispatchToMainThread(onClosed);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGW("Failed to dispatch onClosed event to main thread (%d)\n", rv);
+  }
+}
+
 nsresult
 CameraControlImpl::GetPreviewStream(CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
 {
@@ -245,7 +325,7 @@ GetPreviewStreamResult::Run()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  if (mOnSuccessCb) {
+  if (mOnSuccessCb && nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
     nsCOMPtr<nsIDOMMediaStream> stream = new DOMCameraPreview(mCameraControl, mWidth, mHeight, mFramesPerSecond);
     mOnSuccessCb->HandleEvent(stream);
   }
diff --git a/dom/camera/CameraControlImpl.h b/dom/camera/CameraControlImpl.h
index b74845a9e53d..16c9cc1257db 100644
--- a/dom/camera/CameraControlImpl.h
+++ b/dom/camera/CameraControlImpl.h
@@ -9,7 +9,7 @@
 #include "nsDOMFile.h"
 #include "DictionaryHelpers.h"
 #include "nsIDOMDeviceStorage.h"
-#include "nsIDOMCameraManager.h"
+#include "DOMCameraManager.h"
 #include "ICameraControl.h"
 #include "CameraCommon.h"
 
@@ -44,9 +44,10 @@ class CameraControlImpl : public ICameraControl
   friend class GetPreviewStreamVideoModeTask;
 
 public:
-  CameraControlImpl(uint32_t aCameraId, nsIThread* aCameraThread)
+  CameraControlImpl(uint32_t aCameraId, nsIThread* aCameraThread, uint64_t aWindowId)
     : mCameraId(aCameraId)
     , mCameraThread(aCameraThread)
+    , mWindowId(aWindowId)
     , mFileFormat()
     , mMaxMeteringAreas(0)
     , mMaxFocusAreas(0)
@@ -58,6 +59,7 @@ public:
     , mStartRecordingOnSuccessCb(nullptr)
     , mStartRecordingOnErrorCb(nullptr)
     , mOnShutterCb(nullptr)
+    , mOnClosedCb(nullptr)
   {
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   }
@@ -77,6 +79,10 @@ public:
   nsresult Get(uint32_t aKey, double* aValue);
   nsresult Set(JSContext* aCx, uint32_t aKey, const JS::Value& aValue, uint32_t aLimit);
   nsresult Get(JSContext* aCx, uint32_t aKey, JS::Value* aValue);
+  nsresult Set(nsICameraShutterCallback* aOnShutter);
+  nsresult Get(nsICameraShutterCallback** aOnShutter);
+  nsresult Set(nsICameraClosedCallback* aOnClosed);
+  nsresult Get(nsICameraClosedCallback** aOnClosed);
 
   nsresult SetFocusAreas(JSContext* aCx, const JS::Value& aValue)
   {
@@ -97,8 +103,16 @@ public:
   virtual void SetParameter(uint32_t aKey, double aValue) = 0;
   virtual void SetParameter(uint32_t aKey, const nsTArray<CameraRegion>& aRegions) = 0;
   virtual nsresult PushParameters() = 0;
+  virtual void Shutdown();
 
   bool ReceiveFrame(void* aBuffer, ImageFormat aFormat, FrameBuilder aBuilder);
+  void OnShutter();
+  void OnClosed();
+
+  uint64_t GetWindowId()
+  {
+    return mWindowId;
+  }
 
 protected:
   virtual ~CameraControlImpl()
@@ -117,8 +131,12 @@ protected:
   virtual nsresult PullParametersImpl() = 0;
   virtual nsresult GetPreviewStreamVideoModeImpl(GetPreviewStreamVideoModeTask* aGetPreviewStreamVideoMode) = 0;
 
+  void OnShutterInternal();
+  void OnClosedInternal();
+
   uint32_t            mCameraId;
   nsCOMPtr<nsIThread> mCameraThread;
+  uint64_t            mWindowId;
   nsString            mFileFormat;
   uint32_t            mMaxMeteringAreas;
   uint32_t            mMaxFocusAreas;
@@ -140,22 +158,50 @@ protected:
   nsCOMPtr<nsICameraStartRecordingCallback> mStartRecordingOnSuccessCb;
   nsCOMPtr<nsICameraErrorCallback>          mStartRecordingOnErrorCb;
   nsCOMPtr<nsICameraShutterCallback>        mOnShutterCb;
+  nsCOMPtr<nsICameraClosedCallback>         mOnClosedCb;
 
 private:
   CameraControlImpl(const CameraControlImpl&) MOZ_DELETE;
   CameraControlImpl& operator=(const CameraControlImpl&) MOZ_DELETE;
 };
 
+// Error result runnable
+class CameraErrorResult : public nsRunnable
+{
+public:
+  CameraErrorResult(nsICameraErrorCallback* onError, const nsString& aErrorMsg, uint64_t aWindowId)
+    : mOnErrorCb(onError)
+    , mErrorMsg(aErrorMsg)
+    , mWindowId(aWindowId)
+  { }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    if (mOnErrorCb && nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
+      mOnErrorCb->HandleEvent(mErrorMsg);
+    }
+    return NS_OK;
+  }
+
+protected:
+  nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
+  const nsString mErrorMsg;
+  uint64_t mWindowId;
+};
+
 // Return the resulting preview stream to JS.  Runs on the main thread.
 class GetPreviewStreamResult : public nsRunnable
 {
 public:
-  GetPreviewStreamResult(CameraControlImpl* aCameraControl, uint32_t aWidth, uint32_t aHeight, uint32_t aFramesPerSecond, nsICameraPreviewStreamCallback* onSuccess)
+  GetPreviewStreamResult(CameraControlImpl* aCameraControl, uint32_t aWidth, uint32_t aHeight, uint32_t aFramesPerSecond, nsICameraPreviewStreamCallback* onSuccess, uint64_t aWindowId)
     : mCameraControl(aCameraControl)
     , mWidth(aWidth)
     , mHeight(aHeight)
     , mFramesPerSecond(aFramesPerSecond)
     , mOnSuccessCb(onSuccess)
+    , mWindowId(aWindowId)
   {
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   }
@@ -174,6 +220,7 @@ protected:
   uint32_t mHeight;
   uint32_t mFramesPerSecond;
   nsCOMPtr<nsICameraPreviewStreamCallback> mOnSuccessCb;
+  uint64_t mWindowId;
 };
 
 // Get the desired preview stream.
@@ -199,7 +246,7 @@ public:
     nsresult rv = mCameraControl->GetPreviewStreamImpl(this);
 
     if (NS_FAILED(rv) && mOnErrorCb) {
-      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
+      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE"), mCameraControl->GetWindowId()));
       NS_ENSURE_SUCCESS(rv, rv);
     }
     return rv;
@@ -215,9 +262,10 @@ public:
 class AutoFocusResult : public nsRunnable
 {
 public:
-  AutoFocusResult(bool aSuccess, nsICameraAutoFocusCallback* onSuccess)
+  AutoFocusResult(bool aSuccess, nsICameraAutoFocusCallback* onSuccess, uint64_t aWindowId)
     : mSuccess(aSuccess)
     , mOnSuccessCb(onSuccess)
+    , mWindowId(aWindowId)
   { }
 
   virtual ~AutoFocusResult() { }
@@ -226,7 +274,7 @@ public:
   {
     MOZ_ASSERT(NS_IsMainThread());
 
-    if (mOnSuccessCb) {
+    if (mOnSuccessCb && nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
       mOnSuccessCb->HandleEvent(mSuccess);
     }
     return NS_OK;
@@ -235,6 +283,7 @@ public:
 protected:
   bool mSuccess;
   nsCOMPtr<nsICameraAutoFocusCallback> mOnSuccessCb;
+  uint64_t mWindowId;
 };
 
 // Autofocus the camera.
@@ -261,7 +310,7 @@ public:
     DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
 
     if (NS_FAILED(rv) && mOnErrorCb) {
-      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
+      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE"), mCameraControl->GetWindowId()));
       NS_ENSURE_SUCCESS(rv, rv);
     }
     return rv;
@@ -276,9 +325,10 @@ public:
 class TakePictureResult : public nsRunnable
 {
 public:
-  TakePictureResult(nsIDOMBlob* aImage, nsICameraTakePictureCallback* onSuccess)
+  TakePictureResult(nsIDOMBlob* aImage, nsICameraTakePictureCallback* onSuccess, uint64_t aWindowId)
     : mImage(aImage)
     , mOnSuccessCb(onSuccess)
+    , mWindowId(aWindowId)
   {
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   }
@@ -293,7 +343,7 @@ public:
     MOZ_ASSERT(NS_IsMainThread());
 
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
-    if (mOnSuccessCb) {
+    if (mOnSuccessCb && nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
       mOnSuccessCb->HandleEvent(mImage);
     }
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
@@ -303,6 +353,7 @@ public:
 protected:
   nsCOMPtr<nsIDOMBlob> mImage;
   nsCOMPtr<nsICameraTakePictureCallback> mOnSuccessCb;
+  uint64_t mWindowId;
 };
 
 // Capture a still image with the camera.
@@ -333,7 +384,7 @@ public:
     DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
 
     if (NS_FAILED(rv) && mOnErrorCb) {
-      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
+      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE"), mCameraControl->GetWindowId()));
       NS_ENSURE_SUCCESS(rv, rv);
     }
     return rv;
@@ -352,8 +403,9 @@ public:
 class StartRecordingResult : public nsRunnable
 {
 public:
-  StartRecordingResult(nsICameraStartRecordingCallback* onSuccess)
+  StartRecordingResult(nsICameraStartRecordingCallback* onSuccess, uint64_t aWindowId)
     : mOnSuccessCb(onSuccess)
+    , mWindowId(aWindowId)
   { }
 
   virtual ~StartRecordingResult() { }
@@ -362,7 +414,7 @@ public:
   {
     MOZ_ASSERT(NS_IsMainThread());
 
-    if (mOnSuccessCb) {
+    if (mOnSuccessCb && nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
       mOnSuccessCb->HandleEvent();
     }
     return NS_OK;
@@ -370,6 +422,7 @@ public:
 
 protected:
   nsCOMPtr<nsICameraStartRecordingCallback> mOnSuccessCb;
+  uint64_t mWindowId;
 };
 
 // Start video recording.
@@ -397,12 +450,8 @@ public:
     nsresult rv = mCameraControl->StartRecordingImpl(this);
     DOM_CAMERA_LOGT("%s:%d : result %d\n", __func__, __LINE__, rv);
 
-    if (NS_SUCCEEDED(rv)) {
-      if (mOnSuccessCb) {
-        rv = NS_DispatchToMainThread(new StartRecordingResult(mOnSuccessCb));
-      }
-    } else if (mOnErrorCb) {
-      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
+    if (NS_FAILED(rv) && mOnErrorCb) {
+      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE"), mCameraControl->GetWindowId()));
     }
     return rv;
   }
@@ -548,7 +597,7 @@ public:
     DOM_CAMERA_LOGI("%s:%d -- AFTER IMPL : rv = %d\n", __func__, __LINE__, rv);
 
     if (NS_FAILED(rv) && mOnErrorCb) {
-      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
+      rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE"), mCameraControl->GetWindowId()));
       NS_ENSURE_SUCCESS(rv, rv);
     }
     return NS_OK;
diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp
index e4be8d22b496..3ff085345ce9 100644
--- a/dom/camera/DOMCameraControl.cpp
+++ b/dom/camera/DOMCameraControl.cpp
@@ -209,14 +209,24 @@ nsDOMCameraControl::GetExposureCompensation(double* aExposureCompensation)
 NS_IMETHODIMP
 nsDOMCameraControl::GetOnShutter(nsICameraShutterCallback** aOnShutter)
 {
-  // TODO: see bug 779138.
-  return NS_ERROR_NOT_IMPLEMENTED;
+  return mCameraControl->Get(aOnShutter);
 }
 NS_IMETHODIMP
 nsDOMCameraControl::SetOnShutter(nsICameraShutterCallback* aOnShutter)
 {
-  // TODO: see bug 779138.
-  return NS_ERROR_NOT_IMPLEMENTED;
+  return mCameraControl->Set(aOnShutter);
+}
+
+/* attribute nsICameraClosedCallback onClosed; */
+NS_IMETHODIMP
+nsDOMCameraControl::GetOnClosed(nsICameraClosedCallback** aOnClosed)
+{
+  return mCameraControl->Get(aOnClosed);
+}
+NS_IMETHODIMP
+nsDOMCameraControl::SetOnClosed(nsICameraClosedCallback* aOnClosed)
+{
+  return mCameraControl->Set(aOnClosed);
 }
 
 /* [implicit_jscontext] void startRecording (in nsIDOMDeviceStorage storageArea, in DOMString filename, in nsICameraStartRecordingCallback onSuccess, [optional] in nsICameraErrorCallback onError); */
@@ -329,28 +339,31 @@ nsDOMCameraControl::GetPreviewStreamVideoMode(const JS::Value& aOptions, nsICame
 class GetCameraResult : public nsRunnable
 {
 public:
-  GetCameraResult(nsDOMCameraControl* aDOMCameraControl, nsresult aResult, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
+  GetCameraResult(nsDOMCameraControl* aDOMCameraControl, nsresult aResult, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
     : mDOMCameraControl(aDOMCameraControl)
     , mResult(aResult)
     , mOnSuccessCb(onSuccess)
     , mOnErrorCb(onError)
+    , mWindowId(aWindowId)
   { }
 
   NS_IMETHOD Run()
   {
     MOZ_ASSERT(NS_IsMainThread());
 
-    DOM_CAMERA_LOGT("%s : this=%p -- BEFORE CALLBACK\n", __func__, this);
-    if (NS_FAILED(mResult)) {
-      if (mOnErrorCb) {
-        mOnErrorCb->HandleEvent(NS_LITERAL_STRING("FAILURE"));
-      }
-    } else {
-      if (mOnSuccessCb) {
-        mOnSuccessCb->HandleEvent(mDOMCameraControl);
+    if (nsDOMCameraManager::IsWindowStillActive(mWindowId)) {
+      DOM_CAMERA_LOGT("%s : this=%p -- BEFORE CALLBACK\n", __func__, this);
+      if (NS_FAILED(mResult)) {
+        if (mOnErrorCb) {
+          mOnErrorCb->HandleEvent(NS_LITERAL_STRING("FAILURE"));
+        }
+      } else {
+        if (mOnSuccessCb) {
+          mOnSuccessCb->HandleEvent(mDOMCameraControl);
+        }
       }
+      DOM_CAMERA_LOGT("%s : this=%p -- AFTER CALLBACK\n", __func__, this);
     }
-    DOM_CAMERA_LOGT("%s : this=%p -- AFTER CALLBACK\n", __func__, this);
 
     /**
      * Finally, release the extra reference to the DOM-facing camera control.
@@ -370,11 +383,19 @@ protected:
   nsresult mResult;
   nsCOMPtr<nsICameraGetCameraCallback> mOnSuccessCb;
   nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
+  uint64_t mWindowId;
 };
 
 nsresult
-nsDOMCameraControl::Result(nsresult aResult, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
+nsDOMCameraControl::Result(nsresult aResult, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
 {
-  nsCOMPtr<GetCameraResult> getCameraResult = new GetCameraResult(this, aResult, onSuccess, onError);
+  nsCOMPtr<GetCameraResult> getCameraResult = new GetCameraResult(this, aResult, onSuccess, onError, aWindowId);
   return NS_DispatchToMainThread(getCameraResult);
 }
+
+void
+nsDOMCameraControl::Shutdown()
+{
+  DOM_CAMERA_LOGI("%s:%d\n", __func__, __LINE__);
+  mCameraControl->Shutdown();
+}
diff --git a/dom/camera/DOMCameraControl.h b/dom/camera/DOMCameraControl.h
index 5a64f1e6f988..04a3950f218e 100644
--- a/dom/camera/DOMCameraControl.h
+++ b/dom/camera/DOMCameraControl.h
@@ -27,8 +27,10 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMCameraControl)
   NS_DECL_NSICAMERACONTROL
 
-  nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError);
-  nsresult Result(nsresult aResult, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError);
+  nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId);
+  nsresult Result(nsresult aResult, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId);
+
+  void Shutdown();
 
 protected:
   virtual ~nsDOMCameraControl();
diff --git a/dom/camera/DOMCameraManager.cpp b/dom/camera/DOMCameraManager.cpp
index 044736c355de..a2526e89a300 100644
--- a/dom/camera/DOMCameraManager.cpp
+++ b/dom/camera/DOMCameraManager.cpp
@@ -3,7 +3,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDebug.h"
-#include "nsIDocument.h"
+#include "nsPIDOMWindow.h"
+#include "mozilla/Services.h"
+#include "nsObserverService.h"
 #include "nsIPermissionManager.h"
 #include "DOMCameraControl.h"
 #include "DOMCameraManager.h"
@@ -12,17 +14,29 @@
 #include "CameraCommon.h"
 
 using namespace mozilla;
+using namespace dom;
 
 DOMCI_DATA(CameraManager, nsIDOMCameraManager)
 
-NS_INTERFACE_MAP_BEGIN(nsDOMCameraManager)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMCameraManager)
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMCameraManager)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCameraThread)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMCameraManager)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mCameraThread)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCameraManager)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCameraManager)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CameraManager)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_ADDREF(nsDOMCameraManager)
-NS_IMPL_RELEASE(nsDOMCameraManager)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCameraManager)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCameraManager)
 
 /**
  * Global camera logging object
@@ -38,8 +52,12 @@ PRLogModuleInfo* gCameraLog = PR_LOG_DEFINE("Camera");
  * GonkCameraManager.cpp and FallbackCameraManager.cpp.
  */
 
+WindowTable nsDOMCameraManager::sActiveWindows;
+bool nsDOMCameraManager::sActiveWindowsInitialized = false;
+
 nsDOMCameraManager::nsDOMCameraManager(uint64_t aWindowId)
   : mWindowId(aWindowId)
+  , mCameraThread(nullptr)
 {
   /* member initializers and constructor code */
   DOM_CAMERA_LOGT("%s:%d : this=%p, windowId=%llx\n", __func__, __LINE__, this, mWindowId);
@@ -49,12 +67,8 @@ nsDOMCameraManager::~nsDOMCameraManager()
 {
   /* destructor code */
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
-}
-
-void
-nsDOMCameraManager::OnNavigation(uint64_t aWindowId)
-{
-  // TODO: see bug 779145.
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+  obs->RemoveObserver(this, "xpcom-shutdown");
 }
 
 // static creator
@@ -72,8 +86,18 @@ nsDOMCameraManager::CheckPermissionAndCreateInstance(nsPIDOMWindow* aWindow)
     return nullptr;
   }
 
+  // Initialize the shared active window tracker
+  if (!sActiveWindowsInitialized) {
+    sActiveWindows.Init();
+    sActiveWindowsInitialized = true;
+  }
+
   nsRefPtr<nsDOMCameraManager> cameraManager =
     new nsDOMCameraManager(aWindow->WindowID());
+
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+  obs->AddObserver(cameraManager, "xpcom-shutdown", true);
+
   return cameraManager.forget();
 }
 
@@ -102,7 +126,84 @@ nsDOMCameraManager::GetCamera(const JS::Value& aOptions, nsICameraGetCameraCallb
   DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
 
   // Creating this object will trigger the onSuccess handler
-  nsCOMPtr<nsICameraControl> cameraControl = new nsDOMCameraControl(cameraId, mCameraThread, onSuccess, onError);
+  nsCOMPtr<nsDOMCameraControl> cameraControl = new nsDOMCameraControl(cameraId, mCameraThread, onSuccess, onError, mWindowId);
 
+  Register(cameraControl);
   return NS_OK;
 }
+
+void
+nsDOMCameraManager::Register(nsDOMCameraControl* aDOMCameraControl)
+{
+  DOM_CAMERA_LOGI(">>> Register( aDOMCameraControl = %p ) mWindowId = 0x%llx\n", aDOMCameraControl, mWindowId);
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Put the camera control into the hash table
+  CameraControls* controls = sActiveWindows.Get(mWindowId);
+  if (!controls) {
+    controls = new CameraControls;
+    sActiveWindows.Put(mWindowId, controls);
+  }
+  controls->AppendElement(aDOMCameraControl);
+}
+
+void
+nsDOMCameraManager::Shutdown(uint64_t aWindowId)
+{
+  DOM_CAMERA_LOGI(">>> Shutdown( aWindowId = 0x%llx )\n", aWindowId);
+  MOZ_ASSERT(NS_IsMainThread());
+
+  CameraControls* controls = sActiveWindows.Get(aWindowId);
+  if (!controls) {
+    return;
+  }
+
+  PRUint32 length = controls->Length();
+  for (PRUint32 i = 0; i < length; i++) {
+    nsRefPtr<nsDOMCameraControl> cameraControl = controls->ElementAt(i);
+    cameraControl->Shutdown();
+  }
+  controls->Clear();
+
+  sActiveWindows.Remove(aWindowId);
+}
+
+void
+nsDOMCameraManager::XpComShutdown()
+{
+  DOM_CAMERA_LOGI(">>> XPCOM Shutdown\n");
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+  obs->RemoveObserver(this, "xpcom-shutdown");
+
+  sActiveWindows.Clear();
+}
+
+nsresult
+nsDOMCameraManager::Observe(nsISupports* aSubject, const char* aTopic, const PRUnichar* aData)
+{
+  if (strcmp(aTopic, "xpcom-shutdown") == 0) {
+    XpComShutdown();
+  }
+  return NS_OK;
+}
+
+void
+nsDOMCameraManager::OnNavigation(uint64_t aWindowId)
+{
+  DOM_CAMERA_LOGI(">>> OnNavigation event\n");
+  Shutdown(aWindowId);
+}
+
+bool
+nsDOMCameraManager::IsWindowStillActive(uint64_t aWindowId)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!sActiveWindowsInitialized) {
+    return false;
+  }
+
+  return !!sActiveWindows.Get(aWindowId);
+}
diff --git a/dom/camera/DOMCameraManager.h b/dom/camera/DOMCameraManager.h
index af2b5b91d998..7bec0019f9d0 100644
--- a/dom/camera/DOMCameraManager.h
+++ b/dom/camera/DOMCameraManager.h
@@ -10,33 +10,62 @@
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsIThread.h"
+#include "nsIObserver.h"
 #include "nsThreadUtils.h"
+#include "nsHashKeys.h"
+#include "nsWeakReference.h"
+#include "nsClassHashtable.h"
 #include "nsIDOMCameraManager.h"
+#include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
 
 class nsPIDOMWindow;
 
-class nsDOMCameraManager MOZ_FINAL : public nsIDOMCameraManager
+namespace mozilla {
+class nsDOMCameraControl;
+}
+
+typedef nsTArray<nsRefPtr<mozilla::nsDOMCameraControl> > CameraControls;
+typedef nsClassHashtable<nsUint64HashKey, CameraControls> WindowTable;
+
+class nsDOMCameraManager MOZ_FINAL
+  : public nsIDOMCameraManager
+  , public nsIObserver
+  , public nsSupportsWeakReference
 {
 public:
-  NS_DECL_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMCameraManager, nsIObserver)
   NS_DECL_NSIDOMCAMERAMANAGER
+  NS_DECL_NSIOBSERVER
 
   static already_AddRefed<nsDOMCameraManager>
     CheckPermissionAndCreateInstance(nsPIDOMWindow* aWindow);
+  static bool IsWindowStillActive(uint64_t aWindowId);
 
+  void Register(mozilla::nsDOMCameraControl* aDOMCameraControl);
   void OnNavigation(uint64_t aWindowId);
 
+protected:
+  void XpComShutdown();
+  void Shutdown(uint64_t aWindowId);
+  ~nsDOMCameraManager();
+
 private:
   nsDOMCameraManager();
   nsDOMCameraManager(uint64_t aWindowId);
   nsDOMCameraManager(const nsDOMCameraManager&) MOZ_DELETE;
   nsDOMCameraManager& operator=(const nsDOMCameraManager&) MOZ_DELETE;
-  ~nsDOMCameraManager();
 
 protected:
   uint64_t mWindowId;
   nsCOMPtr<nsIThread> mCameraThread;
+  /**
+   * 'mActiveWindows' is only ever accessed while in the main thread,
+   * so it is not otherwise protected.
+   */
+  static WindowTable sActiveWindows;
+  static bool sActiveWindowsInitialized;
 };
 
 class GetCameraTask : public nsRunnable
diff --git a/dom/camera/FallbackCameraControl.cpp b/dom/camera/FallbackCameraControl.cpp
index 42bdc6589776..5b16ded9ba27 100644
--- a/dom/camera/FallbackCameraControl.cpp
+++ b/dom/camera/FallbackCameraControl.cpp
@@ -14,7 +14,7 @@ using namespace mozilla;
 class nsFallbackCameraControl : public CameraControlImpl
 {
 public:
-  nsFallbackCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError);
+  nsFallbackCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId);
 
   const char* GetParameter(const char* aKey);
   const char* GetParameterConstChar(uint32_t aKey);
@@ -52,7 +52,7 @@ private:
  * store a reference in the 'mCameraControl' member (which is why it is
  * defined here).
  */
-nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
+nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
 {
 }
 
@@ -62,8 +62,8 @@ nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThr
  * None of these should ever get called--they exist to keep the linker happy,
  * and may be used as templates for new camera support classes.
  */
-nsFallbackCameraControl::nsFallbackCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
-  : CameraControlImpl(aCameraId, aCameraThread)
+nsFallbackCameraControl::nsFallbackCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
+  : CameraControlImpl(aCameraId, aCameraThread, aWindowId)
 {
 }
 
diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp
index 6b60351ca0f5..d9e24568ed54 100644
--- a/dom/camera/GonkCameraControl.cpp
+++ b/dom/camera/GonkCameraControl.cpp
@@ -107,7 +107,7 @@ static const char* getKeyText(uint32_t aKey)
 }
 
 // nsDOMCameraControl implementation-specific constructor
-nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
+nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
   : mDOMCapabilities(nullptr)
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
@@ -124,7 +124,7 @@ nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThr
    * nsDOMCameraControl or memory will leak!
    */
   NS_ADDREF_THIS();
-  mCameraControl = new nsGonkCameraControl(aCameraId, aCameraThread, this, onSuccess, onError);
+  mCameraControl = new nsGonkCameraControl(aCameraId, aCameraThread, this, onSuccess, onError, aWindowId);
 }
 
 // Gonk-specific CameraControl implementation.
@@ -133,11 +133,12 @@ nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, nsIThread* aCameraThr
 class InitGonkCameraControl : public nsRunnable
 {
 public:
-  InitGonkCameraControl(nsGonkCameraControl* aCameraControl, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
+  InitGonkCameraControl(nsGonkCameraControl* aCameraControl, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
     : mCameraControl(aCameraControl)
     , mDOMCameraControl(aDOMCameraControl)
     , mOnSuccessCb(onSuccess)
     , mOnErrorCb(onError)
+    , mWindowId(aWindowId)
   {
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   }
@@ -150,7 +151,7 @@ public:
   NS_IMETHOD Run()
   {
     nsresult rv = mCameraControl->Init();
-    return mDOMCameraControl->Result(rv, mOnSuccessCb, mOnErrorCb);
+    return mDOMCameraControl->Result(rv, mOnSuccessCb, mOnErrorCb, mWindowId);
   }
 
   nsRefPtr<nsGonkCameraControl> mCameraControl;
@@ -158,11 +159,12 @@ public:
   nsDOMCameraControl* mDOMCameraControl;
   nsCOMPtr<nsICameraGetCameraCallback> mOnSuccessCb;
   nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
+  uint64_t mWindowId;
 };
 
 // Construct nsGonkCameraControl on the main thread.
-nsGonkCameraControl::nsGonkCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError)
-  : CameraControlImpl(aCameraId, aCameraThread)
+nsGonkCameraControl::nsGonkCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
+  : CameraControlImpl(aCameraId, aCameraThread, aWindowId)
   , mHwHandle(0)
   , mExposureCompensationMin(0.0)
   , mExposureCompensationStep(0.0)
@@ -177,7 +179,7 @@ nsGonkCameraControl::nsGonkCameraControl(uint32_t aCameraId, nsIThread* aCameraT
   mRwLock = PR_NewRWLock(PR_RWLOCK_RANK_NONE, "GonkCameraControl.Parameters.Lock");
 
   // ...but initialization is carried out on the camera thread.
-  nsCOMPtr<nsIRunnable> init = new InitGonkCameraControl(this, aDOMCameraControl, onSuccess, onError);
+  nsCOMPtr<nsIRunnable> init = new InitGonkCameraControl(this, aDOMCameraControl, onSuccess, onError, aWindowId);
   mCameraThread->Dispatch(init, NS_DISPATCH_NORMAL);
 }
 
@@ -519,7 +521,7 @@ nsGonkCameraControl::GetPreviewStreamImpl(GetPreviewStreamTask* aGetPreviewStrea
 
   DOM_CAMERA_LOGI("config preview: wated %d x %d, got %d x %d (%d fps, format %d)\n", aGetPreviewStream->mSize.width, aGetPreviewStream->mSize.height, mWidth, mHeight, mFps, mFormat);
 
-  nsCOMPtr<GetPreviewStreamResult> getPreviewStreamResult = new GetPreviewStreamResult(this, mWidth, mHeight, mFps, aGetPreviewStream->mOnSuccessCb);
+  nsCOMPtr<GetPreviewStreamResult> getPreviewStreamResult = new GetPreviewStreamResult(this, mWidth, mHeight, mFps, aGetPreviewStream->mOnSuccessCb, mWindowId);
   return NS_DispatchToMainThread(getPreviewStreamResult);
 }
 
@@ -587,7 +589,7 @@ nsGonkCameraControl::AutoFocusImpl(AutoFocusTask* aAutoFocus)
     nsCOMPtr<nsICameraErrorCallback> ecb = mAutoFocusOnErrorCb;
     mAutoFocusOnErrorCb = nullptr;
     if (ecb) {
-      nsresult rv = NS_DispatchToMainThread(new CameraErrorResult(ecb, NS_LITERAL_STRING("CANCELLED")));
+      nsresult rv = NS_DispatchToMainThread(new CameraErrorResult(ecb, NS_LITERAL_STRING("CANCELLED"), mWindowId));
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
@@ -616,7 +618,7 @@ nsGonkCameraControl::TakePictureImpl(TakePictureTask* aTakePicture)
     nsCOMPtr<nsICameraErrorCallback> ecb = mTakePictureOnErrorCb;
     mTakePictureOnErrorCb = nullptr;
     if (ecb) {
-      nsresult rv = NS_DispatchToMainThread(new CameraErrorResult(ecb, NS_LITERAL_STRING("CANCELLED")));
+      nsresult rv = NS_DispatchToMainThread(new CameraErrorResult(ecb, NS_LITERAL_STRING("CANCELLED"), mWindowId));
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
@@ -709,34 +711,17 @@ nsGonkCameraControl::StartRecordingImpl(StartRecordingTask* aStartRecording)
   mStartRecordingOnErrorCb = aStartRecording->mOnErrorCb;
 
   /**
-   * We need to pull in the base path from aStartRecording->mStorageArea
-   * once that feature lands.  See bug 795201.
-   *
-   * For now, we just assume /sdcard/Movies.
-   *
-   * Also, the camera app needs to provide the file extension '.3gp' for now.
+   * The camera app needs to provide the file extension '.3gp' for now.
    * See bug 795202.
    */
-#if 1
   nsCOMPtr<nsIFile> filename;
   aStartRecording->mStorageArea->GetRootDirectory(getter_AddRefs(filename));
   filename->Append(aStartRecording->mFilename);
 
   nsAutoCString pathname;
   filename->GetNativePath(pathname);
-#else
-  nsAutoCString pathname(NS_LITERAL_CSTRING("/sdcard/Movies/"));
-  nsAutoCString filename(NS_ConvertUTF16toUTF8(aStartRecording->mFilename));
-
-  // Make sure that the file name doesn't contain any directory components.
-  if (strcmp(filename.get(), basename(filename.get())) != 0) {
-    DOM_CAMERA_LOGE("Video filename '%s' is not valid\n", filename.get());
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  pathname.Append(filename);
-#endif
   DOM_CAMERA_LOGI("Video pathname is '%s'\n", pathname.get());
+
   int fd = open(pathname.get(), O_RDWR | O_CREAT, 0644);
   if (fd < 0) {
     DOM_CAMERA_LOGE("Couldn't create file '%s' with error (%d) %s\n", pathname.get(), errno, strerror(errno));
@@ -755,7 +740,7 @@ nsGonkCameraControl::StartRecordingImpl(StartRecordingTask* aStartRecording)
   }
 
   // dispatch the callback
-  nsCOMPtr<nsIRunnable> startRecordingResult = new StartRecordingResult(mStartRecordingOnSuccessCb);
+  nsCOMPtr<nsIRunnable> startRecordingResult = new StartRecordingResult(mStartRecordingOnSuccessCb, mWindowId);
   nsresult rv = NS_DispatchToMainThread(startRecordingResult);
   if (NS_FAILED(rv)) {
     DOM_CAMERA_LOGE("Failed to dispatch start recording result to main thread (%d)!", rv);
@@ -788,7 +773,7 @@ nsGonkCameraControl::AutoFocusComplete(bool aSuccess)
    * to the onSuccess callback to determine how to handle the case
    * where the camera wasn't actually able to acquire focus.
    */
-  nsCOMPtr<nsIRunnable> autoFocusResult = new AutoFocusResult(aSuccess, mAutoFocusOnSuccessCb);
+  nsCOMPtr<nsIRunnable> autoFocusResult = new AutoFocusResult(aSuccess, mAutoFocusOnSuccessCb, mWindowId);
   /**
    * Remember to set these to null so that we don't hold any extra
    * references to our document's window.
@@ -810,7 +795,7 @@ nsGonkCameraControl::TakePictureComplete(uint8_t* aData, uint32_t aLength)
 
   // TODO: see bug 779144.
   nsIDOMBlob* blob = new nsDOMMemoryFile(static_cast<void*>(data), static_cast<uint64_t>(aLength), NS_LITERAL_STRING("image/jpeg"));
-  nsCOMPtr<nsIRunnable> takePictureResult = new TakePictureResult(blob, mTakePictureOnSuccessCb);
+  nsCOMPtr<nsIRunnable> takePictureResult = new TakePictureResult(blob, mTakePictureOnSuccessCb, mWindowId);
   /**
    * Remember to set these to null so that we don't hold any extra
    * references to our document's window.
@@ -1017,7 +1002,7 @@ nsGonkCameraControl::GetPreviewStreamVideoModeImpl(GetPreviewStreamVideoModeTask
   NS_ENSURE_SUCCESS(rv, rv);
 
   // create and return new preview stream object
-  getPreviewStreamResult = new GetPreviewStreamResult(this, mVideoWidth, mVideoHeight, mVideoFrameRate, aGetPreviewStreamVideoMode->mOnSuccessCb);
+  getPreviewStreamResult = new GetPreviewStreamResult(this, mVideoWidth, mVideoHeight, mVideoFrameRate, aGetPreviewStreamVideoMode->mOnSuccessCb, mWindowId);
   rv = NS_DispatchToMainThread(getPreviewStreamResult);
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to dispatch GetPreviewStreamVideoMode() onSuccess callback to main thread!");
@@ -1064,4 +1049,16 @@ ReceiveFrame(nsGonkCameraControl* gc, layers::GraphicBufferLocked* aBuffer)
   }
 }
 
+void
+OnShutter(nsGonkCameraControl* gc)
+{
+  gc->OnShutter();
+}
+
+void
+OnClosed(nsGonkCameraControl* gc)
+{
+  gc->OnClosed();
+}
+
 } // namespace mozilla
diff --git a/dom/camera/GonkCameraControl.h b/dom/camera/GonkCameraControl.h
index 0e9bec158006..6918a0e452b7 100644
--- a/dom/camera/GonkCameraControl.h
+++ b/dom/camera/GonkCameraControl.h
@@ -35,7 +35,7 @@ class GraphicBufferLocked;
 class nsGonkCameraControl : public CameraControlImpl
 {
 public:
-  nsGonkCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError);
+  nsGonkCameraControl(uint32_t aCameraId, nsIThread* aCameraThread, nsDOMCameraControl* aDOMCameraControl, nsICameraGetCameraCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId);
   nsresult Init();
 
   const char* GetParameter(const char* aKey);
@@ -120,6 +120,8 @@ private:
 void ReceiveImage(nsGonkCameraControl* gc, uint8_t* aData, uint32_t aLength);
 void AutoFocusComplete(nsGonkCameraControl* gc, bool aSuccess);
 void ReceiveFrame(nsGonkCameraControl* gc, layers::GraphicBufferLocked* aBuffer);
+void OnShutter(nsGonkCameraControl* gc);
+void OnClosed(nsGonkCameraControl* gc);
 
 } // namespace mozilla
 
diff --git a/dom/camera/GonkCameraHwMgr.cpp b/dom/camera/GonkCameraHwMgr.cpp
index d22471b803c1..65d8f58f1e41 100644
--- a/dom/camera/GonkCameraHwMgr.cpp
+++ b/dom/camera/GonkCameraHwMgr.cpp
@@ -134,7 +134,7 @@ GonkCameraHardware::NotifyCallback(int32_t aMsgType, int32_t ext1, int32_t ext2,
       break;
 
     case CAMERA_MSG_SHUTTER:
-      DOM_CAMERA_LOGW("Shutter event not handled yet\n");
+      OnShutter(camera);
       break;
 
     default:
@@ -198,6 +198,14 @@ GonkCameraHardware::~GonkCameraHardware()
 {
   DOM_CAMERA_LOGT( "%s:%d : this=%p\n", __func__, __LINE__, (void*)this );
   sHw = nullptr;
+
+  /**
+   * Trigger the OnClosed event; the upper layers can't do anything
+   * with the hardware layer once they receive this event.
+   */
+  if (mTarget) {
+    OnClosed(mTarget);
+  }
 }
 
 GonkCameraHardware* GonkCameraHardware::sHw         = nullptr;
diff --git a/dom/camera/ICameraControl.h b/dom/camera/ICameraControl.h
index 2f5a88b74f3f..571fbbd50132 100644
--- a/dom/camera/ICameraControl.h
+++ b/dom/camera/ICameraControl.h
@@ -37,6 +37,10 @@ public:
   virtual nsresult Get(uint32_t aKey, double* aValue) = 0;
   virtual nsresult Set(JSContext* aCx, uint32_t aKey, const JS::Value& aValue, uint32_t aLimit) = 0;
   virtual nsresult Get(JSContext* aCx, uint32_t aKey, JS::Value* aValue) = 0;
+  virtual nsresult Set(nsICameraShutterCallback* aOnShutter) = 0;
+  virtual nsresult Get(nsICameraShutterCallback** aOnShutter) = 0;
+  virtual nsresult Set(nsICameraClosedCallback* aOnClosed) = 0;
+  virtual nsresult Get(nsICameraClosedCallback** aOnClosed) = 0;
   virtual nsresult SetFocusAreas(JSContext* aCx, const JS::Value& aValue) = 0;
   virtual nsresult SetMeteringAreas(JSContext* aCx, const JS::Value& aValue) = 0;
 
@@ -49,6 +53,8 @@ public:
   virtual void SetParameter(uint32_t aKey, double aValue) = 0;
   virtual void SetParameter(uint32_t aKey, const nsTArray<CameraRegion>& aRegions) = 0;
 
+  virtual void Shutdown() = 0;
+
 protected:
   virtual ~ICameraControl() { }
 };
diff --git a/dom/camera/nsIDOMCameraManager.idl b/dom/camera/nsIDOMCameraManager.idl
index aaf0fe8f999e..a9031f98c534 100644
--- a/dom/camera/nsIDOMCameraManager.idl
+++ b/dom/camera/nsIDOMCameraManager.idl
@@ -184,6 +184,12 @@ interface nsICameraShutterCallback : nsISupports
     void handleEvent();
 };
 
+[scriptable, function, uuid(0ef0f01e-ce74-4741-9bba-54376adfb7a2)]
+interface nsICameraClosedCallback : nsISupports
+{
+    void handleEvent();
+};
+
 [scriptable, function, uuid(a302c6c9-3776-4d1d-a395-f4105d47c3d3)]
 interface nsICameraErrorCallback : nsISupports
 {
@@ -194,7 +200,7 @@ interface nsICameraErrorCallback : nsISupports
     attributes here affect the preview, any pictures taken, and/or
     any video recorded by the camera.
 */
-[scriptable, uuid(469e0462-59e4-4ed5-afa9-aecd1256ee30)]
+[scriptable, uuid(0f206acd-196b-4bdf-8198-44c1a0cd1998)]
 interface nsICameraControl : nsISupports
 {
     readonly attribute nsICameraCapabilities capabilities;
@@ -285,6 +291,11 @@ interface nsICameraControl : nsISupports
        a shutter sound and/or a visual shutter indicator. */
     attribute nsICameraShutterCallback onShutter;
 
+    /* the function to call when the camera hardware is closed
+       by the underlying framework, e.g. when another app makes a more
+       recent call to get the camera. */
+    attribute nsICameraClosedCallback onClosed;
+
     /* tell the camera to attempt to focus the image */
     void autoFocus(in nsICameraAutoFocusCallback onSuccess, [optional] in nsICameraErrorCallback onError);
 

From b858e87bce6d2c82a069c50a45b74085cc84bb51 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Sun, 30 Sep 2012 21:29:42 -0400
Subject: [PATCH 33/64] bug 769764 - followup fix error check and whitespace
 r=josh

---
 dom/plugins/base/nsPluginHost.cpp                          | 2 +-
 toolkit/components/passwordmgr/test/test_prompt_async.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index 1bef46932c9d..2ff98f8fd9c1 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -751,7 +751,7 @@ nsresult nsPluginHost::FindProxyForURL(const char* url, char* *result)
     return res;
 
   proxyService2 = do_QueryInterface(proxyService, &res);
-  if (NS_FAILED(res) || !proxyService)
+  if (NS_FAILED(res) || !proxyService2)
     return res;
 
   ioService = do_GetService(NS_IOSERVICE_CONTRACTID, &res);
diff --git a/toolkit/components/passwordmgr/test/test_prompt_async.html b/toolkit/components/passwordmgr/test/test_prompt_async.html
index 8c360adfdc17..eab918c4b17a 100644
--- a/toolkit/components/passwordmgr/test/test_prompt_async.html
+++ b/toolkit/components/passwordmgr/test/test_prompt_async.html
@@ -81,7 +81,7 @@
 
             var mozproxy = "moz-proxy://" +
                            SpecialPowers.wrap(pi).host + ":" +
-	                   SpecialPowers.wrap(pi).port;
+                           SpecialPowers.wrap(pi).port;
 
             addLogin(mozproxy, "proxy_realm",
                      "proxy_user", "proxy_pass");
@@ -125,7 +125,7 @@
 	const interfaces = [Ci.nsIProtocolProxyCallback, Ci.nsISupports];
 
         if (!interfaces.some( function(v) { return iid.equals(v) } ))
-	  throw Components.results.NS_ERROR_NO_INTERFACE;
+          throw Components.results.NS_ERROR_NO_INTERFACE;
 	  return this;
 	},
 

From 3bb8a8dd86a9de819d6974f9486a92a31befb54d Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 30 Sep 2012 18:33:07 -0700
Subject: [PATCH 34/64] Bug 443763 - reenable test_bug331215.xul now that the
 passage of time has fixed it

--HG--
rename : layout/reftests/flexbox/solidblue.png => layout/reftests/bugs/solidblue.png
extra : rebase_source : 8862729ddc242e07a31abd2ec815ab0bd9dd35f9
---
 toolkit/content/tests/chrome/test_bug331215.xul | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/toolkit/content/tests/chrome/test_bug331215.xul b/toolkit/content/tests/chrome/test_bug331215.xul
index 0f369d840478..f4b1a991e166 100644
--- a/toolkit/content/tests/chrome/test_bug331215.xul
+++ b/toolkit/content/tests/chrome/test_bug331215.xul
@@ -29,13 +29,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=331215
 <![CDATA[
 
 /** Test for Bug 331215 **/
-todo(false, "disabled - to be fixed in bug 443763");
-/*
-XXX disabled - to be fixed in bug 443763
+
 SimpleTest.waitForExplicitFinish();
 window.open("bug331215_window.xul", "331215test", 
             "chrome,width=600,height=600");
-*/
 
 ]]>
 </script>

From 7ad8f721a7e7fdf360a22dbf385c3e05b96c4818 Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall.law@gmail.com>
Date: Sun, 30 Sep 2012 21:55:51 -0500
Subject: [PATCH 35/64] Bug 778349: Initial support for OS ("FOTA") updates in
 Gonk. r=rstrong r=bbondy r=fabrice

---
 b2g/components/DirectoryProvider.js         |  35 +++++++
 b2g/components/UpdatePrompt.js              |  46 ++++++++-
 toolkit/mozapps/update/common/errors.h      |   2 +
 toolkit/mozapps/update/nsIUpdateService.idl |   8 +-
 toolkit/mozapps/update/nsUpdateService.js   |  37 ++++++-
 toolkit/mozapps/update/updater/updater.cpp  |  12 ++-
 toolkit/xre/nsUpdateDriver.cpp              | 103 +++++++++++++++++++-
 toolkit/xre/nsUpdateDriver.h                |   7 +-
 xpcom/build/nsXULAppAPI.h                   |   7 ++
 9 files changed, 245 insertions(+), 12 deletions(-)

diff --git a/b2g/components/DirectoryProvider.js b/b2g/components/DirectoryProvider.js
index b02a3a560d1b..1a657f33dee8 100644
--- a/b2g/components/DirectoryProvider.js
+++ b/b2g/components/DirectoryProvider.js
@@ -10,8 +10,13 @@ const Cr = Components.results;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
+const XRE_OS_UPDATE_APPLY_TO_DIR = "OSUpdApplyToD"
 const LOCAL_DIR = "/data/local";
 
+XPCOMUtils.defineLazyServiceGetter(Services, "env",
+                                   "@mozilla.org/process/environment;1",
+                                   "nsIEnvironment");
+
 function DirectoryProvider() {
 }
 
@@ -35,10 +40,40 @@ DirectoryProvider.prototype = {
       file.initWithPath("/system/b2g");
       persistent.value = true;
       return file;
+    } else if (prop == XRE_OS_UPDATE_APPLY_TO_DIR) {
+      return this.getOSUpdateApplyToDir(persistent);
     }
 #endif
 
     return null;
+  },
+
+  getOSUpdateApplyToDir: function dp_getOSUpdateApplyToDir(persistent) {
+    // TODO add logic to check available storage space,
+    // and iterate through pref(s) to find alternative dirs if
+    // necessary.
+
+    let path = Services.env.get("EXTERNAL_STORAGE");
+    if (!path) {
+      path = LOCAL_PATH;
+    }
+
+    let dir = Cc["@mozilla.org/file/local;1"]
+                 .createInstance(Ci.nsILocalFile)
+    dir.initWithPath(path);
+
+    if (!dir.exists() && path != LOCAL_PATH) {
+      // Fallback to LOCAL_PATH if we didn't fallback earlier
+      dir.initWithPath(LOCAL_PATH);
+
+      if (!dir.exists()) {
+        throw Cr.NS_ERROR_FILE_NOT_FOUND;
+      }
+    }
+
+    dir.appendRelativePath("updates");
+    persistent.value = false;
+    return dir;
   }
 };
 
diff --git a/b2g/components/UpdatePrompt.js b/b2g/components/UpdatePrompt.js
index f3f785131a0f..8b813d6c4c6d 100644
--- a/b2g/components/UpdatePrompt.js
+++ b/b2g/components/UpdatePrompt.js
@@ -168,7 +168,7 @@ UpdatePrompt.prototype = {
         this._applyWaitTimer = this.createTimer(APPLY_WAIT_TIMEOUT);
         break;
       case "restart":
-        this.restartProcess();
+        this.finishUpdate();
         break;
     }
   },
@@ -178,6 +178,34 @@ UpdatePrompt.prototype = {
     Services.aus.addDownloadListener(this);
   },
 
+  finishUpdate: function UP_finishUpdate() {
+    if (!this._update.isOSUpdate) {
+      // Standard gecko+gaia updates will just need to restart the process
+      this.restartProcess();
+      return;
+    }
+
+    let osApplyToDir;
+    try {
+      this._update.QueryInterface(Ci.nsIWritablePropertyBag);
+      osApplyToDir = this._update.getProperty("osApplyToDir");
+    } catch (e) {}
+
+    if (!osApplyToDir) {
+      log("Error: Update has no osApplyToDir");
+      return;
+    }
+
+    let updateFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
+    updateFile.initWithPath(osApplyToDir + "/update.zip");
+    if (!updateFile.exists()) {
+      log("Error: FOTA update not found at " + updateFile.path);
+      return;
+    }
+
+    this.finishOSUpdate(updateFile.path);
+  },
+
   restartProcess: function UP_restartProcess() {
     log("Update downloaded, restarting to apply it");
 
@@ -194,11 +222,25 @@ UpdatePrompt.prototype = {
       );
   },
 
+  finishOSUpdate: function UP_finishOSUpdate(aOsUpdatePath) {
+    let recoveryService = Cc["@mozilla.org/recovery-service;1"]
+                            .getService(Ci.nsIRecoveryService);
+
+    log("Rebooting into recovery to apply FOTA update: " + aOsUpdatePath);
+
+    try {
+      recoveryService.installFotaUpdate(aOsUpdatePath);
+    } catch(e) {
+      log("Error: Couldn't reboot into recovery to apply FOTA update " +
+          aOsUpdatePath);
+    }
+  },
+
   notify: function UP_notify(aTimer) {
     if (aTimer == this._applyPromptTimer) {
       log("Timed out waiting for result, restarting");
       this._applyPromptTimer = null;
-      this.restartProcess();
+      this.finishUpdate();
     } else if (aTimer == this._applyWaitTimer) {
       this._applyWaitTimer = null;
       this.showUpdatePrompt();
diff --git a/toolkit/mozapps/update/common/errors.h b/toolkit/mozapps/update/common/errors.h
index c98504135900..2142826474e4 100644
--- a/toolkit/mozapps/update/common/errors.h
+++ b/toolkit/mozapps/update/common/errors.h
@@ -62,6 +62,8 @@
 #define UNEXPECTED_BSPATCH_ERROR 41
 #define UNEXPECTED_FILE_OPERATION_ERROR 42
 #define FILESYSTEM_MOUNT_READWRITE_ERROR 43
+#define FOTA_GENERAL_ERROR 44
+#define FOTA_UNKNOWN_ERROR 45
 
 // The following error codes are only used by updater.exe
 // when a fallback key exists and XPCShell tests are being run.
diff --git a/toolkit/mozapps/update/nsIUpdateService.idl b/toolkit/mozapps/update/nsIUpdateService.idl
index 0dde626795f4..4a6b3cc995be 100644
--- a/toolkit/mozapps/update/nsIUpdateService.idl
+++ b/toolkit/mozapps/update/nsIUpdateService.idl
@@ -87,7 +87,7 @@ interface nsIUpdatePatch : nsISupports
  * that the front end and other application services can use to learn more
  * about what is going on.
  */
-[scriptable, uuid(2379e2e1-8eab-4084-8d8c-94ffeee56804)]
+[scriptable, uuid(b10bbf29-5a54-4e1e-aa64-c4e4e5819a52)]
 interface nsIUpdate : nsISupports
 {
   /**
@@ -197,6 +197,12 @@ interface nsIUpdate : nsISupports
    */
   attribute boolean isSecurityUpdate;
 
+  /**
+   * Whether or not the update being downloaded is an OS update. This is
+   * generally only possible in Gonk right now.
+   */
+  attribute boolean isOSUpdate;
+
   /**
    * When the update was installed.
    */
diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index 0fa4769361b3..e3b617cae26d 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -141,6 +141,8 @@ const UNEXPECTED_MAR_ERROR             = 40;
 const UNEXPECTED_BSPATCH_ERROR         = 41;
 const UNEXPECTED_FILE_OPERATION_ERROR  = 42;
 const FILESYSTEM_MOUNT_READWRITE_ERROR = 43;
+const FOTA_GENERAL_ERROR               = 44;
+const FOTA_UNKNOWN_ERROR               = 45;
 
 const CERT_ATTR_CHECK_FAILED_NO_UPDATE  = 100;
 const CERT_ATTR_CHECK_FAILED_HAS_UPDATE = 101;
@@ -958,7 +960,9 @@ function handleUpdateFailure(update, errorCode) {
       update.errorCode == WRITE_ERROR_ACCESS_DENIED ||
       update.errorCode == WRITE_ERROR_SHARING_VIOLATION ||
       update.errorCode == WRITE_ERROR_CALLBACK_APP ||
-      update.errorCode == FILESYSTEM_MOUNT_READWRITE_ERROR) {
+      update.errorCode == FILESYSTEM_MOUNT_READWRITE_ERROR ||
+      update.errorCode == FOTA_GENERAL_ERROR ||
+      update.errorCode == FOTA_UNKNOWN_ERROR) {
     Cc["@mozilla.org/updates/update-prompt;1"].
       createInstance(Ci.nsIUpdatePrompt).
       showUpdateError(update);
@@ -1172,6 +1176,7 @@ function Update(update) {
   this._properties = {};
   this._patches = [];
   this.isCompleteUpdate = false;
+  this.isOSUpdate = false;
   this.showPrompt = false;
   this.showSurvey = false;
   this.showNeverForVersion = false;
@@ -1232,6 +1237,8 @@ function Update(update) {
       this.isCompleteUpdate = attr.value == "true";
     else if (attr.name == "isSecurityUpdate")
       this.isSecurityUpdate = attr.value == "true";
+    else if (attr.name == "isOSUpdate")
+      this.isOSUpdate = attr.value == "true";
     else if (attr.name == "showNeverForVersion")
       this.showNeverForVersion = attr.value == "true";
     else if (attr.name == "showPrompt")
@@ -1370,6 +1377,7 @@ Update.prototype = {
     update.setAttribute("extensionVersion", this.appVersion);
     update.setAttribute("installDate", this.installDate);
     update.setAttribute("isCompleteUpdate", this.isCompleteUpdate);
+    update.setAttribute("isOSUpdate", this.isOSUpdate);
     update.setAttribute("name", this.name);
     update.setAttribute("serviceURL", this.serviceURL);
     update.setAttribute("showNeverForVersion", this.showNeverForVersion);
@@ -1582,6 +1590,29 @@ UpdateService.prototype = {
       return;
     }
 
+#ifdef MOZ_WIDGET_GONK
+    if (status == STATE_APPLIED && update && update.isOSUpdate) {
+      // In gonk, we need to check for OS update status after startup, since
+      // the recovery partition won't write to update.status for us
+      var recoveryService = Cc["@mozilla.org/recovery-service;1"].
+                            getService(Ci.nsIRecoveryService);
+
+      var fotaStatus = recoveryService.getFotaUpdateStatus();
+      switch (fotaStatus) {
+        case Ci.nsIRecoveryService.FOTA_UPDATE_SUCCESS:
+          status = STATE_SUCCEEDED;
+          break;
+        case Ci.nsIRecoveryService.FOTA_UPDATE_FAIL:
+          status = STATE_FAILED + ": " + FOTA_GENERAL_ERROR;
+          break;
+        case Ci.nsIRecoveryService.FOTA_UPDATE_UNKNOWN:
+        default:
+          status = STATE_FAILED + ": " + FOTA_UNKNOWN_ERROR;
+          break;
+      }
+    }
+#endif
+
     if (!update)
       update = new Update(null);
 
@@ -3477,7 +3508,9 @@ UpdatePrompt.prototype = {
          update.errorCode == WRITE_ERROR_ACCESS_DENIED ||
          update.errorCode == WRITE_ERROR_SHARING_VIOLATION ||
          update.errorCode == WRITE_ERROR_CALLBACK_APP ||
-         update.errorCode == FILESYSTEM_MOUNT_READWRITE_ERROR)) {
+         update.errorCode == FILESYSTEM_MOUNT_READWRITE_ERROR ||
+         update.errorCode == FOTA_GENERAL_ERROR ||
+         update.errorCode == FOTA_UNKNOWN_ERROR)) {
       var title = gUpdateBundle.GetStringFromName("updaterIOErrorTitle");
       var text = gUpdateBundle.formatStringFromName("updaterIOErrorMsg",
                                                     [Services.appinfo.name,
diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
index f432a4a0e820..68693422dc82 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -272,6 +272,7 @@ static bool gSucceeded = false;
 static bool sBackgroundUpdate = false;
 static bool sReplaceRequest = false;
 static bool sUsingService = false;
+static bool sIsOSUpdate = false;
 
 #ifdef XP_WIN
 // The current working directory specified in the command line.
@@ -2092,7 +2093,7 @@ UpdateThreadFunc(void *param)
     }
 #endif
 
-    if (rv == OK && sBackgroundUpdate) {
+    if (rv == OK && sBackgroundUpdate && !sIsOSUpdate) {
       rv = CopyInstallDirToDestDir();
     }
 
@@ -2257,6 +2258,11 @@ int NS_main(int argc, NS_tchar **argv)
     }
   }
 
+  if (getenv("MOZ_OS_UPDATE")) {
+    sIsOSUpdate = true;
+    putenv(const_cast<char*>("MOZ_OS_UPDATE="));
+  }
+
   if (sReplaceRequest) {
     // If we're attempting to replace the application, try to append to the
     // log generated when staging the background update.
@@ -3385,6 +3391,10 @@ GetManifestContents(const NS_tchar *manifest)
 
 int AddPreCompleteActions(ActionList *list)
 {
+  if (sIsOSUpdate) {
+    return OK;
+  }
+
   NS_tchar *rb = GetManifestContents(NS_T("precomplete"));
   if (rb == NULL) {
     LOG(("AddPreCompleteActions: error getting contents of precomplete " \
diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index 10e60d6fb274..c6752b7d1c80 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -9,7 +9,9 @@
 #include "nsUpdateDriver.h"
 #include "nsXULAppAPI.h"
 #include "nsAppRunner.h"
+#include "nsIWritablePropertyBag.h"
 #include "nsIFile.h"
+#include "nsIVariant.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "prproces.h"
@@ -557,6 +559,48 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
 #endif
 }
 
+#if defined(MOZ_WIDGET_GONK)
+static nsresult
+GetOSApplyToDir(nsACString& applyToDir)
+{
+  nsCOMPtr<nsIProperties> ds =
+    do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
+  NS_ASSERTION(ds, "Can't get directory service");
+
+  nsCOMPtr<nsIFile> osApplyToDir;
+  nsresult rv = ds->Get(XRE_OS_UPDATE_APPLY_TO_DIR, NS_GET_IID(nsIFile),
+                        getter_AddRefs(osApplyToDir));
+  NS_ASSERTION(NS_SUCCEEDED(rv), "Can't get the OS applyTo dir");
+
+  return osApplyToDir->GetNativePath(applyToDir);
+}
+
+static void
+SetOSApplyToDir(nsIUpdate* update, const nsACString& osApplyToDir)
+{
+  nsresult rv;
+  nsCOMPtr<nsIWritablePropertyBag> updateProperties =
+    do_QueryInterface(update, &rv);
+
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  nsCOMPtr<nsIWritableVariant> variant =
+    do_CreateInstance("@mozilla.org/variant;1", &rv);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  rv = variant->SetAsACString(osApplyToDir);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  updateProperties->SetProperty(NS_LITERAL_STRING("osApplyToDir"), variant);
+}
+#endif
+
 /**
  * Apply an update, possibly in the background.
  *
@@ -574,7 +618,8 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
  */
 static void
 ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
-            nsIFile *appDir, int appArgc, char **appArgv, bool restart,
+            nsIFile *appDir, int appArgc, char **appArgv,
+            bool restart, bool isOSUpdate, nsIFile *osApplyToDir,
             ProcessType *outpid)
 {
   nsresult rv;
@@ -672,9 +717,26 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
   NS_ConvertUTF16toUTF8 applyToDir(applyToDirW);
 #else
   nsAutoCString applyToDir;
-  rv = updatedDir->GetNativePath(applyToDir);
-#endif
+
+#if defined(MOZ_WIDGET_GONK)
+  if (isOSUpdate) {
+    if (!osApplyToDir) {
+      return;
+    }
+
+    rv = osApplyToDir->GetNativePath(applyToDir);
+  } else {
+#endif // defined(MOZ_WIDGET_GONK)
+
+    rv = updatedDir->GetNativePath(applyToDir);
+
+#if defined(MOZ_WIDGET_GONK)
+  }
+#endif // defined(MOZ_WIDGET_GONK)
+
+#endif // defined(XP_WIN)
 #endif
+
   if (NS_FAILED(rv))
     return;
 
@@ -742,6 +804,10 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
     PR_SetEnv("MOZ_SAFE_MODE_RESTART=1");
   }
 
+  if (isOSUpdate) {
+    PR_SetEnv("MOZ_OS_UPDATE=1");
+  }
+
   LOG(("spawning updater process [%s]\n", updaterPath.get()));
 
 #if defined(USE_EXECV)
@@ -801,7 +867,8 @@ WaitForProcess(ProcessType pt)
 nsresult
 ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
                int argc, char **argv, const char *appVersion,
-               bool restart, ProcessType *pid)
+               bool restart, bool isOSUpdate, nsIFile *osApplyToDir,
+               ProcessType *pid)
 {
   nsresult rv;
 
@@ -865,7 +932,7 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
       updatesDir->Remove(true);
     } else {
       ApplyUpdate(greDir, updatesDir, statusFile,
-                  appDir, argc, argv, restart, pid);
+                  appDir, argc, argv, restart, isOSUpdate, osApplyToDir, pid);
     }
     break;
   }
@@ -885,6 +952,8 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
   return NS_OK;
 }
 
+
+
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsUpdateProcessor, nsIUpdateProcessor)
 
 nsUpdateProcessor::nsUpdateProcessor()
@@ -980,6 +1049,26 @@ nsUpdateProcessor::ProcessUpdate(nsIUpdate* aUpdate)
   }
   mInfo.mAppVersion = appVersion;
 
+#if defined(MOZ_WIDGET_GONK)
+  bool isOSUpdate;
+  if (NS_SUCCEEDED(aUpdate->GetIsOSUpdate(&isOSUpdate)) &&
+      isOSUpdate) {
+    nsAutoCString osApplyToDir;
+
+    // This needs to be done on the main thread, so we pass it along in
+    // BackgroundThreadInfo
+    nsresult rv = GetOSApplyToDir(osApplyToDir);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Can't get the OS apply to dir");
+
+    SetOSApplyToDir(aUpdate, osApplyToDir);
+
+    mInfo.mIsOSUpdate = true;
+    rv = NS_NewNativeLocalFile(osApplyToDir, false,
+                               getter_AddRefs(mInfo.mOSApplyToDir));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create nsIFile for OS apply to dir");
+  }
+#endif
+
   mUpdate = aUpdate;
 
   NS_ABORT_IF_FALSE(NS_IsMainThread(), "not main thread");
@@ -987,6 +1076,8 @@ nsUpdateProcessor::ProcessUpdate(nsIUpdate* aUpdate)
                       NS_NewRunnableMethod(this, &nsUpdateProcessor::StartBackgroundUpdate));
 }
 
+
+
 void
 nsUpdateProcessor::StartBackgroundUpdate()
 {
@@ -999,6 +1090,8 @@ nsUpdateProcessor::StartBackgroundUpdate()
                                mInfo.mArgv,
                                mInfo.mAppVersion.get(),
                                false,
+                               mInfo.mIsOSUpdate,
+                               mInfo.mOSApplyToDir,
                                &mUpdaterPID);
   NS_ENSURE_SUCCESS_VOID(rv);
 
diff --git a/toolkit/xre/nsUpdateDriver.h b/toolkit/xre/nsUpdateDriver.h
index dfd0aa24fc77..ee34b630b81e 100644
--- a/toolkit/xre/nsUpdateDriver.h
+++ b/toolkit/xre/nsUpdateDriver.h
@@ -53,6 +53,8 @@ NS_HIDDEN_(nsresult) ProcessUpdates(nsIFile *greDir, nsIFile *appDir,
                                     int argc, char **argv,
                                     const char *appVersion,
                                     bool restart = true,
+                                    bool isOSUpdate = false,
+                                    nsIFile *osApplyToDir = nullptr,
                                     ProcessType *pid = nullptr);
 
 #ifdef MOZ_UPDATER
@@ -72,7 +74,8 @@ private:
   struct BackgroundUpdateInfo {
     BackgroundUpdateInfo()
       : mArgc(0),
-        mArgv(nullptr)
+        mArgv(nullptr),
+        mIsOSUpdate(false)
     {}
     ~BackgroundUpdateInfo() {
       for (int i = 0; i < mArgc; ++i) {
@@ -84,9 +87,11 @@ private:
     nsCOMPtr<nsIFile> mGREDir;
     nsCOMPtr<nsIFile> mAppDir;
     nsCOMPtr<nsIFile> mUpdateRoot;
+    nsCOMPtr<nsIFile> mOSApplyToDir;
     int mArgc;
     char **mArgv;
     nsAutoCString mAppVersion;
+    bool mIsOSUpdate;
   };
 
 private:
diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
index a6fb639f741a..d7859a2b9c6e 100644
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -124,6 +124,13 @@
  */
 #define XRE_UPDATE_ROOT_DIR "UpdRootD"
 
+/**
+ * A directory service key which provides the directory where an OS update is
+*  applied.
+ * At present this is supported only in Gonk.
+ */
+#define XRE_OS_UPDATE_APPLY_TO_DIR "OSUpdApplyToD"
+
 /**
  * Platform flag values for XRE_main.
  *

From c5240fbef4457dc3b2e8d731b458412a23b3bd43 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Sun, 30 Sep 2012 17:04:32 -0700
Subject: [PATCH 36/64] Bug 795765 - Fix "used but never defined" warning for
 JSObject::asString().  r=jwalden.

---
 js/src/ion/CodeGenerator.cpp | 5 +++++
 js/src/ion/MIR.h             | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 905fc097b271..064c9eea97a1 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -22,6 +22,11 @@ using namespace js::ion;
 namespace js {
 namespace ion {
 
+StringObject *
+MNewStringObject::templateObj() const {
+    return &templateObj_->asString();
+}
+
 CodeGenerator::CodeGenerator(MIRGenerator *gen, LIRGraph &graph)
   : CodeGeneratorSpecific(gen, graph)
 {
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 462ab1ed6040..220e15048443 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -5311,9 +5311,9 @@ class MNewStringObject :
     MDefinition *input() const {
         return getOperand(0);
     }
-    StringObject *templateObj() const {
-        return &templateObj_->asString();
-    }
+
+    StringObject *templateObj() const;
+
     TypePolicy *typePolicy() {
         return this;
     }

From 00548792dc45bbf7624c530649f0c519586455a2 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 22:03:43 -0700
Subject: [PATCH 37/64] Bug 793831: Add socket validity checks to RIL IPC;
 r=cjones

---
 ipc/ril/Ril.cpp | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/ipc/ril/Ril.cpp b/ipc/ril/Ril.cpp
index 65d68a9c288a..c6173a4d9b80 100644
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -93,7 +93,11 @@ class RilReconnectTask : public CancelableTask {
 public:
     static void Enqueue(int aDelayMs = 0) {
         MessageLoopForIO* ioLoop = MessageLoopForIO::current();
-        MOZ_ASSERT(ioLoop && sClient->mIOLoop == ioLoop);
+        if (!ioLoop) {
+            NS_WARNING("No IOLoop to attach to, cancelling self!");
+            CancelIt();
+            return;
+        }
         if (sTask) {
             return;
         }
@@ -140,6 +144,10 @@ class RilWriteTask : public Task {
 };
 
 void RilWriteTask::Run() {
+    if(sClient->mSocket.get() < 0) {
+        NS_WARNING("Trying to write to non-open socket!");
+        return;
+    }
     sClient->OnFileCanWriteWithoutBlocking(sClient->mSocket.rwget());
 }
 
@@ -161,6 +169,8 @@ ConnectToRil(Monitor* aMonitor, bool* aSuccess)
 bool
 RilClient::OpenSocket()
 {
+
+    ScopedClose skt;
 #if defined(MOZ_WIDGET_GONK)
     // Using a network socket to test basic functionality
     // before we see how this works on the phone.
@@ -171,7 +181,7 @@ RilClient::OpenSocket()
     memset(&addr, 0, sizeof(addr));
     strcpy(addr.sun_path, RIL_SOCKET_NAME);
     addr.sun_family = AF_LOCAL;
-    mSocket.reset(socket(AF_LOCAL, SOCK_STREAM, 0));
+    skt.reset(socket(AF_LOCAL, SOCK_STREAM, 0));
     alen = strlen(RIL_SOCKET_NAME) + offsetof(struct sockaddr_un, sun_path) + 1;
 #else
     struct hostent *hp;
@@ -185,45 +195,46 @@ RilClient::OpenSocket()
     addr.sin_family = hp->h_addrtype;
     addr.sin_port = htons(RIL_TEST_PORT);
     memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
-    mSocket.reset(socket(hp->h_addrtype, SOCK_STREAM, 0));
+    skt.reset(socket(hp->h_addrtype, SOCK_STREAM, 0));
     alen = sizeof(addr);
 #endif
 
-    if (mSocket.get() < 0) {
+    if (skt.get() < 0) {
         LOG("Cannot create socket for RIL!\n");
         return false;
     }
 
-    if (connect(mSocket.get(), (struct sockaddr *) &addr, alen) < 0) {
+    if (connect(skt.get(), (struct sockaddr *) &addr, alen) < 0) {
 #if defined(MOZ_WIDGET_GONK)
         LOG("Cannot open socket for RIL!\n");
 #endif
-        mSocket.dispose();
+        skt.dispose();
         return false;
     }
 
     // Set close-on-exec bit.
-    int flags = fcntl(mSocket.get(), F_GETFD);
+    int flags = fcntl(skt.get(), F_GETFD);
     if (-1 == flags) {
         return false;
     }
 
     flags |= FD_CLOEXEC;
-    if (-1 == fcntl(mSocket.get(), F_SETFD, flags)) {
+    if (-1 == fcntl(skt.get(), F_SETFD, flags)) {
         return false;
     }
 
     // Select non-blocking IO.
-    if (-1 == fcntl(mSocket.get(), F_SETFL, O_NONBLOCK)) {
+    if (-1 == fcntl(skt.get(), F_SETFL, O_NONBLOCK)) {
         return false;
     }
-    if (!mIOLoop->WatchFileDescriptor(mSocket.get(),
+    if (!mIOLoop->WatchFileDescriptor(skt.get(),
                                       true,
                                       MessageLoopForIO::WATCH_READ,
                                       &mReadWatcher,
                                       this)) {
         return false;
     }
+    mSocket = skt.forget();
     LOG("Socket open for RIL\n");
     return true;
 }
@@ -261,7 +272,9 @@ RilClient::OnFileCanReadWithoutBlocking(int fd)
                 mIncoming.forget();
                 mReadWatcher.StopWatchingFileDescriptor();
                 mWriteWatcher.StopWatchingFileDescriptor();
-                close(mSocket.get());
+                // ScopedClose will close our old socket on a reset.
+                // Setting to -1 means writes will fail with message.
+                mSocket.reset(-1);
                 RilReconnectTask::Enqueue();
                 return;
             }

From f73578f1a801ffb9dc9c570f32209ff1f54c0a10 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 22:54:27 -0700
Subject: [PATCH 38/64] Bug 790739: Patch 1 - UnixSocket changes for server
 sockets; r=cjones

---
 ipc/unixsocket/UnixSocket.cpp | 305 +++++++++++++++++++++++++++++++---
 ipc/unixsocket/UnixSocket.h   |  75 +++++----
 2 files changed, 324 insertions(+), 56 deletions(-)

diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp
index a4b760014b22..fd1c88215d72 100644
--- a/ipc/unixsocket/UnixSocket.cpp
+++ b/ipc/unixsocket/UnixSocket.cpp
@@ -24,16 +24,31 @@
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
 
+#undef LOG
+#if defined(MOZ_WIDGET_GONK)
+#include <android/log.h>
+#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
+#else
+#define BTDEBUG true
+#define LOG(args...) if (BTDEBUG) printf(args);
+#endif
+
+static const int SOCKET_RETRY_TIME_MS = 1000;
+
 namespace mozilla {
 namespace ipc {
 
 class UnixSocketImpl : public MessageLoopForIO::Watcher
 {
 public:
-  UnixSocketImpl(UnixSocketConsumer* aConsumer, int aFd)
+  UnixSocketImpl(UnixSocketConsumer* aConsumer, UnixSocketConnector* aConnector,
+                 const nsACString& aAddress)
     : mConsumer(aConsumer)
     , mIOLoop(nullptr)
-    , mFd(aFd)
+    , mFd(-1)
+    , mConnector(aConnector)
+    , mCurrentTaskIsCanceled(false)
+    , mAddress(aAddress)
   {
   }
 
@@ -54,6 +69,42 @@ public:
     return mFd > 0;
   }
 
+  void CancelTask()
+  {
+    if (!mTask) {
+      return;
+    }
+    mTask->Cancel();
+    mTask = nullptr;
+    mCurrentTaskIsCanceled = true;
+  }
+  
+  void UnsetTask()
+  {
+    mTask = nullptr;
+  }
+
+  void EnqueueTask(int aDelayMs, CancelableTask* aTask)
+  {
+    MessageLoopForIO* ioLoop = MessageLoopForIO::current();
+    if (!ioLoop) {
+      NS_WARNING("No IOLoop to attach to, cancelling self!");
+      return;
+    }
+    if (mTask) {
+      return;
+    }
+    if (mCurrentTaskIsCanceled) {
+      return;
+    }
+    mTask = aTask;
+    if (aDelayMs) {
+      ioLoop->PostDelayedTask(FROM_HERE, mTask, aDelayMs);
+    } else {
+      ioLoop->PostTask(FROM_HERE, mTask);
+    }
+  }
+  
   void SetUpIO()
   {
     MOZ_ASSERT(!mIOLoop);
@@ -70,6 +121,33 @@ public:
     mConsumer.forget();
   }
 
+  /** 
+   * Connect to a socket
+   */
+  void Connect();
+
+  /** 
+   * Run bind/listen to prepare for further runs of accept()
+   */
+  void Listen();
+
+  /** 
+   * Accept an incoming connection
+   */
+  void Accept();
+
+  /** 
+   * Stop whatever connect/accept task is running
+   */
+  void Stop();
+
+  /** 
+   * Set up nonblocking flags on whatever our current file descriptor is.
+   *
+   * @return true if successful, false otherwise
+   */
+  bool SetNonblockFlags();
+
   /**
    * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated
    * directly from main thread. All non-main-thread accesses should happen with
@@ -105,12 +183,6 @@ private:
   typedef nsTArray<UnixSocketRawData* > UnixSocketRawDataQueue;
   UnixSocketRawDataQueue mOutgoingQ;
 
-  /**
-   * File descriptor to read from/write to. Connection happens on user provided
-   * thread. Read/write/close happens on IO thread.
-   */
-  ScopedClose mFd;
-
   /**
    * Incoming packet. Only to be accessed on IO Thread.
    */
@@ -125,6 +197,33 @@ private:
    * Write watcher for libevent. Only to be accessed on IO Thread.
    */
   MessageLoopForIO::FileDescriptorWatcher mWriteWatcher;
+
+  /**
+   * File descriptor to read from/write to. Connection happens on user provided
+   * thread. Read/write/close happens on IO thread.
+   */
+  ScopedClose mFd;
+
+  /** 
+   * Connector object used to create the connection we are currently using.
+   */
+  nsAutoPtr<UnixSocketConnector> mConnector;
+
+  /**
+   * If true, do not requeue whatever task we're running
+   */
+  bool mCurrentTaskIsCanceled;
+
+  /**
+   * Pointer to the task we're currently running. DO NOT DELETE MANUALLY. This
+   * will be taken care of by the IO loop. Just set to nullptr.
+   */
+  CancelableTask* mTask;
+
+  /**
+   * Address we are connecting to, assuming we are creating a client connection.
+   */
+  nsCString mAddress;
 };
 
 static void
@@ -201,27 +300,160 @@ private:
   UnixSocketImpl* mImpl;
 };
 
-bool
-UnixSocketConnector::Connect(int aFd, const char* aAddress)
+class SocketAcceptTask : public CancelableTask {
+  virtual void Run();
+
+  bool mCanceled;
+  UnixSocketImpl* mImpl;
+public:
+  virtual void Cancel() { mCanceled = true; }
+  SocketAcceptTask(UnixSocketImpl* aImpl) : mCanceled(false), mImpl(aImpl) { }
+};
+
+void SocketAcceptTask::Run() {
+  mImpl->UnsetTask();
+  if (mCanceled) {
+    return;
+  }
+  mImpl->Accept();
+}
+
+class SocketConnectTask : public CancelableTask {
+  virtual void Run();
+
+  bool mCanceled;
+  UnixSocketImpl* mImpl;
+public:
+  SocketConnectTask(UnixSocketImpl* aImpl) : mCanceled(false), mImpl(aImpl) { }
+  virtual void Cancel() { mCanceled = true; }  
+};
+
+void SocketConnectTask::Run() {
+  mImpl->UnsetTask();
+  if (mCanceled) {
+    return;
+  }
+  mImpl->Connect();
+}
+
+void
+UnixSocketImpl::Accept()
 {
-  if (!ConnectInternal(aFd, aAddress))
+  socklen_t addr_sz;
+  struct sockaddr addr;
+
+  // This will set things we don't particularly care about, but it will hand
+  // back the correct structure size which is what we do care about.
+  mConnector->CreateAddr(true, addr_sz, &addr, nullptr);
+
+  if(mFd.get() < 0)
   {
-    return false;
+    mFd = mConnector->Create();
+    if (mFd.get() < 0) {
+      return;
+    }
+
+    if (!SetNonblockFlags()) {
+      return;
+    }
+
+    if (bind(mFd.get(), &addr, addr_sz)) {
+#ifdef DEBUG
+      LOG("...bind(%d) gave errno %d", mFd.get(), errno);
+#endif
+      return;
+    }
+
+    if (listen(mFd.get(), 1)) {
+#ifdef DEBUG
+      LOG("...listen(%d) gave errno %d", mFd.get(), errno);
+#endif
+      return;
+    }
+
   }
 
+  int client_fd;
+  client_fd = accept(mFd.get(), &addr, &addr_sz);
+  if (client_fd < 0) {
+#if DEBUG
+    LOG("Socket accept errno=%d\n", errno);
+#endif
+    EnqueueTask(SOCKET_RETRY_TIME_MS, new SocketAcceptTask(this));
+    return;
+  }
+
+  if(client_fd < 0)
+  {
+    EnqueueTask(SOCKET_RETRY_TIME_MS, new SocketAcceptTask(this));
+    return;
+  }
+
+  if (!mConnector->Setup(client_fd)) {
+    NS_WARNING("Could not set up socket!");
+    return;
+  }
+  mFd.reset(client_fd);
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
+                                   new StartImplReadingTask(this));
+}
+
+void
+UnixSocketImpl::Connect()
+{
+  if(mFd.get() < 0)
+  {
+    mFd = mConnector->Create();
+    if (mFd.get() < 0) {
+      return;
+    }
+  }
+
+  int ret;
+  socklen_t addr_sz;
+  struct sockaddr addr;
+
+  mConnector->CreateAddr(false, addr_sz, &addr, mAddress.get());
+
+  ret = connect(mFd.get(), &addr, addr_sz);
+
+  if (ret) {
+#if DEBUG
+    LOG("Socket connect errno=%d\n", errno);
+#endif
+    mFd.reset(-1);
+    return;
+  }
+
+  if (!mConnector->Setup(mFd)) {
+    NS_WARNING("Could not set up socket!");
+    return;
+  }
+
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
+                                   new StartImplReadingTask(this));
+}
+
+bool
+UnixSocketImpl::SetNonblockFlags()
+{
+  // Set socket addr to be reused even if kernel is still waiting to close
+  int n = 1;
+  setsockopt(mFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n));
+
   // Set close-on-exec bit.
-  int flags = fcntl(aFd, F_GETFD);
+  int flags = fcntl(mFd, F_GETFD);
   if (-1 == flags) {
     return false;
   }
 
   flags |= FD_CLOEXEC;
-  if (-1 == fcntl(aFd, F_SETFD, flags)) {
+  if (-1 == fcntl(mFd, F_SETFD, flags)) {
     return false;
   }
 
   // Select non-blocking IO.
-  if (-1 == fcntl(aFd, F_SETFL, O_NONBLOCK)) {
+  if (-1 == fcntl(mFd, F_SETFL, O_NONBLOCK)) {
     return false;
   }
 
@@ -373,23 +605,48 @@ UnixSocketImpl::OnFileCanWriteWithoutBlocking(int aFd)
 }
 
 bool
-UnixSocketConsumer::ConnectSocket(UnixSocketConnector& aConnector,
+UnixSocketConsumer::ConnectSocket(UnixSocketConnector* aConnector,
                                   const char* aAddress)
 {
   MOZ_ASSERT(!NS_IsMainThread());
-  MOZ_ASSERT(!mImpl);
-  ScopedClose fd(aConnector.Create());
-  if (fd < 0) {
+  MOZ_ASSERT(aConnector);
+  if (mImpl) {
+    NS_WARNING("Socket already connecting/connected!");
     return false;
   }
-  if (!aConnector.Connect(fd, aAddress)) {
-    return false;
-  }
-  mImpl = new UnixSocketImpl(this, fd.forget());
+  nsCString addr;
+  addr.Assign(aAddress);
+  mImpl = new UnixSocketImpl(this, aConnector, addr);
   XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
-                                   new StartImplReadingTask(mImpl));
+                                   new SocketConnectTask(mImpl));
   return true;
 }
 
+bool
+UnixSocketConsumer::ListenSocket(UnixSocketConnector* aConnector)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(aConnector);
+  if (mImpl) {
+    NS_WARNING("Socket already connecting/connected!");
+    return false;
+  }
+  nsCString addr;
+  mImpl = new UnixSocketImpl(this, aConnector, addr);
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
+                                   new SocketAcceptTask(mImpl));
+  return true;
+}
+
+void
+UnixSocketConsumer::CancelSocketTask()
+{
+  if(!mImpl) {
+    NS_WARNING("No socket implementation to cancel task on!");
+    return;
+  }
+  mImpl->CancelTask();
+}
+
 } // namespace ipc
 } // namespace mozilla
diff --git a/ipc/unixsocket/UnixSocket.h b/ipc/unixsocket/UnixSocket.h
index fef24993a2cf..e95b11f4a0ef 100644
--- a/ipc/unixsocket/UnixSocket.h
+++ b/ipc/unixsocket/UnixSocket.h
@@ -24,7 +24,7 @@ struct UnixSocketRawData
   size_t mSize;
   size_t mCurrentWriteOffset;
 
-  /** 
+  /**
    * Constructor for situations where size is not known beforehand. (for
    * example, when reading a packet)
    *
@@ -35,7 +35,7 @@ struct UnixSocketRawData
   {
   }
 
-  /** 
+  /**
    * Constructor for situations where size is known beforehand (for example,
    * when being assigned strings)
    *
@@ -50,7 +50,7 @@ struct UnixSocketRawData
 
 class UnixSocketImpl;
 
-/** 
+/**
  * UnixSocketConnector defines the socket creation and connection/listening
  * functions for a UnixSocketConsumer. Due to the fact that socket setup can
  * vary between protocols (unix sockets, tcp sockets, bluetooth sockets, etc),
@@ -70,7 +70,7 @@ public:
   virtual ~UnixSocketConnector()
   {}
 
-  /** 
+  /**
    * Establishs a file descriptor for a socket.
    *
    * @return File descriptor for socket
@@ -78,28 +78,28 @@ public:
   virtual int Create() = 0;
 
   /** 
-   * Runs connect function on a file descriptor for the address specified. Makes
-   * sure socket is marked with flags expected by the UnixSocket handler
-   * (non-block, etc...)
+   * Since most socket specifics are related to address formation into a
+   * sockaddr struct, this function is defined by subclasses and fills in the
+   * structure as needed for whatever connection it is trying to build
    *
-   * @param aFd File descriptor created by Create() function
-   * @param aAddress Address to connect to
-   *
-   * @return true if connected, false otherwise
+   * @param aIsServer True is we are acting as a server socket
+   * @param aAddrSize Size of the struct 
+   * @param aAddr Struct to fill
+   * @param aAddress If aIsServer is false, Address to connect to. nullptr otherwise.
    */
-  bool Connect(int aFd, const char* aAddress);
-  
-protected:
+  virtual void CreateAddr(bool aIsServer,
+                          socklen_t& aAddrSize,
+                          struct sockaddr *aAddr,
+                          const char* aAddress) = 0;
+
   /** 
-   * Internal type-specific connection function to be overridden by child
-   * classes.
+   * Does any socket type specific setup that may be needed
    *
-   * @param aFd File descriptor created by Create() function
-   * @param aAddress Address to connect to
+   * @param aFd File descriptor for opened socket
    *
-   * @return true if connected, false otherwise
+   * @return true is successful, false otherwise
    */
-  virtual bool ConnectInternal(int aFd, const char* aAddress) = 0;
+  virtual bool Setup(int aFd) = 0;  
 };
 
 class UnixSocketConsumer : public RefCounted<UnixSocketConsumer>
@@ -110,8 +110,8 @@ public:
   {}
 
   virtual ~UnixSocketConsumer();
-  
-  /** 
+
+  /**
    * Function to be called whenever data is received. This is only called on the
    * main thread.
    *
@@ -119,7 +119,7 @@ public:
    */
   virtual void ReceiveSocketData(UnixSocketRawData* aMessage) = 0;
 
-  /** 
+  /**
    * Queue data to be sent to the socket on the IO thread. Can only be called on
    * originating thread.
    *
@@ -129,7 +129,7 @@ public:
    */
   bool SendSocketData(UnixSocketRawData* aMessage);
 
-  /** 
+  /**
    * Convenience function for sending strings to the socket (common in bluetooth
    * profile usage). Converts to a UnixSocketRawData struct. Can only be called
    * on originating thread.
@@ -140,26 +140,37 @@ public:
    */
   bool SendSocketData(const nsACString& aMessage);
 
-  /** 
-   * Connects to a socket. Due to the fact that this is a blocking connect (and
-   * for things such as bluetooth, it /will/ block), it is expected to be run on
-   * a thread provided by the user. It cannot run on the main thread. Runs the
-   * Create() and Connect() functions in the UnixSocketConnector.
+  /**
+   * Starts a task on the socket that will try to connect to a socket in a
+   * non-blocking manner.
    *
    * @param aConnector Connector object for socket type specific functions
    * @param aAddress Address to connect to.
    *
-   * @return true on connection, false otherwise.
+   * @return true on connect task started, false otherwise.
    */
-  bool ConnectSocket(UnixSocketConnector& aConnector, const char* aAddress);
+  bool ConnectSocket(UnixSocketConnector* aConnector, const char* aAddress);
 
   /** 
+   * Starts a task on the socket that will try to accept a new connection in a
+   * non-blocking manner.
+   *
+   * @param aConnector Connector object for socket type specific functions
+   *
+   * @return true on listen started, false otherwise
+   */
+  bool ListenSocket(UnixSocketConnector* aConnector);
+
+  /**
    * Queues the internal representation of socket for deletion. Can be called
    * from main thread.
-   *
    */
   void CloseSocket();
 
+  /** 
+   * Cancels connect/accept task loop, if one is currently running.
+   */
+  void CancelSocketTask();
 private:
   nsAutoPtr<UnixSocketImpl> mImpl;
 };

From 0514e729f5da90043c84cafa839f559190cdf79c Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 22:54:53 -0700
Subject: [PATCH 39/64] Bug 790739: Patch 2 - BluetoothSocketConnection changes
 for server sockets; r=cjones

---
 .../BluetoothUnixSocketConnector.cpp          | 124 +++++++++---------
 dom/bluetooth/BluetoothUnixSocketConnector.h  |   7 +-
 2 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.cpp b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
index ee1ccae5a260..affb9445e794 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.cpp
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
@@ -35,6 +35,15 @@
 #include "BluetoothUnixSocketConnector.h"
 #include "nsThreadUtils.h"
 
+#undef LOG
+#if defined(MOZ_WIDGET_GONK)
+#include <android/log.h>
+#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
+#else
+#define BTDEBUG true
+#define LOG(args...) if (BTDEBUG) printf(args);
+#endif
+
 USING_BLUETOOTH_NAMESPACE
 
 static const int RFCOMM_SO_SNDBUF = 70 * 1024; // 70 KB send buffer
@@ -62,33 +71,11 @@ BluetoothUnixSocketConnector::BluetoothUnixSocketConnector(
 {
 }
 
-int
-BluetoothUnixSocketConnector::Create()
+bool
+BluetoothUnixSocketConnector::Setup(int aFd)
 {
-  MOZ_ASSERT(!NS_IsMainThread());
   int lm = 0;
-  int fd = -1;
   int sndbuf;
-
-  switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-    break;
-  case BluetoothSocketType::SCO:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
-    break;
-  case BluetoothSocketType::L2CAP:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
-    break;
-  default:
-    return -1;
-  }
-
-  if (fd < 0) {
-    NS_WARNING("Could not open bluetooth socket!");
-    return -1;
-  }
-
   /* kernel does not yet support LM for SCO */
   switch (mType) {
   case BluetoothSocketType::RFCOMM:
@@ -104,72 +91,91 @@ BluetoothUnixSocketConnector::Create()
   }
 
   if (lm) {
-    if (setsockopt(fd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
+    if (setsockopt(aFd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
       NS_WARNING("setsockopt(RFCOMM_LM) failed, throwing");
-      return -1;
+      return false;
     }
   }
 
   if (mType == BluetoothSocketType::RFCOMM) {
     sndbuf = RFCOMM_SO_SNDBUF;
-    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
+    if (setsockopt(aFd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
       NS_WARNING("setsockopt(SO_SNDBUF) failed, throwing");
-      return -1;
+      return false;
     }
   }
 
+  return true;
+}
+
+int
+BluetoothUnixSocketConnector::Create()
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  int fd = -1;
+
+  switch (mType) {
+  case BluetoothSocketType::RFCOMM:
+    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+    break;
+  case BluetoothSocketType::SCO:
+    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
+    break;
+  case BluetoothSocketType::L2CAP:
+    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
+    break;
+  default:
+    MOZ_NOT_REACHED();
+  }
+
+  if (fd < 0) {
+    NS_WARNING("Could not open bluetooth socket!");
+    return -1;
+  }
+
+  if (!Setup(fd)) {
+    NS_WARNING("Could not set up socket!");
+  }
   return fd;
 }
 
-bool
-BluetoothUnixSocketConnector::ConnectInternal(int aFd, const char* aAddress)
+void
+BluetoothUnixSocketConnector::CreateAddr(bool aIsServer,
+                                         socklen_t& aAddrSize,
+                                         struct sockaddr* aAddr,
+                                         const char* aAddress)
 {
-  int n = 1;
-  setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n));
-  
-  socklen_t addr_sz;
-  struct sockaddr *addr;
-  bdaddr_t bd_address_obj;
+  // Set to BDADDR_ANY, if it's not a server, we'll reset.
+  bdaddr_t bd_address_obj = {{0, 0, 0, 0, 0, 0}};
 
-  if (get_bdaddr(aAddress, &bd_address_obj)) {
-    NS_WARNING("Can't get bluetooth address!");
-    return false;
+  if (!aIsServer && aAddress && strlen(aAddress) > 0) {
+    if (get_bdaddr(aAddress, &bd_address_obj)) {
+      NS_WARNING("Can't get bluetooth address!");
+      return;
+    }
   }
 
   switch (mType) {
   case BluetoothSocketType::RFCOMM:
     struct sockaddr_rc addr_rc;
-    addr = (struct sockaddr *)&addr_rc;
-    addr_sz = sizeof(addr_rc);
-
-    memset(addr, 0, addr_sz);
+    aAddrSize = sizeof(addr_rc);
+    memset(aAddr, 0, aAddrSize);
     addr_rc.rc_family = AF_BLUETOOTH;
     addr_rc.rc_channel = mChannel;
     memcpy(&addr_rc.rc_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
+    memcpy(aAddr, &addr_rc, sizeof(addr_rc));
     break;
   case BluetoothSocketType::SCO:
     struct sockaddr_sco addr_sco;
-    addr = (struct sockaddr *)&addr_sco;
-    addr_sz = sizeof(addr_sco);
+    aAddrSize = sizeof(addr_sco);
 
-    memset(addr, 0, addr_sz);
+    memset(aAddr, 0, aAddrSize);
     addr_sco.sco_family = AF_BLUETOOTH;
     memcpy(&addr_sco.sco_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
+    memcpy(aAddr, &addr_sco, sizeof(addr_sco));
     break;
   default:
     NS_WARNING("Socket type unknown!");
-    return false;
   }
-
-  int ret = connect(aFd, addr, addr_sz);
-
-  if (ret) {
-#if DEBUG
-    //LOG("Socket connect errno=%d\n", errno);
-#endif
-    NS_WARNING("Socket connect error!");
-    return false;
-  }
-
-  return true;
 }
+
diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.h b/dom/bluetooth/BluetoothUnixSocketConnector.h
index 324a0485d709..68e0f0061ad7 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.h
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.h
@@ -20,8 +20,11 @@ public:
   virtual ~BluetoothUnixSocketConnector()
   {}
   virtual int Create() MOZ_OVERRIDE;
-  virtual bool ConnectInternal(int aFd, const char* aAddress) MOZ_OVERRIDE;
-
+  virtual void CreateAddr(bool aIsServer,
+                          socklen_t& aAddrSize,
+                          struct sockaddr* aAddr,
+                          const char* aAddress) MOZ_OVERRIDE;
+  virtual bool Setup(int aFd) MOZ_OVERRIDE;
 private:
   BluetoothSocketType mType;
   int mChannel;

From 2a50397f574f6f730afb4a151a3d467a919a8f33 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 22:55:27 -0700
Subject: [PATCH 40/64] Bug 790739: Patch 3 - Service and Manager changes for
 Bluetooth server sockets; r=cjones

---
 dom/bluetooth/BluetoothHfpManager.cpp         |  19 +++
 dom/bluetooth/BluetoothHfpManager.h           |   2 +-
 dom/bluetooth/BluetoothService.h              |   7 ++
 dom/bluetooth/BluetoothServiceUuid.h          |  15 +++
 .../ipc/BluetoothServiceChildProcess.cpp      |  13 +++
 .../ipc/BluetoothServiceChildProcess.h        |   7 ++
 dom/bluetooth/linux/BluetoothDBusService.cpp  | 110 ++++++++++++++++--
 dom/bluetooth/linux/BluetoothDBusService.h    |  21 ++++
 ipc/dbus/DBusUtils.cpp                        |  18 ++-
 ipc/dbus/DBusUtils.h                          |   2 +
 10 files changed, 200 insertions(+), 14 deletions(-)

diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index d57a02b911d6..458b6062639f 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -407,6 +407,25 @@ BluetoothHfpManager::Connect(const nsAString& aDeviceObjectPath,
   return NS_FAILED(rv) ? false : true;
 }
 
+bool
+BluetoothHfpManager::Listen()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  BluetoothService* bs = BluetoothService::Get();
+  if (!bs) {
+    NS_WARNING("BluetoothService not available!");
+    return false;
+  }
+
+  nsresult rv = bs->ListenSocketViaService(BluetoothReservedChannels::HANDSFREE_AG,
+                                           BluetoothSocketType::RFCOMM,
+                                           true,
+                                           false,
+                                           this);
+  return NS_FAILED(rv) ? false : true;
+}
+
 void
 BluetoothHfpManager::Disconnect()
 {
diff --git a/dom/bluetooth/BluetoothHfpManager.h b/dom/bluetooth/BluetoothHfpManager.h
index 7679e8ef8b6f..719fdee4e7b9 100644
--- a/dom/bluetooth/BluetoothHfpManager.h
+++ b/dom/bluetooth/BluetoothHfpManager.h
@@ -34,7 +34,7 @@ public:
   bool SendLine(const char* aMessage);
   void CallStateChanged(int aCallIndex, int aCallState,
                         const char* aNumber, bool aIsActive);
-
+  bool Listen();
 private:
   BluetoothHfpManager();
 
diff --git a/dom/bluetooth/BluetoothService.h b/dom/bluetooth/BluetoothService.h
index d7af9702759e..69371778512b 100644
--- a/dom/bluetooth/BluetoothService.h
+++ b/dom/bluetooth/BluetoothService.h
@@ -279,6 +279,13 @@ public:
   virtual void
   DisconnectObjectPush(BluetoothReplyRunnable* aRunnable) = 0;
 
+  virtual nsresult
+  ListenSocketViaService(int aChannel,
+                         BluetoothSocketType aType,
+                         bool aAuth,
+                         bool aEncrypt,
+                         mozilla::ipc::UnixSocketConsumer* aConsumer) = 0;
+
   bool
   IsEnabled() const
   {
diff --git a/dom/bluetooth/BluetoothServiceUuid.h b/dom/bluetooth/BluetoothServiceUuid.h
index 12bad23132fb..29f337bbc350 100644
--- a/dom/bluetooth/BluetoothServiceUuid.h
+++ b/dom/bluetooth/BluetoothServiceUuid.h
@@ -30,6 +30,21 @@ namespace BluetoothServiceUuidStr {
   static const char* ObjectPush    = "00001105-0000-1000-8000-00805F9B34FB";
 }
 
+// TODO/qdot: Move these back into gonk and make the service handler deal with
+// it there.
+//
+// Gotten from reading the "u8" values in B2G/external/bluez/src/adapter.c
+// These were hardcoded into android
+enum BluetoothReservedChannels {
+  DIALUP_NETWORK = 1,
+  HANDSFREE_AG = 10,
+  HEADSET_AG = 11,
+  OPUSH = 12,
+  SIM_ACCESS = 15,
+  PBAP_PSE = 19,
+  FTP = 20,
+};
+
 }
 }
 }
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
index 5ac058707387..a0ead26dfbfc 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
@@ -226,6 +226,19 @@ BluetoothServiceChildProcess::GetSocketViaService(
   return NS_ERROR_FAILURE;
 }
 
+
+nsresult
+BluetoothServiceChildProcess::ListenSocketViaService(
+  int aChannel,
+  BluetoothSocketType aType,
+  bool aAuth,
+  bool aEncrypt,
+  mozilla::ipc::UnixSocketConsumer* aConsumer)
+{
+  MOZ_NOT_REACHED("This should never be called!");
+  return NS_ERROR_FAILURE;
+}
+
 bool
 BluetoothServiceChildProcess::SetPinCodeInternal(
                                                 const nsAString& aDeviceAddress,
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
index 37f553747232..90e9260f57f3 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
@@ -101,6 +101,13 @@ public:
                       mozilla::ipc::UnixSocketConsumer* aConsumer,
                       BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
 
+  virtual nsresult
+  ListenSocketViaService(int aChannel,
+                         BluetoothSocketType aType,
+                         bool aAuth,
+                         bool aEncrypt,
+                         mozilla::ipc::UnixSocketConsumer* aConsumer) MOZ_OVERRIDE;
+
   virtual bool
   SetPinCodeInternal(const nsAString& aDeviceAddress,
                      const nsAString& aPinCode,
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index cecb3832cdb6..62075d0abe81 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -261,6 +261,7 @@ public:
       NS_WARNING("prepare adapter failed");
       return NS_ERROR_FAILURE;
     }
+
     return NS_OK;
   }
 
@@ -726,6 +727,29 @@ ExtractHandles(DBusMessage *aReply, nsTArray<uint32_t>& aOutHandles)
   }
 }
 
+// static
+bool
+BluetoothDBusService::AddServiceRecords(const nsAString& aAdapterPath,
+                                        const char* serviceName,
+                                        unsigned long long uuidMsb,
+                                        unsigned long long uuidLsb,
+                                        int channel)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  DBusMessage *reply;
+  reply = dbus_func_args(gThreadConnection->GetConnection(),
+                         NS_ConvertUTF16toUTF8(aAdapterPath).get(),
+                         DBUS_ADAPTER_IFACE, "AddRfcommServiceRecord",
+                         DBUS_TYPE_STRING, &serviceName,
+                         DBUS_TYPE_UINT64, &uuidMsb,
+                         DBUS_TYPE_UINT64, &uuidLsb,
+                         DBUS_TYPE_UINT16, &channel,
+                         DBUS_TYPE_INVALID);
+
+  return reply ? dbus_returns_uint32(reply) : -1;
+}
+
 // static
 bool
 BluetoothDBusService::AddReservedServicesInternal(const nsAString& aAdapterPath,
@@ -2277,7 +2301,9 @@ public:
 
     nsString address = GetAddressFromObjectPath(mObjectPath);
     nsString replyError;
-    BluetoothUnixSocketConnector c(BluetoothSocketType::SCO, -1, mAuth, mEncrypt);
+    BluetoothUnixSocketConnector* c =
+      new BluetoothUnixSocketConnector(BluetoothSocketType::SCO, -1,
+                                       mAuth, mEncrypt);
 
     BluetoothScoManager* sco = BluetoothScoManager::Get();
     if (!mConsumer->ConnectSocket(c, NS_ConvertUTF16toUTF8(address).get())) {
@@ -2302,16 +2328,16 @@ private:
   bool mEncrypt;
 };
 
-class CreateBluetoothSocketRunnable : public nsRunnable
+class ConnectBluetoothSocketRunnable : public nsRunnable
 {
 public:
-  CreateBluetoothSocketRunnable(BluetoothReplyRunnable* aRunnable,
-                                UnixSocketConsumer* aConsumer,
-                                const nsAString& aObjectPath,
-                                const nsAString& aServiceUUID,
-                                BluetoothSocketType aType,
-                                bool aAuth,
-                                bool aEncrypt)
+  ConnectBluetoothSocketRunnable(BluetoothReplyRunnable* aRunnable,
+                                 UnixSocketConsumer* aConsumer,
+                                 const nsAString& aObjectPath,
+                                 const nsAString& aServiceUUID,
+                                 BluetoothSocketType aType,
+                                 bool aAuth,
+                                 bool aEncrypt)
     : mRunnable(dont_AddRef(aRunnable)),
       mConsumer(aConsumer),
       mObjectPath(aObjectPath),
@@ -2325,14 +2351,14 @@ public:
   nsresult
   Run()
   {
-    NS_WARNING("Running create socket!\n");
     MOZ_ASSERT(!NS_IsMainThread());
 
     nsString address = GetAddressFromObjectPath(mObjectPath);
     int channel = GetDeviceServiceChannel(mObjectPath, mServiceUUID, 0x0004);
     BluetoothValue v;
     nsString replyError;
-    BluetoothUnixSocketConnector c(mType, channel, mAuth, mEncrypt);
+    BluetoothUnixSocketConnector* c =
+      new BluetoothUnixSocketConnector(mType, channel, mAuth, mEncrypt);
     if (!mConsumer->ConnectSocket(c, NS_ConvertUTF16toUTF8(address).get())) {
       replyError.AssignLiteral("SocketConnectionError");
       DispatchBluetoothReply(mRunnable, v, replyError);
@@ -2395,7 +2421,7 @@ BluetoothDBusService::GetSocketViaService(const nsAString& aObjectPath,
   }
   nsRefPtr<BluetoothReplyRunnable> runnable = aRunnable;
 
-  nsRefPtr<nsRunnable> func(new CreateBluetoothSocketRunnable(runnable,
+  nsRefPtr<nsRunnable> func(new ConnectBluetoothSocketRunnable(runnable,
                                                               aConsumer,
                                                               aObjectPath,
                                                               aService, aType,
@@ -2409,3 +2435,63 @@ BluetoothDBusService::GetSocketViaService(const nsAString& aObjectPath,
   return NS_OK;
 }
 
+class ListenBluetoothSocketRunnable : public nsRunnable
+{
+public:
+  ListenBluetoothSocketRunnable(UnixSocketConsumer* aConsumer,
+                                int aChannel,
+                                BluetoothSocketType aType,
+                                bool aAuth,
+                                bool aEncrypt)
+    : mConsumer(aConsumer)
+    , mChannel(aChannel)
+    , mType(aType)
+    , mAuth(aAuth)
+    , mEncrypt(aEncrypt)
+  {
+  }
+
+  nsresult
+  Run()
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+    BluetoothUnixSocketConnector* c =
+      new BluetoothUnixSocketConnector(mType, mChannel, mAuth, mEncrypt);
+    if (!mConsumer->ListenSocket(c)) {
+      NS_WARNING("Can't listen on socket!");
+      return NS_ERROR_FAILURE;
+    }
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<UnixSocketConsumer> mConsumer;
+  int mChannel;
+  BluetoothSocketType mType;
+  bool mAuth;
+  bool mEncrypt;
+};
+
+nsresult
+BluetoothDBusService::ListenSocketViaService(int aChannel,
+                                             BluetoothSocketType aType,
+                                             bool aAuth,
+                                             bool aEncrypt,
+                                             mozilla::ipc::UnixSocketConsumer* aConsumer)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Must be called from main thread!");
+  if (!mConnection || !gThreadConnection) {
+    NS_ERROR("Bluetooth service not started yet!");
+    return NS_ERROR_FAILURE;
+  }
+  nsRefPtr<nsRunnable> func(new ListenBluetoothSocketRunnable(aConsumer,
+                                                              aChannel, aType,
+                                                              aAuth,
+                                                              aEncrypt));
+  if (NS_FAILED(mBluetoothCommandThread->Dispatch(func, NS_DISPATCH_NORMAL))) {
+    NS_WARNING("Cannot dispatch firmware loading task!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
diff --git a/dom/bluetooth/linux/BluetoothDBusService.h b/dom/bluetooth/linux/BluetoothDBusService.h
index 536180146241..13cd8dfd5a89 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.h
+++ b/dom/bluetooth/linux/BluetoothDBusService.h
@@ -58,6 +58,20 @@ public:
                 const nsAString& aDeviceAddress,
                 nsAString& aDevicePath);
 
+  static bool
+  AddServiceRecords(const nsAString& aAdapterPath,
+                    const char* serviceName,
+                    unsigned long long uuidMsb,
+                    unsigned long long uuidLsb,
+                    int channel);
+
+  static bool
+  RemoveServiceRecords(const nsAString& aAdapterPath,
+                       const char* serviceName,
+                       unsigned long long uuidMsb,
+                       unsigned long long uuidLsb,
+                       int channel);
+
   static bool
   AddReservedServicesInternal(const nsAString& aAdapterPath,
                               const nsTArray<uint32_t>& aServices,
@@ -82,6 +96,13 @@ public:
                       mozilla::ipc::UnixSocketConsumer* aConsumer,
                       BluetoothReplyRunnable* aRunnable);
 
+  virtual nsresult
+  ListenSocketViaService(int aChannel,
+                         BluetoothSocketType aType,
+                         bool aAuth,
+                         bool aEncrypt,
+                         mozilla::ipc::UnixSocketConsumer* aConsumer);
+
   virtual nsresult
   CreatePairedDeviceInternal(const nsAString& aAdapterPath,
                              const nsAString& aDeviceAddress,
diff --git a/ipc/dbus/DBusUtils.cpp b/ipc/dbus/DBusUtils.cpp
index a5b6e6221c5e..d545591d6238 100644
--- a/ipc/dbus/DBusUtils.cpp
+++ b/ipc/dbus/DBusUtils.cpp
@@ -264,7 +264,7 @@ DBusMessage * dbus_func_args_error(DBusConnection *conn,
 int dbus_returns_int32(DBusMessage *reply) 
 {
   DBusError err;
-  int ret = -1;
+  int32_t ret = -1;
 
   dbus_error_init(&err);
   if (!dbus_message_get_args(reply, &err,
@@ -277,5 +277,21 @@ int dbus_returns_int32(DBusMessage *reply)
   return ret;
 }
 
+int dbus_returns_uint32(DBusMessage *reply)
+{
+  DBusError err;
+  uint32_t ret = -1;
+
+  dbus_error_init(&err);
+  if (!dbus_message_get_args(reply, &err,
+                             DBUS_TYPE_UINT32, &ret,
+                             DBUS_TYPE_INVALID)) {
+    LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
+  }
+
+  dbus_message_unref(reply);
+  return ret;
+}
+
 }
 }
diff --git a/ipc/dbus/DBusUtils.h b/ipc/dbus/DBusUtils.h
index 9a9262ec5bab..f2bea44c43f0 100644
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -108,6 +108,8 @@ DBusMessage*  dbus_func_args_timeout_valist(DBusConnection* conn,
 
 int dbus_returns_int32(DBusMessage *reply);
 
+int dbus_returns_uint32(DBusMessage *reply);
+
 }
 }
 

From bc8f19ace488171cdf291d1be415584f5b416fec Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Mon, 1 Oct 2012 02:13:49 -0400
Subject: [PATCH 41/64] Bug 790508: SampleAnimations should walk the layer tree
 from the root instead of from the primary scrollable layer r=cjones

---
 gfx/layers/ipc/CompositorParent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index c73a8f1b3563..2fad34b6b903 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -758,7 +758,7 @@ CompositorParent::TransformShadowTree(TimeStamp aCurrentFrame)
 
   // NB: we must sample animations *before* sampling pan/zoom
   // transforms.
-  wantNextFrame |= SampleAnimations(layer, mLastCompose);
+  wantNextFrame |= SampleAnimations(root, mLastCompose);
 
   const FrameMetrics& metrics = container->GetFrameMetrics();
   // We must apply the resolution scale before a pan/zoom transform, so we call

From a3b572e5408c6af72d911e8cc2d47044729527b9 Mon Sep 17 00:00:00 2001
From: Patrick Wang <kk1fff@patrickz.net>
Date: Thu, 27 Sep 2012 17:07:24 +0800
Subject: [PATCH 42/64] Bug 791935 - Part 1: IDL change r=philikon sr=sicking

---
 dom/icc/interfaces/SimToolKit.idl       | 34 +++++++++++++++++++++++++
 dom/icc/interfaces/nsIDOMIccManager.idl |  1 +
 2 files changed, 35 insertions(+)

diff --git a/dom/icc/interfaces/SimToolKit.idl b/dom/icc/interfaces/SimToolKit.idl
index dc826207078c..a4fbb5e3e3b3 100644
--- a/dom/icc/interfaces/SimToolKit.idl
+++ b/dom/icc/interfaces/SimToolKit.idl
@@ -460,3 +460,37 @@ dictionary MozStkResponse
    */
   boolean hasConfirmed;
 };
+
+dictionary MozStkCallEvent
+{
+  /**
+   * The type of this event.
+   * It shall be one of following:
+   *     - nsIDOMMozIccManager.STK_EVENT_TYPE_MT_CALL,
+   *     - nsIDOMMozIccManager.STK_EVENT_TYPE_CALL_CONNECTED,
+   *     - nsIDOMMozIccManager.STK_EVENT_TYPE_CALL_DISCONNECTED.
+   */
+  unsigned short eventType;
+
+  /**
+   * Remote party number.
+   */
+  DOMString number;
+
+  /**
+   * This field is available in 'STK_EVENT_TYPE_CALL_CONNECTED' and
+   * 'STK_EVENT_TYPE_CALL_DISCONNECTED' events.
+   * For STK_EVENT_TYPE_CALL_DISCONNECTED event, setting this to true means the
+   * connection is answered by remote end, that is, this is an outgoing call.
+   * For STK_EVENT_TYPE_CALL_DISCONNECTED event, setting this to true indicates
+   * the connection is hung up by remote.
+   */
+  boolean isIssuedByRemote;
+
+  /**
+   * This field is available in Call Disconnected event to indicate the cause
+   * of disconnection. The cause string is passed to gaia through the error
+   * listener of nsIDOMCallEvent. Null if there's no error.
+   */
+  DOMString error;
+};
\ No newline at end of file
diff --git a/dom/icc/interfaces/nsIDOMIccManager.idl b/dom/icc/interfaces/nsIDOMIccManager.idl
index f6333830b2fb..9fce87945266 100644
--- a/dom/icc/interfaces/nsIDOMIccManager.idl
+++ b/dom/icc/interfaces/nsIDOMIccManager.idl
@@ -224,6 +224,7 @@ interface nsIDOMMozIccManager : nsIDOMEventTarget
    * @param event
    *        one of events below:
    *        - MozStkLocationEvent
+   *        - MozStkCallEvent
    */
   void sendStkEventDownload(in jsval event);
 

From 9812f4de6ffb3ece10fb1a49b0e749c27356d4a1 Mon Sep 17 00:00:00 2001
From: Patrick Wang <kk1fff@patrickz.net>
Date: Thu, 27 Sep 2012 17:12:10 +0800
Subject: [PATCH 43/64] Bug 791935 - Part 2: Send MT Call, Call Connected and
 Call Disconnected envelope commands r=philikon

---
 dom/system/gonk/ril_consts.js |   3 +
 dom/system/gonk/ril_worker.js | 123 +++++++++++++++++++++++++++++++++-
 2 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js
index 194af1e1b0aa..496417de0924 100644
--- a/dom/system/gonk/ril_consts.js
+++ b/dom/system/gonk/ril_consts.js
@@ -535,6 +535,7 @@ const COMPREHENSIONTLV_TAG_RESULT = 0x03;
 const COMPREHENSIONTLV_TAG_DURATION = 0x04;
 const COMPREHENSIONTLV_TAG_ALPHA_ID = 0x05;
 const COMPREHENSIONTLV_TAG_ADDRESS = 0x06;
+const COMPREHENSIONTLV_TAG_SUBADDRESS = 0x08;
 const COMPREHENSIONTLV_TAG_SMS_TPDU = 0x0b;
 const COMPREHENSIONTLV_TAG_TEXT_STRING = 0x0d;
 const COMPREHENSIONTLV_TAG_TONE = 0x0e;
@@ -545,7 +546,9 @@ const COMPREHENSIONTLV_TAG_FILE_LIST = 0x12;
 const COMPREHENSIONTLV_TAG_LOCATION_INFO = 0x13;
 const COMPREHENSIONTLV_TAG_HELP_REQUEST = 0x15;
 const COMPREHENSIONTLV_TAG_DEFAULT_TEXT = 0x17;
+const COMPREHENSIONTLV_TAG_CAUSE = 0x1a;
 const COMPREHENSIONTLV_TAG_LOCATION_STATUS = 0x1b;
+const COMPREHENSIONTLV_TAG_TRANSACTION_ID = 0x1c;
 const COMPREHENSIONTLV_TAG_EVENT_LIST = 0x19;
 const COMPREHENSIONTLV_TAG_ICON_ID = 0x1e;
 const COMPREHENSIONTLV_TAG_ICON_ID_LIST = 0x1f;
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 88122b547edc..1437b95557b2 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -2394,6 +2394,24 @@ let RIL = {
           command.locationInfo = command.event.locationInfo;
         }
         break;
+      case STK_EVENT_TYPE_MT_CALL:
+        command.deviceId = {
+          sourceId: STK_DEVICE_ID_NETWORK,
+          destinationId: STK_DEVICE_ID_SIM
+        };
+        command.transactionId = 0;
+        command.address = command.eventData.number;
+        break;
+      case STK_EVENT_TYPE_CALL_DISCONNECTED:
+        command.cause = command.eventData.error;
+      case STK_EVENT_TYPE_CALL_CONNECTED:  // Fall through
+        command.deviceId = {
+          sourceId: (command.eventData.isIssuedByRemote ?
+                     STK_DEVICE_ID_NETWORK : STK_DEVICE_ID_ME),
+          destinationId: STK_DEVICE_ID_SIM
+        };
+        command.transactionId = 0;
+        break;
     }
     this.sendICCEnvelopeCommand(command);
   },
@@ -2408,6 +2426,9 @@ let RIL = {
    * @param [optional] eventList
    * @param [optional] locationStatus
    * @param [optional] locationInfo
+   * @param [optional] address
+   * @param [optional] transactionId
+   * @param [optional] cause
    */
   sendICCEnvelopeCommand: function sendICCEnvelopeCommand(options) {
     if (DEBUG) {
@@ -2423,7 +2444,15 @@ let RIL = {
                     (options.locationInfo.gsmCellId > 0xffff ?
                       TLV_LOCATION_INFO_UMTS_SIZE :
                       TLV_LOCATION_INFO_GSM_SIZE) :
-                    0);
+                    0) +
+                 (options.transactionId ? 3 : 0) +
+                 (options.address ?
+                  1 + // Length of tag.
+                  ComprehensionTlvHelper.getSizeOfLengthOctets(
+                    Math.ceil(options.address.length/2) + 1) + // Length of length field.
+                  Math.ceil(options.address.length/2) + 1 // address BCD + TON.
+                  : 0) +
+                 (options.cause ? 4 : 0);
     let size = (2 + berLen) * 2;
 
     Buf.writeUint32(size);
@@ -2477,6 +2506,29 @@ let RIL = {
       ComprehensionTlvHelper.writeLocationInfoTlv(options.locationInfo);
     }
 
+    // Transaction Id
+    if (options.transactionId) {
+      GsmPDUHelper.writeHexOctet(COMPREHENSIONTLV_TAG_TRANSACTION_ID |
+                                 COMPREHENSIONTLV_FLAG_CR);
+      GsmPDUHelper.writeHexOctet(1);
+      GsmPDUHelper.writeHexOctet(options.transactionId);
+    }
+
+    // Address
+    if (options.address) {
+      GsmPDUHelper.writeHexOctet(COMPREHENSIONTLV_TAG_ADDRESS |
+                                 COMPREHENSIONTLV_FLAG_CR);
+      ComprehensionTlvHelper.writeLength(
+        Math.ceil(options.address.length/2) + 1 // address BCD + TON
+      );
+      GsmPDUHelper.writeDiallingNumber(options.address);
+    }
+
+    // Cause of disconnection.
+    if (options.cause) {
+      ComprehensionTlvHelper.writeCauseTlv(options.cause);
+    }
+
     Buf.writeUint32(0);
     Buf.sendParcel();
   },
@@ -6959,6 +7011,75 @@ let ComprehensionTlvHelper = {
       GsmPDUHelper.writeHexOctet(loc.gsmCellId & 0xff);
     }
   },
+
+  /**
+   * Given a geckoError string, this function translates it into cause value
+   * and write the value into buffer.
+   *
+   * @param geckoError Error string that is passed to gecko.
+   */
+  writeCauseTlv: function writeCauseTlv(geckoError) {
+    let cause = -1;
+    for (let errorNo in RIL_ERROR_TO_GECKO_ERROR) {
+      if (geckoError == RIL_ERROR_TO_GECKO_ERROR[errorNo]) {
+        cause = errorNo;
+        break;
+      }
+    }
+    cause = (cause == -1) ? ERROR_SUCCESS : cause;
+
+    GsmPDUHelper.writeHexOctet(COMPREHENSIONTLV_TAG_CAUSE |
+                               COMPREHENSIONTLV_FLAG_CR);
+    GsmPDUHelper.writeHexOctet(2);  // For single cause value.
+
+    // TS 04.08, clause 10.5.4.11: National standard code + user location.
+    GsmPDUHelper.writeHexOctet(0x60);
+
+    // TS 04.08, clause 10.5.4.11: ext bit = 1 + 7 bits for cause.
+    // +-----------------+----------------------------------+
+    // | Ext = 1 (1 bit) |          Cause (7 bits)          |
+    // +-----------------+----------------------------------+
+    GsmPDUHelper.writeHexOctet(0x80 | cause);
+  },
+
+  getSizeOfLengthOctets: function getSizeOfLengthOctets(length) {
+    if (length >= 0x10000) {
+      return 4; // 0x83, len_1, len_2, len_3
+    } else if (length >= 0x100) {
+      return 3; // 0x82, len_1, len_2
+    } else if (length >= 0x80) {
+      return 2; // 0x81, len
+    } else {
+      return 1; // len
+    }
+  },
+
+  writeLength: function writeLength(length) {
+    // TS 101.220 clause 7.1.2, Length Encoding.
+    // Length   |  Byte 1  | Byte 2 | Byte 3 | Byte 4 |
+    // 0 - 127  |  00 - 7f | N/A    | N/A    | N/A    |
+    // 128-255  |  81      | 80 - ff| N/A    | N/A    |
+    // 256-65535|  82      | 0100 - ffff     | N/A    |
+    // 65536-   |  83      |     010000 - ffffff      |
+    // 16777215
+    if (length < 0x80) {
+      GsmPDUHelper.writeHexOctet(length);
+    } else if (0x80 <= length && length < 0x100) {
+      GsmPDUHelper.writeHexOctet(0x81);
+      GsmPDUHelper.writeHexOctet(length);
+    } else if (0x100 <= length && length < 0x10000) {
+      GsmPDUHelper.writeHexOctet(0x82);
+      GsmPDUHelper.writeHexOctet((length >> 8) & 0xff);
+      GsmPDUHelper.writeHexOctet(length & 0xff);
+    } else if (0x10000 <= length && length < 0x1000000) {
+      GsmPDUHelper.writeHexOctet(0x83);
+      GsmPDUHelper.writeHexOctet((length >> 16) & 0xff);
+      GsmPDUHelper.writeHexOctet((length >> 8) & 0xff);
+      GsmPDUHelper.writeHexOctet(length & 0xff);
+    } else {
+      throw new Error("Invalid length value :" + length);
+    }
+  },
 };
 
 let BerTlvHelper = {

From 6b4f0fbaee2ff27cbd92916b7cec2ba74b25d5ef Mon Sep 17 00:00:00 2001
From: Patrick Wang <kk1fff@patrickz.net>
Date: Tue, 25 Sep 2012 18:24:10 +0800
Subject: [PATCH 44/64] Bug 791935 - Part 3: Test case r=philikon

---
 dom/system/gonk/tests/test_ril_worker_icc.js | 76 ++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/dom/system/gonk/tests/test_ril_worker_icc.js b/dom/system/gonk/tests/test_ril_worker_icc.js
index 1dc135525c48..92142fb10384 100644
--- a/dom/system/gonk/tests/test_ril_worker_icc.js
+++ b/dom/system/gonk/tests/test_ril_worker_icc.js
@@ -233,6 +233,27 @@ add_test(function test_write_location_info_tlv() {
   run_next_test();
 });
 
+/**
+ * Verify ComprehensionTlvHelper.writeErrorNumber
+ */
+add_test(function test_write_disconnecting_cause() {
+  let worker = newUint8Worker();
+  let pduHelper = worker.GsmPDUHelper;
+  let tlvHelper = worker.ComprehensionTlvHelper;
+
+  tlvHelper.writeCauseTlv(RIL_ERROR_TO_GECKO_ERROR[ERROR_GENERIC_FAILURE]);
+  let tag = pduHelper.readHexOctet();
+  do_check_eq(tag, COMPREHENSIONTLV_TAG_CAUSE | COMPREHENSIONTLV_FLAG_CR);
+  let len = pduHelper.readHexOctet();
+  do_check_eq(len, 2);  // We have one cause.
+  let standard = pduHelper.readHexOctet();
+  do_check_eq(standard, 0x60);
+  let cause = pduHelper.readHexOctet();
+  do_check_eq(cause, 0x80 | ERROR_GENERIC_FAILURE);
+
+  run_next_test();
+});
+
 /**
  * Verify Proactive Command : Refresh
  */
@@ -341,3 +362,58 @@ add_test(function test_stk_proactive_command_poll_interval() {
 
   run_next_test();
 });
+
+/**
+ * Verify ComprehensionTlvHelper.getSizeOfLengthOctets
+ */
+add_test(function test_get_size_of_length_octets() {
+  let worker = newUint8Worker();
+  let tlvHelper = worker.ComprehensionTlvHelper;
+
+  let length = 0x70;
+  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 1);
+
+  length = 0x80;
+  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 2);
+
+  length = 0x180;
+  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 3);
+
+  length = 0x18000;
+  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 4);
+
+  run_next_test();
+});
+
+/**
+ * Verify ComprehensionTlvHelper.writeLength
+ */
+add_test(function test_write_length() {
+  let worker = newUint8Worker();
+  let pduHelper = worker.GsmPDUHelper;
+  let tlvHelper = worker.ComprehensionTlvHelper;
+
+  let length = 0x70;
+  tlvHelper.writeLength(length);
+  do_check_eq(pduHelper.readHexOctet(), length);
+
+  length = 0x80;
+  tlvHelper.writeLength(length);
+  do_check_eq(pduHelper.readHexOctet(), 0x81);
+  do_check_eq(pduHelper.readHexOctet(), length);
+
+  length = 0x180;
+  tlvHelper.writeLength(length);
+  do_check_eq(pduHelper.readHexOctet(), 0x82);
+  do_check_eq(pduHelper.readHexOctet(), (length >> 8) & 0xff);
+  do_check_eq(pduHelper.readHexOctet(), length & 0xff);
+
+  length = 0x18000;
+  tlvHelper.writeLength(length);
+  do_check_eq(pduHelper.readHexOctet(), 0x83);
+  do_check_eq(pduHelper.readHexOctet(), (length >> 16) & 0xff);
+  do_check_eq(pduHelper.readHexOctet(), (length >> 8) & 0xff);
+  do_check_eq(pduHelper.readHexOctet(), length & 0xff);
+
+  run_next_test();
+});
\ No newline at end of file

From 3825fda6ae3a139fdacf3d7a5929bfbef2da1991 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 23:16:26 -0700
Subject: [PATCH 45/64] Backing out 9a88f0d57e7d (Bug 790739) due to bustage

--HG--
extra : rebase_source : 1f6e7eda80f1b66b854c5c112f1b0816381f27e2
---
 dom/bluetooth/BluetoothHfpManager.cpp         |  19 ---
 dom/bluetooth/BluetoothHfpManager.h           |   2 +-
 dom/bluetooth/BluetoothService.h              |   7 --
 dom/bluetooth/BluetoothServiceUuid.h          |  15 ---
 .../ipc/BluetoothServiceChildProcess.cpp      |  13 ---
 .../ipc/BluetoothServiceChildProcess.h        |   7 --
 dom/bluetooth/linux/BluetoothDBusService.cpp  | 110 ++----------------
 dom/bluetooth/linux/BluetoothDBusService.h    |  21 ----
 ipc/dbus/DBusUtils.cpp                        |  18 +--
 ipc/dbus/DBusUtils.h                          |   2 -
 10 files changed, 14 insertions(+), 200 deletions(-)

diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index 458b6062639f..d57a02b911d6 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -407,25 +407,6 @@ BluetoothHfpManager::Connect(const nsAString& aDeviceObjectPath,
   return NS_FAILED(rv) ? false : true;
 }
 
-bool
-BluetoothHfpManager::Listen()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  BluetoothService* bs = BluetoothService::Get();
-  if (!bs) {
-    NS_WARNING("BluetoothService not available!");
-    return false;
-  }
-
-  nsresult rv = bs->ListenSocketViaService(BluetoothReservedChannels::HANDSFREE_AG,
-                                           BluetoothSocketType::RFCOMM,
-                                           true,
-                                           false,
-                                           this);
-  return NS_FAILED(rv) ? false : true;
-}
-
 void
 BluetoothHfpManager::Disconnect()
 {
diff --git a/dom/bluetooth/BluetoothHfpManager.h b/dom/bluetooth/BluetoothHfpManager.h
index 719fdee4e7b9..7679e8ef8b6f 100644
--- a/dom/bluetooth/BluetoothHfpManager.h
+++ b/dom/bluetooth/BluetoothHfpManager.h
@@ -34,7 +34,7 @@ public:
   bool SendLine(const char* aMessage);
   void CallStateChanged(int aCallIndex, int aCallState,
                         const char* aNumber, bool aIsActive);
-  bool Listen();
+
 private:
   BluetoothHfpManager();
 
diff --git a/dom/bluetooth/BluetoothService.h b/dom/bluetooth/BluetoothService.h
index 69371778512b..d7af9702759e 100644
--- a/dom/bluetooth/BluetoothService.h
+++ b/dom/bluetooth/BluetoothService.h
@@ -279,13 +279,6 @@ public:
   virtual void
   DisconnectObjectPush(BluetoothReplyRunnable* aRunnable) = 0;
 
-  virtual nsresult
-  ListenSocketViaService(int aChannel,
-                         BluetoothSocketType aType,
-                         bool aAuth,
-                         bool aEncrypt,
-                         mozilla::ipc::UnixSocketConsumer* aConsumer) = 0;
-
   bool
   IsEnabled() const
   {
diff --git a/dom/bluetooth/BluetoothServiceUuid.h b/dom/bluetooth/BluetoothServiceUuid.h
index 29f337bbc350..12bad23132fb 100644
--- a/dom/bluetooth/BluetoothServiceUuid.h
+++ b/dom/bluetooth/BluetoothServiceUuid.h
@@ -30,21 +30,6 @@ namespace BluetoothServiceUuidStr {
   static const char* ObjectPush    = "00001105-0000-1000-8000-00805F9B34FB";
 }
 
-// TODO/qdot: Move these back into gonk and make the service handler deal with
-// it there.
-//
-// Gotten from reading the "u8" values in B2G/external/bluez/src/adapter.c
-// These were hardcoded into android
-enum BluetoothReservedChannels {
-  DIALUP_NETWORK = 1,
-  HANDSFREE_AG = 10,
-  HEADSET_AG = 11,
-  OPUSH = 12,
-  SIM_ACCESS = 15,
-  PBAP_PSE = 19,
-  FTP = 20,
-};
-
 }
 }
 }
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
index a0ead26dfbfc..5ac058707387 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
@@ -226,19 +226,6 @@ BluetoothServiceChildProcess::GetSocketViaService(
   return NS_ERROR_FAILURE;
 }
 
-
-nsresult
-BluetoothServiceChildProcess::ListenSocketViaService(
-  int aChannel,
-  BluetoothSocketType aType,
-  bool aAuth,
-  bool aEncrypt,
-  mozilla::ipc::UnixSocketConsumer* aConsumer)
-{
-  MOZ_NOT_REACHED("This should never be called!");
-  return NS_ERROR_FAILURE;
-}
-
 bool
 BluetoothServiceChildProcess::SetPinCodeInternal(
                                                 const nsAString& aDeviceAddress,
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
index 90e9260f57f3..37f553747232 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
@@ -101,13 +101,6 @@ public:
                       mozilla::ipc::UnixSocketConsumer* aConsumer,
                       BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
 
-  virtual nsresult
-  ListenSocketViaService(int aChannel,
-                         BluetoothSocketType aType,
-                         bool aAuth,
-                         bool aEncrypt,
-                         mozilla::ipc::UnixSocketConsumer* aConsumer) MOZ_OVERRIDE;
-
   virtual bool
   SetPinCodeInternal(const nsAString& aDeviceAddress,
                      const nsAString& aPinCode,
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 62075d0abe81..cecb3832cdb6 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -261,7 +261,6 @@ public:
       NS_WARNING("prepare adapter failed");
       return NS_ERROR_FAILURE;
     }
-
     return NS_OK;
   }
 
@@ -727,29 +726,6 @@ ExtractHandles(DBusMessage *aReply, nsTArray<uint32_t>& aOutHandles)
   }
 }
 
-// static
-bool
-BluetoothDBusService::AddServiceRecords(const nsAString& aAdapterPath,
-                                        const char* serviceName,
-                                        unsigned long long uuidMsb,
-                                        unsigned long long uuidLsb,
-                                        int channel)
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  DBusMessage *reply;
-  reply = dbus_func_args(gThreadConnection->GetConnection(),
-                         NS_ConvertUTF16toUTF8(aAdapterPath).get(),
-                         DBUS_ADAPTER_IFACE, "AddRfcommServiceRecord",
-                         DBUS_TYPE_STRING, &serviceName,
-                         DBUS_TYPE_UINT64, &uuidMsb,
-                         DBUS_TYPE_UINT64, &uuidLsb,
-                         DBUS_TYPE_UINT16, &channel,
-                         DBUS_TYPE_INVALID);
-
-  return reply ? dbus_returns_uint32(reply) : -1;
-}
-
 // static
 bool
 BluetoothDBusService::AddReservedServicesInternal(const nsAString& aAdapterPath,
@@ -2301,9 +2277,7 @@ public:
 
     nsString address = GetAddressFromObjectPath(mObjectPath);
     nsString replyError;
-    BluetoothUnixSocketConnector* c =
-      new BluetoothUnixSocketConnector(BluetoothSocketType::SCO, -1,
-                                       mAuth, mEncrypt);
+    BluetoothUnixSocketConnector c(BluetoothSocketType::SCO, -1, mAuth, mEncrypt);
 
     BluetoothScoManager* sco = BluetoothScoManager::Get();
     if (!mConsumer->ConnectSocket(c, NS_ConvertUTF16toUTF8(address).get())) {
@@ -2328,16 +2302,16 @@ private:
   bool mEncrypt;
 };
 
-class ConnectBluetoothSocketRunnable : public nsRunnable
+class CreateBluetoothSocketRunnable : public nsRunnable
 {
 public:
-  ConnectBluetoothSocketRunnable(BluetoothReplyRunnable* aRunnable,
-                                 UnixSocketConsumer* aConsumer,
-                                 const nsAString& aObjectPath,
-                                 const nsAString& aServiceUUID,
-                                 BluetoothSocketType aType,
-                                 bool aAuth,
-                                 bool aEncrypt)
+  CreateBluetoothSocketRunnable(BluetoothReplyRunnable* aRunnable,
+                                UnixSocketConsumer* aConsumer,
+                                const nsAString& aObjectPath,
+                                const nsAString& aServiceUUID,
+                                BluetoothSocketType aType,
+                                bool aAuth,
+                                bool aEncrypt)
     : mRunnable(dont_AddRef(aRunnable)),
       mConsumer(aConsumer),
       mObjectPath(aObjectPath),
@@ -2351,14 +2325,14 @@ public:
   nsresult
   Run()
   {
+    NS_WARNING("Running create socket!\n");
     MOZ_ASSERT(!NS_IsMainThread());
 
     nsString address = GetAddressFromObjectPath(mObjectPath);
     int channel = GetDeviceServiceChannel(mObjectPath, mServiceUUID, 0x0004);
     BluetoothValue v;
     nsString replyError;
-    BluetoothUnixSocketConnector* c =
-      new BluetoothUnixSocketConnector(mType, channel, mAuth, mEncrypt);
+    BluetoothUnixSocketConnector c(mType, channel, mAuth, mEncrypt);
     if (!mConsumer->ConnectSocket(c, NS_ConvertUTF16toUTF8(address).get())) {
       replyError.AssignLiteral("SocketConnectionError");
       DispatchBluetoothReply(mRunnable, v, replyError);
@@ -2421,7 +2395,7 @@ BluetoothDBusService::GetSocketViaService(const nsAString& aObjectPath,
   }
   nsRefPtr<BluetoothReplyRunnable> runnable = aRunnable;
 
-  nsRefPtr<nsRunnable> func(new ConnectBluetoothSocketRunnable(runnable,
+  nsRefPtr<nsRunnable> func(new CreateBluetoothSocketRunnable(runnable,
                                                               aConsumer,
                                                               aObjectPath,
                                                               aService, aType,
@@ -2435,63 +2409,3 @@ BluetoothDBusService::GetSocketViaService(const nsAString& aObjectPath,
   return NS_OK;
 }
 
-class ListenBluetoothSocketRunnable : public nsRunnable
-{
-public:
-  ListenBluetoothSocketRunnable(UnixSocketConsumer* aConsumer,
-                                int aChannel,
-                                BluetoothSocketType aType,
-                                bool aAuth,
-                                bool aEncrypt)
-    : mConsumer(aConsumer)
-    , mChannel(aChannel)
-    , mType(aType)
-    , mAuth(aAuth)
-    , mEncrypt(aEncrypt)
-  {
-  }
-
-  nsresult
-  Run()
-  {
-    MOZ_ASSERT(!NS_IsMainThread());
-    BluetoothUnixSocketConnector* c =
-      new BluetoothUnixSocketConnector(mType, mChannel, mAuth, mEncrypt);
-    if (!mConsumer->ListenSocket(c)) {
-      NS_WARNING("Can't listen on socket!");
-      return NS_ERROR_FAILURE;
-    }
-    return NS_OK;
-  }
-
-private:
-  nsRefPtr<UnixSocketConsumer> mConsumer;
-  int mChannel;
-  BluetoothSocketType mType;
-  bool mAuth;
-  bool mEncrypt;
-};
-
-nsresult
-BluetoothDBusService::ListenSocketViaService(int aChannel,
-                                             BluetoothSocketType aType,
-                                             bool aAuth,
-                                             bool aEncrypt,
-                                             mozilla::ipc::UnixSocketConsumer* aConsumer)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Must be called from main thread!");
-  if (!mConnection || !gThreadConnection) {
-    NS_ERROR("Bluetooth service not started yet!");
-    return NS_ERROR_FAILURE;
-  }
-  nsRefPtr<nsRunnable> func(new ListenBluetoothSocketRunnable(aConsumer,
-                                                              aChannel, aType,
-                                                              aAuth,
-                                                              aEncrypt));
-  if (NS_FAILED(mBluetoothCommandThread->Dispatch(func, NS_DISPATCH_NORMAL))) {
-    NS_WARNING("Cannot dispatch firmware loading task!");
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
diff --git a/dom/bluetooth/linux/BluetoothDBusService.h b/dom/bluetooth/linux/BluetoothDBusService.h
index 13cd8dfd5a89..536180146241 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.h
+++ b/dom/bluetooth/linux/BluetoothDBusService.h
@@ -58,20 +58,6 @@ public:
                 const nsAString& aDeviceAddress,
                 nsAString& aDevicePath);
 
-  static bool
-  AddServiceRecords(const nsAString& aAdapterPath,
-                    const char* serviceName,
-                    unsigned long long uuidMsb,
-                    unsigned long long uuidLsb,
-                    int channel);
-
-  static bool
-  RemoveServiceRecords(const nsAString& aAdapterPath,
-                       const char* serviceName,
-                       unsigned long long uuidMsb,
-                       unsigned long long uuidLsb,
-                       int channel);
-
   static bool
   AddReservedServicesInternal(const nsAString& aAdapterPath,
                               const nsTArray<uint32_t>& aServices,
@@ -96,13 +82,6 @@ public:
                       mozilla::ipc::UnixSocketConsumer* aConsumer,
                       BluetoothReplyRunnable* aRunnable);
 
-  virtual nsresult
-  ListenSocketViaService(int aChannel,
-                         BluetoothSocketType aType,
-                         bool aAuth,
-                         bool aEncrypt,
-                         mozilla::ipc::UnixSocketConsumer* aConsumer);
-
   virtual nsresult
   CreatePairedDeviceInternal(const nsAString& aAdapterPath,
                              const nsAString& aDeviceAddress,
diff --git a/ipc/dbus/DBusUtils.cpp b/ipc/dbus/DBusUtils.cpp
index d545591d6238..a5b6e6221c5e 100644
--- a/ipc/dbus/DBusUtils.cpp
+++ b/ipc/dbus/DBusUtils.cpp
@@ -264,7 +264,7 @@ DBusMessage * dbus_func_args_error(DBusConnection *conn,
 int dbus_returns_int32(DBusMessage *reply) 
 {
   DBusError err;
-  int32_t ret = -1;
+  int ret = -1;
 
   dbus_error_init(&err);
   if (!dbus_message_get_args(reply, &err,
@@ -277,21 +277,5 @@ int dbus_returns_int32(DBusMessage *reply)
   return ret;
 }
 
-int dbus_returns_uint32(DBusMessage *reply)
-{
-  DBusError err;
-  uint32_t ret = -1;
-
-  dbus_error_init(&err);
-  if (!dbus_message_get_args(reply, &err,
-                             DBUS_TYPE_UINT32, &ret,
-                             DBUS_TYPE_INVALID)) {
-    LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
-  }
-
-  dbus_message_unref(reply);
-  return ret;
-}
-
 }
 }
diff --git a/ipc/dbus/DBusUtils.h b/ipc/dbus/DBusUtils.h
index f2bea44c43f0..9a9262ec5bab 100644
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -108,8 +108,6 @@ DBusMessage*  dbus_func_args_timeout_valist(DBusConnection* conn,
 
 int dbus_returns_int32(DBusMessage *reply);
 
-int dbus_returns_uint32(DBusMessage *reply);
-
 }
 }
 

From 83a933da2f8752fc49870ffb09caf6f30da10a71 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 23:17:21 -0700
Subject: [PATCH 46/64] Backing out 826ef2970e19 (Bug 790739) due to bustage

--HG--
extra : rebase_source : b9698710f280c343d5aac29441111e9848912dc8
---
 .../BluetoothUnixSocketConnector.cpp          | 124 +++++++++---------
 dom/bluetooth/BluetoothUnixSocketConnector.h  |   7 +-
 2 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.cpp b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
index affb9445e794..ee1ccae5a260 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.cpp
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
@@ -35,15 +35,6 @@
 #include "BluetoothUnixSocketConnector.h"
 #include "nsThreadUtils.h"
 
-#undef LOG
-#if defined(MOZ_WIDGET_GONK)
-#include <android/log.h>
-#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
-#else
-#define BTDEBUG true
-#define LOG(args...) if (BTDEBUG) printf(args);
-#endif
-
 USING_BLUETOOTH_NAMESPACE
 
 static const int RFCOMM_SO_SNDBUF = 70 * 1024; // 70 KB send buffer
@@ -71,11 +62,33 @@ BluetoothUnixSocketConnector::BluetoothUnixSocketConnector(
 {
 }
 
-bool
-BluetoothUnixSocketConnector::Setup(int aFd)
+int
+BluetoothUnixSocketConnector::Create()
 {
+  MOZ_ASSERT(!NS_IsMainThread());
   int lm = 0;
+  int fd = -1;
   int sndbuf;
+
+  switch (mType) {
+  case BluetoothSocketType::RFCOMM:
+    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+    break;
+  case BluetoothSocketType::SCO:
+    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
+    break;
+  case BluetoothSocketType::L2CAP:
+    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
+    break;
+  default:
+    return -1;
+  }
+
+  if (fd < 0) {
+    NS_WARNING("Could not open bluetooth socket!");
+    return -1;
+  }
+
   /* kernel does not yet support LM for SCO */
   switch (mType) {
   case BluetoothSocketType::RFCOMM:
@@ -91,91 +104,72 @@ BluetoothUnixSocketConnector::Setup(int aFd)
   }
 
   if (lm) {
-    if (setsockopt(aFd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
+    if (setsockopt(fd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
       NS_WARNING("setsockopt(RFCOMM_LM) failed, throwing");
-      return false;
+      return -1;
     }
   }
 
   if (mType == BluetoothSocketType::RFCOMM) {
     sndbuf = RFCOMM_SO_SNDBUF;
-    if (setsockopt(aFd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
+    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
       NS_WARNING("setsockopt(SO_SNDBUF) failed, throwing");
-      return false;
+      return -1;
     }
   }
 
-  return true;
-}
-
-int
-BluetoothUnixSocketConnector::Create()
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-  int fd = -1;
-
-  switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-    break;
-  case BluetoothSocketType::SCO:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
-    break;
-  case BluetoothSocketType::L2CAP:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
-    break;
-  default:
-    MOZ_NOT_REACHED();
-  }
-
-  if (fd < 0) {
-    NS_WARNING("Could not open bluetooth socket!");
-    return -1;
-  }
-
-  if (!Setup(fd)) {
-    NS_WARNING("Could not set up socket!");
-  }
   return fd;
 }
 
-void
-BluetoothUnixSocketConnector::CreateAddr(bool aIsServer,
-                                         socklen_t& aAddrSize,
-                                         struct sockaddr* aAddr,
-                                         const char* aAddress)
+bool
+BluetoothUnixSocketConnector::ConnectInternal(int aFd, const char* aAddress)
 {
-  // Set to BDADDR_ANY, if it's not a server, we'll reset.
-  bdaddr_t bd_address_obj = {{0, 0, 0, 0, 0, 0}};
+  int n = 1;
+  setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n));
+  
+  socklen_t addr_sz;
+  struct sockaddr *addr;
+  bdaddr_t bd_address_obj;
 
-  if (!aIsServer && aAddress && strlen(aAddress) > 0) {
-    if (get_bdaddr(aAddress, &bd_address_obj)) {
-      NS_WARNING("Can't get bluetooth address!");
-      return;
-    }
+  if (get_bdaddr(aAddress, &bd_address_obj)) {
+    NS_WARNING("Can't get bluetooth address!");
+    return false;
   }
 
   switch (mType) {
   case BluetoothSocketType::RFCOMM:
     struct sockaddr_rc addr_rc;
-    aAddrSize = sizeof(addr_rc);
-    memset(aAddr, 0, aAddrSize);
+    addr = (struct sockaddr *)&addr_rc;
+    addr_sz = sizeof(addr_rc);
+
+    memset(addr, 0, addr_sz);
     addr_rc.rc_family = AF_BLUETOOTH;
     addr_rc.rc_channel = mChannel;
     memcpy(&addr_rc.rc_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
-    memcpy(aAddr, &addr_rc, sizeof(addr_rc));
     break;
   case BluetoothSocketType::SCO:
     struct sockaddr_sco addr_sco;
-    aAddrSize = sizeof(addr_sco);
+    addr = (struct sockaddr *)&addr_sco;
+    addr_sz = sizeof(addr_sco);
 
-    memset(aAddr, 0, aAddrSize);
+    memset(addr, 0, addr_sz);
     addr_sco.sco_family = AF_BLUETOOTH;
     memcpy(&addr_sco.sco_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
-    memcpy(aAddr, &addr_sco, sizeof(addr_sco));
     break;
   default:
     NS_WARNING("Socket type unknown!");
+    return false;
   }
-}
 
+  int ret = connect(aFd, addr, addr_sz);
+
+  if (ret) {
+#if DEBUG
+    //LOG("Socket connect errno=%d\n", errno);
+#endif
+    NS_WARNING("Socket connect error!");
+    return false;
+  }
+
+  return true;
+}
diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.h b/dom/bluetooth/BluetoothUnixSocketConnector.h
index 68e0f0061ad7..324a0485d709 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.h
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.h
@@ -20,11 +20,8 @@ public:
   virtual ~BluetoothUnixSocketConnector()
   {}
   virtual int Create() MOZ_OVERRIDE;
-  virtual void CreateAddr(bool aIsServer,
-                          socklen_t& aAddrSize,
-                          struct sockaddr* aAddr,
-                          const char* aAddress) MOZ_OVERRIDE;
-  virtual bool Setup(int aFd) MOZ_OVERRIDE;
+  virtual bool ConnectInternal(int aFd, const char* aAddress) MOZ_OVERRIDE;
+
 private:
   BluetoothSocketType mType;
   int mChannel;

From a24393b7185a8a099c2c400120efa9772876034f Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Sun, 30 Sep 2012 23:17:46 -0700
Subject: [PATCH 47/64] Backing out e8e7e0cf43d8 (Bug 790739) due to bustage

--HG--
extra : rebase_source : ab39dff4819b2a08bbc9696bfdca88b513fcb9c6
---
 ipc/unixsocket/UnixSocket.cpp | 303 +++-------------------------------
 ipc/unixsocket/UnixSocket.h   |  75 ++++-----
 2 files changed, 55 insertions(+), 323 deletions(-)

diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp
index fd1c88215d72..a4b760014b22 100644
--- a/ipc/unixsocket/UnixSocket.cpp
+++ b/ipc/unixsocket/UnixSocket.cpp
@@ -24,31 +24,16 @@
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
 
-#undef LOG
-#if defined(MOZ_WIDGET_GONK)
-#include <android/log.h>
-#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
-#else
-#define BTDEBUG true
-#define LOG(args...) if (BTDEBUG) printf(args);
-#endif
-
-static const int SOCKET_RETRY_TIME_MS = 1000;
-
 namespace mozilla {
 namespace ipc {
 
 class UnixSocketImpl : public MessageLoopForIO::Watcher
 {
 public:
-  UnixSocketImpl(UnixSocketConsumer* aConsumer, UnixSocketConnector* aConnector,
-                 const nsACString& aAddress)
+  UnixSocketImpl(UnixSocketConsumer* aConsumer, int aFd)
     : mConsumer(aConsumer)
     , mIOLoop(nullptr)
-    , mFd(-1)
-    , mConnector(aConnector)
-    , mCurrentTaskIsCanceled(false)
-    , mAddress(aAddress)
+    , mFd(aFd)
   {
   }
 
@@ -69,42 +54,6 @@ public:
     return mFd > 0;
   }
 
-  void CancelTask()
-  {
-    if (!mTask) {
-      return;
-    }
-    mTask->Cancel();
-    mTask = nullptr;
-    mCurrentTaskIsCanceled = true;
-  }
-  
-  void UnsetTask()
-  {
-    mTask = nullptr;
-  }
-
-  void EnqueueTask(int aDelayMs, CancelableTask* aTask)
-  {
-    MessageLoopForIO* ioLoop = MessageLoopForIO::current();
-    if (!ioLoop) {
-      NS_WARNING("No IOLoop to attach to, cancelling self!");
-      return;
-    }
-    if (mTask) {
-      return;
-    }
-    if (mCurrentTaskIsCanceled) {
-      return;
-    }
-    mTask = aTask;
-    if (aDelayMs) {
-      ioLoop->PostDelayedTask(FROM_HERE, mTask, aDelayMs);
-    } else {
-      ioLoop->PostTask(FROM_HERE, mTask);
-    }
-  }
-  
   void SetUpIO()
   {
     MOZ_ASSERT(!mIOLoop);
@@ -121,33 +70,6 @@ public:
     mConsumer.forget();
   }
 
-  /** 
-   * Connect to a socket
-   */
-  void Connect();
-
-  /** 
-   * Run bind/listen to prepare for further runs of accept()
-   */
-  void Listen();
-
-  /** 
-   * Accept an incoming connection
-   */
-  void Accept();
-
-  /** 
-   * Stop whatever connect/accept task is running
-   */
-  void Stop();
-
-  /** 
-   * Set up nonblocking flags on whatever our current file descriptor is.
-   *
-   * @return true if successful, false otherwise
-   */
-  bool SetNonblockFlags();
-
   /**
    * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated
    * directly from main thread. All non-main-thread accesses should happen with
@@ -183,6 +105,12 @@ private:
   typedef nsTArray<UnixSocketRawData* > UnixSocketRawDataQueue;
   UnixSocketRawDataQueue mOutgoingQ;
 
+  /**
+   * File descriptor to read from/write to. Connection happens on user provided
+   * thread. Read/write/close happens on IO thread.
+   */
+  ScopedClose mFd;
+
   /**
    * Incoming packet. Only to be accessed on IO Thread.
    */
@@ -197,33 +125,6 @@ private:
    * Write watcher for libevent. Only to be accessed on IO Thread.
    */
   MessageLoopForIO::FileDescriptorWatcher mWriteWatcher;
-
-  /**
-   * File descriptor to read from/write to. Connection happens on user provided
-   * thread. Read/write/close happens on IO thread.
-   */
-  ScopedClose mFd;
-
-  /** 
-   * Connector object used to create the connection we are currently using.
-   */
-  nsAutoPtr<UnixSocketConnector> mConnector;
-
-  /**
-   * If true, do not requeue whatever task we're running
-   */
-  bool mCurrentTaskIsCanceled;
-
-  /**
-   * Pointer to the task we're currently running. DO NOT DELETE MANUALLY. This
-   * will be taken care of by the IO loop. Just set to nullptr.
-   */
-  CancelableTask* mTask;
-
-  /**
-   * Address we are connecting to, assuming we are creating a client connection.
-   */
-  nsCString mAddress;
 };
 
 static void
@@ -300,160 +201,27 @@ private:
   UnixSocketImpl* mImpl;
 };
 
-class SocketAcceptTask : public CancelableTask {
-  virtual void Run();
-
-  bool mCanceled;
-  UnixSocketImpl* mImpl;
-public:
-  virtual void Cancel() { mCanceled = true; }
-  SocketAcceptTask(UnixSocketImpl* aImpl) : mCanceled(false), mImpl(aImpl) { }
-};
-
-void SocketAcceptTask::Run() {
-  mImpl->UnsetTask();
-  if (mCanceled) {
-    return;
-  }
-  mImpl->Accept();
-}
-
-class SocketConnectTask : public CancelableTask {
-  virtual void Run();
-
-  bool mCanceled;
-  UnixSocketImpl* mImpl;
-public:
-  SocketConnectTask(UnixSocketImpl* aImpl) : mCanceled(false), mImpl(aImpl) { }
-  virtual void Cancel() { mCanceled = true; }  
-};
-
-void SocketConnectTask::Run() {
-  mImpl->UnsetTask();
-  if (mCanceled) {
-    return;
-  }
-  mImpl->Connect();
-}
-
-void
-UnixSocketImpl::Accept()
-{
-  socklen_t addr_sz;
-  struct sockaddr addr;
-
-  // This will set things we don't particularly care about, but it will hand
-  // back the correct structure size which is what we do care about.
-  mConnector->CreateAddr(true, addr_sz, &addr, nullptr);
-
-  if(mFd.get() < 0)
-  {
-    mFd = mConnector->Create();
-    if (mFd.get() < 0) {
-      return;
-    }
-
-    if (!SetNonblockFlags()) {
-      return;
-    }
-
-    if (bind(mFd.get(), &addr, addr_sz)) {
-#ifdef DEBUG
-      LOG("...bind(%d) gave errno %d", mFd.get(), errno);
-#endif
-      return;
-    }
-
-    if (listen(mFd.get(), 1)) {
-#ifdef DEBUG
-      LOG("...listen(%d) gave errno %d", mFd.get(), errno);
-#endif
-      return;
-    }
-
-  }
-
-  int client_fd;
-  client_fd = accept(mFd.get(), &addr, &addr_sz);
-  if (client_fd < 0) {
-#if DEBUG
-    LOG("Socket accept errno=%d\n", errno);
-#endif
-    EnqueueTask(SOCKET_RETRY_TIME_MS, new SocketAcceptTask(this));
-    return;
-  }
-
-  if(client_fd < 0)
-  {
-    EnqueueTask(SOCKET_RETRY_TIME_MS, new SocketAcceptTask(this));
-    return;
-  }
-
-  if (!mConnector->Setup(client_fd)) {
-    NS_WARNING("Could not set up socket!");
-    return;
-  }
-  mFd.reset(client_fd);
-  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
-                                   new StartImplReadingTask(this));
-}
-
-void
-UnixSocketImpl::Connect()
-{
-  if(mFd.get() < 0)
-  {
-    mFd = mConnector->Create();
-    if (mFd.get() < 0) {
-      return;
-    }
-  }
-
-  int ret;
-  socklen_t addr_sz;
-  struct sockaddr addr;
-
-  mConnector->CreateAddr(false, addr_sz, &addr, mAddress.get());
-
-  ret = connect(mFd.get(), &addr, addr_sz);
-
-  if (ret) {
-#if DEBUG
-    LOG("Socket connect errno=%d\n", errno);
-#endif
-    mFd.reset(-1);
-    return;
-  }
-
-  if (!mConnector->Setup(mFd)) {
-    NS_WARNING("Could not set up socket!");
-    return;
-  }
-
-  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
-                                   new StartImplReadingTask(this));
-}
-
 bool
-UnixSocketImpl::SetNonblockFlags()
+UnixSocketConnector::Connect(int aFd, const char* aAddress)
 {
-  // Set socket addr to be reused even if kernel is still waiting to close
-  int n = 1;
-  setsockopt(mFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n));
+  if (!ConnectInternal(aFd, aAddress))
+  {
+    return false;
+  }
 
   // Set close-on-exec bit.
-  int flags = fcntl(mFd, F_GETFD);
+  int flags = fcntl(aFd, F_GETFD);
   if (-1 == flags) {
     return false;
   }
 
   flags |= FD_CLOEXEC;
-  if (-1 == fcntl(mFd, F_SETFD, flags)) {
+  if (-1 == fcntl(aFd, F_SETFD, flags)) {
     return false;
   }
 
   // Select non-blocking IO.
-  if (-1 == fcntl(mFd, F_SETFL, O_NONBLOCK)) {
+  if (-1 == fcntl(aFd, F_SETFL, O_NONBLOCK)) {
     return false;
   }
 
@@ -605,48 +373,23 @@ UnixSocketImpl::OnFileCanWriteWithoutBlocking(int aFd)
 }
 
 bool
-UnixSocketConsumer::ConnectSocket(UnixSocketConnector* aConnector,
+UnixSocketConsumer::ConnectSocket(UnixSocketConnector& aConnector,
                                   const char* aAddress)
 {
   MOZ_ASSERT(!NS_IsMainThread());
-  MOZ_ASSERT(aConnector);
-  if (mImpl) {
-    NS_WARNING("Socket already connecting/connected!");
+  MOZ_ASSERT(!mImpl);
+  ScopedClose fd(aConnector.Create());
+  if (fd < 0) {
     return false;
   }
-  nsCString addr;
-  addr.Assign(aAddress);
-  mImpl = new UnixSocketImpl(this, aConnector, addr);
-  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
-                                   new SocketConnectTask(mImpl));
-  return true;
-}
-
-bool
-UnixSocketConsumer::ListenSocket(UnixSocketConnector* aConnector)
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-  MOZ_ASSERT(aConnector);
-  if (mImpl) {
-    NS_WARNING("Socket already connecting/connected!");
+  if (!aConnector.Connect(fd, aAddress)) {
     return false;
   }
-  nsCString addr;
-  mImpl = new UnixSocketImpl(this, aConnector, addr);
+  mImpl = new UnixSocketImpl(this, fd.forget());
   XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
-                                   new SocketAcceptTask(mImpl));
+                                   new StartImplReadingTask(mImpl));
   return true;
 }
 
-void
-UnixSocketConsumer::CancelSocketTask()
-{
-  if(!mImpl) {
-    NS_WARNING("No socket implementation to cancel task on!");
-    return;
-  }
-  mImpl->CancelTask();
-}
-
 } // namespace ipc
 } // namespace mozilla
diff --git a/ipc/unixsocket/UnixSocket.h b/ipc/unixsocket/UnixSocket.h
index e95b11f4a0ef..fef24993a2cf 100644
--- a/ipc/unixsocket/UnixSocket.h
+++ b/ipc/unixsocket/UnixSocket.h
@@ -24,7 +24,7 @@ struct UnixSocketRawData
   size_t mSize;
   size_t mCurrentWriteOffset;
 
-  /**
+  /** 
    * Constructor for situations where size is not known beforehand. (for
    * example, when reading a packet)
    *
@@ -35,7 +35,7 @@ struct UnixSocketRawData
   {
   }
 
-  /**
+  /** 
    * Constructor for situations where size is known beforehand (for example,
    * when being assigned strings)
    *
@@ -50,7 +50,7 @@ struct UnixSocketRawData
 
 class UnixSocketImpl;
 
-/**
+/** 
  * UnixSocketConnector defines the socket creation and connection/listening
  * functions for a UnixSocketConsumer. Due to the fact that socket setup can
  * vary between protocols (unix sockets, tcp sockets, bluetooth sockets, etc),
@@ -70,7 +70,7 @@ public:
   virtual ~UnixSocketConnector()
   {}
 
-  /**
+  /** 
    * Establishs a file descriptor for a socket.
    *
    * @return File descriptor for socket
@@ -78,28 +78,28 @@ public:
   virtual int Create() = 0;
 
   /** 
-   * Since most socket specifics are related to address formation into a
-   * sockaddr struct, this function is defined by subclasses and fills in the
-   * structure as needed for whatever connection it is trying to build
+   * Runs connect function on a file descriptor for the address specified. Makes
+   * sure socket is marked with flags expected by the UnixSocket handler
+   * (non-block, etc...)
    *
-   * @param aIsServer True is we are acting as a server socket
-   * @param aAddrSize Size of the struct 
-   * @param aAddr Struct to fill
-   * @param aAddress If aIsServer is false, Address to connect to. nullptr otherwise.
+   * @param aFd File descriptor created by Create() function
+   * @param aAddress Address to connect to
+   *
+   * @return true if connected, false otherwise
    */
-  virtual void CreateAddr(bool aIsServer,
-                          socklen_t& aAddrSize,
-                          struct sockaddr *aAddr,
-                          const char* aAddress) = 0;
-
+  bool Connect(int aFd, const char* aAddress);
+  
+protected:
   /** 
-   * Does any socket type specific setup that may be needed
+   * Internal type-specific connection function to be overridden by child
+   * classes.
    *
-   * @param aFd File descriptor for opened socket
+   * @param aFd File descriptor created by Create() function
+   * @param aAddress Address to connect to
    *
-   * @return true is successful, false otherwise
+   * @return true if connected, false otherwise
    */
-  virtual bool Setup(int aFd) = 0;  
+  virtual bool ConnectInternal(int aFd, const char* aAddress) = 0;
 };
 
 class UnixSocketConsumer : public RefCounted<UnixSocketConsumer>
@@ -110,8 +110,8 @@ public:
   {}
 
   virtual ~UnixSocketConsumer();
-
-  /**
+  
+  /** 
    * Function to be called whenever data is received. This is only called on the
    * main thread.
    *
@@ -119,7 +119,7 @@ public:
    */
   virtual void ReceiveSocketData(UnixSocketRawData* aMessage) = 0;
 
-  /**
+  /** 
    * Queue data to be sent to the socket on the IO thread. Can only be called on
    * originating thread.
    *
@@ -129,7 +129,7 @@ public:
    */
   bool SendSocketData(UnixSocketRawData* aMessage);
 
-  /**
+  /** 
    * Convenience function for sending strings to the socket (common in bluetooth
    * profile usage). Converts to a UnixSocketRawData struct. Can only be called
    * on originating thread.
@@ -140,37 +140,26 @@ public:
    */
   bool SendSocketData(const nsACString& aMessage);
 
-  /**
-   * Starts a task on the socket that will try to connect to a socket in a
-   * non-blocking manner.
+  /** 
+   * Connects to a socket. Due to the fact that this is a blocking connect (and
+   * for things such as bluetooth, it /will/ block), it is expected to be run on
+   * a thread provided by the user. It cannot run on the main thread. Runs the
+   * Create() and Connect() functions in the UnixSocketConnector.
    *
    * @param aConnector Connector object for socket type specific functions
    * @param aAddress Address to connect to.
    *
-   * @return true on connect task started, false otherwise.
+   * @return true on connection, false otherwise.
    */
-  bool ConnectSocket(UnixSocketConnector* aConnector, const char* aAddress);
+  bool ConnectSocket(UnixSocketConnector& aConnector, const char* aAddress);
 
   /** 
-   * Starts a task on the socket that will try to accept a new connection in a
-   * non-blocking manner.
-   *
-   * @param aConnector Connector object for socket type specific functions
-   *
-   * @return true on listen started, false otherwise
-   */
-  bool ListenSocket(UnixSocketConnector* aConnector);
-
-  /**
    * Queues the internal representation of socket for deletion. Can be called
    * from main thread.
+   *
    */
   void CloseSocket();
 
-  /** 
-   * Cancels connect/accept task loop, if one is currently running.
-   */
-  void CancelSocketTask();
 private:
   nsAutoPtr<UnixSocketImpl> mImpl;
 };

From c95d365829acd8863781ddcea39cf35ac98430dc Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Fri, 28 Sep 2012 18:59:12 +0800
Subject: [PATCH 48/64] Bug 795410 - patch 1: Basic function prototype, r=qdot

From 2231ac9d0fb159edabb891f8b89afc176fb15c2b Mon Sep 17 00:00:00 2001
---
 dom/bluetooth/BluetoothAdapter.cpp            | 33 ++++++++++++++++++-
 dom/bluetooth/BluetoothOppManager.cpp         |  4 +--
 dom/bluetooth/BluetoothOppManager.h           |  2 +-
 dom/bluetooth/BluetoothService.h              |  7 ++++
 dom/bluetooth/gonk/BluetoothGonkService.cpp   |  1 +
 .../ipc/BluetoothServiceChildProcess.cpp      | 11 +++++++
 .../ipc/BluetoothServiceChildProcess.h        |  6 ++++
 dom/bluetooth/linux/BluetoothDBusService.cpp  | 11 +++++++
 dom/bluetooth/linux/BluetoothDBusService.h    |  6 ++++
 9 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp
index afc44729d85e..2e4150b8999f 100644
--- a/dom/bluetooth/BluetoothAdapter.cpp
+++ b/dom/bluetooth/BluetoothAdapter.cpp
@@ -24,6 +24,7 @@
 #include "nsXPCOMCIDInternal.h"
 
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
+#include "mozilla/dom/ContentChild.h"
 #include "mozilla/LazyIdleThread.h"
 #include "mozilla/Util.h"
 
@@ -816,7 +817,37 @@ BluetoothAdapter::SendFile(const nsAString& aDeviceAddress,
                            nsIDOMBlob* aBlob,
                            nsIDOMDOMRequest** aRequest)
 {
-  // Will implement in another patch
+  BluetoothService* bs = BluetoothService::Get();
+  if (!bs) {
+    NS_WARNING("BluetoothService not available!");
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsIDOMRequestService> rs = do_GetService("@mozilla.org/dom/dom-request-service;1");
+  if (!rs) {
+    NS_WARNING("No DOMRequest Service!");
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsIDOMDOMRequest> req;
+  nsresult rv = rs->CreateRequest(GetOwner(), getter_AddRefs(req));
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Can't create DOMRequest!");
+    return NS_ERROR_FAILURE;
+  }
+
+  BlobChild* actor =
+      mozilla::dom::ContentChild::GetSingleton()->GetOrCreateActorForBlob(aBlob);
+
+  if (!actor) {
+    NS_WARNING("Can't create actor");
+    return NS_ERROR_FAILURE;
+  }
+
+  nsRefPtr<BluetoothVoidReplyRunnable> result = new BluetoothVoidReplyRunnable(req);
+  bs->SendFile(aDeviceAddress, nullptr, actor, result);
+  req.forget(aRequest);
+
   return NS_OK;
 }
 
diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index fc3ab3c93791..e995d8cba872 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -12,8 +12,8 @@
 #include "BluetoothServiceUuid.h"
 #include "ObexBase.h"
 
-#include "mozilla/dom/ipc/Blob.h"
 #include "mozilla/RefPtr.h"
+#include "nsIDOMFile.h"
 
 USING_BLUETOOTH_NAMESPACE
 using namespace mozilla::ipc;
@@ -79,7 +79,7 @@ BluetoothOppManager::Disconnect()
 }
 
 bool
-BluetoothOppManager::SendFile(BlobParent* aParent,
+BluetoothOppManager::SendFile(BlobParent* aActor,
                               BluetoothReplyRunnable* aRunnable)
 {
   // will implement in another patch.
diff --git a/dom/bluetooth/BluetoothOppManager.h b/dom/bluetooth/BluetoothOppManager.h
index ea68bf0e5c12..6ed6991f0098 100644
--- a/dom/bluetooth/BluetoothOppManager.h
+++ b/dom/bluetooth/BluetoothOppManager.h
@@ -8,12 +8,12 @@
 #define mozilla_dom_bluetooth_bluetoothoppmanager_h__
 
 #include "BluetoothCommon.h"
+#include "mozilla/dom/ipc/Blob.h"
 #include "mozilla/ipc/UnixSocket.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothReplyRunnable;
-class BlobParent;
 
 class BluetoothOppManager : public mozilla::ipc::UnixSocketConsumer
 {
diff --git a/dom/bluetooth/BluetoothService.h b/dom/bluetooth/BluetoothService.h
index d7af9702759e..5a77cb44ce52 100644
--- a/dom/bluetooth/BluetoothService.h
+++ b/dom/bluetooth/BluetoothService.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_bluetooth_bluetootheventservice_h__
 
 #include "BluetoothCommon.h"
+#include "mozilla/dom/ipc/Blob.h"
 #include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
 #include "nsIObserver.h"
@@ -279,6 +280,12 @@ public:
   virtual void
   DisconnectObjectPush(BluetoothReplyRunnable* aRunnable) = 0;
 
+  virtual bool
+  SendFile(const nsAString& aDeviceAddress,
+           BlobParent* aBlobParent,
+           BlobChild* aBlobChild,
+           BluetoothReplyRunnable* aRunnable) = 0;
+
   bool
   IsEnabled() const
   {
diff --git a/dom/bluetooth/gonk/BluetoothGonkService.cpp b/dom/bluetooth/gonk/BluetoothGonkService.cpp
index 98b4433a8be4..dc2e8e4bc6e5 100644
--- a/dom/bluetooth/gonk/BluetoothGonkService.cpp
+++ b/dom/bluetooth/gonk/BluetoothGonkService.cpp
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+#include "base/basictypes.h"
 #include "BluetoothGonkService.h"
 #include "BluetoothDBusService.h"
 
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
index 5ac058707387..be3ebfd655c9 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
@@ -326,6 +326,17 @@ BluetoothServiceChildProcess::DisconnectObjectPush(
   SendRequest(aRunnable, DisconnectObjectPushRequest());
 }
 
+bool
+BluetoothServiceChildProcess::SendFile(
+  const nsAString& aDeviceAddress,
+  BlobParent* aBlobParent,
+  BlobChild* aBlobChild,
+  BluetoothReplyRunnable* aRunnable)
+{
+  // Will implement in another patch
+  return true;
+}
+
 nsresult
 BluetoothServiceChildProcess::HandleStartup()
 {
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
index 37f553747232..276f83b7f900 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
@@ -138,6 +138,12 @@ public:
   virtual void
   DisconnectObjectPush(BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
 
+  virtual bool
+  SendFile(const nsAString& aDeviceAddress,
+           BlobParent* aBlobParent,
+           BlobChild* aBlobChild,
+           BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
+
 protected:
   BluetoothServiceChildProcess();
   virtual ~BluetoothServiceChildProcess();
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index cecb3832cdb6..04e12534e719 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -2409,3 +2409,14 @@ BluetoothDBusService::GetSocketViaService(const nsAString& aObjectPath,
   return NS_OK;
 }
 
+bool
+BluetoothDBusService::SendFile(const nsAString& aDeviceAddress,
+                               BlobParent* aBlobParent,
+                               BlobChild* aBlobChild,
+                               BluetoothReplyRunnable* aRunnable)
+{
+  BluetoothOppManager* opp = BluetoothOppManager::Get();
+  opp->SendFile(aBlobParent, aRunnable);
+
+  return true;
+}
diff --git a/dom/bluetooth/linux/BluetoothDBusService.h b/dom/bluetooth/linux/BluetoothDBusService.h
index 536180146241..1173556bbd3e 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.h
+++ b/dom/bluetooth/linux/BluetoothDBusService.h
@@ -128,6 +128,12 @@ public:
   virtual void
   DisconnectObjectPush(BluetoothReplyRunnable* aRunnable);
 
+  virtual bool
+  SendFile(const nsAString& aDeviceAddress,
+           BlobParent* aBlobParent,
+           BlobChild* aBlobChild,
+           BluetoothReplyRunnable* aRunnable);
+
 private:
   nsresult SendGetPropertyMessage(const nsAString& aPath,
                                   const char* aInterface,

From 3e4b2a49a184bd0113f4ee64ea74bb812b3a9caa Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Fri, 28 Sep 2012 19:42:04 +0800
Subject: [PATCH 49/64] Bug 795410 - patch 2: Complete call flow, r=qdot

From 9fb76c07818c989ec8edc26b54ba84e1e6ec41ed Mon Sep 17 00:00:00 2001
---
 dom/bluetooth/ipc/BluetoothParent.cpp              | 14 ++++++++++++++
 dom/bluetooth/ipc/BluetoothParent.h                |  3 +++
 dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp |  3 ++-
 dom/bluetooth/ipc/PBluetooth.ipdl                  |  8 ++++++++
 dom/bluetooth/linux/BluetoothDBusService.cpp       |  4 ++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dom/bluetooth/ipc/BluetoothParent.cpp b/dom/bluetooth/ipc/BluetoothParent.cpp
index a6a7fdc573eb..a985bd15c70a 100644
--- a/dom/bluetooth/ipc/BluetoothParent.cpp
+++ b/dom/bluetooth/ipc/BluetoothParent.cpp
@@ -221,6 +221,8 @@ BluetoothParent::RecvPBluetoothRequestConstructor(
       return actor->DoRequest(aRequest.get_DisconnectHeadsetRequest());
     case Request::TDisconnectObjectPushRequest:
       return actor->DoRequest(aRequest.get_DisconnectObjectPushRequest());
+    case Request::TSendFileRequest:
+      return actor->DoRequest(aRequest.get_SendFileRequest());
     default:
       MOZ_NOT_REACHED("Unknown type!");
       return false;
@@ -538,3 +540,15 @@ BluetoothRequestParent::DoRequest(const DisconnectObjectPushRequest& aRequest)
 
   return true;
 }
+
+bool
+BluetoothRequestParent::DoRequest(const SendFileRequest& aRequest)
+{
+  MOZ_ASSERT(mService);
+  MOZ_ASSERT(mRequestType == Request::TSendFileRequest);
+
+  return mService->SendFile(aRequest.devicePath(),
+                            (BlobParent*)aRequest.blobParent(),
+                            (BlobChild*)aRequest.blobChild(),
+                            mReplyRunnable.get());
+}
diff --git a/dom/bluetooth/ipc/BluetoothParent.h b/dom/bluetooth/ipc/BluetoothParent.h
index 0e4a0fc9655e..4468f6cc1e26 100644
--- a/dom/bluetooth/ipc/BluetoothParent.h
+++ b/dom/bluetooth/ipc/BluetoothParent.h
@@ -177,6 +177,9 @@ protected:
 
   bool
   DoRequest(const DisconnectObjectPushRequest& aRequest);
+
+  bool
+  DoRequest(const SendFileRequest& aRequest);
 };
 
 END_BLUETOOTH_NAMESPACE
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
index be3ebfd655c9..b877a5a8a563 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
@@ -333,7 +333,8 @@ BluetoothServiceChildProcess::SendFile(
   BlobChild* aBlobChild,
   BluetoothReplyRunnable* aRunnable)
 {
-  // Will implement in another patch
+  SendRequest(aRunnable,
+              SendFileRequest(nsString(aDeviceAddress), nullptr, aBlobChild));
   return true;
 }
 
diff --git a/dom/bluetooth/ipc/PBluetooth.ipdl b/dom/bluetooth/ipc/PBluetooth.ipdl
index d65dd166f3e2..3eed31d7e1ae 100644
--- a/dom/bluetooth/ipc/PBluetooth.ipdl
+++ b/dom/bluetooth/ipc/PBluetooth.ipdl
@@ -4,6 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+include protocol PBlob;
 include protocol PBluetoothRequest;
 include protocol PContent;
 
@@ -115,6 +116,12 @@ struct DisconnectHeadsetRequest
 struct DisconnectObjectPushRequest
 {};
 
+struct SendFileRequest
+{
+  nsString devicePath;
+  PBlob blob;
+};
+
 union Request
 {
   DefaultAdapterPathRequest;
@@ -135,6 +142,7 @@ union Request
   ConnectObjectPushRequest;
   DisconnectHeadsetRequest;
   DisconnectObjectPushRequest;
+  SendFileRequest;
 };
 
 protocol PBluetooth
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 04e12534e719..769c4f034d68 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -2415,6 +2415,10 @@ BluetoothDBusService::SendFile(const nsAString& aDeviceAddress,
                                BlobChild* aBlobChild,
                                BluetoothReplyRunnable* aRunnable)
 {
+  // Currently we only support one device sending one file at a time,
+  // so we don't need aDeviceAddress here because the target device
+  // has been determined when calling 'Connect()'. Nevertheless, keep
+  // it for future use.
   BluetoothOppManager* opp = BluetoothOppManager::Get();
   opp->SendFile(aBlobParent, aRunnable);
 

From b4cd0aa3b162c1e68f831ab887982481334df5a8 Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Fri, 28 Sep 2012 20:03:36 +0800
Subject: [PATCH 50/64] Bug 795410 - patch 3: Get file content and send, r=qdot

From 01ff8209cc5242bdf6c89432899ab4658e71e58a Mon Sep 17 00:00:00 2001
---
 dom/bluetooth/BluetoothOppManager.cpp | 237 +++++++++++++++++++++++++-
 dom/bluetooth/BluetoothOppManager.h   |  14 +-
 2 files changed, 245 insertions(+), 6 deletions(-)

diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index e995d8cba872..c037ad13615f 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -13,16 +13,84 @@
 #include "ObexBase.h"
 
 #include "mozilla/RefPtr.h"
-#include "nsIDOMFile.h"
+#include "nsIInputStream.h"
 
 USING_BLUETOOTH_NAMESPACE
 using namespace mozilla::ipc;
 
 static mozilla::RefPtr<BluetoothOppManager> sInstance;
+static nsCOMPtr<nsIInputStream> stream = nullptr;
+static uint64_t sSentFileSize = 0;
+
+class ReadFileTask : public nsRunnable
+{
+public:
+  ReadFileTask(nsIDOMBlob* aBlob) : mBlob(aBlob)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+  }
+
+  NS_IMETHOD Run()
+  {
+    if (NS_IsMainThread()) {
+      NS_WARNING("Can't read file from main thread");
+      return NS_ERROR_FAILURE;
+    }
+
+    uint64_t fileSize;
+    nsresult rv = mBlob->GetSize(&fileSize);
+    if (NS_FAILED(rv)) {
+      NS_WARNING("Can't get file size");
+      return NS_ERROR_FAILURE;;
+    }
+
+    if (stream == nullptr) {
+      rv = mBlob->GetInternalStream(getter_AddRefs(stream));
+      if (NS_FAILED(rv)) {
+        NS_WARNING("Can't get internal stream of blob");
+        return NS_ERROR_FAILURE;
+      }
+    }
+
+    /*
+     * 255 is the Minimum OBEX Packet Length (See section 3.3.1.4,
+     * IrOBEX ver 1.2)
+     */
+    char buf[255];
+    uint32_t numRead;
+    int offset = 0;
+
+    // function inputstream->Read() only works on non-main thread
+    rv = stream->Read(buf, sizeof(buf), &numRead);
+    if (NS_FAILED(rv)) {
+      // Needs error handling here
+      return NS_ERROR_FAILURE;
+    }
+
+    if (numRead > 0) {
+      if (sSentFileSize + numRead >= fileSize) {
+        sInstance->SendPutRequest((uint8_t*)buf, numRead, true);
+      } else {
+        sInstance->SendPutRequest((uint8_t*)buf, numRead, false);
+      }
+
+      sSentFileSize += numRead;
+    }
+
+    return NS_OK;
+  };
+
+private:
+  nsCOMPtr<nsIDOMBlob> mBlob;
+};
 
 BluetoothOppManager::BluetoothOppManager() : mConnected(false)
                                            , mConnectionId(1)
                                            , mLastCommand(0)
+                                           , mBlob(nullptr)
+                                           , mRemoteObexVersion(0)
+                                           , mRemoteConnectionFlags(0)
+                                           , mRemoteMaxPacketLength(0)
 {
 }
 
@@ -82,7 +150,21 @@ bool
 BluetoothOppManager::SendFile(BlobParent* aActor,
                               BluetoothReplyRunnable* aRunnable)
 {
-  // will implement in another patch.
+  if (mBlob) {
+    // Means there's a sending process. Reply error.
+    return false;
+  }
+
+  /*
+   * Process of sending a file:
+   *  - Keep blob because OPP connection has not been established yet.
+   *  - Create an OPP connection by SendConnectRequest()
+   *  - After receiving the response, start to read file and send.
+   */
+  mBlob = aActor->GetBlob();
+
+  SendConnectRequest();
+
   return true;
 }
 
@@ -98,21 +180,83 @@ void
 BluetoothOppManager::ReceiveSocketData(UnixSocketRawData* aMessage)
 {
   uint8_t responseCode = aMessage->mData[0];
+  int packetLength = (((int)aMessage->mData[1]) << 8) | aMessage->mData[2];
+  int receivedLength = aMessage->mSize;
 
   if (mLastCommand == ObexRequestCode::Connect) {
     if (responseCode == ObexResponseCode::Success) {
       mConnected = true;
+
+      // Keep remote information
+      mRemoteObexVersion = aMessage->mData[3];
+      mRemoteConnectionFlags = aMessage->mData[4];
+      mRemoteMaxPacketLength =
+        (((int)(aMessage->mData[5]) << 8) | aMessage->mData[6]);
+
+      if (mBlob) {
+        /*
+         * Before sending content, we have to send a header including
+         * information such as file name, file length and content type.
+         */
+        nsresult rv;
+        nsCOMPtr<nsIDOMFile> file = do_QueryInterface(mBlob);
+        nsString fileName;
+        if (file) {
+          rv = file->GetName(fileName);
+        }
+
+        if (!file || fileName.IsEmpty()) {
+          fileName.AssignLiteral("Unknown");
+        }
+
+        uint64_t fileSize;
+        rv = mBlob->GetSize(&fileSize);
+        if (NS_FAILED(rv)) {
+          NS_WARNING("Can't get file size");
+          return;
+        }
+
+        sSentFileSize = 0;
+        sInstance->SendPutHeaderRequest(fileName, fileSize);
+      }
     }
   } else if (mLastCommand == ObexRequestCode::Disconnect) {
-    if (responseCode == ObexResponseCode::Success) {
+    if (responseCode != ObexResponseCode::Success) {
+      // FIXME: Needs error handling here
+      NS_WARNING("[OPP] Disconnect failed");
+    } else {
       mConnected = false;
+      mBlob = nullptr;
+    }
+  } else if (mLastCommand == ObexRequestCode::Put) {
+    if (responseCode != ObexResponseCode::Continue) {
+      // FIXME: Needs error handling here
+      NS_WARNING("[OPP] Put failed");
+    } else {
+      nsCOMPtr<nsIThread> t;
+      NS_NewThread(getter_AddRefs(t));
+
+      nsRefPtr<ReadFileTask> task = new ReadFileTask(mBlob);
+
+      if (NS_FAILED(t->Dispatch(task, NS_DISPATCH_NORMAL))) {
+        NS_WARNING("Cannot dispatch ring task!");
+      }
+    }
+  } else if (mLastCommand == ObexRequestCode::PutFinal) {
+    if (responseCode != ObexResponseCode::Success) {
+      // FIXME: Needs error handling here
+      NS_WARNING("[OPP] PutFinal failed");
+    } else {
+      SendDisconnectRequest();
     }
   }
 }
 
 void
-BluetoothOppManager::SendConnectReqeust()
+BluetoothOppManager::SendConnectRequest()
 {
+  if (mConnected) return;
+
   // Section 3.3.1 "Connect", IrOBEX 1.2
   // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2][Headers:var]
   uint8_t req[255];
@@ -123,7 +267,7 @@ BluetoothOppManager::SendConnectReqeust()
   req[5] = BluetoothOppManager::MAX_PACKET_LENGTH >> 8;
   req[6] = BluetoothOppManager::MAX_PACKET_LENGTH;
 
-  index += AppendHeaderConnectionId(&req[index], mConnectionId++);
+  index += AppendHeaderConnectionId(&req[index], mConnectionId);
   SetObexPacketInfo(req, ObexRequestCode::Connect, index);
   mLastCommand = ObexRequestCode::Connect;
 
@@ -132,3 +276,86 @@ BluetoothOppManager::SendConnectReqeust()
   SendSocketData(s);
 }
 
+void
+BluetoothOppManager::SendPutHeaderRequest(const nsAString& aFileName, int aFileSize)
+{
+  uint8_t* req = new uint8_t[mRemoteMaxPacketLength];
+
+  const PRUnichar* fileNamePtr = aFileName.BeginReading();
+  uint32_t len = aFileName.Length();
+  uint8_t* fileName = new uint8_t[(len + 1) * 2];
+  for (int i = 0; i < len; i++) {
+    fileName[i * 2] = (uint8_t)(fileNamePtr[i] >> 8);
+    fileName[i * 2 + 1] = (uint8_t)fileNamePtr[i];
+  }
+
+  fileName[len * 2] = 0x00;
+  fileName[len * 2 + 1] = 0x00;
+
+  int index = 3;
+  index += AppendHeaderConnectionId(&req[index], mConnectionId);
+  index += AppendHeaderName(&req[index], (char*)fileName, (len + 1) * 2);
+  index += AppendHeaderLength(&req[index], aFileSize);
+
+  SetObexPacketInfo(req, ObexRequestCode::Put, index);
+  mLastCommand = ObexRequestCode::Put;
+
+  UnixSocketRawData* s = new UnixSocketRawData(index);
+  memcpy(s->mData, req, s->mSize);
+  SendSocketData(s);
+
+  delete [] fileName;
+  delete [] req;
+}
+
+void
+BluetoothOppManager::SendPutRequest(uint8_t* aFileBody,
+                                    int aFileBodyLength,
+                                    bool aFinal)
+{
+  int sentFileBodyLength = 0;
+  int index = 3;
+  int packetLeftSpace = mRemoteMaxPacketLength - index - 3;
+
+  if (!mConnected) return;
+  if (aFileBodyLength > packetLeftSpace) {
+    NS_WARNING("Not allowed such a small MaxPacketLength value");
+    return;
+  }
+
+  // IrOBEX 1.2 3.3.3
+  // [opcode:1][length:2][Headers:var]
+  uint8_t* req = new uint8_t[mRemoteMaxPacketLength];
+
+  index += AppendHeaderBody(&req[index], aFileBody, aFileBodyLength);
+
+  if (aFinal) {
+    SetObexPacketInfo(req, ObexRequestCode::PutFinal, index);
+    mLastCommand = ObexRequestCode::PutFinal;
+  } else {
+    SetObexPacketInfo(req, ObexRequestCode::Put, index);
+    mLastCommand = ObexRequestCode::Put;
+  }
+
+  UnixSocketRawData* s = new UnixSocketRawData(index);
+  memcpy(s->mData, req, s->mSize);
+  SendSocketData(s);
+
+  delete [] req;
+}
+
+void
+BluetoothOppManager::SendDisconnectRequest()
+{
+  // IrOBEX 1.2 3.3.2
+  // [opcode:1][length:2][Headers:var]
+  uint8_t req[255];
+  int index = 3;
+
+  SetObexPacketInfo(req, ObexRequestCode::Disconnect, index);
+  mLastCommand = ObexRequestCode::Disconnect;
+
+  UnixSocketRawData* s = new UnixSocketRawData(index);
+  memcpy(s->mData, req, s->mSize);
+  SendSocketData(s);
+}
diff --git a/dom/bluetooth/BluetoothOppManager.h b/dom/bluetooth/BluetoothOppManager.h
index 6ed6991f0098..0f94ac31c3c0 100644
--- a/dom/bluetooth/BluetoothOppManager.h
+++ b/dom/bluetooth/BluetoothOppManager.h
@@ -10,6 +10,7 @@
 #include "BluetoothCommon.h"
 #include "mozilla/dom/ipc/Blob.h"
 #include "mozilla/ipc/UnixSocket.h"
+#include "nsIDOMFile.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
@@ -50,13 +51,24 @@ public:
 
   bool StopSendingFile(BluetoothReplyRunnable* aRunnable);
 
+  // xxx For runnable use
+  void SendConnectRequest();
+  void SendPutHeaderRequest(const nsAString& aFileName, int aFileSize);
+  void SendPutRequest(uint8_t* aFileBody, int aFileBodyLength,
+                      bool aFinal);
+  void SendDisconnectRequest();
+
 private:
   BluetoothOppManager();
-  void SendConnectReqeust();
 
   bool mConnected;
   int mConnectionId;
   int mLastCommand;
+  uint8_t mRemoteObexVersion;
+  uint8_t mRemoteConnectionFlags;
+  int mRemoteMaxPacketLength;
+
+  nsCOMPtr<nsIDOMBlob> mBlob;
 };
 
 END_BLUETOOTH_NAMESPACE

From 184cc8ba2c7d54e5dd8017d6d2595245e269849e Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Mon, 1 Oct 2012 00:03:16 -0700
Subject: [PATCH 51/64] Bug 790739: Patch 1 - UnixSocket changes for server
 sockets; r=cjones

---
 ipc/unixsocket/UnixSocket.cpp | 305 +++++++++++++++++++++++++++++++---
 ipc/unixsocket/UnixSocket.h   |  76 +++++----
 2 files changed, 325 insertions(+), 56 deletions(-)

diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp
index a4b760014b22..fd1c88215d72 100644
--- a/ipc/unixsocket/UnixSocket.cpp
+++ b/ipc/unixsocket/UnixSocket.cpp
@@ -24,16 +24,31 @@
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
 
+#undef LOG
+#if defined(MOZ_WIDGET_GONK)
+#include <android/log.h>
+#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
+#else
+#define BTDEBUG true
+#define LOG(args...) if (BTDEBUG) printf(args);
+#endif
+
+static const int SOCKET_RETRY_TIME_MS = 1000;
+
 namespace mozilla {
 namespace ipc {
 
 class UnixSocketImpl : public MessageLoopForIO::Watcher
 {
 public:
-  UnixSocketImpl(UnixSocketConsumer* aConsumer, int aFd)
+  UnixSocketImpl(UnixSocketConsumer* aConsumer, UnixSocketConnector* aConnector,
+                 const nsACString& aAddress)
     : mConsumer(aConsumer)
     , mIOLoop(nullptr)
-    , mFd(aFd)
+    , mFd(-1)
+    , mConnector(aConnector)
+    , mCurrentTaskIsCanceled(false)
+    , mAddress(aAddress)
   {
   }
 
@@ -54,6 +69,42 @@ public:
     return mFd > 0;
   }
 
+  void CancelTask()
+  {
+    if (!mTask) {
+      return;
+    }
+    mTask->Cancel();
+    mTask = nullptr;
+    mCurrentTaskIsCanceled = true;
+  }
+  
+  void UnsetTask()
+  {
+    mTask = nullptr;
+  }
+
+  void EnqueueTask(int aDelayMs, CancelableTask* aTask)
+  {
+    MessageLoopForIO* ioLoop = MessageLoopForIO::current();
+    if (!ioLoop) {
+      NS_WARNING("No IOLoop to attach to, cancelling self!");
+      return;
+    }
+    if (mTask) {
+      return;
+    }
+    if (mCurrentTaskIsCanceled) {
+      return;
+    }
+    mTask = aTask;
+    if (aDelayMs) {
+      ioLoop->PostDelayedTask(FROM_HERE, mTask, aDelayMs);
+    } else {
+      ioLoop->PostTask(FROM_HERE, mTask);
+    }
+  }
+  
   void SetUpIO()
   {
     MOZ_ASSERT(!mIOLoop);
@@ -70,6 +121,33 @@ public:
     mConsumer.forget();
   }
 
+  /** 
+   * Connect to a socket
+   */
+  void Connect();
+
+  /** 
+   * Run bind/listen to prepare for further runs of accept()
+   */
+  void Listen();
+
+  /** 
+   * Accept an incoming connection
+   */
+  void Accept();
+
+  /** 
+   * Stop whatever connect/accept task is running
+   */
+  void Stop();
+
+  /** 
+   * Set up nonblocking flags on whatever our current file descriptor is.
+   *
+   * @return true if successful, false otherwise
+   */
+  bool SetNonblockFlags();
+
   /**
    * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated
    * directly from main thread. All non-main-thread accesses should happen with
@@ -105,12 +183,6 @@ private:
   typedef nsTArray<UnixSocketRawData* > UnixSocketRawDataQueue;
   UnixSocketRawDataQueue mOutgoingQ;
 
-  /**
-   * File descriptor to read from/write to. Connection happens on user provided
-   * thread. Read/write/close happens on IO thread.
-   */
-  ScopedClose mFd;
-
   /**
    * Incoming packet. Only to be accessed on IO Thread.
    */
@@ -125,6 +197,33 @@ private:
    * Write watcher for libevent. Only to be accessed on IO Thread.
    */
   MessageLoopForIO::FileDescriptorWatcher mWriteWatcher;
+
+  /**
+   * File descriptor to read from/write to. Connection happens on user provided
+   * thread. Read/write/close happens on IO thread.
+   */
+  ScopedClose mFd;
+
+  /** 
+   * Connector object used to create the connection we are currently using.
+   */
+  nsAutoPtr<UnixSocketConnector> mConnector;
+
+  /**
+   * If true, do not requeue whatever task we're running
+   */
+  bool mCurrentTaskIsCanceled;
+
+  /**
+   * Pointer to the task we're currently running. DO NOT DELETE MANUALLY. This
+   * will be taken care of by the IO loop. Just set to nullptr.
+   */
+  CancelableTask* mTask;
+
+  /**
+   * Address we are connecting to, assuming we are creating a client connection.
+   */
+  nsCString mAddress;
 };
 
 static void
@@ -201,27 +300,160 @@ private:
   UnixSocketImpl* mImpl;
 };
 
-bool
-UnixSocketConnector::Connect(int aFd, const char* aAddress)
+class SocketAcceptTask : public CancelableTask {
+  virtual void Run();
+
+  bool mCanceled;
+  UnixSocketImpl* mImpl;
+public:
+  virtual void Cancel() { mCanceled = true; }
+  SocketAcceptTask(UnixSocketImpl* aImpl) : mCanceled(false), mImpl(aImpl) { }
+};
+
+void SocketAcceptTask::Run() {
+  mImpl->UnsetTask();
+  if (mCanceled) {
+    return;
+  }
+  mImpl->Accept();
+}
+
+class SocketConnectTask : public CancelableTask {
+  virtual void Run();
+
+  bool mCanceled;
+  UnixSocketImpl* mImpl;
+public:
+  SocketConnectTask(UnixSocketImpl* aImpl) : mCanceled(false), mImpl(aImpl) { }
+  virtual void Cancel() { mCanceled = true; }  
+};
+
+void SocketConnectTask::Run() {
+  mImpl->UnsetTask();
+  if (mCanceled) {
+    return;
+  }
+  mImpl->Connect();
+}
+
+void
+UnixSocketImpl::Accept()
 {
-  if (!ConnectInternal(aFd, aAddress))
+  socklen_t addr_sz;
+  struct sockaddr addr;
+
+  // This will set things we don't particularly care about, but it will hand
+  // back the correct structure size which is what we do care about.
+  mConnector->CreateAddr(true, addr_sz, &addr, nullptr);
+
+  if(mFd.get() < 0)
   {
-    return false;
+    mFd = mConnector->Create();
+    if (mFd.get() < 0) {
+      return;
+    }
+
+    if (!SetNonblockFlags()) {
+      return;
+    }
+
+    if (bind(mFd.get(), &addr, addr_sz)) {
+#ifdef DEBUG
+      LOG("...bind(%d) gave errno %d", mFd.get(), errno);
+#endif
+      return;
+    }
+
+    if (listen(mFd.get(), 1)) {
+#ifdef DEBUG
+      LOG("...listen(%d) gave errno %d", mFd.get(), errno);
+#endif
+      return;
+    }
+
   }
 
+  int client_fd;
+  client_fd = accept(mFd.get(), &addr, &addr_sz);
+  if (client_fd < 0) {
+#if DEBUG
+    LOG("Socket accept errno=%d\n", errno);
+#endif
+    EnqueueTask(SOCKET_RETRY_TIME_MS, new SocketAcceptTask(this));
+    return;
+  }
+
+  if(client_fd < 0)
+  {
+    EnqueueTask(SOCKET_RETRY_TIME_MS, new SocketAcceptTask(this));
+    return;
+  }
+
+  if (!mConnector->Setup(client_fd)) {
+    NS_WARNING("Could not set up socket!");
+    return;
+  }
+  mFd.reset(client_fd);
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
+                                   new StartImplReadingTask(this));
+}
+
+void
+UnixSocketImpl::Connect()
+{
+  if(mFd.get() < 0)
+  {
+    mFd = mConnector->Create();
+    if (mFd.get() < 0) {
+      return;
+    }
+  }
+
+  int ret;
+  socklen_t addr_sz;
+  struct sockaddr addr;
+
+  mConnector->CreateAddr(false, addr_sz, &addr, mAddress.get());
+
+  ret = connect(mFd.get(), &addr, addr_sz);
+
+  if (ret) {
+#if DEBUG
+    LOG("Socket connect errno=%d\n", errno);
+#endif
+    mFd.reset(-1);
+    return;
+  }
+
+  if (!mConnector->Setup(mFd)) {
+    NS_WARNING("Could not set up socket!");
+    return;
+  }
+
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
+                                   new StartImplReadingTask(this));
+}
+
+bool
+UnixSocketImpl::SetNonblockFlags()
+{
+  // Set socket addr to be reused even if kernel is still waiting to close
+  int n = 1;
+  setsockopt(mFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n));
+
   // Set close-on-exec bit.
-  int flags = fcntl(aFd, F_GETFD);
+  int flags = fcntl(mFd, F_GETFD);
   if (-1 == flags) {
     return false;
   }
 
   flags |= FD_CLOEXEC;
-  if (-1 == fcntl(aFd, F_SETFD, flags)) {
+  if (-1 == fcntl(mFd, F_SETFD, flags)) {
     return false;
   }
 
   // Select non-blocking IO.
-  if (-1 == fcntl(aFd, F_SETFL, O_NONBLOCK)) {
+  if (-1 == fcntl(mFd, F_SETFL, O_NONBLOCK)) {
     return false;
   }
 
@@ -373,23 +605,48 @@ UnixSocketImpl::OnFileCanWriteWithoutBlocking(int aFd)
 }
 
 bool
-UnixSocketConsumer::ConnectSocket(UnixSocketConnector& aConnector,
+UnixSocketConsumer::ConnectSocket(UnixSocketConnector* aConnector,
                                   const char* aAddress)
 {
   MOZ_ASSERT(!NS_IsMainThread());
-  MOZ_ASSERT(!mImpl);
-  ScopedClose fd(aConnector.Create());
-  if (fd < 0) {
+  MOZ_ASSERT(aConnector);
+  if (mImpl) {
+    NS_WARNING("Socket already connecting/connected!");
     return false;
   }
-  if (!aConnector.Connect(fd, aAddress)) {
-    return false;
-  }
-  mImpl = new UnixSocketImpl(this, fd.forget());
+  nsCString addr;
+  addr.Assign(aAddress);
+  mImpl = new UnixSocketImpl(this, aConnector, addr);
   XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
-                                   new StartImplReadingTask(mImpl));
+                                   new SocketConnectTask(mImpl));
   return true;
 }
 
+bool
+UnixSocketConsumer::ListenSocket(UnixSocketConnector* aConnector)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(aConnector);
+  if (mImpl) {
+    NS_WARNING("Socket already connecting/connected!");
+    return false;
+  }
+  nsCString addr;
+  mImpl = new UnixSocketImpl(this, aConnector, addr);
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE,
+                                   new SocketAcceptTask(mImpl));
+  return true;
+}
+
+void
+UnixSocketConsumer::CancelSocketTask()
+{
+  if(!mImpl) {
+    NS_WARNING("No socket implementation to cancel task on!");
+    return;
+  }
+  mImpl->CancelTask();
+}
+
 } // namespace ipc
 } // namespace mozilla
diff --git a/ipc/unixsocket/UnixSocket.h b/ipc/unixsocket/UnixSocket.h
index fef24993a2cf..7dc01551f632 100644
--- a/ipc/unixsocket/UnixSocket.h
+++ b/ipc/unixsocket/UnixSocket.h
@@ -7,6 +7,7 @@
 #ifndef mozilla_ipc_UnixSocket_h
 #define mozilla_ipc_UnixSocket_h
 
+#include <sys/socket.h>
 #include <stdlib.h>
 #include "nsString.h"
 #include "nsAutoPtr.h"
@@ -24,7 +25,7 @@ struct UnixSocketRawData
   size_t mSize;
   size_t mCurrentWriteOffset;
 
-  /** 
+  /**
    * Constructor for situations where size is not known beforehand. (for
    * example, when reading a packet)
    *
@@ -35,7 +36,7 @@ struct UnixSocketRawData
   {
   }
 
-  /** 
+  /**
    * Constructor for situations where size is known beforehand (for example,
    * when being assigned strings)
    *
@@ -50,7 +51,7 @@ struct UnixSocketRawData
 
 class UnixSocketImpl;
 
-/** 
+/**
  * UnixSocketConnector defines the socket creation and connection/listening
  * functions for a UnixSocketConsumer. Due to the fact that socket setup can
  * vary between protocols (unix sockets, tcp sockets, bluetooth sockets, etc),
@@ -70,7 +71,7 @@ public:
   virtual ~UnixSocketConnector()
   {}
 
-  /** 
+  /**
    * Establishs a file descriptor for a socket.
    *
    * @return File descriptor for socket
@@ -78,28 +79,28 @@ public:
   virtual int Create() = 0;
 
   /** 
-   * Runs connect function on a file descriptor for the address specified. Makes
-   * sure socket is marked with flags expected by the UnixSocket handler
-   * (non-block, etc...)
+   * Since most socket specifics are related to address formation into a
+   * sockaddr struct, this function is defined by subclasses and fills in the
+   * structure as needed for whatever connection it is trying to build
    *
-   * @param aFd File descriptor created by Create() function
-   * @param aAddress Address to connect to
-   *
-   * @return true if connected, false otherwise
+   * @param aIsServer True is we are acting as a server socket
+   * @param aAddrSize Size of the struct 
+   * @param aAddr Struct to fill
+   * @param aAddress If aIsServer is false, Address to connect to. nullptr otherwise.
    */
-  bool Connect(int aFd, const char* aAddress);
-  
-protected:
+  virtual void CreateAddr(bool aIsServer,
+                          socklen_t& aAddrSize,
+                          struct sockaddr *aAddr,
+                          const char* aAddress) = 0;
+
   /** 
-   * Internal type-specific connection function to be overridden by child
-   * classes.
+   * Does any socket type specific setup that may be needed
    *
-   * @param aFd File descriptor created by Create() function
-   * @param aAddress Address to connect to
+   * @param aFd File descriptor for opened socket
    *
-   * @return true if connected, false otherwise
+   * @return true is successful, false otherwise
    */
-  virtual bool ConnectInternal(int aFd, const char* aAddress) = 0;
+  virtual bool Setup(int aFd) = 0;  
 };
 
 class UnixSocketConsumer : public RefCounted<UnixSocketConsumer>
@@ -110,8 +111,8 @@ public:
   {}
 
   virtual ~UnixSocketConsumer();
-  
-  /** 
+
+  /**
    * Function to be called whenever data is received. This is only called on the
    * main thread.
    *
@@ -119,7 +120,7 @@ public:
    */
   virtual void ReceiveSocketData(UnixSocketRawData* aMessage) = 0;
 
-  /** 
+  /**
    * Queue data to be sent to the socket on the IO thread. Can only be called on
    * originating thread.
    *
@@ -129,7 +130,7 @@ public:
    */
   bool SendSocketData(UnixSocketRawData* aMessage);
 
-  /** 
+  /**
    * Convenience function for sending strings to the socket (common in bluetooth
    * profile usage). Converts to a UnixSocketRawData struct. Can only be called
    * on originating thread.
@@ -140,26 +141,37 @@ public:
    */
   bool SendSocketData(const nsACString& aMessage);
 
-  /** 
-   * Connects to a socket. Due to the fact that this is a blocking connect (and
-   * for things such as bluetooth, it /will/ block), it is expected to be run on
-   * a thread provided by the user. It cannot run on the main thread. Runs the
-   * Create() and Connect() functions in the UnixSocketConnector.
+  /**
+   * Starts a task on the socket that will try to connect to a socket in a
+   * non-blocking manner.
    *
    * @param aConnector Connector object for socket type specific functions
    * @param aAddress Address to connect to.
    *
-   * @return true on connection, false otherwise.
+   * @return true on connect task started, false otherwise.
    */
-  bool ConnectSocket(UnixSocketConnector& aConnector, const char* aAddress);
+  bool ConnectSocket(UnixSocketConnector* aConnector, const char* aAddress);
 
   /** 
+   * Starts a task on the socket that will try to accept a new connection in a
+   * non-blocking manner.
+   *
+   * @param aConnector Connector object for socket type specific functions
+   *
+   * @return true on listen started, false otherwise
+   */
+  bool ListenSocket(UnixSocketConnector* aConnector);
+
+  /**
    * Queues the internal representation of socket for deletion. Can be called
    * from main thread.
-   *
    */
   void CloseSocket();
 
+  /** 
+   * Cancels connect/accept task loop, if one is currently running.
+   */
+  void CancelSocketTask();
 private:
   nsAutoPtr<UnixSocketImpl> mImpl;
 };

From c909c64c0243f3014d13fc358671ab1b8723f056 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Mon, 1 Oct 2012 00:03:28 -0700
Subject: [PATCH 52/64] Bug 790739: Patch 2 - BluetoothSocketConnection changes
 for server sockets; r=cjones

---
 .../BluetoothUnixSocketConnector.cpp          | 124 +++++++++---------
 dom/bluetooth/BluetoothUnixSocketConnector.h  |   8 +-
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.cpp b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
index ee1ccae5a260..affb9445e794 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.cpp
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
@@ -35,6 +35,15 @@
 #include "BluetoothUnixSocketConnector.h"
 #include "nsThreadUtils.h"
 
+#undef LOG
+#if defined(MOZ_WIDGET_GONK)
+#include <android/log.h>
+#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
+#else
+#define BTDEBUG true
+#define LOG(args...) if (BTDEBUG) printf(args);
+#endif
+
 USING_BLUETOOTH_NAMESPACE
 
 static const int RFCOMM_SO_SNDBUF = 70 * 1024; // 70 KB send buffer
@@ -62,33 +71,11 @@ BluetoothUnixSocketConnector::BluetoothUnixSocketConnector(
 {
 }
 
-int
-BluetoothUnixSocketConnector::Create()
+bool
+BluetoothUnixSocketConnector::Setup(int aFd)
 {
-  MOZ_ASSERT(!NS_IsMainThread());
   int lm = 0;
-  int fd = -1;
   int sndbuf;
-
-  switch (mType) {
-  case BluetoothSocketType::RFCOMM:
-    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-    break;
-  case BluetoothSocketType::SCO:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
-    break;
-  case BluetoothSocketType::L2CAP:
-    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
-    break;
-  default:
-    return -1;
-  }
-
-  if (fd < 0) {
-    NS_WARNING("Could not open bluetooth socket!");
-    return -1;
-  }
-
   /* kernel does not yet support LM for SCO */
   switch (mType) {
   case BluetoothSocketType::RFCOMM:
@@ -104,72 +91,91 @@ BluetoothUnixSocketConnector::Create()
   }
 
   if (lm) {
-    if (setsockopt(fd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
+    if (setsockopt(aFd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
       NS_WARNING("setsockopt(RFCOMM_LM) failed, throwing");
-      return -1;
+      return false;
     }
   }
 
   if (mType == BluetoothSocketType::RFCOMM) {
     sndbuf = RFCOMM_SO_SNDBUF;
-    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
+    if (setsockopt(aFd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))) {
       NS_WARNING("setsockopt(SO_SNDBUF) failed, throwing");
-      return -1;
+      return false;
     }
   }
 
+  return true;
+}
+
+int
+BluetoothUnixSocketConnector::Create()
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  int fd = -1;
+
+  switch (mType) {
+  case BluetoothSocketType::RFCOMM:
+    fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+    break;
+  case BluetoothSocketType::SCO:
+    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
+    break;
+  case BluetoothSocketType::L2CAP:
+    fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
+    break;
+  default:
+    MOZ_NOT_REACHED();
+  }
+
+  if (fd < 0) {
+    NS_WARNING("Could not open bluetooth socket!");
+    return -1;
+  }
+
+  if (!Setup(fd)) {
+    NS_WARNING("Could not set up socket!");
+  }
   return fd;
 }
 
-bool
-BluetoothUnixSocketConnector::ConnectInternal(int aFd, const char* aAddress)
+void
+BluetoothUnixSocketConnector::CreateAddr(bool aIsServer,
+                                         socklen_t& aAddrSize,
+                                         struct sockaddr* aAddr,
+                                         const char* aAddress)
 {
-  int n = 1;
-  setsockopt(aFd, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n));
-  
-  socklen_t addr_sz;
-  struct sockaddr *addr;
-  bdaddr_t bd_address_obj;
+  // Set to BDADDR_ANY, if it's not a server, we'll reset.
+  bdaddr_t bd_address_obj = {{0, 0, 0, 0, 0, 0}};
 
-  if (get_bdaddr(aAddress, &bd_address_obj)) {
-    NS_WARNING("Can't get bluetooth address!");
-    return false;
+  if (!aIsServer && aAddress && strlen(aAddress) > 0) {
+    if (get_bdaddr(aAddress, &bd_address_obj)) {
+      NS_WARNING("Can't get bluetooth address!");
+      return;
+    }
   }
 
   switch (mType) {
   case BluetoothSocketType::RFCOMM:
     struct sockaddr_rc addr_rc;
-    addr = (struct sockaddr *)&addr_rc;
-    addr_sz = sizeof(addr_rc);
-
-    memset(addr, 0, addr_sz);
+    aAddrSize = sizeof(addr_rc);
+    memset(aAddr, 0, aAddrSize);
     addr_rc.rc_family = AF_BLUETOOTH;
     addr_rc.rc_channel = mChannel;
     memcpy(&addr_rc.rc_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
+    memcpy(aAddr, &addr_rc, sizeof(addr_rc));
     break;
   case BluetoothSocketType::SCO:
     struct sockaddr_sco addr_sco;
-    addr = (struct sockaddr *)&addr_sco;
-    addr_sz = sizeof(addr_sco);
+    aAddrSize = sizeof(addr_sco);
 
-    memset(addr, 0, addr_sz);
+    memset(aAddr, 0, aAddrSize);
     addr_sco.sco_family = AF_BLUETOOTH;
     memcpy(&addr_sco.sco_bdaddr, &bd_address_obj, sizeof(bdaddr_t));
+    memcpy(aAddr, &addr_sco, sizeof(addr_sco));
     break;
   default:
     NS_WARNING("Socket type unknown!");
-    return false;
   }
-
-  int ret = connect(aFd, addr, addr_sz);
-
-  if (ret) {
-#if DEBUG
-    //LOG("Socket connect errno=%d\n", errno);
-#endif
-    NS_WARNING("Socket connect error!");
-    return false;
-  }
-
-  return true;
 }
+
diff --git a/dom/bluetooth/BluetoothUnixSocketConnector.h b/dom/bluetooth/BluetoothUnixSocketConnector.h
index 324a0485d709..14b811cc1818 100644
--- a/dom/bluetooth/BluetoothUnixSocketConnector.h
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_bluetooth_BluetoothUnixSocketConnector_h
 
 #include "BluetoothCommon.h"
+#include <sys/socket.h>
 #include <mozilla/ipc/UnixSocket.h>
 
 BEGIN_BLUETOOTH_NAMESPACE
@@ -20,8 +21,11 @@ public:
   virtual ~BluetoothUnixSocketConnector()
   {}
   virtual int Create() MOZ_OVERRIDE;
-  virtual bool ConnectInternal(int aFd, const char* aAddress) MOZ_OVERRIDE;
-
+  virtual void CreateAddr(bool aIsServer,
+                          socklen_t& aAddrSize,
+                          struct sockaddr* aAddr,
+                          const char* aAddress) MOZ_OVERRIDE;
+  virtual bool Setup(int aFd) MOZ_OVERRIDE;
 private:
   BluetoothSocketType mType;
   int mChannel;

From 156f92210d048c72ae215e51d8e32c784199e7f8 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Mon, 1 Oct 2012 00:04:01 -0700
Subject: [PATCH 53/64] Bug 790739: Patch 3 - Service and Manager changes for
 Bluetooth server sockets; r=cjones

---
 dom/bluetooth/BluetoothHfpManager.cpp         |  19 +++
 dom/bluetooth/BluetoothHfpManager.h           |   2 +-
 dom/bluetooth/BluetoothService.h              |   7 ++
 dom/bluetooth/BluetoothServiceUuid.h          |  15 +++
 .../ipc/BluetoothServiceChildProcess.cpp      |  13 +++
 .../ipc/BluetoothServiceChildProcess.h        |   7 ++
 dom/bluetooth/linux/BluetoothDBusService.cpp  | 110 ++++++++++++++++--
 dom/bluetooth/linux/BluetoothDBusService.h    |  21 ++++
 ipc/dbus/DBusUtils.cpp                        |  18 ++-
 ipc/dbus/DBusUtils.h                          |   2 +
 10 files changed, 200 insertions(+), 14 deletions(-)

diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index d57a02b911d6..458b6062639f 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -407,6 +407,25 @@ BluetoothHfpManager::Connect(const nsAString& aDeviceObjectPath,
   return NS_FAILED(rv) ? false : true;
 }
 
+bool
+BluetoothHfpManager::Listen()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  BluetoothService* bs = BluetoothService::Get();
+  if (!bs) {
+    NS_WARNING("BluetoothService not available!");
+    return false;
+  }
+
+  nsresult rv = bs->ListenSocketViaService(BluetoothReservedChannels::HANDSFREE_AG,
+                                           BluetoothSocketType::RFCOMM,
+                                           true,
+                                           false,
+                                           this);
+  return NS_FAILED(rv) ? false : true;
+}
+
 void
 BluetoothHfpManager::Disconnect()
 {
diff --git a/dom/bluetooth/BluetoothHfpManager.h b/dom/bluetooth/BluetoothHfpManager.h
index 7679e8ef8b6f..719fdee4e7b9 100644
--- a/dom/bluetooth/BluetoothHfpManager.h
+++ b/dom/bluetooth/BluetoothHfpManager.h
@@ -34,7 +34,7 @@ public:
   bool SendLine(const char* aMessage);
   void CallStateChanged(int aCallIndex, int aCallState,
                         const char* aNumber, bool aIsActive);
-
+  bool Listen();
 private:
   BluetoothHfpManager();
 
diff --git a/dom/bluetooth/BluetoothService.h b/dom/bluetooth/BluetoothService.h
index 5a77cb44ce52..df730794df7b 100644
--- a/dom/bluetooth/BluetoothService.h
+++ b/dom/bluetooth/BluetoothService.h
@@ -286,6 +286,13 @@ public:
            BlobChild* aBlobChild,
            BluetoothReplyRunnable* aRunnable) = 0;
 
+  virtual nsresult
+  ListenSocketViaService(int aChannel,
+                         BluetoothSocketType aType,
+                         bool aAuth,
+                         bool aEncrypt,
+                         mozilla::ipc::UnixSocketConsumer* aConsumer) = 0;
+
   bool
   IsEnabled() const
   {
diff --git a/dom/bluetooth/BluetoothServiceUuid.h b/dom/bluetooth/BluetoothServiceUuid.h
index 12bad23132fb..29f337bbc350 100644
--- a/dom/bluetooth/BluetoothServiceUuid.h
+++ b/dom/bluetooth/BluetoothServiceUuid.h
@@ -30,6 +30,21 @@ namespace BluetoothServiceUuidStr {
   static const char* ObjectPush    = "00001105-0000-1000-8000-00805F9B34FB";
 }
 
+// TODO/qdot: Move these back into gonk and make the service handler deal with
+// it there.
+//
+// Gotten from reading the "u8" values in B2G/external/bluez/src/adapter.c
+// These were hardcoded into android
+enum BluetoothReservedChannels {
+  DIALUP_NETWORK = 1,
+  HANDSFREE_AG = 10,
+  HEADSET_AG = 11,
+  OPUSH = 12,
+  SIM_ACCESS = 15,
+  PBAP_PSE = 19,
+  FTP = 20,
+};
+
 }
 }
 }
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
index b877a5a8a563..e877f774c6a9 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
@@ -226,6 +226,19 @@ BluetoothServiceChildProcess::GetSocketViaService(
   return NS_ERROR_FAILURE;
 }
 
+
+nsresult
+BluetoothServiceChildProcess::ListenSocketViaService(
+  int aChannel,
+  BluetoothSocketType aType,
+  bool aAuth,
+  bool aEncrypt,
+  mozilla::ipc::UnixSocketConsumer* aConsumer)
+{
+  MOZ_NOT_REACHED("This should never be called!");
+  return NS_ERROR_FAILURE;
+}
+
 bool
 BluetoothServiceChildProcess::SetPinCodeInternal(
                                                 const nsAString& aDeviceAddress,
diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
index 276f83b7f900..9862c7edba9f 100644
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
+++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h
@@ -101,6 +101,13 @@ public:
                       mozilla::ipc::UnixSocketConsumer* aConsumer,
                       BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
 
+  virtual nsresult
+  ListenSocketViaService(int aChannel,
+                         BluetoothSocketType aType,
+                         bool aAuth,
+                         bool aEncrypt,
+                         mozilla::ipc::UnixSocketConsumer* aConsumer) MOZ_OVERRIDE;
+
   virtual bool
   SetPinCodeInternal(const nsAString& aDeviceAddress,
                      const nsAString& aPinCode,
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 769c4f034d68..100b6f1502a2 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -726,6 +726,29 @@ ExtractHandles(DBusMessage *aReply, nsTArray<uint32_t>& aOutHandles)
   }
 }
 
+// static
+bool
+BluetoothDBusService::AddServiceRecords(const nsAString& aAdapterPath,
+                                        const char* serviceName,
+                                        unsigned long long uuidMsb,
+                                        unsigned long long uuidLsb,
+                                        int channel)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  DBusMessage *reply;
+  reply = dbus_func_args(gThreadConnection->GetConnection(),
+                         NS_ConvertUTF16toUTF8(aAdapterPath).get(),
+                         DBUS_ADAPTER_IFACE, "AddRfcommServiceRecord",
+                         DBUS_TYPE_STRING, &serviceName,
+                         DBUS_TYPE_UINT64, &uuidMsb,
+                         DBUS_TYPE_UINT64, &uuidLsb,
+                         DBUS_TYPE_UINT16, &channel,
+                         DBUS_TYPE_INVALID);
+
+  return reply ? dbus_returns_uint32(reply) : -1;
+}
+
 // static
 bool
 BluetoothDBusService::AddReservedServicesInternal(const nsAString& aAdapterPath,
@@ -2277,7 +2300,9 @@ public:
 
     nsString address = GetAddressFromObjectPath(mObjectPath);
     nsString replyError;
-    BluetoothUnixSocketConnector c(BluetoothSocketType::SCO, -1, mAuth, mEncrypt);
+    BluetoothUnixSocketConnector* c =
+      new BluetoothUnixSocketConnector(BluetoothSocketType::SCO, -1,
+                                       mAuth, mEncrypt);
 
     BluetoothScoManager* sco = BluetoothScoManager::Get();
     if (!mConsumer->ConnectSocket(c, NS_ConvertUTF16toUTF8(address).get())) {
@@ -2302,16 +2327,16 @@ private:
   bool mEncrypt;
 };
 
-class CreateBluetoothSocketRunnable : public nsRunnable
+class ConnectBluetoothSocketRunnable : public nsRunnable
 {
 public:
-  CreateBluetoothSocketRunnable(BluetoothReplyRunnable* aRunnable,
-                                UnixSocketConsumer* aConsumer,
-                                const nsAString& aObjectPath,
-                                const nsAString& aServiceUUID,
-                                BluetoothSocketType aType,
-                                bool aAuth,
-                                bool aEncrypt)
+  ConnectBluetoothSocketRunnable(BluetoothReplyRunnable* aRunnable,
+                                 UnixSocketConsumer* aConsumer,
+                                 const nsAString& aObjectPath,
+                                 const nsAString& aServiceUUID,
+                                 BluetoothSocketType aType,
+                                 bool aAuth,
+                                 bool aEncrypt)
     : mRunnable(dont_AddRef(aRunnable)),
       mConsumer(aConsumer),
       mObjectPath(aObjectPath),
@@ -2325,14 +2350,14 @@ public:
   nsresult
   Run()
   {
-    NS_WARNING("Running create socket!\n");
     MOZ_ASSERT(!NS_IsMainThread());
 
     nsString address = GetAddressFromObjectPath(mObjectPath);
     int channel = GetDeviceServiceChannel(mObjectPath, mServiceUUID, 0x0004);
     BluetoothValue v;
     nsString replyError;
-    BluetoothUnixSocketConnector c(mType, channel, mAuth, mEncrypt);
+    BluetoothUnixSocketConnector* c =
+      new BluetoothUnixSocketConnector(mType, channel, mAuth, mEncrypt);
     if (!mConsumer->ConnectSocket(c, NS_ConvertUTF16toUTF8(address).get())) {
       replyError.AssignLiteral("SocketConnectionError");
       DispatchBluetoothReply(mRunnable, v, replyError);
@@ -2395,7 +2420,7 @@ BluetoothDBusService::GetSocketViaService(const nsAString& aObjectPath,
   }
   nsRefPtr<BluetoothReplyRunnable> runnable = aRunnable;
 
-  nsRefPtr<nsRunnable> func(new CreateBluetoothSocketRunnable(runnable,
+  nsRefPtr<nsRunnable> func(new ConnectBluetoothSocketRunnable(runnable,
                                                               aConsumer,
                                                               aObjectPath,
                                                               aService, aType,
@@ -2424,3 +2449,64 @@ BluetoothDBusService::SendFile(const nsAString& aDeviceAddress,
 
   return true;
 }
+
+class ListenBluetoothSocketRunnable : public nsRunnable
+{
+public:
+  ListenBluetoothSocketRunnable(UnixSocketConsumer* aConsumer,
+                                int aChannel,
+                                BluetoothSocketType aType,
+                                bool aAuth,
+                                bool aEncrypt)
+    : mConsumer(aConsumer)
+    , mChannel(aChannel)
+    , mType(aType)
+    , mAuth(aAuth)
+    , mEncrypt(aEncrypt)
+  {
+  }
+
+  nsresult
+  Run()
+  {
+    MOZ_ASSERT(!NS_IsMainThread());
+    BluetoothUnixSocketConnector* c =
+      new BluetoothUnixSocketConnector(mType, mChannel, mAuth, mEncrypt);
+    if (!mConsumer->ListenSocket(c)) {
+      NS_WARNING("Can't listen on socket!");
+      return NS_ERROR_FAILURE;
+    }
+    return NS_OK;
+  }
+
+private:
+  nsRefPtr<UnixSocketConsumer> mConsumer;
+  int mChannel;
+  BluetoothSocketType mType;
+  bool mAuth;
+  bool mEncrypt;
+};
+
+nsresult
+BluetoothDBusService::ListenSocketViaService(int aChannel,
+                                             BluetoothSocketType aType,
+                                             bool aAuth,
+                                             bool aEncrypt,
+                                             mozilla::ipc::UnixSocketConsumer* aConsumer)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Must be called from main thread!");
+  if (!mConnection || !gThreadConnection) {
+    NS_ERROR("Bluetooth service not started yet!");
+    return NS_ERROR_FAILURE;
+  }
+  nsRefPtr<nsRunnable> func(new ListenBluetoothSocketRunnable(aConsumer,
+                                                              aChannel, aType,
+                                                              aAuth,
+                                                              aEncrypt));
+  if (NS_FAILED(mBluetoothCommandThread->Dispatch(func, NS_DISPATCH_NORMAL))) {
+    NS_WARNING("Cannot dispatch firmware loading task!");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
diff --git a/dom/bluetooth/linux/BluetoothDBusService.h b/dom/bluetooth/linux/BluetoothDBusService.h
index 1173556bbd3e..b5e698c4724c 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.h
+++ b/dom/bluetooth/linux/BluetoothDBusService.h
@@ -58,6 +58,20 @@ public:
                 const nsAString& aDeviceAddress,
                 nsAString& aDevicePath);
 
+  static bool
+  AddServiceRecords(const nsAString& aAdapterPath,
+                    const char* serviceName,
+                    unsigned long long uuidMsb,
+                    unsigned long long uuidLsb,
+                    int channel);
+
+  static bool
+  RemoveServiceRecords(const nsAString& aAdapterPath,
+                       const char* serviceName,
+                       unsigned long long uuidMsb,
+                       unsigned long long uuidLsb,
+                       int channel);
+
   static bool
   AddReservedServicesInternal(const nsAString& aAdapterPath,
                               const nsTArray<uint32_t>& aServices,
@@ -82,6 +96,13 @@ public:
                       mozilla::ipc::UnixSocketConsumer* aConsumer,
                       BluetoothReplyRunnable* aRunnable);
 
+  virtual nsresult
+  ListenSocketViaService(int aChannel,
+                         BluetoothSocketType aType,
+                         bool aAuth,
+                         bool aEncrypt,
+                         mozilla::ipc::UnixSocketConsumer* aConsumer);
+
   virtual nsresult
   CreatePairedDeviceInternal(const nsAString& aAdapterPath,
                              const nsAString& aDeviceAddress,
diff --git a/ipc/dbus/DBusUtils.cpp b/ipc/dbus/DBusUtils.cpp
index a5b6e6221c5e..d545591d6238 100644
--- a/ipc/dbus/DBusUtils.cpp
+++ b/ipc/dbus/DBusUtils.cpp
@@ -264,7 +264,7 @@ DBusMessage * dbus_func_args_error(DBusConnection *conn,
 int dbus_returns_int32(DBusMessage *reply) 
 {
   DBusError err;
-  int ret = -1;
+  int32_t ret = -1;
 
   dbus_error_init(&err);
   if (!dbus_message_get_args(reply, &err,
@@ -277,5 +277,21 @@ int dbus_returns_int32(DBusMessage *reply)
   return ret;
 }
 
+int dbus_returns_uint32(DBusMessage *reply)
+{
+  DBusError err;
+  uint32_t ret = -1;
+
+  dbus_error_init(&err);
+  if (!dbus_message_get_args(reply, &err,
+                             DBUS_TYPE_UINT32, &ret,
+                             DBUS_TYPE_INVALID)) {
+    LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
+  }
+
+  dbus_message_unref(reply);
+  return ret;
+}
+
 }
 }
diff --git a/ipc/dbus/DBusUtils.h b/ipc/dbus/DBusUtils.h
index 9a9262ec5bab..f2bea44c43f0 100644
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -108,6 +108,8 @@ DBusMessage*  dbus_func_args_timeout_valist(DBusConnection* conn,
 
 int dbus_returns_int32(DBusMessage *reply);
 
+int dbus_returns_uint32(DBusMessage *reply);
+
 }
 }
 

From 4649363c2e0c9c2de40888b4d7c172dc2be0a5dc Mon Sep 17 00:00:00 2001
From: Gina Yeh <gyeh@mozilla.com>
Date: Mon, 1 Oct 2012 15:44:48 +0800
Subject: [PATCH 54/64] Bug 795249 - Final version: Broadcast hfp connection
 status with system message, r=qdot

---
 dom/bluetooth/BluetoothHfpManager.cpp        | 77 +++++++++++++-------
 dom/bluetooth/BluetoothHfpManager.h          |  7 +-
 dom/bluetooth/BluetoothUtils.cpp             | 68 +++++++++++++++++
 dom/bluetooth/BluetoothUtils.h               | 13 ++++
 dom/bluetooth/linux/BluetoothDBusService.cpp | 32 +-------
 5 files changed, 138 insertions(+), 59 deletions(-)

diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index 458b6062639f..b2e989cf281f 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -19,6 +19,8 @@
 #include "nsIObserverService.h"
 #include "nsIRadioInterfaceLayer.h"
 #include "nsISystemMessagesInternal.h"
+#include "BluetoothUtils.h"
+
 #include "nsVariant.h"
 
 #include <unistd.h> /* usleep() */
@@ -144,12 +146,9 @@ BluetoothHfpManager::Get()
 }
 
 bool
-BluetoothHfpManager::BroadcastSystemMessage(const char* aCommand,
-                                            const int aCommandLength)
+BluetoothHfpManager::BroadcastSystemMessage(const nsAString& aType,
+                                            const InfallibleTArray<BluetoothNamedValue>& aData)
 {
-  nsString type;
-  type.AssignLiteral("bluetooth-dialer-command");
-
   JSContext* cx = nsContentUtils::GetSafeJSContext();
   NS_ASSERTION(!::JS_IsExceptionPending(cx),
                "Shouldn't get here when an exception is pending!");
@@ -161,14 +160,7 @@ BluetoothHfpManager::BroadcastSystemMessage(const char* aCommand,
     return false;
   }
 
-  JSString* JsData = JS_NewStringCopyN(cx, aCommand, aCommandLength);
-  if (!JsData) {
-    NS_WARNING("JS_NewStringCopyN is out of memory");
-    return false;
-  }
-
-  jsval v = STRING_TO_JSVAL(JsData);
-  if (!JS_SetProperty(cx, obj, "command", &v)) {
+  if (!SetJsObject(cx, obj, aData)) {
     NS_WARNING("Failed to set properties of system message!");
     return false;
   }
@@ -181,11 +173,50 @@ BluetoothHfpManager::BroadcastSystemMessage(const char* aCommand,
     return false;
   }
 
-  systemMessenger->BroadcastMessage(type, OBJECT_TO_JSVAL(obj));
+  systemMessenger->BroadcastMessage(aType, OBJECT_TO_JSVAL(obj));
 
   return true;
 }
 
+void
+BluetoothHfpManager::NotifySettings(const bool aConnected)
+{
+  nsString type, name;
+  BluetoothValue v;
+  InfallibleTArray<BluetoothNamedValue> parameters;
+  type.AssignLiteral("bluetooth-hfp-status-changed");
+
+  name.AssignLiteral("connected");
+  v = aConnected;
+  parameters.AppendElement(BluetoothNamedValue(name, v));
+
+  name.AssignLiteral("address");
+  v = GetAddressFromObjectPath(mDevicePath);
+  parameters.AppendElement(BluetoothNamedValue(name, v));
+
+  if (!BroadcastSystemMessage(type, parameters)) {
+    NS_WARNING("Failed to broadcast system message to dialer");
+    return;
+  }
+}
+
+void
+BluetoothHfpManager::NotifyDialer(const nsAString& aCommand)
+{
+  nsString type, name, command;
+  command = aCommand;
+  InfallibleTArray<BluetoothNamedValue> parameters;
+  type.AssignLiteral("bluetooth-dialer-command");
+
+  BluetoothValue v(command);
+  parameters.AppendElement(BluetoothNamedValue(type, v));
+
+  if (!BroadcastSystemMessage(type, parameters)) {
+    NS_WARNING("Failed to broadcast system message to dialer");
+    return;
+  }
+}
+
 nsresult
 BluetoothHfpManager::HandleVolumeChanged(const nsAString& aData)
 {
@@ -315,6 +346,8 @@ BluetoothHfpManager::ReceiveSocketData(UnixSocketRawData* aMessage)
     SendLine("+CIND: 5,5,1,0,0,0,0");
     SendLine("OK");
   } else if (!strncmp(msg, "AT+CMER=", 8)) {
+    // SLC establishment
+    NotifySettings(true);
     SendLine("OK");
   } else if (!strncmp(msg, "AT+CHLD=?", 9)) {
     SendLine("+CHLD: (0,1,2,3)");
@@ -349,22 +382,13 @@ BluetoothHfpManager::ReceiveSocketData(UnixSocketRawData* aMessage)
 
     SendLine("OK");
   } else if (!strncmp(msg, "AT+BLDN", 7)) {
-    if (!BroadcastSystemMessage("BLDN", 4)) {
-      NS_WARNING("Failed to broadcast system message to dialer");
-      return;
-    }
+    NotifyDialer(NS_LITERAL_STRING("BLDN"));
     SendLine("OK");
   } else if (!strncmp(msg, "ATA", 3)) {
-    if (!BroadcastSystemMessage("ATA", 3)) {
-      NS_WARNING("Failed to broadcast system message to dialer");
-      return;
-    }
+    NotifyDialer(NS_LITERAL_STRING("ATA"));
     SendLine("OK");
   } else if (!strncmp(msg, "AT+CHUP", 7)) {
-    if (!BroadcastSystemMessage("CHUP", 4)) {
-      NS_WARNING("Failed to broadcast system message to dialer");
-      return;
-    }
+    NotifyDialer(NS_LITERAL_STRING("CHUP"));
     SendLine("OK");
   } else {
 #ifdef DEBUG
@@ -429,6 +453,7 @@ BluetoothHfpManager::Listen()
 void
 BluetoothHfpManager::Disconnect()
 {
+  NotifySettings(false);
   CloseSocket();
 }
 
diff --git a/dom/bluetooth/BluetoothHfpManager.h b/dom/bluetooth/BluetoothHfpManager.h
index 719fdee4e7b9..e0644ef60db5 100644
--- a/dom/bluetooth/BluetoothHfpManager.h
+++ b/dom/bluetooth/BluetoothHfpManager.h
@@ -15,6 +15,7 @@
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothReplyRunnable;
+class BluetoothNamedValue;
 
 class BluetoothHfpManager : public mozilla::ipc::UnixSocketConsumer
                           , public nsIObserver
@@ -38,9 +39,11 @@ public:
 private:
   BluetoothHfpManager();
 
-  bool BroadcastSystemMessage(const char* aCommand,
-                              const int aCommandLength);
   nsresult HandleVolumeChanged(const nsAString& aData);
+  bool BroadcastSystemMessage(const nsAString& aType,
+                              const InfallibleTArray<BluetoothNamedValue>& aData);
+  void NotifyDialer(const nsAString& aCommand);
+  void NotifySettings(const bool aConnected);
 
   int mCurrentVgs;
   int mCurrentCallIndex;
diff --git a/dom/bluetooth/BluetoothUtils.cpp b/dom/bluetooth/BluetoothUtils.cpp
index afe5987f4671..3113225b59ef 100644
--- a/dom/bluetooth/BluetoothUtils.cpp
+++ b/dom/bluetooth/BluetoothUtils.cpp
@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "base/basictypes.h"
+
 #include "BluetoothUtils.h"
 #include "nsContentUtils.h"
 #include "BluetoothDevice.h"
@@ -11,6 +13,7 @@
 #include "nsTArray.h"
 #include "nsString.h"
 #include "mozilla/Scoped.h"
+#include "mozilla/dom/bluetooth/BluetoothTypes.h"
 
 nsresult
 mozilla::dom::bluetooth::StringArrayToJSArray(JSContext* aCx, JSObject* aGlobal,
@@ -98,3 +101,68 @@ mozilla::dom::bluetooth::BluetoothDeviceArrayToJSArray(JSContext* aCx, JSObject*
   *aResultArray = arrayObj;
   return NS_OK;
 }
+
+bool
+mozilla::dom::bluetooth::SetJsObject(JSContext* aContext,
+                                     JSObject* aObj,
+                                     const InfallibleTArray<BluetoothNamedValue>& aData)
+{
+  for (uint32_t i = 0; i < aData.Length(); i++) {
+    jsval v;
+    if (aData[i].value().type() == BluetoothValue::TnsString) {
+      nsString data = aData[i].value().get_nsString();
+      JSString* JsData = JS_NewStringCopyN(aContext,
+                                           NS_ConvertUTF16toUTF8(data).get(),
+                                           data.Length());
+      NS_ENSURE_TRUE(JsData, NS_ERROR_OUT_OF_MEMORY);
+      v = STRING_TO_JSVAL(JsData);
+    } else if (aData[i].value().type() == BluetoothValue::Tuint32_t) {
+      int data = aData[i].value().get_uint32_t();
+      v = INT_TO_JSVAL(data);
+    } else if (aData[i].value().type() == BluetoothValue::Tbool) {
+      bool data = aData[i].value().get_bool();
+      v = BOOLEAN_TO_JSVAL(data);
+    } else {
+      NS_WARNING("SetJsObject: Parameter is not handled");
+    }
+
+    if (!JS_SetProperty(aContext, aObj,
+                        NS_ConvertUTF16toUTF8(aData[i].name()).get(),
+                        &v)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+nsString
+mozilla::dom::bluetooth::GetObjectPathFromAddress(const nsAString& aAdapterPath,
+                                                  const nsAString& aDeviceAddress)
+{
+  // The object path would be like /org/bluez/2906/hci0/dev_00_23_7F_CB_B4_F1,
+  // and the adapter path would be the first part of the object path, according
+  // to the example above, it's /org/bluez/2906/hci0.
+  nsString devicePath(aAdapterPath);
+  devicePath.AppendLiteral("/dev_");
+  devicePath.Append(aDeviceAddress);
+  devicePath.ReplaceChar(':', '_');
+  return devicePath;
+}
+
+nsString
+mozilla::dom::bluetooth::GetAddressFromObjectPath(const nsAString& aObjectPath)
+{
+  // The object path would be like /org/bluez/2906/hci0/dev_00_23_7F_CB_B4_F1,
+  // and the adapter path would be the first part of the object path, according
+  // to the example above, it's /org/bluez/2906/hci0.
+  nsString address(aObjectPath);
+  int addressHead = address.RFind("/") + 5;
+
+  MOZ_ASSERT(addressHead + BLUETOOTH_ADDRESS_LENGTH == address.Length());
+
+  address.Cut(0, addressHead);
+  address.ReplaceChar('_', ':');
+
+  return address;
+}
+
diff --git a/dom/bluetooth/BluetoothUtils.h b/dom/bluetooth/BluetoothUtils.h
index 9c6670bea810..bfc70afbdd58 100644
--- a/dom/bluetooth/BluetoothUtils.h
+++ b/dom/bluetooth/BluetoothUtils.h
@@ -15,6 +15,7 @@ class JSObject;
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothDevice;
+class BluetoothNamedValue;
 
 nsresult
 StringArrayToJSArray(JSContext* aCx, JSObject* aGlobal,
@@ -26,6 +27,18 @@ BluetoothDeviceArrayToJSArray(JSContext* aCx, JSObject* aGlobal,
                               const nsTArray<nsRefPtr<BluetoothDevice> >& aSourceArray,
                               JSObject** aResultArray);
 
+bool
+SetJsObject(JSContext* aContext,
+            JSObject* aObj,
+            const InfallibleTArray<BluetoothNamedValue>& aData);
+
+nsString
+GetObjectPathFromAddress(const nsAString& aAdapterPath,
+                         const nsAString& aDeviceAddress);
+
+nsString
+GetAddressFromObjectPath(const nsAString& aObjectPath);
+
 END_BLUETOOTH_NAMESPACE
 
 #endif
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 100b6f1502a2..bdc02a9af0c0 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -24,6 +24,7 @@
 #include "BluetoothScoManager.h"
 #include "BluetoothServiceUuid.h"
 #include "BluetoothUnixSocketConnector.h"
+#include "BluetoothUtils.h"
 
 #include <cstdio>
 #include <dbus/dbus.h>
@@ -154,37 +155,6 @@ static nsTArray<uint32_t> sServiceHandles;
 
 typedef void (*UnpackFunc)(DBusMessage*, DBusError*, BluetoothValue&, nsAString&);
 
-static nsString
-GetObjectPathFromAddress(const nsAString& aAdapterPath,
-                         const nsAString& aDeviceAddress)
-{
-  // The object path would be like /org/bluez/2906/hci0/dev_00_23_7F_CB_B4_F1,
-  // and the adapter path would be the first part of the object path, according
-  // to the example above, it's /org/bluez/2906/hci0.
-  nsString devicePath(aAdapterPath);
-  devicePath.AppendLiteral("/dev_");
-  devicePath.Append(aDeviceAddress);
-  devicePath.ReplaceChar(':', '_');
-  return devicePath;
-}
-
-static nsString
-GetAddressFromObjectPath(const nsAString& aObjectPath)
-{
-  // The object path would be like /org/bluez/2906/hci0/dev_00_23_7F_CB_B4_F1,
-  // and the adapter path would be the first part of the object path, according
-  // to the example above, it's /org/bluez/2906/hci0.
-  nsString address(aObjectPath);
-  int addressHead = address.RFind("/") + 5;
-
-  MOZ_ASSERT(addressHead + BLUETOOTH_ADDRESS_LENGTH == address.Length());
-
-  address.Cut(0, addressHead);
-  address.ReplaceChar('_', ':');
-
-  return address;
-}
-
 class DistributeBluetoothSignalTask : public nsRunnable {
   BluetoothSignal mSignal;
 public:

From b70e7be378f1ad684f274947201da76816027644 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Mon, 1 Oct 2012 11:49:01 +0300
Subject: [PATCH 55/64] Bug 792790 - Introduce NoBoundsCheck variants of
 accessors on nsHtml5HtmlAttributes; Make operator= in jArray nullptr-aware.
 r=smaug.

---
 parser/html/jArray.h                    |  20 +++-
 parser/html/javasrc/HtmlAttributes.java | 116 ++++++++++++++++++------
 parser/html/javasrc/TreeBuilder.java    |   8 +-
 parser/html/nsHtml5HtmlAttributes.cpp   |  99 +++++++++-----------
 parser/html/nsHtml5HtmlAttributes.h     |  12 +--
 parser/html/nsHtml5Tokenizer.cpp        |   4 +-
 parser/html/nsHtml5TreeBuilder.cpp      |  14 +--
 parser/html/nsHtml5TreeOperation.cpp    |  30 ++++--
 8 files changed, 187 insertions(+), 116 deletions(-)

diff --git a/parser/html/jArray.h b/parser/html/jArray.h
index de4acd04f739..7707f808bf84 100644
--- a/parser/html/jArray.h
+++ b/parser/html/jArray.h
@@ -23,6 +23,7 @@
 #ifndef jArray_h_
 #define jArray_h_
 
+#include "mozilla/NullPtr.h"
 #include "nsDebug.h"
 
 template<class T, class L>
@@ -99,11 +100,24 @@ class autoJArray {
       arr = other.arr;
       length = other.length;
     }
-    void operator=(L zero) {
+#if defined(__clang__)
+    // clang on OS X 10.7 does not have std::nullptr_t
+    typedef decltype(nullptr) jArray_nullptr_t;
+#elif defined(MOZ_HAVE_CXX11_NULLPTR)
+    // decltype(nullptr) does not evaluate to std::nullptr_t on GCC 4.6.3
+    typedef std::nullptr_t jArray_nullptr_t;
+#elif defined(__GNUC__)
+    typedef void* jArray_nullptr_t;
+#elif defined(_WIN64)
+    typedef uint64_t jArray_nullptr_t;
+#else
+    typedef uint32_t jArray_nullptr_t;
+#endif
+    void operator=(jArray_nullptr_t zero) {
       // Make assigning null to an array in Java delete the buffer in C++
-      NS_ASSERTION(!zero, "Non-zero integer assigned to jArray.");
+      // MSVC10 does not allow asserting that zero is null.
       delete[] arr;
-      arr = 0;
+      arr = nullptr;
       length = 0;
     }
 };
diff --git a/parser/html/javasrc/HtmlAttributes.java b/parser/html/javasrc/HtmlAttributes.java
index adf67d374e2a..292effaeacca 100644
--- a/parser/html/javasrc/HtmlAttributes.java
+++ b/parser/html/javasrc/HtmlAttributes.java
@@ -131,8 +131,94 @@ public final class HtmlAttributes implements Attributes {
         return -1;
     }
 
+    /**
+     * Only use with static argument.
+     * 
+     * @see org.xml.sax.Attributes#getValue(java.lang.String)
+     */
+    public String getValue(AttributeName name) {
+        int index = getIndex(name);
+        if (index == -1) {
+            return null;
+        } else {
+            return getValueNoBoundsCheck(index);
+        }
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    /**
+     * Variant of <code>getLocalName(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the local name at index
+     */
+    public @Local String getLocalNameNoBoundsCheck(int index) {
+        // CPPONLY: assert index < length && index >= 0: "Index out of bounds";
+        return names[index].getLocal(mode);
+    }
+
+    /**
+     * Variant of <code>getURI(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the namespace URI at index
+     */
+    public @NsUri String getURINoBoundsCheck(int index) {
+        // CPPONLY: assert index < length && index >= 0: "Index out of bounds";
+        return names[index].getUri(mode);
+    }
+
+    /**
+     * Variant of <code>getPrefix(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the namespace prefix at index
+     */
+    public @Prefix String getPrefixNoBoundsCheck(int index) {
+        // CPPONLY: assert index < length && index >= 0: "Index out of bounds";
+        return names[index].getPrefix(mode);
+    }
+
+    /**
+     * Variant of <code>getValue(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the attribute value at index
+     */
+    public String getValueNoBoundsCheck(int index) {
+        // CPPONLY: assert index < length && index >= 0: "Index out of bounds";
+        return values[index];
+    }
+
+    /**
+     * Variant of <code>getAttributeName(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the attribute name at index
+     */
+    public AttributeName getAttributeNameNoBoundsCheck(int index) {
+        // CPPONLY: assert index < length && index >= 0: "Index out of bounds";
+        return names[index];
+    }
+
     // [NOCPP[
     
+    /**
+     * Variant of <code>getQName(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the QName at index
+     */
+    public @QName String getQNameNoBoundsCheck(int index) {
+        return names[index].getQName(mode);
+    }
+
+    /**
+     * Variant of <code>getType(int index)</code> without bounds check.
+     * @param index a valid attribute index
+     * @return the attribute type at index
+     */
+    public @IdType String getTypeNoBoundsCheck(int index) {
+        return (names[index] == AttributeName.ID) ? "ID" : "CDATA";
+    }
+
     public int getIndex(String qName) {
         for (int i = 0; i < length; i++) {
             if (names[i].getQName(mode).equals(qName)) {
@@ -188,12 +274,6 @@ public final class HtmlAttributes implements Attributes {
         }
     }
     
-    // ]NOCPP]
-    
-    public int getLength() {
-        return length;
-    }
-
     public @Local String getLocalName(int index) {
         if (index < length && index >= 0) {
             return names[index].getLocal(mode);
@@ -201,8 +281,6 @@ public final class HtmlAttributes implements Attributes {
             return null;
         }
     }
-
-    // [NOCPP[
     
     public @QName String getQName(int index) {
         if (index < length && index >= 0) {
@@ -220,8 +298,6 @@ public final class HtmlAttributes implements Attributes {
         }
     }
 
-    // ]NOCPP]
-    
     public AttributeName getAttributeName(int index) {
         if (index < length && index >= 0) {
             return names[index];
@@ -254,22 +330,6 @@ public final class HtmlAttributes implements Attributes {
         }
     }
 
-    /**
-     * Only use with static argument.
-     * 
-     * @see org.xml.sax.Attributes#getValue(java.lang.String)
-     */
-    public String getValue(AttributeName name) {
-        int index = getIndex(name);
-        if (index == -1) {
-            return null;
-        } else {
-            return getValue(index);
-        }
-    }
-    
-    // [NOCPP[
-
     public String getId() {
         return idValue;
     }
@@ -518,9 +578,9 @@ public final class HtmlAttributes implements Attributes {
     public void merge(HtmlAttributes attributes) throws SAXException {
         int len = attributes.getLength();
         for (int i = 0; i < len; i++) {
-            AttributeName name = attributes.getAttributeName(i);
+            AttributeName name = attributes.getAttributeNameNoBoundsCheck(i);
             if (!contains(name)) {
-                addAttribute(name, attributes.getValue(i), XmlViolationPolicy.ALLOW);
+                addAttribute(name, attributes.getValueNoBoundsCheck(i), XmlViolationPolicy.ALLOW);
             }
         }
     }
diff --git a/parser/html/javasrc/TreeBuilder.java b/parser/html/javasrc/TreeBuilder.java
index 9bd40e194210..0487b988830f 100644
--- a/parser/html/javasrc/TreeBuilder.java
+++ b/parser/html/javasrc/TreeBuilder.java
@@ -2143,7 +2143,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
                                 if (actionIndex > -1) {
                                     formAttrs.addAttribute(
                                             AttributeName.ACTION,
-                                            attributes.getValue(actionIndex)
+                                            attributes.getValueNoBoundsCheck(actionIndex)
                                             // [NOCPP[
                                             , XmlViolationPolicy.ALLOW
                                     // ]NOCPP]
@@ -2158,7 +2158,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
                                         HtmlAttributes.EMPTY_ATTRIBUTES);
                                 int promptIndex = attributes.getIndex(AttributeName.PROMPT);
                                 if (promptIndex > -1) {
-                                    @Auto char[] prompt = Portability.newCharArrayFromString(attributes.getValue(promptIndex));
+                                    @Auto char[] prompt = Portability.newCharArrayFromString(attributes.getValueNoBoundsCheck(promptIndex));
                                     appendCharacters(stack[currentPtr].node,
                                             prompt, 0, prompt.length);
                                 } else {
@@ -2174,14 +2174,14 @@ public abstract class TreeBuilder<T> implements TokenHandler,
                                 // ]NOCPP]
                                 );
                                 for (int i = 0; i < attributes.getLength(); i++) {
-                                    AttributeName attributeQName = attributes.getAttributeName(i);
+                                    AttributeName attributeQName = attributes.getAttributeNameNoBoundsCheck(i);
                                     if (AttributeName.NAME == attributeQName
                                             || AttributeName.PROMPT == attributeQName) {
                                         attributes.releaseValue(i);
                                     } else if (AttributeName.ACTION != attributeQName) {
                                         inputAttributes.addAttribute(
                                                 attributeQName,
-                                                attributes.getValue(i)
+                                                attributes.getValueNoBoundsCheck(i)
                                                 // [NOCPP[
                                                 , XmlViolationPolicy.ALLOW
                                         // ]NOCPP]
diff --git a/parser/html/nsHtml5HtmlAttributes.cpp b/parser/html/nsHtml5HtmlAttributes.cpp
index c256a0ff3946..222566af38a2 100644
--- a/parser/html/nsHtml5HtmlAttributes.cpp
+++ b/parser/html/nsHtml5HtmlAttributes.cpp
@@ -84,62 +84,6 @@ nsHtml5HtmlAttributes::getIndex(nsHtml5AttributeName* name)
   return -1;
 }
 
-int32_t 
-nsHtml5HtmlAttributes::getLength()
-{
-  return length;
-}
-
-nsIAtom* 
-nsHtml5HtmlAttributes::getLocalName(int32_t index)
-{
-  if (index < length && index >= 0) {
-    return names[index]->getLocal(mode);
-  } else {
-    return nullptr;
-  }
-}
-
-nsHtml5AttributeName* 
-nsHtml5HtmlAttributes::getAttributeName(int32_t index)
-{
-  if (index < length && index >= 0) {
-    return names[index];
-  } else {
-    return nullptr;
-  }
-}
-
-int32_t 
-nsHtml5HtmlAttributes::getURI(int32_t index)
-{
-  if (index < length && index >= 0) {
-    return names[index]->getUri(mode);
-  } else {
-    return 0;
-  }
-}
-
-nsIAtom* 
-nsHtml5HtmlAttributes::getPrefix(int32_t index)
-{
-  if (index < length && index >= 0) {
-    return names[index]->getPrefix(mode);
-  } else {
-    return nullptr;
-  }
-}
-
-nsString* 
-nsHtml5HtmlAttributes::getValue(int32_t index)
-{
-  if (index < length && index >= 0) {
-    return values[index];
-  } else {
-    return nullptr;
-  }
-}
-
 nsString* 
 nsHtml5HtmlAttributes::getValue(nsHtml5AttributeName* name)
 {
@@ -147,10 +91,51 @@ nsHtml5HtmlAttributes::getValue(nsHtml5AttributeName* name)
   if (index == -1) {
     return nullptr;
   } else {
-    return getValue(index);
+    return getValueNoBoundsCheck(index);
   }
 }
 
+int32_t 
+nsHtml5HtmlAttributes::getLength()
+{
+  return length;
+}
+
+nsIAtom* 
+nsHtml5HtmlAttributes::getLocalNameNoBoundsCheck(int32_t index)
+{
+
+  return names[index]->getLocal(mode);
+}
+
+int32_t 
+nsHtml5HtmlAttributes::getURINoBoundsCheck(int32_t index)
+{
+
+  return names[index]->getUri(mode);
+}
+
+nsIAtom* 
+nsHtml5HtmlAttributes::getPrefixNoBoundsCheck(int32_t index)
+{
+
+  return names[index]->getPrefix(mode);
+}
+
+nsString* 
+nsHtml5HtmlAttributes::getValueNoBoundsCheck(int32_t index)
+{
+
+  return values[index];
+}
+
+nsHtml5AttributeName* 
+nsHtml5HtmlAttributes::getAttributeNameNoBoundsCheck(int32_t index)
+{
+
+  return names[index];
+}
+
 void 
 nsHtml5HtmlAttributes::addAttribute(nsHtml5AttributeName* name, nsString* value)
 {
diff --git a/parser/html/nsHtml5HtmlAttributes.h b/parser/html/nsHtml5HtmlAttributes.h
index 0105700680ea..87d3f3808742 100644
--- a/parser/html/nsHtml5HtmlAttributes.h
+++ b/parser/html/nsHtml5HtmlAttributes.h
@@ -69,13 +69,13 @@ class nsHtml5HtmlAttributes
     nsHtml5HtmlAttributes(int32_t mode);
     ~nsHtml5HtmlAttributes();
     int32_t getIndex(nsHtml5AttributeName* name);
-    int32_t getLength();
-    nsIAtom* getLocalName(int32_t index);
-    nsHtml5AttributeName* getAttributeName(int32_t index);
-    int32_t getURI(int32_t index);
-    nsIAtom* getPrefix(int32_t index);
-    nsString* getValue(int32_t index);
     nsString* getValue(nsHtml5AttributeName* name);
+    int32_t getLength();
+    nsIAtom* getLocalNameNoBoundsCheck(int32_t index);
+    int32_t getURINoBoundsCheck(int32_t index);
+    nsIAtom* getPrefixNoBoundsCheck(int32_t index);
+    nsString* getValueNoBoundsCheck(int32_t index);
+    nsHtml5AttributeName* getAttributeNameNoBoundsCheck(int32_t index);
     void addAttribute(nsHtml5AttributeName* name, nsString* value);
     void clear(int32_t m);
     void releaseValue(int32_t i);
diff --git a/parser/html/nsHtml5Tokenizer.cpp b/parser/html/nsHtml5Tokenizer.cpp
index 7abd36ac001a..bf4ffaa834a2 100644
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@@ -3906,8 +3906,8 @@ nsHtml5Tokenizer::emitOrAppendOne(const PRUnichar* val, int32_t returnState)
 void 
 nsHtml5Tokenizer::end()
 {
-  strBuf = 0;
-  longStrBuf = 0;
+  strBuf = nullptr;
+  longStrBuf = nullptr;
   doctypeName = nullptr;
   if (systemIdentifier) {
     nsHtml5Portability::releaseString(systemIdentifier);
diff --git a/parser/html/nsHtml5TreeBuilder.cpp b/parser/html/nsHtml5TreeBuilder.cpp
index 426e9d800920..2e0f333e9650 100644
--- a/parser/html/nsHtml5TreeBuilder.cpp
+++ b/parser/html/nsHtml5TreeBuilder.cpp
@@ -548,7 +548,7 @@ nsHtml5TreeBuilder::endTokenization()
       stack[currentPtr]->release();
       currentPtr--;
     }
-    stack = 0;
+    stack = nullptr;
   }
   if (listOfActiveFormattingElements) {
     while (listPtr > -1) {
@@ -557,9 +557,9 @@ nsHtml5TreeBuilder::endTokenization()
       }
       listPtr--;
     }
-    listOfActiveFormattingElements = 0;
+    listOfActiveFormattingElements = nullptr;
   }
-  charBuffer = 0;
+  charBuffer = nullptr;
   end();
 }
 
@@ -1132,14 +1132,14 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
               nsHtml5HtmlAttributes* formAttrs = new nsHtml5HtmlAttributes(0);
               int32_t actionIndex = attributes->getIndex(nsHtml5AttributeName::ATTR_ACTION);
               if (actionIndex > -1) {
-                formAttrs->addAttribute(nsHtml5AttributeName::ATTR_ACTION, attributes->getValue(actionIndex));
+                formAttrs->addAttribute(nsHtml5AttributeName::ATTR_ACTION, attributes->getValueNoBoundsCheck(actionIndex));
               }
               appendToCurrentNodeAndPushFormElementMayFoster(formAttrs);
               appendVoidElementToCurrentMayFoster(nsHtml5ElementName::ELT_HR, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
               appendToCurrentNodeAndPushElementMayFoster(nsHtml5ElementName::ELT_LABEL, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
               int32_t promptIndex = attributes->getIndex(nsHtml5AttributeName::ATTR_PROMPT);
               if (promptIndex > -1) {
-                autoJArray<PRUnichar,int32_t> prompt = nsHtml5Portability::newCharArrayFromString(attributes->getValue(promptIndex));
+                autoJArray<PRUnichar,int32_t> prompt = nsHtml5Portability::newCharArrayFromString(attributes->getValueNoBoundsCheck(promptIndex));
                 appendCharacters(stack[currentPtr]->node, prompt, 0, prompt.length);
               } else {
                 appendIsindexPrompt(stack[currentPtr]->node);
@@ -1147,11 +1147,11 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
               nsHtml5HtmlAttributes* inputAttributes = new nsHtml5HtmlAttributes(0);
               inputAttributes->addAttribute(nsHtml5AttributeName::ATTR_NAME, nsHtml5Portability::newStringFromLiteral("isindex"));
               for (int32_t i = 0; i < attributes->getLength(); i++) {
-                nsHtml5AttributeName* attributeQName = attributes->getAttributeName(i);
+                nsHtml5AttributeName* attributeQName = attributes->getAttributeNameNoBoundsCheck(i);
                 if (nsHtml5AttributeName::ATTR_NAME == attributeQName || nsHtml5AttributeName::ATTR_PROMPT == attributeQName) {
                   attributes->releaseValue(i);
                 } else if (nsHtml5AttributeName::ATTR_ACTION != attributeQName) {
-                  inputAttributes->addAttribute(attributeQName, attributes->getValue(i));
+                  inputAttributes->addAttribute(attributeQName, attributes->getValueNoBoundsCheck(i));
                 }
               }
               attributes->clearWithoutReleasingContents();
diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp
index e005cb995e23..1dcedd9e8eb3 100644
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -305,12 +305,17 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
         --i;
         // prefix doesn't need regetting. it is always null or a static atom
         // local name is never null
-        nsCOMPtr<nsIAtom> localName = Reget(attributes->getLocalName(i));
-        int32_t nsuri = attributes->getURI(i);
+        nsCOMPtr<nsIAtom> localName =
+          Reget(attributes->getLocalNameNoBoundsCheck(i));
+        int32_t nsuri = attributes->getURINoBoundsCheck(i);
         if (!node->HasAttr(nsuri, localName)) {
           // prefix doesn't need regetting. it is always null or a static atom
           // local name is never null
-          node->SetAttr(nsuri, localName, attributes->getPrefix(i), *(attributes->getValue(i)), true);
+          node->SetAttr(nsuri,
+                        localName,
+                        attributes->getPrefixNoBoundsCheck(i),
+                        *(attributes->getValueNoBoundsCheck(i)),
+                        true);
           // XXX what to do with nsresult?
         }
       }
@@ -404,19 +409,26 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
         --i;
         // prefix doesn't need regetting. it is always null or a static atom
         // local name is never null
-        nsCOMPtr<nsIAtom> localName = Reget(attributes->getLocalName(i));
+        nsCOMPtr<nsIAtom> localName =
+          Reget(attributes->getLocalNameNoBoundsCheck(i));
         if (ns == kNameSpaceID_XHTML &&
             nsHtml5Atoms::a == name &&
             nsHtml5Atoms::name == localName) {
           // This is an HTML5-incompliant Geckoism.
           // Remove when fixing bug 582361
-          NS_ConvertUTF16toUTF8 cname(*(attributes->getValue(i)));
+          NS_ConvertUTF16toUTF8 cname(*(attributes->getValueNoBoundsCheck(i)));
           NS_ConvertUTF8toUTF16 uv(nsUnescape(cname.BeginWriting()));
-          newContent->SetAttr(attributes->getURI(i), localName,
-              attributes->getPrefix(i), uv, false);
+          newContent->SetAttr(attributes->getURINoBoundsCheck(i),
+                              localName,
+                              attributes->getPrefixNoBoundsCheck(i),
+                              uv,
+                              false);
         } else {
-          newContent->SetAttr(attributes->getURI(i), localName,
-              attributes->getPrefix(i), *(attributes->getValue(i)), false);
+          newContent->SetAttr(attributes->getURINoBoundsCheck(i),
+                              localName,
+                              attributes->getPrefixNoBoundsCheck(i),
+                              *(attributes->getValueNoBoundsCheck(i)),
+                              false);
         }
       }
 

From ee3abb4e836d4832a5cb9e4ddd7ff45f42b95cf1 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Mon, 1 Oct 2012 11:52:32 +0300
Subject: [PATCH 56/64] Bug 503190 - Include assertions in the C++ translator
 output. r=smaug.

---
 parser/html/javasrc/ElementName.java    |  4 --
 parser/html/javasrc/HtmlAttributes.java | 25 ++++---
 parser/html/javasrc/Tokenizer.java      |  2 +-
 parser/html/javasrc/TreeBuilder.java    | 23 +++----
 parser/html/nsHtml5ElementName.cpp      |  6 ++
 parser/html/nsHtml5ElementName.h        |  1 +
 parser/html/nsHtml5HtmlAttributes.cpp   | 14 ++--
 parser/html/nsHtml5StackNode.cpp        |  4 +-
 parser/html/nsHtml5Tokenizer.cpp        |  4 +-
 parser/html/nsHtml5TreeBuilder.cpp      | 92 ++++++++++++-------------
 parser/html/nsHtml5TreeBuilder.h        |  4 +-
 11 files changed, 94 insertions(+), 85 deletions(-)

diff --git a/parser/html/javasrc/ElementName.java b/parser/html/javasrc/ElementName.java
index 3a29f448ed6f..c5a95e59578c 100644
--- a/parser/html/javasrc/ElementName.java
+++ b/parser/html/javasrc/ElementName.java
@@ -103,13 +103,9 @@ public final class ElementName
         return flags & GROUP_MASK;
     }
     
-    // [NOCPP[
-    
     public boolean isCustom() {
         return (flags & CUSTOM) != 0;
     }
-    
-    // ]NOCPP]
 
     static ElementName elementNameByBuffer(@NoLength char[] buf, int offset, int length, Interner interner) {
         int hash = ElementName.bufToHash(buf, length);
diff --git a/parser/html/javasrc/HtmlAttributes.java b/parser/html/javasrc/HtmlAttributes.java
index 292effaeacca..b8112fd8b288 100644
--- a/parser/html/javasrc/HtmlAttributes.java
+++ b/parser/html/javasrc/HtmlAttributes.java
@@ -505,25 +505,32 @@ public final class HtmlAttributes implements Attributes {
         mode = AttributeName.SVG;
     }
 
-    public HtmlAttributes cloneAttributes(Interner interner) throws SAXException {
-        assert (length == 0 && xmlnsLength == 0) || mode == 0 || mode == 3;
+    public HtmlAttributes cloneAttributes(Interner interner)
+            throws SAXException {
+        assert (length == 0
+                // [NOCPP[
+                && xmlnsLength == 0
+                // ]NOCPP]
+                )
+                || mode == 0 || mode == 3;
         HtmlAttributes clone = new HtmlAttributes(0);
         for (int i = 0; i < length; i++) {
-            clone.addAttribute(names[i].cloneAttributeName(interner), Portability.newStringFromString(values[i])
-            // [NOCPP[
-                   , XmlViolationPolicy.ALLOW
-            // ]NOCPP]
+            clone.addAttribute(names[i].cloneAttributeName(interner),
+                    Portability.newStringFromString(values[i])
+                    // [NOCPP[
+                    , XmlViolationPolicy.ALLOW
+                    // ]NOCPP]
             );
         }
         // [NOCPP[
         for (int i = 0; i < xmlnsLength; i++) {
-            clone.addAttribute(xmlnsNames[i],
-                    xmlnsValues[i], XmlViolationPolicy.ALLOW);
+            clone.addAttribute(xmlnsNames[i], xmlnsValues[i],
+                    XmlViolationPolicy.ALLOW);
         }
         // ]NOCPP]
         return clone; // XXX!!!
     }
-    
+
     public boolean equalsAnother(HtmlAttributes other) {
         assert mode == 0 || mode == 3 : "Trying to compare attributes in foreign content.";
         int otherLength = other.getLength();
diff --git a/parser/html/javasrc/Tokenizer.java b/parser/html/javasrc/Tokenizer.java
index 62468cbff025..2ca48e0f4116 100644
--- a/parser/html/javasrc/Tokenizer.java
+++ b/parser/html/javasrc/Tokenizer.java
@@ -4243,7 +4243,7 @@ public class Tokenizer implements Locator {
                             break stateloop;
                         }
                         c = checkChar(buf, pos);
-                        assert (index > 0);
+                        assert index > 0;
                         if (index < 6) { // SCRIPT_ARR.length
                             char folded = c;
                             if (c >= 'A' && c <= 'Z') {
diff --git a/parser/html/javasrc/TreeBuilder.java b/parser/html/javasrc/TreeBuilder.java
index 0487b988830f..8fb2b37459c7 100644
--- a/parser/html/javasrc/TreeBuilder.java
+++ b/parser/html/javasrc/TreeBuilder.java
@@ -798,10 +798,9 @@ public abstract class TreeBuilder<T> implements TokenHandler,
                                     if (!"http://www.w3.org/TR/html4/strict.dtd".equals(systemIdentifier)) {
                                         warn("The doctype did not contain the system identifier prescribed by the HTML 4.01 specification. Expected \u201C<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\u201D.");
                                     }
-                                } else {
-                                    if (!(publicIdentifier == null && systemIdentifier == null)) {
-                                        err("Legacy doctype. Expected e.g. \u201C<!DOCTYPE html>\u201D.");
-                                    }
+                                } else if (!((systemIdentifier == null || Portability.literalEqualsString(
+                                        "about:legacy-compat", systemIdentifier)) && publicIdentifier == null)) {
+                                    err("Legacy doctype. Expected e.g. \u201C<!DOCTYPE html>\u201D.");
                                 }
                                 documentModeInternal(
                                         DocumentMode.STANDARDS_MODE,
@@ -4182,12 +4181,12 @@ public abstract class TreeBuilder<T> implements TokenHandler,
         }
     }
 
-    private boolean clearLastStackSlot() {
+    private boolean debugOnlyClearLastStackSlot() {
         stack[currentPtr] = null;
         return true;
     }
 
-    private boolean clearLastListSlot() {
+    private boolean debugOnlyClearLastListSlot() {
         listOfActiveFormattingElements[listPtr] = null;
         return true;
     }
@@ -4250,7 +4249,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
             fatal();
             stack[pos].release();
             System.arraycopy(stack, pos + 1, stack, pos, currentPtr - pos);
-            assert clearLastStackSlot();
+            assert debugOnlyClearLastStackSlot();
             currentPtr--;
         }
     }
@@ -4278,14 +4277,14 @@ public abstract class TreeBuilder<T> implements TokenHandler,
         assert listOfActiveFormattingElements[pos] != null;
         listOfActiveFormattingElements[pos].release();
         if (pos == listPtr) {
-            assert clearLastListSlot();
+            assert debugOnlyClearLastListSlot();
             listPtr--;
             return;
         }
         assert pos < listPtr;
         System.arraycopy(listOfActiveFormattingElements, pos + 1,
                 listOfActiveFormattingElements, pos, listPtr - pos);
-        assert clearLastListSlot();
+        assert debugOnlyClearLastListSlot();
         listPtr--;
     }
 
@@ -4655,7 +4654,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
 
     private void pop() throws SAXException {
         StackNode<T> node = stack[currentPtr];
-        assert clearLastStackSlot();
+        assert debugOnlyClearLastStackSlot();
         currentPtr--;
         elementPopped(node.ns, node.popName, node.node);
         node.release();
@@ -4663,14 +4662,14 @@ public abstract class TreeBuilder<T> implements TokenHandler,
 
     private void silentPop() throws SAXException {
         StackNode<T> node = stack[currentPtr];
-        assert clearLastStackSlot();
+        assert debugOnlyClearLastStackSlot();
         currentPtr--;
         node.release();
     }
 
     private void popOnEof() throws SAXException {
         StackNode<T> node = stack[currentPtr];
-        assert clearLastStackSlot();
+        assert debugOnlyClearLastStackSlot();
         currentPtr--;
         markMalformedIfScript(node.node);
         elementPopped(node.ns, node.popName, node.node);
diff --git a/parser/html/nsHtml5ElementName.cpp b/parser/html/nsHtml5ElementName.cpp
index 6665d6d3d648..376f9573c4f0 100644
--- a/parser/html/nsHtml5ElementName.cpp
+++ b/parser/html/nsHtml5ElementName.cpp
@@ -62,6 +62,12 @@ nsHtml5ElementName::getGroup()
   return flags & NS_HTML5ELEMENT_NAME_GROUP_MASK;
 }
 
+bool 
+nsHtml5ElementName::isCustom()
+{
+  return (flags & NS_HTML5ELEMENT_NAME_CUSTOM);
+}
+
 nsHtml5ElementName* 
 nsHtml5ElementName::elementNameByBuffer(PRUnichar* buf, int32_t offset, int32_t length, nsHtml5AtomTable* interner)
 {
diff --git a/parser/html/nsHtml5ElementName.h b/parser/html/nsHtml5ElementName.h
index b0a868a36492..12f3c805bb9a 100644
--- a/parser/html/nsHtml5ElementName.h
+++ b/parser/html/nsHtml5ElementName.h
@@ -68,6 +68,7 @@ class nsHtml5ElementName
     }
 
     int32_t getGroup();
+    bool isCustom();
     static nsHtml5ElementName* elementNameByBuffer(PRUnichar* buf, int32_t offset, int32_t length, nsHtml5AtomTable* interner);
   private:
     static int32_t bufToHash(PRUnichar* buf, int32_t len);
diff --git a/parser/html/nsHtml5HtmlAttributes.cpp b/parser/html/nsHtml5HtmlAttributes.cpp
index 222566af38a2..0b95bca5cd1a 100644
--- a/parser/html/nsHtml5HtmlAttributes.cpp
+++ b/parser/html/nsHtml5HtmlAttributes.cpp
@@ -104,35 +104,35 @@ nsHtml5HtmlAttributes::getLength()
 nsIAtom* 
 nsHtml5HtmlAttributes::getLocalNameNoBoundsCheck(int32_t index)
 {
-
+  MOZ_ASSERT(index < length && index >= 0, "Index out of bounds");
   return names[index]->getLocal(mode);
 }
 
 int32_t 
 nsHtml5HtmlAttributes::getURINoBoundsCheck(int32_t index)
 {
-
+  MOZ_ASSERT(index < length && index >= 0, "Index out of bounds");
   return names[index]->getUri(mode);
 }
 
 nsIAtom* 
 nsHtml5HtmlAttributes::getPrefixNoBoundsCheck(int32_t index)
 {
-
+  MOZ_ASSERT(index < length && index >= 0, "Index out of bounds");
   return names[index]->getPrefix(mode);
 }
 
 nsString* 
 nsHtml5HtmlAttributes::getValueNoBoundsCheck(int32_t index)
 {
-
+  MOZ_ASSERT(index < length && index >= 0, "Index out of bounds");
   return values[index];
 }
 
 nsHtml5AttributeName* 
 nsHtml5HtmlAttributes::getAttributeNameNoBoundsCheck(int32_t index)
 {
-
+  MOZ_ASSERT(index < length && index >= 0, "Index out of bounds");
   return names[index];
 }
 
@@ -208,7 +208,7 @@ nsHtml5HtmlAttributes::adjustForSvg()
 nsHtml5HtmlAttributes* 
 nsHtml5HtmlAttributes::cloneAttributes(nsHtml5AtomTable* interner)
 {
-
+  MOZ_ASSERT((!length) || !mode || mode == 3);
   nsHtml5HtmlAttributes* clone = new nsHtml5HtmlAttributes(0);
   for (int32_t i = 0; i < length; i++) {
     clone->addAttribute(names[i]->cloneAttributeName(interner), nsHtml5Portability::newStringFromString(values[i]));
@@ -219,7 +219,7 @@ nsHtml5HtmlAttributes::cloneAttributes(nsHtml5AtomTable* interner)
 bool 
 nsHtml5HtmlAttributes::equalsAnother(nsHtml5HtmlAttributes* other)
 {
-
+  MOZ_ASSERT(!mode || mode == 3, "Trying to compare attributes in foreign content.");
   int32_t otherLength = other->getLength();
   if (length != otherLength) {
     return false;
diff --git a/parser/html/nsHtml5StackNode.cpp b/parser/html/nsHtml5StackNode.cpp
index 97966a76d926..6077e5d9f13e 100644
--- a/parser/html/nsHtml5StackNode.cpp
+++ b/parser/html/nsHtml5StackNode.cpp
@@ -109,7 +109,7 @@ nsHtml5StackNode::nsHtml5StackNode(nsHtml5ElementName* elementName, nsIContent**
     refcount(1)
 {
   MOZ_COUNT_CTOR(nsHtml5StackNode);
-
+  MOZ_ASSERT(!elementName->isCustom(), "Don't use this constructor for custom elements.");
 }
 
 
@@ -123,7 +123,7 @@ nsHtml5StackNode::nsHtml5StackNode(nsHtml5ElementName* elementName, nsIContent**
     refcount(1)
 {
   MOZ_COUNT_CTOR(nsHtml5StackNode);
-
+  MOZ_ASSERT(!elementName->isCustom(), "Don't use this constructor for custom elements.");
 }
 
 
diff --git a/parser/html/nsHtml5Tokenizer.cpp b/parser/html/nsHtml5Tokenizer.cpp
index bf4ffaa834a2..a431fbee5839 100644
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@@ -189,7 +189,7 @@ nsHtml5Tokenizer::endTagExpectationToArray()
       return;
     }
     default: {
-
+      MOZ_ASSERT(false, "Bad end tag expectation.");
       return;
     }
   }
@@ -2401,7 +2401,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
             NS_HTML5_BREAK(stateloop);
           }
           c = checkChar(buf, pos);
-
+          MOZ_ASSERT(index > 0);
           if (index < 6) {
             PRUnichar folded = c;
             if (c >= 'A' && c <= 'Z') {
diff --git a/parser/html/nsHtml5TreeBuilder.cpp b/parser/html/nsHtml5TreeBuilder.cpp
index 2e0f333e9650..df52ca5160af 100644
--- a/parser/html/nsHtml5TreeBuilder.cpp
+++ b/parser/html/nsHtml5TreeBuilder.cpp
@@ -489,7 +489,7 @@ nsHtml5TreeBuilder::eof()
       }
       case NS_HTML5TREE_BUILDER_IN_COLUMN_GROUP: {
         if (!currentPtr) {
-
+          MOZ_ASSERT(fragment);
           NS_HTML5_BREAK(eofloop);
         } else {
           popOnEof();
@@ -688,7 +688,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
           case NS_HTML5TREE_BUILDER_TR: {
             eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TR);
             if (!eltPos) {
-
+              MOZ_ASSERT(fragment);
               errNoTableRowToClose();
               NS_HTML5_BREAK(starttagloop);
             }
@@ -743,7 +743,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
               errTableSeenWhileTableOpen();
               eltPos = findLastInTableScope(name);
               if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+                MOZ_ASSERT(fragment);
                 NS_HTML5_BREAK(starttagloop);
               }
               generateImpliedEndTags();
@@ -854,7 +854,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
           case NS_HTML5TREE_BUILDER_FRAMESET: {
             if (mode == NS_HTML5TREE_BUILDER_FRAMESET_OK) {
               if (!currentPtr || stack[1]->getGroup() != NS_HTML5TREE_BUILDER_BODY) {
-
+                MOZ_ASSERT(fragment);
                 errStrayStartTag(name);
                 NS_HTML5_BREAK(starttagloop);
               } else {
@@ -921,7 +921,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
             }
             case NS_HTML5TREE_BUILDER_BODY: {
               if (!currentPtr || stack[1]->getGroup() != NS_HTML5TREE_BUILDER_BODY) {
-
+                MOZ_ASSERT(fragment);
                 errStrayStartTag(name);
                 NS_HTML5_BREAK(starttagloop);
               }
@@ -1438,7 +1438,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
           }
           default: {
             if (!currentPtr) {
-
+              MOZ_ASSERT(fragment);
               errGarbageInColgroup();
               NS_HTML5_BREAK(starttagloop);
             }
@@ -1458,7 +1458,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
             errStartTagWithSelectOpen(name);
             eltPos = findLastInTableScope(nsHtml5Atoms::select);
             if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+              MOZ_ASSERT(fragment);
               NS_HTML5_BREAK(starttagloop);
             }
             while (currentPtr >= eltPos) {
@@ -1504,7 +1504,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
             errStartSelectWhereEndSelectExpected();
             eltPos = findLastInTableScope(name);
             if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+              MOZ_ASSERT(fragment);
               errNoSelectInTableScope();
               NS_HTML5_BREAK(starttagloop);
             } else {
@@ -1521,7 +1521,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
             errStartTagWithSelectOpen(name);
             eltPos = findLastInTableScope(nsHtml5Atoms::select);
             if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+              MOZ_ASSERT(fragment);
               NS_HTML5_BREAK(starttagloop);
             }
             while (currentPtr >= eltPos) {
@@ -1790,7 +1790,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
         }
       }
       case NS_HTML5TREE_BUILDER_TEXT: {
-
+        MOZ_ASSERT(false);
         NS_HTML5_BREAK(starttagloop);
       }
     }
@@ -2064,7 +2064,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           case NS_HTML5TREE_BUILDER_TR: {
             eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TR);
             if (!eltPos) {
-
+              MOZ_ASSERT(fragment);
               errNoTableRowToClose();
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2076,7 +2076,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           case NS_HTML5TREE_BUILDER_TABLE: {
             eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TR);
             if (!eltPos) {
-
+              MOZ_ASSERT(fragment);
               errNoTableRowToClose();
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2092,7 +2092,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
             }
             eltPos = findLastOrRoot(NS_HTML5TREE_BUILDER_TR);
             if (!eltPos) {
-
+              MOZ_ASSERT(fragment);
               errNoTableRowToClose();
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2130,7 +2130,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           case NS_HTML5TREE_BUILDER_TABLE: {
             eltPos = findLastInTableScopeOrRootTbodyTheadTfoot();
             if (!eltPos) {
-
+              MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2158,7 +2158,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           case NS_HTML5TREE_BUILDER_TABLE: {
             eltPos = findLast(nsHtml5Atoms::table);
             if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+              MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2279,11 +2279,11 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
         switch(group) {
           case NS_HTML5TREE_BUILDER_BODY: {
             if (!isSecondOnStackBody()) {
-
+              MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
-
+            MOZ_ASSERT(currentPtr >= 1);
             if (NS_UNLIKELY(mViewSource)) {
               for (int32_t i = 2; i <= currentPtr; i++) {
                 switch(stack[i]->getGroup()) {
@@ -2310,7 +2310,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           }
           case NS_HTML5TREE_BUILDER_HTML: {
             if (!isSecondOnStackBody()) {
-
+              MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2389,7 +2389,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
               NS_HTML5_BREAK(endtagloop);
             }
             generateImpliedEndTagsExceptFor(nsHtml5Atoms::p);
-
+            MOZ_ASSERT(eltPos != NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK);
             if (!!NS_UNLIKELY(mViewSource) && eltPos != currentPtr) {
               errUnclosedElements(eltPos, name);
             }
@@ -2537,7 +2537,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
         switch(group) {
           case NS_HTML5TREE_BUILDER_COLGROUP: {
             if (!currentPtr) {
-
+              MOZ_ASSERT(fragment);
               errGarbageInColgroup();
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2551,7 +2551,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           }
           default: {
             if (!currentPtr) {
-
+              MOZ_ASSERT(fragment);
               errGarbageInColgroup();
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2572,7 +2572,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
             if (findLastInTableScope(name) != NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
               eltPos = findLastInTableScope(nsHtml5Atoms::select);
               if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+                MOZ_ASSERT(fragment);
                 NS_HTML5_BREAK(endtagloop);
               }
               while (currentPtr >= eltPos) {
@@ -2613,7 +2613,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
           case NS_HTML5TREE_BUILDER_SELECT: {
             eltPos = findLastInTableScope(nsHtml5Atoms::select);
             if (eltPos == NS_HTML5TREE_BUILDER_NOT_FOUND_ON_STACK) {
-
+              MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
@@ -2651,7 +2651,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
         switch(group) {
           case NS_HTML5TREE_BUILDER_FRAMESET: {
             if (!currentPtr) {
-
+              MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
@@ -3113,14 +3113,14 @@ nsHtml5TreeBuilder::implicitlyCloseP()
 }
 
 bool 
-nsHtml5TreeBuilder::clearLastStackSlot()
+nsHtml5TreeBuilder::debugOnlyClearLastStackSlot()
 {
   stack[currentPtr] = nullptr;
   return true;
 }
 
 bool 
-nsHtml5TreeBuilder::clearLastListSlot()
+nsHtml5TreeBuilder::debugOnlyClearLastListSlot()
 {
   listOfActiveFormattingElements[listPtr] = nullptr;
   return true;
@@ -3185,7 +3185,7 @@ nsHtml5TreeBuilder::removeFromStack(int32_t pos)
 
     stack[pos]->release();
     nsHtml5ArrayCopy::arraycopy(stack, pos + 1, pos, currentPtr - pos);
-
+    MOZ_ASSERT(debugOnlyClearLastStackSlot());
     currentPtr--;
   }
 }
@@ -3213,16 +3213,16 @@ nsHtml5TreeBuilder::removeFromStack(nsHtml5StackNode* node)
 void 
 nsHtml5TreeBuilder::removeFromListOfActiveFormattingElements(int32_t pos)
 {
-
+  MOZ_ASSERT(!!listOfActiveFormattingElements[pos]);
   listOfActiveFormattingElements[pos]->release();
   if (pos == listPtr) {
-
+    MOZ_ASSERT(debugOnlyClearLastListSlot());
     listPtr--;
     return;
   }
-
+  MOZ_ASSERT(pos < listPtr);
   nsHtml5ArrayCopy::arraycopy(listOfActiveFormattingElements, pos + 1, pos, listPtr - pos);
-
+  MOZ_ASSERT(debugOnlyClearLastListSlot());
   listPtr--;
 }
 
@@ -3293,9 +3293,9 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
       nsHtml5StackNode* node = stack[nodePos];
       int32_t nodeListPos = findInListOfActiveFormattingElements(node);
       if (nodeListPos == -1) {
-
-
-
+        MOZ_ASSERT(formattingEltStackPos < nodePos);
+        MOZ_ASSERT(bookmark < nodePos);
+        MOZ_ASSERT(furthestBlockPos > nodePos);
         removeFromStack(nodePos);
         furthestBlockPos--;
         continue;
@@ -3306,8 +3306,8 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
       if (nodePos == furthestBlockPos) {
         bookmark = nodeListPos + 1;
       }
-
-
+      MOZ_ASSERT(node == listOfActiveFormattingElements[nodeListPos]);
+      MOZ_ASSERT(node == stack[nodePos]);
       nsIContent** clone = createElement(kNameSpaceID_XHTML, node->name, node->attributes->cloneAttributes(nullptr));
       nsHtml5StackNode* newNode = new nsHtml5StackNode(node->getFlags(), node->ns, node->name, clone, node->popName, node->attributes);
       node->dropAttributes();
@@ -3336,7 +3336,7 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
     appendElement(clone, furthestBlock->node);
     removeFromListOfActiveFormattingElements(formattingEltListPos);
     insertIntoListOfActiveFormattingElements(formattingClone, bookmark);
-
+    MOZ_ASSERT(formattingEltStackPos < furthestBlockPos);
     removeFromStack(formattingEltStackPos);
     insertIntoStack(formattingClone, furthestBlockPos);
   }
@@ -3346,8 +3346,8 @@ nsHtml5TreeBuilder::adoptionAgencyEndTag(nsIAtom* name)
 void 
 nsHtml5TreeBuilder::insertIntoStack(nsHtml5StackNode* node, int32_t position)
 {
-
-
+  MOZ_ASSERT(currentPtr + 1 < stack.length);
+  MOZ_ASSERT(position <= currentPtr + 1);
   if (position == currentPtr + 1) {
     push(node);
   } else {
@@ -3361,7 +3361,7 @@ void
 nsHtml5TreeBuilder::insertIntoListOfActiveFormattingElements(nsHtml5StackNode* formattingClone, int32_t bookmark)
 {
   formattingClone->retain();
-
+  MOZ_ASSERT(listPtr + 1 < listOfActiveFormattingElements.length);
   if (bookmark <= listPtr) {
     nsHtml5ArrayCopy::arraycopy(listOfActiveFormattingElements, bookmark, bookmark + 1, (listPtr - bookmark) + 1);
   }
@@ -3458,9 +3458,9 @@ nsHtml5TreeBuilder::addAttributesToHtml(nsHtml5HtmlAttributes* attributes)
 void 
 nsHtml5TreeBuilder::pushHeadPointerOntoStack()
 {
-
-
-
+  MOZ_ASSERT(!!headPointer);
+  MOZ_ASSERT(!fragment);
+  MOZ_ASSERT(mode == NS_HTML5TREE_BUILDER_AFTER_HEAD);
 
   silentPush(new nsHtml5StackNode(nsHtml5ElementName::ELT_HEAD, headPointer));
 }
@@ -3535,7 +3535,7 @@ void
 nsHtml5TreeBuilder::pop()
 {
   nsHtml5StackNode* node = stack[currentPtr];
-
+  MOZ_ASSERT(debugOnlyClearLastStackSlot());
   currentPtr--;
   elementPopped(node->ns, node->popName, node->node);
   node->release();
@@ -3545,7 +3545,7 @@ void
 nsHtml5TreeBuilder::silentPop()
 {
   nsHtml5StackNode* node = stack[currentPtr];
-
+  MOZ_ASSERT(debugOnlyClearLastStackSlot());
   currentPtr--;
   node->release();
 }
@@ -3554,7 +3554,7 @@ void
 nsHtml5TreeBuilder::popOnEof()
 {
   nsHtml5StackNode* node = stack[currentPtr];
-
+  MOZ_ASSERT(debugOnlyClearLastStackSlot());
   currentPtr--;
   markMalformedIfScript(node->node);
   elementPopped(node->ns, node->popName, node->node);
diff --git a/parser/html/nsHtml5TreeBuilder.h b/parser/html/nsHtml5TreeBuilder.h
index 29859b497a68..26e7944ed2f2 100644
--- a/parser/html/nsHtml5TreeBuilder.h
+++ b/parser/html/nsHtml5TreeBuilder.h
@@ -131,8 +131,8 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState
     void clearStackBackTo(int32_t eltPos);
     void resetTheInsertionMode();
     void implicitlyCloseP();
-    bool clearLastStackSlot();
-    bool clearLastListSlot();
+    bool debugOnlyClearLastStackSlot();
+    bool debugOnlyClearLastListSlot();
     void push(nsHtml5StackNode* node);
     void silentPush(nsHtml5StackNode* node);
     void append(nsHtml5StackNode* node);

From 96b3ddd3e3c119bce29081a2c2c78964e8293061 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Wed, 19 Sep 2012 15:02:37 +0200
Subject: [PATCH 57/64] Fix for bug 791347 (Support non-nsISupports refcounted
 natives and non-refcounted natives in new DOM bindings). r=bz/smaug.

--HG--
extra : rebase_source : cd6d98461d7fa3a07fa1361b4d840448122b6655
---
 dom/bindings/BindingUtils.h           |  22 +++++
 dom/bindings/Bindings.conf            |  17 ++++
 dom/bindings/Codegen.py               | 119 ++++++++++++++++++++++----
 dom/bindings/Configuration.py         |  13 ++-
 dom/bindings/Makefile.in              |   1 +
 dom/bindings/NonRefcountedDOMObject.h |  37 ++++++++
 js/xpconnect/src/XPCJSRuntime.cpp     | 106 +++++++++++++++++------
 js/xpconnect/src/xpcprivate.h         |  39 +++++++++
 8 files changed, 312 insertions(+), 42 deletions(-)
 create mode 100644 dom/bindings/NonRefcountedDOMObject.h

diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index ee9d6c3691cb..ad6a061603da 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -9,6 +9,7 @@
 
 #include "mozilla/dom/DOMJSClass.h"
 #include "mozilla/dom/DOMJSProxyHandler.h"
+#include "mozilla/dom/NonRefcountedDOMObject.h"
 #include "mozilla/dom/workers/Workers.h"
 #include "mozilla/ErrorResult.h"
 
@@ -1145,6 +1146,27 @@ XrayEnumerateProperties(JS::AutoIdVector& props,
                         ConstantSpec* constantSpecs,
                         size_t constantCount);
 
+// Transfer reference in ptr to smartPtr.
+template<class T>
+inline void
+Take(nsRefPtr<T>& smartPtr, T* ptr)
+{
+  smartPtr = dont_AddRef(ptr);
+}
+
+// Transfer ownership of ptr to smartPtr.
+template<class T>
+inline void
+Take(nsAutoPtr<T>& smartPtr, T* ptr)
+{
+  smartPtr = ptr;
+}
+
+inline void
+MustInheritFromNonRefcountedDOMObject(NonRefcountedDOMObject*)
+{
+}
+
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index e9eaf8b47cd1..58e3c7a794c8 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -54,6 +54,23 @@
 #                   cannot be prefable, and must ensure that they disallow
 #                   XPConnect wrapping.  Always true for worker descriptors.
 #                   Defaults to true.
+#   * nativeOwnership: Describes how the native object is held. 4 possible
+#                      types: worker object ("worker"), non-refcounted object
+#                      ("owned"), refcounted non-nsISupports object
+#                      ("refcounted") or nsISupports ("nsisupports").
+#                      Non-refcounted objects need to inherit from
+#                      mozilla::dom::NonRefcountedDOMObject and preferably use
+#                      MOZ_COUNT_CTOR/MOZ_COUNT_DTOR in their
+#                      constructor/destructor so they participate in leak
+#                      logging.
+#                      This mostly determines how the finalizer releases the
+#                      binding's hold on the native object. For a worker object
+#                      it'll call Release, for a non-refcounted object it'll
+#                      call delete through XPConnect's deferred finalization
+#                      mechanism, for a refcounted object it'll call Release
+#                      through XPConnect's deferred finalization mechanism.
+#                      Always "worker" for worker descriptors. Defaults to
+#                      "nsisupports".
 #
 #   The following fields are either a string, an array (defaults to an empty
 #   array) or a dictionary with three possible keys (all, getterOnly and
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 6d2cc0bde366..4cd846a4dac5 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -96,7 +96,7 @@ def DOMClass(descriptor):
         return """{
   { %s },
   %s, %s
-}""" % (prototypeChainString, toStringBool(descriptor.nativeIsISupports),
+}""" % (prototypeChainString, toStringBool(descriptor.nativeOwnership == 'nsisupports'),
           nativeHooks)
 
 class CGDOMJSClass(CGThing):
@@ -634,10 +634,58 @@ class CGAddPropertyHook(CGAbstractClassHook):
         # FIXME https://bugzilla.mozilla.org/show_bug.cgi?id=774279
         # Using a real trace hook might enable us to deal with non-nsISupports
         # wrappercached things here.
-        assert self.descriptor.nativeIsISupports
+        assert self.descriptor.nativeOwnership == 'nsisupports'
         return """  nsContentUtils::PreserveWrapper(reinterpret_cast<nsISupports*>(self), self);
   return true;"""
 
+def DeferredFinalizeSmartPtr(descriptor):
+    if descriptor.nativeOwnership == 'owned':
+        smartPtr = 'nsAutoPtr<%s>'
+    else:
+        assert descriptor.nativeOwnership == 'refcounted'
+        smartPtr = 'nsRefPtr<%s>'
+    return smartPtr % descriptor.nativeType
+
+class CGDeferredFinalizePointers(CGThing):
+    def __init__(self, descriptor):
+        CGThing.__init__(self)
+        self.descriptor = descriptor
+
+    def declare(self):
+        return ""
+
+    def define(self):
+        return """nsTArray<%s >* sDeferredFinalizePointers;
+""" % DeferredFinalizeSmartPtr(self.descriptor)
+
+class CGGetDeferredFinalizePointers(CGAbstractStaticMethod):
+    def __init__(self, descriptor):
+        CGAbstractStaticMethod.__init__(self, descriptor, "GetDeferredFinalizePointers", "void*", [])
+
+    def definition_body(self):
+        return """  nsTArray<%s >* pointers = sDeferredFinalizePointers;
+  sDeferredFinalizePointers = nullptr;
+  return pointers;""" % DeferredFinalizeSmartPtr(self.descriptor)
+
+class CGDeferredFinalize(CGAbstractStaticMethod):
+    def __init__(self, descriptor):
+        CGAbstractStaticMethod.__init__(self, descriptor, "DeferredFinalize", "bool", [Argument('int32_t', 'slice'), Argument('void*', 'data')])
+
+    def definition_body(self):
+        smartPtr = DeferredFinalizeSmartPtr(self.descriptor)
+        return """  nsTArray<%(smartPtr)s >* pointers = static_cast<nsTArray<%(smartPtr)s >*>(data);
+  uint32_t oldLen = pointers->Length();
+  if (slice == -1 || slice > oldLen) {
+    slice = oldLen;
+  }
+  uint32_t newLen = oldLen - slice;
+  pointers->RemoveElementsAt(newLen, slice);
+  if (newLen == 0) {
+    delete pointers;
+    return true;
+  }
+  return false;""" % { 'smartPtr': smartPtr }
+
 def finalizeHook(descriptor, hookName, context):
     if descriptor.customFinalize:
         return """if (self) {
@@ -646,14 +694,36 @@ def finalizeHook(descriptor, hookName, context):
     clearWrapper = "ClearWrapper(self, self);\n" if descriptor.wrapperCache else ""
     if descriptor.workers:
         release = "self->Release();"
-    else:
-        assert descriptor.nativeIsISupports
+    elif descriptor.nativeOwnership == 'nsisupports':
         release = """XPCJSRuntime *rt = nsXPConnect::GetRuntimeInstance();
 if (rt) {
   rt->DeferredRelease(reinterpret_cast<nsISupports*>(self));
 } else {
   NS_RELEASE(self);
 }"""
+    else:
+        smartPtr = DeferredFinalizeSmartPtr(descriptor)
+        release = """static bool registered = false;
+if (!registered) {
+  XPCJSRuntime *rt = nsXPConnect::GetRuntimeInstance();
+  if (!rt) {
+    %(smartPtr)s dying;
+    Take(dying, self);
+    return;
+  }
+  rt->RegisterDeferredFinalize(GetDeferredFinalizePointers, DeferredFinalize);
+  registered = true;
+}
+if (!sDeferredFinalizePointers) {
+  sDeferredFinalizePointers = new nsAutoTArray<%(smartPtr)s, 16>();
+}
+%(smartPtr)s* defer = sDeferredFinalizePointers->AppendElement();
+if (!defer) {
+  %(smartPtr)s dying;
+  Take(dying, self);
+  return;
+}
+Take(*defer, self);""" % { 'smartPtr': smartPtr }
     return clearWrapper + release
 
 class CGClassFinalizeHook(CGAbstractClassHook):
@@ -743,6 +813,7 @@ class CGClassHasInstanceHook(CGAbstractStaticMethod):
         return self.generate_code()
 
     def generate_code(self):
+        assert self.descriptor.nativeOwnership == 'nsisupports'
         return """  if (!vp.isObject()) {
     *bp = false;
     return true;
@@ -961,7 +1032,7 @@ class MethodDefiner(PropertyDefiner):
                                  "flags": "JSPROP_ENUMERATE",
                                  "pref": None })
 
-        if not descriptor.interface.parent and not static and not descriptor.workers:
+        if not descriptor.interface.parent and not static and descriptor.nativeOwnership == 'nsisupports':
             self.chrome.append({"name": 'QueryInterface',
                                 "methodInfo": False,
                                 "length": 1,
@@ -1385,6 +1456,15 @@ def CreateBindingJSObject(descriptor, parent):
   }
 
   js::SetReservedSlot(obj, DOM_OBJECT_SLOT, PRIVATE_TO_JSVAL(aObject));
+"""
+    if descriptor.nativeOwnership in ['refcounted', 'nsisupports']:
+        create += """  NS_ADDREF(aObject);
+"""
+    else:
+        assert descriptor.nativeOwnership == 'owned'
+        create += """  // Make sure the native objects inherit from NonRefcountedDOMObject so that we
+  // log their ctor and dtor.
+  MustInheritFromNonRefcountedDOMObject(aObject);
 """
     return create % parent
 
@@ -1418,7 +1498,6 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
   }
 
 %s
-  NS_ADDREF(aObject);
 
   aCache->SetWrapper(obj);
 
@@ -1453,7 +1532,6 @@ class CGWrapNonWrapperCacheMethod(CGAbstractMethod):
   }
 
 %s
-  NS_ADDREF(aObject);
 
   return obj;""" % CreateBindingJSObject(self.descriptor, "global")
 
@@ -5105,17 +5183,23 @@ class CGDescriptor(CGThing):
             if hasLenientSetter: cgThings.append(CGGenericSetter(descriptor,
                                                                  lenientThis=True))
 
-        if descriptor.concrete and not descriptor.proxy:
-            if not descriptor.workers and descriptor.wrapperCache:
-                cgThings.append(CGAddPropertyHook(descriptor))
+        if descriptor.concrete:
+            if descriptor.nativeOwnership == 'owned' or descriptor.nativeOwnership == 'refcounted':
+                cgThings.append(CGDeferredFinalizePointers(descriptor))
+                cgThings.append(CGGetDeferredFinalizePointers(descriptor))
+                cgThings.append(CGDeferredFinalize(descriptor))
 
-            # Always have a finalize hook, regardless of whether the class wants a
-            # custom hook.
-            cgThings.append(CGClassFinalizeHook(descriptor))
+            if not descriptor.proxy:
+                if not descriptor.workers and descriptor.wrapperCache:
+                    cgThings.append(CGAddPropertyHook(descriptor))
 
-            # Only generate a trace hook if the class wants a custom hook.
-            if (descriptor.customTrace):
-                cgThings.append(CGClassTraceHook(descriptor))
+                # Always have a finalize hook, regardless of whether the class
+                # wants a custom hook.
+                cgThings.append(CGClassFinalizeHook(descriptor))
+
+                # Only generate a trace hook if the class wants a custom hook.
+                if (descriptor.customTrace):
+                    cgThings.append(CGClassTraceHook(descriptor))
 
         if descriptor.interface.hasInterfaceObject():
             cgThings.append(CGClassConstructHook(descriptor))
@@ -5608,7 +5692,8 @@ class CGBindingRoot(CGThing):
                          ['mozilla/dom/BindingUtils.h',
                           'mozilla/dom/DOMJSClass.h',
                           'mozilla/dom/DOMJSProxyHandler.h'],
-                         ['mozilla/dom/Nullable.h',
+                         ['mozilla/dom/NonRefcountedDOMObject.h',
+                          'mozilla/dom/Nullable.h',
                           'PrimitiveConversions.h',
                           'XPCQuickStubs.h',
                           'nsDOMQS.h',
diff --git a/dom/bindings/Configuration.py b/dom/bindings/Configuration.py
index e60a89603a49..503db3553934 100644
--- a/dom/bindings/Configuration.py
+++ b/dom/bindings/Configuration.py
@@ -227,7 +227,18 @@ class Descriptor(DescriptorProvider):
                             self.interface.identifier.name)
         self.prefable = desc.get('prefable', False)
 
-        self.nativeIsISupports = not self.workers
+        if self.workers:
+            if desc.get('nativeOwnership', 'worker') != 'worker':
+                raise TypeError("Worker descriptor for %s should have 'worker' "
+                                "as value for nativeOwnership" %
+                                self.interface.identifier.name)
+            self.nativeOwnership = "worker"
+        else:
+            self.nativeOwnership = desc.get('nativeOwnership', 'nsisupports')
+            if not self.nativeOwnership in ['owned', 'refcounted', 'nsisupports']:
+                raise TypeError("Descriptor for %s has unrecognized value (%s) "
+                                "for nativeOwnership" %
+                                (self.interface.identifier.name, self.nativeOwnership))
         self.customTrace = desc.get('customTrace', self.workers)
         self.customFinalize = desc.get('customFinalize', self.workers)
         self.wrapperCache = self.workers or desc.get('wrapperCache', True)
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index 1dd733774c64..d6dd271234fc 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -58,6 +58,7 @@ EXPORTS_$(binding_include_path) = \
   DOMJSClass.h \
   DOMJSProxyHandler.h \
   Errors.msg \
+  NonRefcountedDOMObject.h \
   Nullable.h \
   PrimitiveConversions.h \
   PrototypeList.h \
diff --git a/dom/bindings/NonRefcountedDOMObject.h b/dom/bindings/NonRefcountedDOMObject.h
new file mode 100644
index 000000000000..2210ea85179c
--- /dev/null
+++ b/dom/bindings/NonRefcountedDOMObject.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* vim: set ts=2 sw=2 et tw=79: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_NonRefcountedDOMObject_h__
+#define mozilla_dom_NonRefcountedDOMObject_h__
+
+#include "nsTraceRefcnt.h"
+
+namespace mozilla {
+namespace dom {
+
+// Natives for DOM classes with 'owned' as the value for nativeOwnership in
+// Bindings.conf need to inherit from this class.
+// If you're seeing objects of this class leak then natives for one of the DOM
+// classes with 'owned' as the value for nativeOwnership in Bindings.conf is
+// leaking. If the native for that class has MOZ_COUNT_CTOR/DTOR in its
+// constructor/destructor then it should show up in the leak log too.
+class NonRefcountedDOMObject
+{
+protected:
+  NonRefcountedDOMObject()
+  {
+    MOZ_COUNT_CTOR(NonRefcountedDOMObject);
+  }
+  ~NonRefcountedDOMObject()
+  {
+    MOZ_COUNT_DTOR(NonRefcountedDOMObject);
+  }
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif /* mozilla_dom_NonRefcountedDOMObject_h__ */
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index fbe6055d4fe2..66cdec68fc20 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -528,10 +528,18 @@ DoDeferredRelease(nsTArray<T> &array)
     }
 }
 
+struct DeferredFinalizeFunction
+{
+  XPCJSRuntime::DeferredFinalizeFunction run;
+  void* data;
+};
+
 class XPCIncrementalReleaseRunnable : public nsRunnable
 {
     XPCJSRuntime *runtime;
     nsTArray<nsISupports *> items;
+    nsAutoTArray<DeferredFinalizeFunction, 16> deferredFinalizeFunctions;
+    uint32_t finalizeFunctionToRun;
 
     static const PRTime SliceMillis = 10; /* ms */
 
@@ -544,12 +552,50 @@ class XPCIncrementalReleaseRunnable : public nsRunnable
     NS_DECL_NSIRUNNABLE
 };
 
+bool
+ReleaseSliceNow(int32_t slice, void* data)
+{
+    nsTArray<nsISupports *>* items =
+        static_cast<nsTArray<nsISupports *>*>(data);
+    uint32_t counter = 0;
+    while (1) {
+        uint32_t count = items->Length();
+        if (!count) {
+            break;
+        }
+
+        nsISupports *wrapper = items->ElementAt(count - 1);
+        items->RemoveElementAt(count - 1);
+        NS_RELEASE(wrapper);
+
+        if (slice > 0 && ++counter == slice) {
+            return items->IsEmpty();
+        }
+    }
+
+    return true;
+}
+
+
 XPCIncrementalReleaseRunnable::XPCIncrementalReleaseRunnable(XPCJSRuntime *rt,
                                                              nsTArray<nsISupports *> &items)
-  : runtime(rt)
+  : runtime(rt),
+    finalizeFunctionToRun(0)
 {
     nsLayoutStatics::AddRef();
     this->items.SwapElements(items);
+    DeferredFinalizeFunction* function =
+        deferredFinalizeFunctions.AppendElement();
+    function->run = ReleaseSliceNow;
+    function->data = &this->items;
+    for (uint32_t i = 0; i < rt->mDeferredFinalizeFunctions.Length(); ++i) {
+        void* data = (rt->mDeferredFinalizeFunctions[i].start)();
+        if (data) {
+            function = deferredFinalizeFunctions.AppendElement();
+            function->run = rt->mDeferredFinalizeFunctions[i].run;
+            function->data = data;
+        }
+    }
 }
 
 XPCIncrementalReleaseRunnable::~XPCIncrementalReleaseRunnable()
@@ -562,33 +608,39 @@ void
 XPCIncrementalReleaseRunnable::ReleaseNow(bool limited)
 {
     MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(deferredFinalizeFunctions.Length() != 0,
+               "We should have at least ReleaseSliceNow to run");
+    MOZ_ASSERT(finalizeFunctionToRun < deferredFinalizeFunctions.Length(),
+               "No more finalizers to run?");
 
     TimeDuration sliceTime = TimeDuration::FromMilliseconds(SliceMillis);
     TimeStamp started = TimeStamp::Now();
-    uint32_t counter = 0;
-    while (1) {
-        uint32_t count = items.Length();
-        if (!count)
-            break;
-
-        nsISupports *wrapper = items[count - 1];
-        items.RemoveElementAt(count - 1);
-        NS_RELEASE(wrapper);
-
+    bool timeout = false;
+    do {
+        const DeferredFinalizeFunction& function =
+            deferredFinalizeFunctions[finalizeFunctionToRun];
         if (limited) {
-            /* We don't want to read the clock too often. */
-            counter++;
-            if (counter == 100) {
-                counter = 0;
-                if (TimeStamp::Now() - started >= sliceTime)
-                    break;
+            bool done = false;
+            while (!timeout && !done) {
+                /* We don't want to read the clock too often, so we try to
+                   release slices of 100 items. */
+                done = function.run(100, function.data);
+                timeout = TimeStamp::Now() - started >= sliceTime;
             }
+            if (done) {
+                ++finalizeFunctionToRun;
+            }
+            if (timeout) {
+                break;
+            }
+        } else {
+            function.run(-1, function.data);
+            MOZ_ASSERT(!items.Length());
+            ++finalizeFunctionToRun;
         }
-    }
+    } while (finalizeFunctionToRun < deferredFinalizeFunctions.Length());
 
-    MOZ_ASSERT_IF(items.Length(), limited);
-
-    if (!items.Length()) {
+    if (finalizeFunctionToRun == deferredFinalizeFunctions.Length()) {
         MOZ_ASSERT(runtime->mReleaseRunnable == this);
         runtime->mReleaseRunnable = nullptr;
     }
@@ -675,11 +727,17 @@ XPCJSRuntime::GCCallback(JSRuntime *rt, JSGCStatus status)
                 self->mReleaseRunnable->ReleaseNow(false);
 
             // Do any deferred releases of native objects.
-            if (js::WasIncrementalGC(rt))
+            if (js::WasIncrementalGC(rt)) {
                 self->ReleaseIncrementally(self->mNativesToReleaseArray);
-            else
+            } else {
                 DoDeferredRelease(self->mNativesToReleaseArray);
-
+                for (uint32_t i = 0; i < self->mDeferredFinalizeFunctions.Length(); ++i) {
+                    void* data = self->mDeferredFinalizeFunctions[i].start();
+                    if (data) {
+                        self->mDeferredFinalizeFunctions[i].run(-1, data);
+                    }
+                }
+            }
             self->GetXPConnect()->ClearGCBeforeCC();
             break;
         }
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index c0d646dbf3bb..b86c37bd2af3 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -727,6 +727,45 @@ public:
 
     bool DeferredRelease(nsISupports* obj);
 
+
+    /**
+     * Infrastructure for classes that need to defer part of the finalization
+     * until after the GC has run, for example for objects that we don't want to
+     * destroy during the GC.
+     */
+
+    // Called once before the deferred finalization starts. Should hand off the
+    // buffer with things to finalize in the return value.
+    typedef void* (*DeferredFinalizeStartFunction)();
+
+    // Called to finalize a number of objects. Slice is the number of objects to
+    // finalize, if it's -1 all objects should be finalized. data is the pointer
+    // returned by DeferredFinalizeStartFunction. Should return if it finalized
+    // all objects remaining in the buffer.
+    typedef bool (*DeferredFinalizeFunction)(int32_t slice, void* data);
+
+private:
+    struct DeferredFinalizeFunctions
+    {
+        DeferredFinalizeStartFunction start;
+        DeferredFinalizeFunction run;
+    };
+    nsAutoTArray<DeferredFinalizeFunctions, 16> mDeferredFinalizeFunctions;
+
+public:
+    // Register deferred finalization functions. Should only be called once per
+    // pair of start and run.
+    bool RegisterDeferredFinalize(DeferredFinalizeStartFunction start,
+                                  DeferredFinalizeFunction run)
+    {
+        DeferredFinalizeFunctions* item =
+            mDeferredFinalizeFunctions.AppendElement();
+        item->start = start;
+        item->run = run;
+        return true;
+    }
+
+
     JSBool GetDoingFinalization() const {return mDoingFinalization;}
 
     // Mapping of often used strings to jsid atoms that live 'forever'.

From 2a69cd7f714160fde6d8ccad127e0703af786757 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Wed, 26 Sep 2012 16:17:46 +0200
Subject: [PATCH 58/64] Fix for bug 794959 (Use the right cast in GetAs*
 functions of union types in new DOM bindings). r=bz.

--HG--
extra : rebase_source : 051181aa319edd386679119846fd61c574957b54
---
 dom/bindings/Codegen.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 4cd846a4dac5..ea965237059a 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3980,10 +3980,7 @@ class CGUnionStruct(CGThing):
   ${externalType} GetAs${name}() const
   {
     MOZ_ASSERT(Is${name}(), "Wrong type!");
-    // The cast to ${externalType} is needed to work around a bug in Apple's
-    // clang compiler, for some reason it doesn't call |S::operator T&| when
-    // casting S<T> to T& and T is forward declared.
-    return (${externalType})mValue.m${name}.Value();
+    return const_cast<${structType}&>(mValue.m${name}.Value());
   }
   ${structType}& SetAs${name}()
   {

From 6cf9f896da9e7ebc8ed4a7cdf0aafa4c1716cb5e Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Wed, 13 Jun 2012 17:18:30 +0200
Subject: [PATCH 59/64] Fix for bug 791774 (Hook DOM lists up to the new DOM
 bindings). r=bz.

--HG--
extra : rebase_source : 873020edd9cd3defc932d77bd26b5d65ebf263cb
---
 content/base/src/FragmentOrElement.cpp        |  9 ++++-
 content/base/src/nsContentList.cpp            | 37 +++++++++++++++----
 content/base/src/nsDOMFile.cpp                |  9 ++++-
 content/base/src/nsDOMSettableTokenList.cpp   | 13 ++++++-
 content/base/src/nsDOMTokenList.cpp           | 10 ++++-
 content/base/src/nsGenericElement.cpp         |  1 -
 content/events/src/nsPaintRequest.cpp         | 17 +++++++++
 content/events/src/nsPaintRequest.h           |  9 +----
 .../content/src/HTMLPropertiesCollection.cpp  | 21 ++++++++---
 content/html/content/src/nsClientRect.cpp     | 11 +++++-
 .../html/content/src/nsHTMLFormElement.cpp    | 11 ++++--
 .../html/content/src/nsHTMLSelectElement.cpp  | 11 ++++--
 .../html/content/src/nsHTMLTableElement.cpp   | 14 +++++--
 content/svg/content/src/DOMSVGLengthList.cpp  | 11 +++++-
 content/svg/content/src/DOMSVGNumberList.cpp  | 11 +++++-
 content/svg/content/src/DOMSVGPathSegList.cpp | 12 +++++-
 content/svg/content/src/DOMSVGPointList.cpp   | 11 +++++-
 .../svg/content/src/DOMSVGTransformList.cpp   | 12 +++++-
 .../test/test_SVGxxxListIndexing.xhtml        |  4 +-
 content/xbl/src/nsBindingManager.cpp          | 11 +++++-
 dom/base/nsDOMClassInfo.cpp                   |  1 +
 dom/bindings/Codegen.py                       |  1 -
 .../tests/approved/test_interfaces.html.json  | 22 +----------
 .../mochitest/chrome/test_moving_nodeList.xul |  5 ++-
 .../general/file_moving_nodeList.html         |  7 ++--
 js/xpconnect/src/dombindings.conf             |  3 +-
 js/xpconnect/src/dombindings.cpp              | 12 ++----
 js/xpconnect/src/dombindings.h                | 10 ++---
 js/xpconnect/src/dombindingsgen.py            | 26 ++++++++++---
 29 files changed, 231 insertions(+), 101 deletions(-)

diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp
index ef4dfb466e48..7075b8a3d6a6 100644
--- a/content/base/src/FragmentOrElement.cpp
+++ b/content/base/src/FragmentOrElement.cpp
@@ -99,6 +99,7 @@
 #include "nsRuleProcessorData.h"
 #include "nsAsyncDOMEvent.h"
 #include "nsTextNode.h"
+#include "mozilla/dom/NodeListBinding.h"
 #include "dombindings.h"
 
 #ifdef MOZ_XUL
@@ -389,7 +390,13 @@ JSObject*
 nsChildContentList::WrapObject(JSContext *cx, JSObject *scope,
                                bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::NodeList::create(cx, scope, this, triedToWrap);
+  JSObject* obj = NodeListBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::NodeList::create(cx, scope, this);
 }
 
 NS_IMETHODIMP
diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp
index 49502c122120..09d38db88c04 100644
--- a/content/base/src/nsContentList.cpp
+++ b/content/base/src/nsContentList.cpp
@@ -19,9 +19,9 @@
 #include "nsContentUtils.h"
 #include "nsCCUncollectableMarker.h"
 #include "nsGkAtoms.h"
-
+#include "mozilla/dom/HTMLCollectionBinding.h"
+#include "mozilla/dom/NodeListBinding.h"
 #include "dombindings.h"
-#include "mozilla/dom/BindingUtils.h"
 
 // Form related includes
 #include "nsIDOMHTMLFormElement.h"
@@ -163,7 +163,13 @@ JSObject*
 nsSimpleContentList::WrapObject(JSContext *cx, JSObject *scope,
                                 bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::NodeList::create(cx, scope, this, triedToWrap);
+  JSObject* obj = NodeListBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::NodeList::create(cx, scope, this);
 }
 
 // nsFormContentList
@@ -297,7 +303,13 @@ JSObject*
 nsCacheableFuncStringNodeList::WrapObject(JSContext *cx, JSObject *scope,
                                           bool *triedToWrap)
 {
-  return oldproxybindings::NodeList::create(cx, scope, this, triedToWrap);
+  JSObject* obj = NodeListBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::NodeList::create(cx, scope, this);
 }
 
 
@@ -305,7 +317,13 @@ JSObject*
 nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JSObject *scope,
                                                 bool *triedToWrap)
 {
-  return oldproxybindings::HTMLCollection::create(cx, scope, this, triedToWrap);
+  JSObject* obj = HTMLCollectionBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::HTMLCollection::create(cx, scope, this);
 }
 
 // Hashtable for storing nsCacheableFuncStringContentList
@@ -534,8 +552,13 @@ nsContentList::~nsContentList()
 JSObject*
 nsContentList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::HTMLCollection::create(cx, scope, this,
-                                                       triedToWrap);
+  JSObject* obj = HTMLCollectionBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::HTMLCollection::create(cx, scope, this);
 }
 
 DOMCI_DATA(ContentList, nsContentList)
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index 3cb76e555fb6..a39ec5f1a6ad 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -35,6 +35,7 @@
 
 #include "plbase64.h"
 #include "prmem.h"
+#include "mozilla/dom/FileListBinding.h"
 #include "dombindings.h"
 
 using namespace mozilla;
@@ -680,7 +681,13 @@ JSObject*
 nsDOMFileList::WrapObject(JSContext *cx, JSObject *scope,
                           bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::FileList::create(cx, scope, this, triedToWrap);
+  JSObject* obj = FileListBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::FileList::create(cx, scope, this);
 }
 
 nsIDOMFile*
diff --git a/content/base/src/nsDOMSettableTokenList.cpp b/content/base/src/nsDOMSettableTokenList.cpp
index 0f6d607444a0..39f7c893a6f5 100644
--- a/content/base/src/nsDOMSettableTokenList.cpp
+++ b/content/base/src/nsDOMSettableTokenList.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "nsDOMSettableTokenList.h"
+#include "mozilla/dom/DOMSettableTokenListBinding.h"
 #include "dombindings.h"
 
 
@@ -51,6 +52,14 @@ JSObject*
 nsDOMSettableTokenList::WrapObject(JSContext *cx, JSObject *scope,
                                    bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::DOMSettableTokenList::create(cx, scope, this,
-                                                             triedToWrap);
+  JSObject* obj = mozilla::dom::DOMSettableTokenListBinding::Wrap(cx, scope,
+                                                                  this,
+                                                                  triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::DOMSettableTokenList::create(cx, scope,
+                                                                      this);
 }
diff --git a/content/base/src/nsDOMTokenList.cpp b/content/base/src/nsDOMTokenList.cpp
index fcc1c6afcb68..b59d23b92606 100644
--- a/content/base/src/nsDOMTokenList.cpp
+++ b/content/base/src/nsDOMTokenList.cpp
@@ -12,6 +12,7 @@
 #include "nsContentUtils.h"
 #include "nsError.h"
 #include "nsGenericElement.h"
+#include "mozilla/dom/DOMTokenListBinding.h"
 #include "dombindings.h"
 #include "mozilla/ErrorResult.h"
 
@@ -312,7 +313,12 @@ nsDOMTokenList::ToString(nsAString& aResult)
 JSObject*
 nsDOMTokenList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::DOMTokenList::create(cx, scope, this,
-                                                     triedToWrap);
+  JSObject* obj = DOMTokenListBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::DOMTokenList::create(cx, scope, this);
 }
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 68e21eafa76f..82b9468464f7 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -102,7 +102,6 @@
 #include "nsRuleProcessorData.h"
 #include "nsAsyncDOMEvent.h"
 #include "nsTextNode.h"
-#include "dombindings.h"
 
 #ifdef MOZ_XUL
 #include "nsIXULDocument.h"
diff --git a/content/events/src/nsPaintRequest.cpp b/content/events/src/nsPaintRequest.cpp
index db6c1a7840b8..22ec478c8113 100644
--- a/content/events/src/nsPaintRequest.cpp
+++ b/content/events/src/nsPaintRequest.cpp
@@ -9,6 +9,8 @@
 #include "nsClientRect.h"
 #include "nsIFrame.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/PaintRequestListBinding.h"
+#include "dombindings.h"
 
 DOMCI_DATA(PaintRequest, nsPaintRequest)
 
@@ -53,6 +55,21 @@ NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPaintRequestList)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPaintRequestList)
 
+JSObject*
+nsPaintRequestList::WrapObject(JSContext *cx, JSObject *scope,
+                               bool *triedToWrap)
+{
+  JSObject* obj = mozilla::dom::PaintRequestListBinding::Wrap(cx, scope, this,
+                                                              triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::PaintRequestList::create(cx, scope,
+                                                                  this);
+}
+
 NS_IMETHODIMP    
 nsPaintRequestList::GetLength(uint32_t* aLength)
 {
diff --git a/content/events/src/nsPaintRequest.h b/content/events/src/nsPaintRequest.h
index 9b704b2f61c6..cc4e15ad7d6a 100644
--- a/content/events/src/nsPaintRequest.h
+++ b/content/events/src/nsPaintRequest.h
@@ -10,8 +10,8 @@
 #include "nsIDOMPaintRequestList.h"
 #include "nsPresContext.h"
 #include "nsIDOMEvent.h"
-#include "dombindings.h"
 #include "mozilla/Attributes.h"
+#include "nsWrapperCache.h"
 
 class nsPaintRequest MOZ_FINAL : public nsIDOMPaintRequest
 {
@@ -44,12 +44,7 @@ public:
   NS_DECL_NSIDOMPAINTREQUESTLIST
   
   virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
-                               bool *triedToWrap)
-  {
-    return mozilla::dom::oldproxybindings::PaintRequestList::create(cx, scope, this,
-                                                           triedToWrap);
-  }
-
+                               bool *triedToWrap);
   nsISupports* GetParentObject()
   {
     return mParent;
diff --git a/content/html/content/src/HTMLPropertiesCollection.cpp b/content/html/content/src/HTMLPropertiesCollection.cpp
index cce421e7edbe..5ce7325d72c5 100644
--- a/content/html/content/src/HTMLPropertiesCollection.cpp
+++ b/content/html/content/src/HTMLPropertiesCollection.cpp
@@ -12,8 +12,8 @@
 #include "nsVariant.h"
 #include "nsDOMSettableTokenList.h"
 #include "nsAttrValue.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCacheInlines.h"
+#include "mozilla/dom/HTMLPropertiesCollectionBinding.h"
 
 DOMCI_DATA(HTMLPropertiesCollection, mozilla::dom::HTMLPropertiesCollection)
 DOMCI_DATA(PropertyNodeList, mozilla::dom::PropertyNodeList)
@@ -110,8 +110,14 @@ JSObject*
 HTMLPropertiesCollection::WrapObject(JSContext* cx, JSObject* scope,
                                      bool* triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::HTMLPropertiesCollection::create(cx, scope, this,
-                                                                 triedToWrap);
+  JSObject* obj = HTMLPropertiesCollectionBinding::Wrap(cx, scope, this,
+                                                        triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::HTMLPropertiesCollection::create(cx, scope, this);
 }
 
 NS_IMETHODIMP
@@ -446,8 +452,13 @@ JSObject*
 PropertyNodeList::WrapObject(JSContext *cx, JSObject *scope,
                              bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::PropertyNodeList::create(cx, scope, this,
-                                                         triedToWrap);
+  JSObject* obj = PropertyNodeListBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::PropertyNodeList::create(cx, scope, this);
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(PropertyNodeList)
diff --git a/content/html/content/src/nsClientRect.cpp b/content/html/content/src/nsClientRect.cpp
index e2021361ed8b..53ece17b2254 100644
--- a/content/html/content/src/nsClientRect.cpp
+++ b/content/html/content/src/nsClientRect.cpp
@@ -8,6 +8,7 @@
 #include "nsDOMClassInfoID.h"
 
 #include "nsPresContext.h"
+#include "mozilla/dom/ClientRectListBinding.h"
 #include "dombindings.h"
 
 DOMCI_DATA(ClientRect, nsClientRect)
@@ -106,8 +107,14 @@ nsClientRectList::GetItemAt(uint32_t aIndex)
 JSObject*
 nsClientRectList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::ClientRectList::create(cx, scope, this,
-                                                       triedToWrap);
+  JSObject* obj = mozilla::dom::ClientRectListBinding::Wrap(cx, scope, this,
+                                                            triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::ClientRectList::create(cx, scope, this);
 }
 
 static double
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 4986e570b3a5..278f353a3f65 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -51,9 +51,9 @@
 #include "nsIConstraintValidation.h"
 
 #include "nsIDOMHTMLButtonElement.h"
+#include "mozilla/dom/HTMLCollectionBinding.h"
 #include "dombindings.h"
 #include "nsSandboxFlags.h"
-#include "mozilla/dom/BindingUtils.h"
 
 using namespace mozilla::dom;
 
@@ -125,8 +125,13 @@ public:
   virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
                                bool *triedToWrap)
   {
-    return mozilla::dom::oldproxybindings::HTMLCollection::create(cx, scope, this,
-                                                         triedToWrap);
+    JSObject* obj = HTMLCollectionBinding::Wrap(cx, scope, this, triedToWrap);
+    if (obj || *triedToWrap) {
+      return obj;
+    }
+
+    *triedToWrap = true;
+    return oldproxybindings::HTMLCollection::create(cx, scope, this);
   }
 
   nsHTMLFormElement* mForm;  // WEAK - the form owns me
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index f29544a0ba2b..5cab598ace1a 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -35,8 +35,8 @@
 #include "nsEventDispatcher.h"
 #include "mozilla/dom/Element.h"
 #include "mozAutoDocUpdate.h"
+#include "mozilla/dom/HTMLOptionsCollectionBinding.h"
 #include "dombindings.h"
-#include "mozilla/dom/BindingUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -2009,8 +2009,13 @@ JSObject*
 nsHTMLOptionCollection::WrapObject(JSContext *cx, JSObject *scope,
                                    bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::HTMLOptionsCollection::create(cx, scope, this,
-                                                              triedToWrap);
+  JSObject* obj = HTMLOptionsCollectionBinding::Wrap(cx, scope, this, triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return oldproxybindings::HTMLOptionsCollection::create(cx, scope, this);
 }
 
 NS_IMETHODIMP
diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp
index 0b6fc68d5ba2..5144b568498c 100644
--- a/content/html/content/src/nsHTMLTableElement.cpp
+++ b/content/html/content/src/nsHTMLTableElement.cpp
@@ -25,9 +25,8 @@
 #include "nsIDOMElement.h"
 #include "nsIHTMLCollection.h"
 #include "nsHTMLStyleSheet.h"
+#include "mozilla/dom/HTMLCollectionBinding.h"
 #include "dombindings.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/BindingUtils.h"
 
 using namespace mozilla;
 
@@ -62,8 +61,15 @@ public:
   virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
                                bool *triedToWrap)
   {
-    return mozilla::dom::oldproxybindings::HTMLCollection::create(cx, scope, this,
-                                                         triedToWrap);
+    JSObject* obj = mozilla::dom::HTMLCollectionBinding::Wrap(cx, scope, this,
+                                                              triedToWrap);
+    if (obj || *triedToWrap) {
+      return obj;
+    }
+
+    *triedToWrap = true;
+    return mozilla::dom::oldproxybindings::HTMLCollection::create(cx, scope,
+                                                                  this);
   }
 
 protected:
diff --git a/content/svg/content/src/DOMSVGLengthList.cpp b/content/svg/content/src/DOMSVGLengthList.cpp
index 4dc04ddb459d..415e56ece9d7 100644
--- a/content/svg/content/src/DOMSVGLengthList.cpp
+++ b/content/svg/content/src/DOMSVGLengthList.cpp
@@ -10,6 +10,7 @@
 #include "SVGAnimatedLengthList.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/SVGLengthListBinding.h"
 #include "dombindings.h"
 
 // See the comment in this file's header.
@@ -76,8 +77,14 @@ NS_INTERFACE_MAP_END
 JSObject*
 DOMSVGLengthList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::SVGLengthList::create(cx, scope, this,
-                                                      triedToWrap);
+  JSObject* obj = mozilla::dom::SVGLengthListBinding::Wrap(cx, scope, this,
+                                                           triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::SVGLengthList::create(cx, scope, this);
 }
 
 nsIDOMSVGLength*
diff --git a/content/svg/content/src/DOMSVGNumberList.cpp b/content/svg/content/src/DOMSVGNumberList.cpp
index d1a5f5acbf37..7caaeecf70d8 100644
--- a/content/svg/content/src/DOMSVGNumberList.cpp
+++ b/content/svg/content/src/DOMSVGNumberList.cpp
@@ -10,6 +10,7 @@
 #include "SVGAnimatedNumberList.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/SVGNumberListBinding.h"
 #include "dombindings.h"
 
 // See the comment in this file's header.
@@ -77,8 +78,14 @@ NS_INTERFACE_MAP_END
 JSObject*
 DOMSVGNumberList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::SVGNumberList::create(cx, scope, this,
-                                                      triedToWrap);
+  JSObject* obj = mozilla::dom::SVGNumberListBinding::Wrap(cx, scope, this,
+                                                           triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::SVGNumberList::create(cx, scope, this);
 }
 
 nsIDOMSVGNumber*
diff --git a/content/svg/content/src/DOMSVGPathSegList.cpp b/content/svg/content/src/DOMSVGPathSegList.cpp
index 5e13c0cdc311..a104a44866ac 100644
--- a/content/svg/content/src/DOMSVGPathSegList.cpp
+++ b/content/svg/content/src/DOMSVGPathSegList.cpp
@@ -11,6 +11,7 @@
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "SVGPathSegUtils.h"
+#include "mozilla/dom/SVGPathSegListBinding.h"
 #include "dombindings.h"
 #include "nsContentUtils.h"
 
@@ -83,8 +84,15 @@ DOMSVGPathSegList::~DOMSVGPathSegList()
 JSObject*
 DOMSVGPathSegList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::SVGPathSegList::create(cx, scope, this,
-                                                       triedToWrap);
+  JSObject* obj = mozilla::dom::SVGPathSegListBinding::Wrap(cx, scope, this,
+                                                            triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::SVGPathSegList::create(cx, scope,
+                                                                this);
 }
 
 nsIDOMSVGPathSeg*
diff --git a/content/svg/content/src/DOMSVGPointList.cpp b/content/svg/content/src/DOMSVGPointList.cpp
index 650284e1ddb2..a9686044dc2e 100644
--- a/content/svg/content/src/DOMSVGPointList.cpp
+++ b/content/svg/content/src/DOMSVGPointList.cpp
@@ -11,6 +11,7 @@
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/SVGPointListBinding.h"
 #include "dombindings.h"
 
 // See the comment in this file's header.
@@ -102,8 +103,14 @@ DOMSVGPointList::~DOMSVGPointList()
 JSObject*
 DOMSVGPointList::WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::SVGPointList::create(cx, scope, this,
-                                                     triedToWrap);
+  JSObject* obj = mozilla::dom::SVGPointListBinding::Wrap(cx, scope, this,
+                                                          triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::SVGPointList::create(cx, scope, this);
 }
 
 nsIDOMSVGPoint*
diff --git a/content/svg/content/src/DOMSVGTransformList.cpp b/content/svg/content/src/DOMSVGTransformList.cpp
index 3c94bd1347be..04d16b00c34c 100644
--- a/content/svg/content/src/DOMSVGTransformList.cpp
+++ b/content/svg/content/src/DOMSVGTransformList.cpp
@@ -9,6 +9,7 @@
 #include "SVGAnimatedTransformList.h"
 #include "nsSVGElement.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/SVGTransformListBinding.h"
 #include "dombindings.h"
 #include "nsError.h"
 
@@ -77,8 +78,15 @@ JSObject*
 DOMSVGTransformList::WrapObject(JSContext *cx, JSObject *scope,
                                 bool *triedToWrap)
 {
-  return mozilla::dom::oldproxybindings::SVGTransformList::create(cx, scope, this,
-                                                         triedToWrap);
+  JSObject* obj = mozilla::dom::SVGTransformListBinding::Wrap(cx, scope, this,
+                                                              triedToWrap);
+  if (obj || *triedToWrap) {
+    return obj;
+  }
+
+  *triedToWrap = true;
+  return mozilla::dom::oldproxybindings::SVGTransformList::create(cx, scope,
+                                                                  this);
 }
 
 nsIDOMSVGTransform*
diff --git a/content/svg/content/test/test_SVGxxxListIndexing.xhtml b/content/svg/content/test/test_SVGxxxListIndexing.xhtml
index 7f0c5bf77bb3..10f6f1ba57fa 100644
--- a/content/svg/content/test/test_SVGxxxListIndexing.xhtml
+++ b/content/svg/content/test/test_SVGxxxListIndexing.xhtml
@@ -25,12 +25,12 @@ var text = document.getElementById("text"),
 function CheckList(aListObject, aExpectedListLength, aListDescription)
 {
   is(aListObject.numberOfItems, aExpectedListLength, aListDescription + ".numberOfItems");
-  is(aListObject.numberOfItems, aExpectedListLength, aListDescription + ".length");
+  is(aListObject.length, aExpectedListLength, aListDescription + ".length");
   for (let i = 0; i < aListObject.length; i++) {
     let item = aListObject.getItem(i);
     ok(aListObject[i] === item, aListDescription + "[" + i + "]");
   }
-  ok(aListObject[aListObject.length] === void 0, aListDescription + "[outOfBounds]");
+  is(typeof(aListObject[aListObject.length]), "undefined", aListDescription + "[outOfBounds]");
 }
 
 var tests = [
diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp
index 86cf1ec1966a..baf3aee09e36 100644
--- a/content/xbl/src/nsBindingManager.cpp
+++ b/content/xbl/src/nsBindingManager.cpp
@@ -43,6 +43,7 @@
 #include "nsBindingManager.h"
 
 #include "nsThreadUtils.h"
+#include "mozilla/dom/NodeListBinding.h"
 #include "dombindings.h"
 
 // ==================================================================
@@ -79,8 +80,14 @@ public:
   virtual JSObject* WrapObject(JSContext *cx, JSObject *scope,
                                bool *triedToWrap)
   {
-    return mozilla::dom::oldproxybindings::NodeList::create(cx, scope, this,
-                                                   triedToWrap);
+    JSObject* obj = mozilla::dom::NodeListBinding::Wrap(cx, scope, this,
+                                                        triedToWrap);
+    if (obj || *triedToWrap) {
+      return obj;
+    }
+
+    *triedToWrap = true;
+    return mozilla::dom::oldproxybindings::NodeList::create(cx, scope, this);
   }
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_ANONYMOUS_CONTENT_LIST_IID)
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 812b23e41e65..5966a481fb6a 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -554,6 +554,7 @@ using mozilla::dom::indexedDB::IDBWrapperCache;
 #include "WebGLContext.h"
 #include "nsICanvasRenderingContextInternal.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/HTMLCollectionBinding.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index ea965237059a..75e684e75ff2 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -4862,7 +4862,6 @@ class CGDOMJSProxyHandler_defineProperty(ClassMethod):
                     "  if (found) {\n"
                     "    return ThrowErrorMessage(cx, MSG_NO_PROPERTY_SETTER, \"%s\");\n" +
                     "  }\n" +
-                    "  return true;\n"
                     "}\n") % (self.descriptor.nativeType, self.descriptor.name)
         return set + """return mozilla::dom::DOMProxyHandler::defineProperty(%s);""" % ", ".join(a.name for a in self.args)
 
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json b/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json
index f054d7da6c9c..a6c9f463dd0a 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json
+++ b/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json
@@ -437,29 +437,9 @@
   "NodeFilter interface: constant SHOW_DOCUMENT_FRAGMENT on interface prototype object": true,
   "NodeFilter interface: constant SHOW_NOTATION on interface prototype object": true,
   "NodeFilter interface: operation acceptNode(Node)": true,
-  "NodeList interface: existence and properties of interface object": true,
-  "NodeList interface: existence and properties of interface prototype object": true,
-  "NodeList interface: attribute length": true,
-  "NodeList interface: calling item(unsigned long) on document.querySelectorAll(\"script\") with too few arguments must throw TypeError": true,
-  "HTMLCollection interface: existence and properties of interface object": true,
-  "HTMLCollection interface: existence and properties of interface prototype object": true,
-  "HTMLCollection interface: attribute length": true,
-  "HTMLCollection interface: calling item(unsigned long) on document.body.children with too few arguments must throw TypeError": true,
-  "HTMLCollection interface: calling namedItem(DOMString) on document.body.children with too few arguments must throw TypeError": true,
   "DOMStringList interface: existence and properties of interface object": true,
   "DOMStringList interface: existence and properties of interface prototype object": true,
   "DOMStringList interface: existence and properties of interface prototype object's \"constructor\" property": true,
   "DOMStringList interface: attribute length": true,
-  "DOMTokenList interface: existence and properties of interface object": true,
-  "DOMTokenList interface: existence and properties of interface prototype object": true,
-  "DOMTokenList interface: attribute length": true,
-  "Stringification of document.body.classList": true,
-  "DOMTokenList interface: calling item(unsigned long) on document.body.classList with too few arguments must throw TypeError": true,
-  "DOMTokenList interface: calling contains(DOMString) on document.body.classList with too few arguments must throw TypeError": true,
-  "DOMTokenList interface: calling add(DOMString) on document.body.classList with too few arguments must throw TypeError": true,
-  "DOMTokenList interface: calling remove(DOMString) on document.body.classList with too few arguments must throw TypeError": true,
-  "DOMTokenList interface: calling toggle(DOMString) on document.body.classList with too few arguments must throw TypeError": true,
-  "DOMSettableTokenList interface: existence and properties of interface object": true,
-  "DOMSettableTokenList interface: existence and properties of interface prototype object": true,
-  "DOMSettableTokenList interface: attribute value": true
+  "Stringification of document.body.classList": true
 }
diff --git a/dom/tests/mochitest/chrome/test_moving_nodeList.xul b/dom/tests/mochitest/chrome/test_moving_nodeList.xul
index 28e4b247e3c0..9762ceddac20 100644
--- a/dom/tests/mochitest/chrome/test_moving_nodeList.xul
+++ b/dom/tests/mochitest/chrome/test_moving_nodeList.xul
@@ -28,9 +28,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=684115
         ok(!("expando" in nodeList), "shouldn't be able to see expandos on the NodeList");
         nodeList = firstWindow.wrappedJSObject.getNodeList();
         ok(("expando" in nodeList), "should be able to see expandos on the NodeList");
-        is(nodeList.selectedIndex, -1, "can access selectedIndex in chrome");
+        options = firstWindow.wrappedJSObject.getOptions();
+        is(options.selectedIndex, -1, "can access selectedIndex in chrome");
         secondWindow.wrappedJSObject.tryToUseNodeList(nodeList, ok);
-        nodeList = document.createElementNS("http://www.w3.org/1999/xhtml", "select").options;
+        nodeList = document.childNodes;
         secondWindow.wrappedJSObject.tryToUseNodeList(nodeList, ok);
         SimpleTest.finish();
       }
diff --git a/dom/tests/mochitest/general/file_moving_nodeList.html b/dom/tests/mochitest/general/file_moving_nodeList.html
index 49b633b81bf9..2456c6e689f6 100644
--- a/dom/tests/mochitest/general/file_moving_nodeList.html
+++ b/dom/tests/mochitest/general/file_moving_nodeList.html
@@ -4,9 +4,10 @@
             document.childNodes.expando = "foo";
 
             function getNodeList() {
-                var nodeList = document.createElement("select").options;
-                nodeList.expando = "foo";
-                return nodeList;
+                return document.childNodes;
+            }
+            function getOptions() {
+                return document.createElement("select").options;
             }
 
             function tryToUseNodeList(nodeList, ok) {
diff --git a/js/xpconnect/src/dombindings.conf b/js/xpconnect/src/dombindings.conf
index 4286da92afb7..f53b1494fc77 100644
--- a/js/xpconnect/src/dombindings.conf
+++ b/js/xpconnect/src/dombindings.conf
@@ -10,7 +10,8 @@ list_classes = [
     },
     {
         'name': 'PropertyNodeList',
-        'nativeClass': 'mozilla::dom::PropertyNodeList'
+        'nativeClass': 'mozilla::dom::PropertyNodeList',
+        'newBindingHeader': 'mozilla/dom/HTMLPropertiesCollectionBinding.h'
     },
     {
         'name': 'HTMLCollection',
diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
index 530f52181add..528164d1edf7 100644
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -323,10 +323,8 @@ js::Class sInterfacePrototypeClass = {
 
 template<class LC>
 JSObject *
-ListBase<LC>::getPrototype(JSContext *cx, JSObject *receiver, bool *enabled)
+ListBase<LC>::getPrototype(JSContext *cx, JSObject *receiver)
 {
-    *enabled = true;
-
     XPCWrappedNativeScope *scope =
         XPCWrappedNativeScope::FindInJSObjectScope(cx, receiver);
     if (!scope)
@@ -405,10 +403,8 @@ ListBase<LC>::getPrototype(JSContext *cx, XPCWrappedNativeScope *scope,
 template<class LC>
 JSObject *
 ListBase<LC>::create(JSContext *cx, JSObject *scope, ListType *aList,
-                     nsWrapperCache* aWrapperCache, bool *triedToWrap)
+                     nsWrapperCache* aWrapperCache)
 {
-    *triedToWrap = true;
-
     JSObject *parent = WrapNativeParent(cx, scope, aList->GetParentObject());
     if (!parent)
         return NULL;
@@ -416,9 +412,7 @@ ListBase<LC>::create(JSContext *cx, JSObject *scope, ListType *aList,
     JSObject *global = js::GetGlobalForObjectCrossCompartment(parent);
     JSAutoCompartment ac(cx, global);
 
-    JSObject *proto = getPrototype(cx, global, triedToWrap);
-    if (!proto && !*triedToWrap)
-        aWrapperCache->ClearIsDOMBinding();
+    JSObject *proto = getPrototype(cx, global);
     if (!proto)
         return NULL;
     JSObject *obj = NewProxyObject(cx, &ListBase<LC>::instance,
diff --git a/js/xpconnect/src/dombindings.h b/js/xpconnect/src/dombindings.h
index 040a963fdea5..70e04deb2304 100644
--- a/js/xpconnect/src/dombindings.h
+++ b/js/xpconnect/src/dombindings.h
@@ -151,14 +151,10 @@ private:
 
 public:
     static JSObject *create(JSContext *cx, JSObject *scope, ListType *list,
-                            nsWrapperCache* cache, bool *triedToWrap);
-
-    static JSObject *getPrototype(JSContext *cx, JSObject *receiver, bool *enabled);
-    static bool DefineDOMInterface(JSContext *cx, JSObject *receiver, bool *enabled)
-    {
-        return !!getPrototype(cx, receiver, enabled);
-    }
+                            nsWrapperCache* cache);
 
+    static JSObject *getPrototype(JSContext *cx, JSObject *receiver);
+    static bool DefineDOMInterface(JSContext *cx, JSObject *receiver, bool *enabled);
     bool getPropertyDescriptor(JSContext *cx, JSObject *proxy, jsid id, bool set,
                                JSPropertyDescriptor *desc);
     bool getOwnPropertyDescriptor(JSContext *cx, JSObject *proxy, jsid id, bool set,
diff --git a/js/xpconnect/src/dombindingsgen.py b/js/xpconnect/src/dombindingsgen.py
index 98e9eb5b6a93..ffc9b1e8690e 100644
--- a/js/xpconnect/src/dombindingsgen.py
+++ b/js/xpconnect/src/dombindingsgen.py
@@ -206,11 +206,13 @@ class Configuration:
         if 'list_classes' not in config:
             raise UserError(filename + ": `%s` was not defined." % name)
         self.list_classes = {}
+        self.newBindingHeaders = []
         for clazz in config['list_classes']:
             self.list_classes[clazz['name']] = \
                 DOMClass(name = clazz['name'],
                          nativeClass = clazz['nativeClass'],
                          prefable = False)
+            self.newBindingHeaders.append(clazz.get('newBindingHeader', "mozilla/dom/" + clazz['name'] + "Binding.h"))
 
         # optional settings
         if 'prefableClasses' in config:
@@ -329,16 +331,16 @@ listDefinitionTemplate = (
 "class ${name} {\n"
 "public:\n"
 "    template<typename I>\n"
-"    static JSObject *create(JSContext *cx, JSObject *scope, I *list, bool *triedToWrap)\n"
+"    static JSObject *create(JSContext *cx, JSObject *scope, I *list)\n"
 "    {\n"
-"        return create(cx, scope, list, list, triedToWrap);\n"
+"        return create(cx, scope, list, list);\n"
 "    }\n"
 "\n"
 "    static bool objIsWrapper(JSObject *obj);\n"
 "    static ${nativeClass} *getNative(JSObject *obj);\n"
 "\n"
 "private:\n"
-"    static JSObject *create(JSContext *cx, JSObject *scope, ${nativeClass} *list, nsWrapperCache *cache, bool *triedToWrap);\n"
+"    static JSObject *create(JSContext *cx, JSObject *scope, ${nativeClass} *list, nsWrapperCache *cache);\n"
 "};"
 "\n"
 "\n")
@@ -434,6 +436,18 @@ listTemplate = (
 "    interface_hasInstance,\n"
 "    NULL                    /* construct   */\n"
 "};\n"
+"\n"
+"// static\n"
+"template<>\n"
+"bool\n"
+"${name}Wrapper::DefineDOMInterface(JSContext *cx, JSObject *receiver, bool *enabled)\n"
+"{\n"
+"  bool ok = mozilla::dom::${name}Binding::DefineDOMInterface(cx, receiver, enabled);\n"
+"  if (ok || *enabled) {\n"
+"    return ok;\n"
+"  }\n"
+"  return getPrototype(cx, receiver);\n"
+"}\n"
 "\n")
 
 derivedClassTemplate = (
@@ -554,9 +568,9 @@ listTemplateFooter = (
 "template class ListBase<${name}Class>;\n"
 "\n"
 "JSObject*\n"
-"${name}::create(JSContext *cx, JSObject *scope, ${nativeClass} *list, nsWrapperCache *cache, bool *triedToWrap)\n"
+"${name}::create(JSContext *cx, JSObject *scope, ${nativeClass} *list, nsWrapperCache *cache)\n"
 "{\n"
-"    return ${name}Wrapper::create(cx, scope, list, cache, triedToWrap);\n"
+"    return ${name}Wrapper::create(cx, scope, list, cache);\n"
 "}\n"
 "\n"
 "bool\n"
@@ -634,6 +648,8 @@ def writeStubFile(filename, config, interfaces):
                         addType(types, p.realtype, config.irregularFilenames)
 
         f.write("".join([("#include \"%s.h\"\n" % re.sub(r'(([^:]+::)*)', '', type)) for type in sorted(types)]))
+        for newBindingHeader in config.newBindingHeaders:
+            f.write("#include \"" + newBindingHeader + "\"\n")
         f.write("\n")
 
         f.write("namespace mozilla {\n"

From ce08364d0f726c9a2e7e358131098bdd07aaecd0 Mon Sep 17 00:00:00 2001
From: Mark Goodwin <mgoodwin@mozilla.com>
Date: Mon, 1 Oct 2012 10:10:29 +0100
Subject: [PATCH 60/64] Bug 770099 - Send CSP policy and report information to
 Web Console (Part 1); r=dveditz,msucan,jwalker

---
 content/base/src/CSPUtils.jsm             | 361 +++++++++++++++-------
 content/base/src/contentSecurityPolicy.js |  52 +---
 content/base/test/unit/test_csputils.js   |  41 +--
 3 files changed, 277 insertions(+), 177 deletions(-)

diff --git a/content/base/src/CSPUtils.jsm b/content/base/src/CSPUtils.jsm
index ca0bbd6a9b17..c2fb1d5a09cd 100644
--- a/content/base/src/CSPUtils.jsm
+++ b/content/base/src/CSPUtils.jsm
@@ -11,6 +11,7 @@
  */
 
 const Cu = Components.utils;
+const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -20,17 +21,16 @@ XPCOMUtils.defineLazyModuleGetter(this, "Services",
 
 // Module stuff
 var EXPORTED_SYMBOLS = ["CSPRep", "CSPSourceList", "CSPSource", "CSPHost",
-                        "CSPWarning", "CSPError", "CSPdebug",
-                        "CSPViolationReportListener", "CSPLocalizer"];
+                        "CSPdebug", "CSPViolationReportListener", "CSPLocalizer"];
 
 var STRINGS_URI = "chrome://global/locale/security/csp.properties";
 
 // these are not exported
 var gIoService = Components.classes["@mozilla.org/network/io-service;1"]
-                 .getService(Components.interfaces.nsIIOService);
+                 .getService(Ci.nsIIOService);
 
 var gETLDService = Components.classes["@mozilla.org/network/effective-tld-service;1"]
-                   .getService(Components.interfaces.nsIEffectiveTLDService);
+                   .getService(Ci.nsIEffectiveTLDService);
 
 // These regexps represent the concrete syntax on the w3 spec as of 7-5-2012
 // scheme          = <scheme production from RFC 3986>
@@ -76,58 +76,30 @@ var gPrefObserver = {
 
   _initialize: function() {
     var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
-                    .getService(Components.interfaces.nsIPrefService);
+                    .getService(Ci.nsIPrefService);
     this._branch = prefSvc.getBranch("security.csp.");
     this._branch.addObserver("", this, false);
     this._debugEnabled = this._branch.getBoolPref("debug");
   },
 
   unregister: function() {
-    if(!this._branch) return;
+    if (!this._branch) return;
     this._branch.removeObserver("", this);
   },
 
   observe: function(aSubject, aTopic, aData) {
-    if(aTopic != "nsPref:changed") return;
-    if(aData === "debug")
+    if (aTopic != "nsPref:changed") return;
+    if (aData === "debug")
       this._debugEnabled = this._branch.getBoolPref("debug");
   },
-
 };
 
-
-function CSPWarning(aMsg, aWindowID, aSource, aScriptSample, aLineNum) {
-  var textMessage = 'CSP WARN:  ' + aMsg + "\n";
-
-  var consoleMsg = Components.classes["@mozilla.org/scripterror;1"]
-                    .createInstance(Components.interfaces.nsIScriptError);
-  consoleMsg.initWithWindowID(textMessage, aSource, aScriptSample, aLineNum, 0,
-                  Components.interfaces.nsIScriptError.warningFlag,
-                  "Content Security Policy", aWindowID);
-  Components.classes["@mozilla.org/consoleservice;1"]
-                    .getService(Components.interfaces.nsIConsoleService)
-                    .logMessage(consoleMsg);
-}
-
-function CSPError(aMsg, aWindowID) {
-  var textMessage = 'CSP ERROR:  ' + aMsg + "\n";
-
-  var consoleMsg = Components.classes["@mozilla.org/scripterror;1"]
-                    .createInstance(Components.interfaces.nsIScriptError);
-  consoleMsg.initWithWindowID(textMessage, null, null, 0, 0,
-                  Components.interfaces.nsIScriptError.errorFlag,
-                  "Content Security Policy", aWindowID);
-  Components.classes["@mozilla.org/consoleservice;1"]
-                    .getService(Components.interfaces.nsIConsoleService)
-                    .logMessage(consoleMsg);
-}
-
 function CSPdebug(aMsg) {
   if (!gPrefObserver.debugEnabled) return;
 
   aMsg = 'CSP debug: ' + aMsg + "\n";
   Components.classes["@mozilla.org/consoleservice;1"]
-                    .getService(Components.interfaces.nsIConsoleService)
+                    .getService(Ci.nsIConsoleService)
                     .logStringMessage(aMsg);
 }
 
@@ -138,16 +110,16 @@ function CSPPolicyURIListener(policyURI, docRequest, csp) {
   this._csp = csp;                // parent document's CSP
   this._policy = "";              // contents fetched from policyURI
   this._wrapper = null;           // nsIScriptableInputStream
-  this._docURI = docRequest.QueryInterface(Components.interfaces.nsIChannel)
+  this._docURI = docRequest.QueryInterface(Ci.nsIChannel)
                  .URI;    // parent document URI (to be used as 'self')
 }
 
 CSPPolicyURIListener.prototype = {
 
   QueryInterface: function(iid) {
-    if (iid.equals(Components.interfaces.nsIStreamListener) ||
-        iid.equals(Components.interfaces.nsIRequestObserver) ||
-        iid.equals(Components.interfaces.nsISupports))
+    if (iid.equals(Ci.nsIStreamListener) ||
+        iid.equals(Ci.nsIRequestObserver) ||
+        iid.equals(Ci.nsISupports))
       return this;
     throw Components.results.NS_ERROR_NO_INTERFACE;
   },
@@ -159,7 +131,7 @@ CSPPolicyURIListener.prototype = {
   function(request, context, inputStream, offset, count) {
     if (this._wrapper == null) {
       this._wrapper = Components.classes["@mozilla.org/scriptableinputstream;1"]
-                      .createInstance(Components.interfaces.nsIScriptableInputStream);
+                      .createInstance(Ci.nsIScriptableInputStream);
       this._wrapper.init(inputStream);
     }
     // store the remote policy as it becomes available
@@ -241,9 +213,10 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
   var UD = CSPRep.URI_DIRECTIVES;
   var aCSPR = new CSPRep();
   aCSPR._originalText = aStr;
+  aCSPR._innerWindowID = innerWindowFromRequest(docRequest);
 
   var selfUri = null;
-  if (self instanceof Components.interfaces.nsIURI)
+  if (self instanceof Ci.nsIURI)
     selfUri = self.clone();
 
   var dirs = aStr.split(";");
@@ -258,7 +231,8 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
 
     if (aCSPR._directives.hasOwnProperty(dirname)) {
       // Check for (most) duplicate directives
-      CSPError(CSPLocalizer.getFormatStr("duplicateDirective", [dirname]));
+      cspError(aCSPR, CSPLocalizer.getFormatStr("duplicateDirective",
+                                                [dirname]));
       CSPdebug("Skipping duplicate directive: \"" + dir + "\"");
       continue directive;
     }
@@ -267,7 +241,8 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
     if (dirname === CSPRep.OPTIONS_DIRECTIVE) {
       if (aCSPR._allowInlineScripts || aCSPR._allowEval) {
         // Check for duplicate options directives
-        CSPError(CSPLocalizer.getFormatStr("duplicateDirective", [dirname]));
+        cspError(aCSPR, CSPLocalizer.getFormatStr("duplicateDirective",
+                                                  [dirname]));
         CSPdebug("Skipping duplicate directive: \"" + dir + "\"");
         continue directive;
       }
@@ -280,7 +255,8 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
         else if (opt === "eval-script")
           aCSPR._allowEval = true;
         else
-          CSPWarning(CSPLocalizer.getFormatStr("doNotUnderstandOption", [opt]));
+          cspWarn(aCSPR, CSPLocalizer.getFormatStr("doNotUnderstandOption",
+                                                   [opt]));
       }
       continue directive;
     }
@@ -289,14 +265,15 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
     // parse "allow" as equivalent to "default-src", at least until the spec
     // stabilizes, at which time we can stop parsing "allow"
     if (dirname === CSPRep.ALLOW_DIRECTIVE) {
-      CSPWarning(CSPLocalizer.getStr("allowDirectiveDeprecated"));
+      cspWarn(aCSPR, CSPLocalizer.getStr("allowDirectiveDeprecated"));
       if (aCSPR._directives.hasOwnProperty(SD.DEFAULT_SRC)) {
         // Check for duplicate default-src and allow directives
-        CSPError(CSPLocalizer.getFormatStr("duplicateDirective", [dirname]));
+        cspError(aCSPR, CSPLocalizer.getFormatStr("duplicateDirective",
+                                                  [dirname]));
         CSPdebug("Skipping duplicate directive: \"" + dir + "\"");
         continue directive;
       }
-      var dv = CSPSourceList.fromString(dirvalue, self, true);
+      var dv = CSPSourceList.fromString(dirvalue, aCSPR, self, true);
       if (dv) {
         aCSPR._directives[SD.DEFAULT_SRC] = dv;
         continue directive;
@@ -307,7 +284,7 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
     for each(var sdi in SD) {
       if (dirname === sdi) {
         // process dirs, and enforce that 'self' is defined.
-        var dv = CSPSourceList.fromString(dirvalue, self, true);
+        var dv = CSPSourceList.fromString(dirvalue, aCSPR, self, true);
         if (dv) {
           aCSPR._directives[sdi] = dv;
           continue directive;
@@ -340,18 +317,19 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
           if (self) {
             if (gETLDService.getBaseDomain(uri) !==
                 gETLDService.getBaseDomain(selfUri)) {
-              CSPWarning(CSPLocalizer.getFormatStr("notETLDPlus1",
-                         [gETLDService.getBaseDomain(uri)]));
+              cspWarn(aCSPR,
+                      CSPLocalizer.getFormatStr("notETLDPlus1",
+                                            [gETLDService.getBaseDomain(uri)]));
               continue;
             }
             if (!uri.schemeIs(selfUri.scheme)) {
-              CSPWarning(CSPLocalizer.getFormatStr("notSameScheme",
-                         [uri.asciiSpec]));
+              cspWarn(aCSPR, CSPLocalizer.getFormatStr("notSameScheme",
+                                                       [uri.asciiSpec]));
               continue;
             }
             if (uri.port && uri.port !== selfUri.port) {
-              CSPWarning(CSPLocalizer.getFormatStr("notSamePort",
-                         [uri.asciiSpec]));
+              cspWarn(aCSPR, CSPLocalizer.getFormatStr("notSamePort",
+                                                       [uri.asciiSpec]));
               continue;
             }
           }
@@ -360,15 +338,16 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
             case Components.results.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS:
             case Components.results.NS_ERROR_HOST_IS_IP_ADDRESS:
               if (uri.host !== selfUri.host) {
-                CSPWarning(CSPLocalizer.getFormatStr("pageCannotSendReportsTo",
-                         [selfUri.host, uri.host]));
+                cspWarn(aCSPR,
+                        CSPLocalizer.getFormatStr("pageCannotSendReportsTo",
+                                                  [selfUri.host, uri.host]));
                 continue;
               }
               break;
 
             default:
-              CSPWarning(CSPLocalizer.getFormatStr("couldNotParseReportURI",
-                        [uriStrings[i]]));
+              cspWarn(aCSPR, CSPLocalizer.getFormatStr("couldNotParseReportURI",
+                                                       [uriStrings[i]]));
               continue;
           }
         }
@@ -383,13 +362,13 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
     if (dirname === UD.POLICY_URI) {
       // POLICY_URI can only be alone
       if (aCSPR._directives.length > 0 || dirs.length > 1) {
-        CSPError(CSPLocalizer.getStr("policyURINotAlone"));
+        cspError(aCSPR, CSPLocalizer.getStr("policyURINotAlone"));
         return CSPRep.fromString("default-src 'none'");
       }
       // if we were called without a reference to the parent document request
       // we won't be able to suspend it while we fetch the policy -> fail closed
       if (!docRequest || !csp) {
-        CSPError(CSPLocalizer.getStr("noParentRequest"));
+        cspError(aCSPR, CSPLocalizer.getStr("noParentRequest"));
         return CSPRep.fromString("default-src 'none'");
       }
 
@@ -397,22 +376,26 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
       try {
         uri = gIoService.newURI(dirvalue, null, selfUri);
       } catch(e) {
-        CSPError(CSPLocalizer.getFormatStr("policyURIParseError", [dirvalue]));
+        cspError(aCSPR, CSPLocalizer.getFormatStr("policyURIParseError",
+                                                  [dirvalue]));
         return CSPRep.fromString("default-src 'none'");
       }
 
       // Verify that policy URI comes from the same origin
       if (selfUri) {
-        if (selfUri.host !== uri.host){
-          CSPError(CSPLocalizer.getFormatStr("nonMatchingHost", [uri.host]));
+        if (selfUri.host !== uri.host) {
+          cspError(aCSPR, CSPLocalizer.getFormatStr("nonMatchingHost",
+                                                    [uri.host]));
           return CSPRep.fromString("default-src 'none'");
         }
-        if (selfUri.port !== uri.port){
-          CSPError(CSPLocalizer.getFormatStr("nonMatchingPort", [uri.port.toString()]));
+        if (selfUri.port !== uri.port) {
+          cspError(aCSPR, CSPLocalizer.getFormatStr("nonMatchingPort",
+                                                    [uri.port.toString()]));
           return CSPRep.fromString("default-src 'none'");
         }
-        if (selfUri.scheme !== uri.scheme){
-          CSPError(CSPLocalizer.getFormatStr("nonMatchingScheme", [uri.scheme]));
+        if (selfUri.scheme !== uri.scheme) {
+          cspError(aCSPR, CSPLocalizer.getFormatStr("nonMatchingScheme",
+                                                    [uri.scheme]));
           return CSPRep.fromString("default-src 'none'");
         }
       }
@@ -423,13 +406,14 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
         var chan = gIoService.newChannel(uri.asciiSpec, null, null);
         // make request anonymous (no cookies, etc.) so the request for the
         // policy-uri can't be abused for CSRF
-        chan.loadFlags |= Components.interfaces.nsIChannel.LOAD_ANONYMOUS;
+        chan.loadFlags |= Ci.nsIChannel.LOAD_ANONYMOUS;
         chan.asyncOpen(new CSPPolicyURIListener(uri, docRequest, csp), null);
       }
       catch (e) {
         // resume the document request and apply most restrictive policy
         docRequest.resume();
-        CSPError(CSPLocalizer.getFormatStr("errorFetchingPolicy", [e.toString()]));
+        cspError(aCSPR, CSPLocalizer.getFormatStr("errorFetchingPolicy",
+                                                  [e.toString()]));
         return CSPRep.fromString("default-src 'none'");
       }
 
@@ -439,7 +423,8 @@ CSPRep.fromString = function(aStr, self, docRequest, csp) {
     }
 
     // UNIDENTIFIED DIRECTIVE /////////////////////////////////////////////
-    CSPWarning(CSPLocalizer.getFormatStr("couldNotProcessUnknownDirective", [dirname]));
+    cspWarn(aCSPR, CSPLocalizer.getFormatStr("couldNotProcessUnknownDirective",
+                                             [dirname]));
 
   } // end directive: loop
 
@@ -511,7 +496,7 @@ CSPRep.prototype = {
     // GLOBALLY ALLOW "about:" SCHEME
     if (aURI instanceof String && aURI.substring(0,6) === "about:")
       return true;
-    if (aURI instanceof Components.interfaces.nsIURI && aURI.scheme === "about")
+    if (aURI instanceof Ci.nsIURI && aURI.scheme === "about")
       return true;
 
     // make sure the context is valid
@@ -563,6 +548,9 @@ CSPRep.prototype = {
 
     newRep._allowInlineScripts = this.allowsInlineScripts
                            && aCSPRep.allowsInlineScripts;
+ 
+    newRep._innerWindowID = this._innerWindowID ?
+                              this._innerWindowID : aCSPRep._innerWindowID;
 
     return newRep;
   },
@@ -578,7 +566,7 @@ CSPRep.prototype = {
     var SD = CSPRep.SRC_DIRECTIVES;
     var defaultSrcDir = this._directives[SD.DEFAULT_SRC];
     if (!defaultSrcDir) {
-      CSPWarning(CSPLocalizer.getStr("allowOrDefaultSrcRequired"));
+      this.warn(CSPLocalizer.getStr("allowOrDefaultSrcRequired"));
       return false;
     }
 
@@ -589,7 +577,7 @@ CSPRep.prototype = {
         // implicit directive, make explicit.
         // All but frame-ancestors directive inherit from 'allow' (bug 555068)
         if (dirv === SD.FRAME_ANCESTORS)
-          this._directives[dirv] = CSPSourceList.fromString("*");
+          this._directives[dirv] = CSPSourceList.fromString("*",this);
         else
           this._directives[dirv] = defaultSrcDir.clone();
         this._directives[dirv]._isImplicit = true;
@@ -613,6 +601,62 @@ CSPRep.prototype = {
   get allowsInlineScripts () {
     return this._allowInlineScripts;
   },
+
+  /**
+   * Sends a warning message to the error console and web developer console.
+   * @param aMsg
+   *        The message to send
+   * @param aSource (optional)
+   *        The URL of the file in which the error occurred
+   * @param aScriptLine (optional)
+   *        The line in the source file which the error occurred
+   * @param aLineNum (optional)
+   *        The number of the line where the error occurred
+   */
+  warn:
+  function cspd_warn(aMsg, aSource, aScriptLine, aLineNum) {
+    var textMessage = 'CSP WARN:  ' + aMsg + "\n";
+
+    var consoleMsg = Components.classes["@mozilla.org/scripterror;1"]
+                               .createInstance(Ci.nsIScriptError);
+    if (this._innerWindowID) {
+      consoleMsg.initWithWindowID(textMessage, aSource, aScriptLine, aLineNum,
+                                  0, Ci.nsIScriptError.warningFlag,
+                                  "Content Security Policy",
+                                  this._innerWindowID);
+    } else {
+      consoleMsg.init(textMessage, aSource, aScriptLine, aLineNum, 0,
+                      Ci.nsIScriptError.warningFlag,
+                      "Content Security Policy");
+    }
+    Components.classes["@mozilla.org/consoleservice;1"]
+              .getService(Ci.nsIConsoleService).logMessage(consoleMsg);
+  },
+
+  /**
+   * Sends an error message to the error console and web developer console.
+   * @param aMsg
+   *        The message to send
+   */
+  error:
+  function cspsd_error(aMsg) {
+    var textMessage = 'CSP ERROR:  ' + aMsg + "\n";
+
+    var consoleMsg = Components.classes["@mozilla.org/scripterror;1"]
+                               .createInstance(Ci.nsIScriptError);
+    if (this._innerWindowID) {
+      consoleMsg.initWithWindowID(textMessage, null, null, 0, 0,
+                                  Ci.nsIScriptError.errorFlag,
+                                  "Content Security Policy",
+                                  this._innerWindowID);
+    }
+    else {
+      consoleMsg.init(textMessage, null, null, 0, 0,
+                      Ci.nsIScriptError.errorFlag, "Content Security Policy");
+    }
+    Components.classes["@mozilla.org/consoleservice;1"]
+              .getService(Ci.nsIConsoleService).logMessage(consoleMsg);
+  },
 };
 
 //////////////////////////////////////////////////////////////////////
@@ -633,6 +677,9 @@ function CSPSourceList() {
  *
  * @param aStr
  *        string rep of a CSP Source List
+ * @param aCSPRep
+ *        the CSPRep to which this souce list belongs. If null, CSP errors and
+ *        warnings will not be sent to the web console.
  * @param self (optional)
  *        URI or CSPSource representing the "self" source
  * @param enforceSelfChecks (optional)
@@ -641,39 +688,42 @@ function CSPSourceList() {
  * @returns
  *        an instance of CSPSourceList
  */
-CSPSourceList.fromString = function(aStr, self, enforceSelfChecks) {
+CSPSourceList.fromString = function(aStr, aCSPRep, self, enforceSelfChecks) {
   // source-list = *WSP [ source-expression *( 1*WSP source-expression ) *WSP ]
   //             / *WSP "'none'" *WSP
 
   /* If self parameter is passed, convert to CSPSource,
      unless it is already a CSPSource. */
-  if(self && !(self instanceof CSPSource)) {
-     self = CSPSource.create(self);
+  if (self && !(self instanceof CSPSource)) {
+     self = CSPSource.create(self, aCSPRep);
   }
 
   var slObj = new CSPSourceList();
+  slObj._CSPRep = aCSPRep;
   aStr = aStr.trim();
   // w3 specifies case insensitive equality
-  if (aStr.toUpperCase() === "'NONE'"){
+  if (aStr.toUpperCase() === "'NONE'") {
     slObj._permitAllSources = false;
     return slObj;
   }
 
   var tokens = aStr.split(/\s+/);
   for (var i in tokens) {
-    if (!R_SOURCEEXP.test(tokens[i])){
-      CSPWarning(CSPLocalizer.getFormatStr("failedToParseUnrecognizedSource",
-                                           [tokens[i]]));
+    if (!R_SOURCEEXP.test(tokens[i])) {
+      cspWarn(aCSPRep,
+              CSPLocalizer.getFormatStr("failedToParseUnrecognizedSource",
+                                        [tokens[i]]));
       continue;
     }
-    var src = CSPSource.create(tokens[i], self, enforceSelfChecks);
+    var src = CSPSource.create(tokens[i], aCSPRep, self, enforceSelfChecks);
     if (!src) {
-      CSPWarning(CSPLocalizer.getFormatStr("failedToParseUnrecognizedSource",
-                                           [tokens[i]]));
+      cspWarn(aCSPRep,
+              CSPLocalizer.getFormatStr("failedToParseUnrecognizedSource",
+                                        [tokens[i]]));
       continue;
     }
     // if a source is a *, then we can permit all sources
-    if (src.permitAll){
+    if (src.permitAll) {
       slObj._permitAllSources = true;
       return slObj;
     } else {
@@ -758,6 +808,7 @@ CSPSourceList.prototype = {
   function() {
     var aSL = new CSPSourceList();
     aSL._permitAllSources = this._permitAllSources;
+    aSL._CSPRep = this._CSPRep;
     for (var i in this._sources) {
       aSL._sources[i] = this._sources[i].clone();
     }
@@ -800,7 +851,7 @@ CSPSourceList.prototype = {
     if (!that) return this.clone();
 
     if (this.isNone() || that.isNone())
-      newCSPSrcList = CSPSourceList.fromString("'none'");
+      newCSPSrcList = CSPSourceList.fromString("'none'", this._CSPRep);
 
     if (this.isAll()) newCSPSrcList = that.clone();
     if (that.isAll()) newCSPSrcList = this.clone();
@@ -837,6 +888,9 @@ CSPSourceList.prototype = {
     // if either was explicit, so is this.
     newCSPSrcList._isImplicit = this._isImplicit && that._isImplicit;
 
+    if ((!newCSPSrcList._CSPRep) && that._CSPRep) {
+      newCSPSrcList._CSPRep = that._CSPRep;
+    }
     return newCSPSrcList;
   }
 }
@@ -865,6 +919,9 @@ function CSPSource() {
  *  - CSPSource (clone)
  * @param aData
  *        string, nsURI, or CSPSource
+ * @param aCSPRep
+ *        The CSPRep this source belongs to. If null, CSP errors and warnings
+ *        will not be sent to the web console.
  * @param self (optional)
  *	  if present, string, URI, or CSPSource representing the "self" resource
  * @param enforceSelfChecks (optional)
@@ -873,12 +930,12 @@ function CSPSource() {
  * @returns
  *        an instance of CSPSource
  */
-CSPSource.create = function(aData, self, enforceSelfChecks) {
+CSPSource.create = function(aData, aCSPRep, self, enforceSelfChecks) {
   if (typeof aData === 'string')
-    return CSPSource.fromString(aData, self, enforceSelfChecks);
+    return CSPSource.fromString(aData, aCSPRep, self, enforceSelfChecks);
 
-  if (aData instanceof Components.interfaces.nsIURI)
-    return CSPSource.fromURI(aData, self, enforceSelfChecks);
+  if (aData instanceof Ci.nsIURI)
+    return CSPSource.fromURI(aData, aCSPRep, self, enforceSelfChecks);
 
   if (aData instanceof CSPSource) {
     var ns = aData.clone();
@@ -896,6 +953,9 @@ CSPSource.create = function(aData, self, enforceSelfChecks) {
  *
  * @param aURI
  *        nsIURI rep of a URI
+ * @param aCSPRep
+ *        The policy this source belongs to. If null, CSP errors and warnings
+ *        will not be sent to the web console.
  * @param self (optional)
  *        string or CSPSource representing the "self" source
  * @param enforceSelfChecks (optional)
@@ -904,23 +964,24 @@ CSPSource.create = function(aData, self, enforceSelfChecks) {
  * @returns
  *        an instance of CSPSource
  */
-CSPSource.fromURI = function(aURI, self, enforceSelfChecks) {
-  if (!(aURI instanceof Components.interfaces.nsIURI)){
-    CSPError(CSPLocalizer.getStr("cspSourceNotURI"));
+CSPSource.fromURI = function(aURI, aCSPRep, self, enforceSelfChecks) {
+  if (!(aURI instanceof Ci.nsIURI)) {
+    cspError(aCSPRep, CSPLocalizer.getStr("cspSourceNotURI"));
     return null;
   }
 
   if (!self && enforceSelfChecks) {
-    CSPError(CSPLocalizer.getStr("selfDataNotProvided"));
+    cspError(aCSPRep, CSPLocalizer.getStr("selfDataNotProvided"));
     return null;
   }
 
   if (self && !(self instanceof CSPSource)) {
-    self = CSPSource.create(self, undefined, false);
+    self = CSPSource.create(self, aCSPRep, undefined, false);
   }
 
   var sObj = new CSPSource();
   sObj._self = self;
+  sObj._CSPRep = aCSPRep;
 
   // PARSE
   // If 'self' is undefined, then use default port for scheme if there is one.
@@ -930,7 +991,8 @@ CSPSource.fromURI = function(aURI, self, enforceSelfChecks) {
     sObj._scheme = aURI.scheme;
   } catch(e) {
     sObj._scheme = undefined;
-    CSPError(CSPLocalizer.getFormatStr("uriWithoutScheme", [aURI.asciiSpec]));
+    cspError(aCSPRep, CSPLocalizer.getFormatStr("uriWithoutScheme",
+                                                [aURI.asciiSpec]));
     return null;
   }
 
@@ -973,6 +1035,8 @@ CSPSource.fromURI = function(aURI, self, enforceSelfChecks) {
  *
  * @param aStr
  *        string rep of a CSP Source
+ * @param aCSPRep
+ *        the CSPRep this CSPSource belongs to
  * @param self (optional)
  *        string, URI, or CSPSource representing the "self" source
  * @param enforceSelfChecks (optional)
@@ -981,35 +1045,37 @@ CSPSource.fromURI = function(aURI, self, enforceSelfChecks) {
  * @returns
  *        an instance of CSPSource
  */
-CSPSource.fromString = function(aStr, self, enforceSelfChecks) {
+CSPSource.fromString = function(aStr, aCSPRep, self, enforceSelfChecks) {
   if (!aStr)
     return null;
 
   if (!(typeof aStr === 'string')) {
-    CSPError(CSPLocalizer.getStr("argumentIsNotString"));
+    cspError(aCSPRep, CSPLocalizer.getStr("argumentIsNotString"));
     return null;
   }
 
   var sObj = new CSPSource();
   sObj._self = self;
+  sObj._CSPRep = aCSPRep;
+
 
   // if equal, return does match
-  if (aStr === "*"){
+  if (aStr === "*") {
     sObj._permitAll = true;
     return sObj;
   }
 
   if (!self && enforceSelfChecks) {
-    CSPError(CSPLocalizer.getStr("selfDataNotProvided"));
+    cspError(aCSPRep, CSPLocalizer.getStr("selfDataNotProvided"));
     return null;
   }
 
   if (self && !(self instanceof CSPSource)) {
-    self = CSPSource.create(self, undefined, false);
+    self = CSPSource.create(self, aCSPRep, undefined, false);
   }
 
   // check for scheme-source match
-  if (R_SCHEMESRC.test(aStr)){
+  if (R_SCHEMESRC.test(aStr)) {
     var schemeSrcMatch = R_GETSCHEME.exec(aStr);
     sObj._scheme = schemeSrcMatch[0];
     if (!sObj._host) sObj._host = CSPHost.fromString("*");
@@ -1031,8 +1097,9 @@ CSPSource.fromString = function(aStr, self, enforceSelfChecks) {
 
     // get array of matches to the R_HOST regular expression
     var hostMatch = R_HOST.exec(aStr);
-    if (!hostMatch){
-      CSPError(CSPLocalizer.getFormatStr("couldntParseInvalidSource", [aStr]));
+    if (!hostMatch) {
+      cspError(aCSPRep, CSPLocalizer.getFormatStr("couldntParseInvalidSource",
+                                                  [aStr]));
       return null;
     }
     // host regex gets scheme, so remove scheme from aStr. Add 3 for '://'
@@ -1044,7 +1111,9 @@ CSPSource.fromString = function(aStr, self, enforceSelfChecks) {
       // gets the default port for the given scheme
       defPort = Services.io.getProtocolHandler(sObj._scheme).defaultPort;
       if (!defPort) {
-        CSPError(CSPLocalizer.getFormatStr("couldntParseInvalidSource", [aStr]));
+        cspError(aCSPRep,
+                 CSPLocalizer.getFormatStr("couldntParseInvalidSource",
+                                           [aStr]));
         return null;
       }
       sObj._port = defPort;
@@ -1057,16 +1126,17 @@ CSPSource.fromString = function(aStr, self, enforceSelfChecks) {
   }
 
   // check for 'self' (case insensitive)
-  if (aStr.toUpperCase() === "'SELF'"){
-    if (!self){
-      CSPError(CSPLocalizer.getStr("selfKeywordNoSelfData"));
+  if (aStr.toUpperCase() === "'SELF'") {
+    if (!self) {
+      cspError(aCSPRep, CSPLocalizer.getStr("selfKeywordNoSelfData"));
       return null;
     }
     sObj._self = self.clone();
     sObj._isSelf = true;
     return sObj;
   }
-  CSPError(CSPLocalizer.getFormatStr("couldntParseInvalidSource",[aStr]));
+  cspError(aCSPRep, CSPLocalizer.getFormatStr("couldntParseInvalidSource",
+                                              [aStr]));
   return null;
 };
 
@@ -1156,6 +1226,7 @@ CSPSource.prototype = {
     aClone._port = this._port;
     aClone._host = this._host ? this._host.clone() : undefined;
     aClone._isSelf = this._isSelf;
+    aClone._CSPRep = this._CSPRep;
     return aClone;
   },
 
@@ -1171,7 +1242,7 @@ CSPSource.prototype = {
     if (!aSource) return false;
 
     if (!(aSource instanceof CSPSource))
-      return this.permits(CSPSource.create(aSource));
+      return this.permits(CSPSource.create(aSource, this._CSPRep));
 
     // verify scheme
     if (this.scheme != aSource.scheme)
@@ -1225,7 +1296,9 @@ CSPSource.prototype = {
     else if (that.port === this.port)
       newSource._port = this.port;
     else {
-      CSPError(CSPLocalizer.getFormatStr("notIntersectPort", [this.toString(), that.toString()]));
+      let msg = CSPLocalizer.getFormatStr("notIntersectPort",
+                                          [this.toString(), that.toString()]);
+      cspError(this._CSPRep, msg);
       return null;
     }
 
@@ -1241,7 +1314,9 @@ CSPSource.prototype = {
     else if (that.scheme === this.scheme)
       newSource._scheme = this.scheme;
     else {
-      CSPError(CSPLocalizer.getFormatStr("notIntersectScheme", [this.toString(), that.toString()]));
+      var msg = CSPLocalizer.getFormatStr("notIntersectScheme",
+                                          [this.toString(), that.toString()]);
+      cspError(this._CSPRep, msg);
       return null;
     }
 
@@ -1257,13 +1332,19 @@ CSPSource.prototype = {
     if (this.host && that.host) {
       newSource._host = this.host.intersectWith(that.host);
     } else if (this.host) {
-      CSPError(CSPLocalizer.getFormatStr("intersectingSourceWithUndefinedHost", [that.toString()]));
+      let msg = CSPLocalizer.getFormatStr("intersectingSourceWithUndefinedHost",
+                                          [that.toString()]);
+      cspError(this._CSPRep, msg);
       newSource._host = this.host.clone();
     } else if (that.host) {
-      CSPError(CSPLocalizer.getFormatStr("intersectingSourceWithUndefinedHost", [this.toString()]));
+      let msg = CSPLocalizer.getFormatStr("intersectingSourceWithUndefinedHost",
+                                          [this.toString()]);
+      cspError(this._CSPRep, msg);
       newSource._host = that.host.clone();
     } else {
-      CSPError(CSPLocalizer.getFormatStr("intersectingSourcesWithUndefinedHosts", [this.toString(), that.toString()]));
+      let msg = CSPLocalizer.getFormatStr("intersectingSourcesWithUndefinedHosts",
+                                          [this.toString(), that.toString()]);
+      cspError(this._CSPRep, msg);
       newSource._host = CSPHost.fromString("*");
     }
 
@@ -1482,7 +1563,7 @@ CSPViolationReportListener.prototype = {
   _reportURI:   null,
 
   QueryInterface: function(iid) {
-    if(iid.equals(Ci.nsIStreamListener) ||
+    if (iid.equals(Ci.nsIStreamListener) ||
         iid.equals(Ci.nsIRequestObserver) ||
         iid.equals(Ci.nsISupports))
       return this;
@@ -1508,6 +1589,52 @@ CSPViolationReportListener.prototype = {
 
 //////////////////////////////////////////////////////////////////////
 
+function innerWindowFromRequest(docRequest) {
+  let win = null;
+  let loadContext = null;
+
+  try {
+    loadContext = docRequest.notificationCallbacks.getInterface(Ci.nsILoadContext);
+  } catch (ex) {
+    try {
+      loadContext = docRequest.loadGroup.notificationCallbacks.getInterface(Ci.nsILoadContext);
+    } catch (ex) {
+      return null;
+    }
+  }
+
+  if (loadContext) {
+    win = loadContext.associatedWindow;
+  }
+  if (win) {
+    try {
+       let winUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
+       return winUtils.currentInnerWindowID;
+    } catch (ex) {
+      return null;
+    }
+  }
+  return null;
+}
+
+function cspError(aCSPRep, aMessage) {
+  if (aCSPRep) {
+    aCSPRep.error(aMessage);
+  } else {
+    (new CSPRep()).error(aMessage);
+  }
+}
+
+function cspWarn(aCSPRep, aMessage) {
+  if (aCSPRep) {
+    aCSPRep.warn(aMessage);
+  } else {
+    (new CSPRep()).warn(aMessage);
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+
 CSPLocalizer = {
   /**
    * Retrieve a localized string.
diff --git a/content/base/src/contentSecurityPolicy.js b/content/base/src/contentSecurityPolicy.js
index e9535ce768af..2d017fd73bef 100644
--- a/content/base/src/contentSecurityPolicy.js
+++ b/content/base/src/contentSecurityPolicy.js
@@ -104,34 +104,6 @@ ContentSecurityPolicy.prototype = {
     return this._reportOnlyMode || this._policy.allowsEvalInScripts;
   },
 
-  get innerWindowID() {
-    let win = null;
-    let loadContext = null;
-
-    try {
-      loadContext = this._docRequest
-                        .notificationCallbacks.getInterface(Ci.nsILoadContext);
-    } catch (ex) {
-      try {
-        loadContext = this._docRequest.loadGroup
-                          .notificationCallbacks.getInterface(Ci.nsILoadContext);
-      } catch (ex) {
-      }
-    }
-
-    if (loadContext) {
-      win = loadContext.associatedWindow;
-    }
-    if (win) {
-      try {
-         let winUtils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-         return winUtils.currentInnerWindowID;
-      } catch (ex) {
-      }
-    }
-    return null;
-  },
-
   /**
    * Log policy violation on the Error Console and send a report if a report-uri
    * is present in the policy
@@ -302,16 +274,15 @@ ContentSecurityPolicy.prototype = {
       CSPdebug("Constructed violation report:\n" + reportString);
 
       var violationMessage = null;
-      if(blockedUri["asciiSpec"]){
+      if (blockedUri["asciiSpec"]) {
          violationMessage = CSPLocalizer.getFormatStr("directiveViolatedWithURI", [violatedDirective, blockedUri.asciiSpec]);
       } else {
          violationMessage = CSPLocalizer.getFormatStr("directiveViolated", [violatedDirective]);
       }
-      CSPWarning(violationMessage,
-                 this.innerWindowID,
-                 (aSourceFile) ? aSourceFile : null,
-                 (aScriptSample) ? decodeURIComponent(aScriptSample) : null,
-                 (aLineNum) ? aLineNum : null);
+      this._policy.warn(violationMessage,
+                        (aSourceFile) ? aSourceFile : null,
+                        (aScriptSample) ? decodeURIComponent(aScriptSample) : null,
+                        (aLineNum) ? aLineNum : null);
 
       // For each URI in the report list, send out a report.
       // We make the assumption that all of the URIs are absolute URIs; this
@@ -323,7 +294,7 @@ ContentSecurityPolicy.prototype = {
 
         try {
           var chan = Services.io.newChannel(uris[i], null, null);
-          if(!chan) {
+          if (!chan) {
             CSPdebug("Error creating channel for " + uris[i]);
             continue;
           }
@@ -338,7 +309,7 @@ ContentSecurityPolicy.prototype = {
 
           // we need to set an nsIChannelEventSink on the channel object
           // so we can tell it to not follow redirects when posting the reports
-          chan.notificationCallbacks = new CSPReportRedirectSink();
+          chan.notificationCallbacks = new CSPReportRedirectSink(this._policy);
 
           chan.QueryInterface(Ci.nsIUploadChannel)
               .setUploadStream(content, "application/json", content.available());
@@ -369,8 +340,8 @@ ContentSecurityPolicy.prototype = {
         } catch(e) {
           // it's possible that the URI was invalid, just log a
           // warning and skip over that.
-          CSPWarning(CSPLocalizer.getFormatStr("triedToSendReport", [uris[i]]), this.innerWindowID);
-          CSPWarning(CSPLocalizer.getFormatStr("errorWas", [e.toString()]), this.innerWindowID);
+          this._policy.warn(CSPLocalizer.getFormatStr("triedToSendReport", [uris[i]]));
+          this._policy.warn(CSPLocalizer.getFormatStr("errorWas", [e.toString()]));
         }
       }
     }
@@ -552,7 +523,8 @@ ContentSecurityPolicy.prototype = {
 // The POST of the violation report (if it happens) should not follow
 // redirects, per the spec. hence, we implement an nsIChannelEventSink
 // with an object so we can tell XHR to abort if a redirect happens.
-function CSPReportRedirectSink() {
+function CSPReportRedirectSink(policy) {
+  this._policy = policy;
 }
 
 CSPReportRedirectSink.prototype = {
@@ -575,7 +547,7 @@ CSPReportRedirectSink.prototype = {
   // nsIChannelEventSink
   asyncOnChannelRedirect: function channel_redirect(oldChannel, newChannel,
                                                     flags, callback) {
-    CSPWarning(CSPLocalizer.getFormatStr("reportPostRedirect", [oldChannel.URI.asciiSpec]));
+    this._policy.warn(CSPLocalizer.getFormatStr("reportPostRedirect", [oldChannel.URI.asciiSpec]));
 
     // cancel the old channel so XHR failure callback happens
     oldChannel.cancel(Cr.NS_ERROR_ABORT);
diff --git a/content/base/test/unit/test_csputils.js b/content/base/test/unit/test_csputils.js
index 45e8739f156c..21aee7516eda 100644
--- a/content/base/test/unit/test_csputils.js
+++ b/content/base/test/unit/test_csputils.js
@@ -159,29 +159,29 @@ test(
     function test_CSPSource_fromString() {
     // can't do these tests because "self" is not defined.
       //"basic source should not be null.");
-      do_check_neq(null, CSPSource.fromString("a.com", "http://abc.com"));
+      do_check_neq(null, CSPSource.fromString("a.com", undefined, "http://abc.com"));
 
       //"ldh characters should all work for host.");
-      do_check_neq(null, CSPSource.fromString("a2-c.com", "https://a.com"));
+      do_check_neq(null, CSPSource.fromString("a2-c.com", undefined, "https://a.com"));
 
       //"wildcard should work in first token for host.");
-      do_check_neq(null, CSPSource.fromString("*.a.com", "http://abc.com"));
+      do_check_neq(null, CSPSource.fromString("*.a.com", undefined, "http://abc.com"));
 
       //print(" --- Ignore the following two errors if they print ---");
       //"wildcard should not work in non-first token for host.");
-      do_check_eq(null, CSPSource.fromString("x.*.a.com", "http://a.com"));
+      do_check_eq(null, CSPSource.fromString("x.*.a.com", undefined, "http://a.com"));
 
       //"funny characters (#) should not work for host.");
-      do_check_eq(null, CSPSource.fromString("a#2-c.com", "http://a.com"));
+      do_check_eq(null, CSPSource.fromString("a#2-c.com", undefined, "http://a.com"));
 
       //print(" --- Stop ignoring errors that print ---\n");
 
       //"failed to parse host with port.");
-      do_check_neq(null, CSPSource.create("a.com:23", "http://a.com"));
+      do_check_neq(null, CSPSource.create("a.com:23", undefined, "http://a.com"));
       //"failed to parse host with scheme.");
-      do_check_neq(null, CSPSource.create("https://a.com", "http://a.com"));
+      do_check_neq(null, CSPSource.create("https://a.com", undefined, "http://a.com"));
       //"failed to parse host with scheme and port.");
-      do_check_neq(null, CSPSource.create("https://a.com:200", "http://a.com"));
+      do_check_neq(null, CSPSource.create("https://a.com:200", undefined, "http://a.com"));
 
       //Check to make sure we don't match multiple instances with regex
       do_check_eq(null, CSPSource.create("http://foo.com:bar.com:23"));
@@ -193,7 +193,7 @@ test(
 test(
     function test_CSPSource_fromString_withSelf() {
       var src;
-      src = CSPSource.create("a.com", "https://foobar.com:443");
+      src = CSPSource.create("a.com", undefined, "https://foobar.com:443");
       //"src should inherit port *
       do_check_true(src.permits("https://a.com:443"));
       //"src should inherit and require https scheme
@@ -201,7 +201,7 @@ test(
       //"src should inherit scheme 'https'"
       do_check_true(src.permits("https://a.com"));
 
-      src = CSPSource.create("http://a.com", "https://foobar.com:443");
+      src = CSPSource.create("http://a.com", undefined, "https://foobar.com:443");
       //"src should inherit and require http scheme"
       do_check_false(src.permits("https://a.com"));
       //"src should inherit scheme 'http'"
@@ -210,7 +210,7 @@ test(
       //"src should inherit default port for 'http'"
       do_check_true(src.permits("http://a.com:80"));
 
-      src = CSPSource.create("'self'", "https://foobar.com:443");
+      src = CSPSource.create("'self'", undefined, "https://foobar.com:443");
       //"src should inherit port *
       do_check_true(src.permits("https://foobar.com:443"));
       //"src should inherit and require https scheme
@@ -220,7 +220,7 @@ test(
       //"src should reject other hosts"
       do_check_false(src.permits("https://a.com"));
 
-      src = CSPSource.create("javascript:", "https://foobar.com:443");
+      src = CSPSource.create("javascript:", undefined, "https://foobar.com:443");
       //"hostless schemes should be parseable."
       var aUri = NetUtil.newURI("javascript:alert('foo');");
       do_check_true(src.permits(aUri));
@@ -260,7 +260,7 @@ test(
     function test_CSPSourceList_fromString_twohost() {
       var str = "foo.bar:21 https://ras.bar";
       var parsed = "http://foo.bar:21 https://ras.bar:443";
-      var sd = CSPSourceList.fromString(str, URI("http://self.com:80"));
+      var sd = CSPSourceList.fromString(str, undefined, URI("http://self.com:80"));
       //"two-host list should parse"
       do_check_neq(null,sd);
       //"two-host list should parse to two hosts"
@@ -272,8 +272,9 @@ test(
 test(
     function test_CSPSourceList_permits() {
       var nullSourceList = CSPSourceList.fromString("'none'");
-      var simpleSourceList = CSPSourceList.fromString("a.com", URI("http://self.com"));
+      var simpleSourceList = CSPSourceList.fromString("a.com", undefined, URI("http://self.com"));
       var doubleSourceList = CSPSourceList.fromString("https://foo.com http://bar.com:88",
+                                                      undefined,
                                                       URI("http://self.com:88"));
       var allSourceList = CSPSourceList.fromString("*");
       var allAndMoreSourceList = CSPSourceList.fromString("* https://bar.com 'none'");
@@ -680,7 +681,7 @@ test(
        */
 
       var src;
-      src = CSPSource.create("a.com", "https://foobar.com:4443");
+      src = CSPSource.create("a.com", undefined, "https://foobar.com:4443");
       //"src should inherit and require https scheme
       do_check_false(src.permits("http://a.com"));
       //"src should inherit scheme 'https'"
@@ -688,7 +689,7 @@ test(
       //"src should get default port
       do_check_true(src.permits("https://a.com:443"));
 
-      src = CSPSource.create("http://a.com", "https://foobar.com:4443");
+      src = CSPSource.create("http://a.com", undefined, "https://foobar.com:4443");
       //"src should require http scheme"
       do_check_false(src.permits("https://a.com"));
       //"src should keep scheme 'http'"
@@ -696,7 +697,7 @@ test(
       //"src should inherit default port for 'http'"
       do_check_true(src.permits("http://a.com:80"));
 
-      src = CSPSource.create("'self'", "https://foobar.com:4443");
+      src = CSPSource.create("'self'", undefined, "https://foobar.com:4443");
       //"src should inherit nonstandard port from self
       do_check_true(src.permits("https://foobar.com:4443"));
       do_check_false(src.permits("https://foobar.com"));
@@ -716,9 +717,9 @@ test(
        * doesn't happen.
        */
 
-      var p_none = CSPSourceList.fromString("'none'", "http://foo.com", false);
-      var p_all = CSPSourceList.fromString("*", "http://foo.com", false);
-      var p_one = CSPSourceList.fromString("bar.com", "http://foo.com", false);
+      var p_none = CSPSourceList.fromString("'none'", undefined, "http://foo.com", false);
+      var p_all = CSPSourceList.fromString("*", undefined, "http://foo.com", false);
+      var p_one = CSPSourceList.fromString("bar.com", undefined, "http://foo.com", false);
 
       do_check_false(p_none.equals(p_all));
       do_check_false(p_none.equals(p_one));

From 46e65eb23376442468e2bb2306b56121091ad3c6 Mon Sep 17 00:00:00 2001
From: Mark Goodwin <mgoodwin@mozilla.com>
Date: Mon, 1 Oct 2012 10:10:30 +0100
Subject: [PATCH 61/64] Bug 770099 - Send CSP policy and report information to
 Web Console (Part 2); r=dveditz,msucan,jwalker

---
 browser/devtools/webconsole/test/Makefile.in  |  6 ++
 ...ser_webconsole_bug_770099_bad_policyuri.js | 55 +++++++++++++++++++
 ...browser_webconsole_bug_770099_violation.js | 55 +++++++++++++++++++
 .../test/test_bug_770099_bad_policy_uri.html  | 12 ++++
 ...st_bug_770099_bad_policy_uri.html^headers^ |  2 +
 .../test/test_bug_770099_violation.html       | 13 +++++
 .../test_bug_770099_violation.html^headers^   |  1 +
 7 files changed, 144 insertions(+)
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_770099_bad_policyuri.js
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_770099_violation.js
 create mode 100644 browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html
 create mode 100644 browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html^headers^
 create mode 100644 browser/devtools/webconsole/test/test_bug_770099_violation.html
 create mode 100644 browser/devtools/webconsole/test/test_bug_770099_violation.html^headers^

diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index 78e8b86fda04..d5d88fe8c3f9 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -107,6 +107,8 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_658368_time_methods.js \
 	browser_webconsole_bug_764572_output_open_url.js \
 	browser_webconsole_bug_622303_persistent_filters.js \
+        browser_webconsole_bug_770099_bad_policyuri.js \
+        browser_webconsole_bug_770099_violation.js \
 	browser_webconsole_window_zombie.js \
 	browser_cached_messages.js \
 	browser_bug664688_sandbox_update_after_navigation.js \
@@ -188,6 +190,10 @@ MOCHITEST_BROWSER_FILES += \
 	test-bug-658368-time-methods.html \
 	test-webconsole-error-observer.html \
 	test-for-of.html \
+        test_bug_770099_violation.html \
+        test_bug_770099_violation.html^headers^ \
+        test_bug_770099_bad_policy_uri.html \
+        test_bug_770099_bad_policy_uri.html^headers^ \
 	test-result-format-as-string.html \
 	test-bug-737873-mixedcontent.html \
 	$(NULL)
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_770099_bad_policyuri.js b/browser/devtools/webconsole/test/browser_webconsole_bug_770099_bad_policyuri.js
new file mode 100644
index 000000000000..cd9c0fcc8402
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_770099_bad_policyuri.js
@@ -0,0 +1,55 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Tests that the Web Console CSP messages are displayed
+
+const TEST_BAD_POLICY_URI = "https://example.com/browser/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html";
+
+let hud = undefined;
+
+function test() {
+  addTab("data:text/html;charset=utf8,Web Console CSP bad policy URI test");
+  browser.addEventListener("load", function _onLoad() {
+    browser.removeEventListener("load", _onLoad, true);
+    openConsole(null, loadDocument);
+  }, true);
+}
+
+function loadDocument(theHud) {
+  hud = theHud;
+  hud.jsterm.clearOutput();
+  browser.addEventListener("load", onLoad, true);
+  content.location = TEST_BAD_POLICY_URI;
+}
+
+function onLoad(aEvent) {
+  browser.removeEventListener("load", onLoad, true);
+  testPolicyURIMessage();
+}
+
+function testPolicyURIMessage() {
+  let aOutputNode = hud.outputNode;
+ 
+  waitForSuccess(
+    {
+      name: "CSP policy URI warning displayed successfully",
+      validatorFn: function() {
+        return aOutputNode.querySelector(".webconsole-msg-error");
+      },
+
+      successFn: function() {
+        //tests on the urlnode
+        let node = aOutputNode.querySelector(".webconsole-msg-error");
+        isnot(node.textContent.indexOf("can't fetch policy"), -1,
+                                       "CSP Policy URI message found");
+        finishTest();
+      },
+
+      failureFn: finishTest,
+    }
+  );
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_770099_violation.js b/browser/devtools/webconsole/test/browser_webconsole_bug_770099_violation.js
new file mode 100644
index 000000000000..b1a2c05ed024
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_770099_violation.js
@@ -0,0 +1,55 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Tests that the Web Console CSP messages are displayed
+
+const TEST_VIOLATION = "https://example.com/browser/browser/devtools/webconsole/test/test_bug_770099_violation.html";
+
+let hud = undefined;
+
+function test() {
+  addTab("data:text/html;charset=utf8,Web Console CSP violation test");
+  browser.addEventListener("load", function _onLoad() {
+    browser.removeEventListener("load", _onLoad, true);
+    openConsole(null, loadDocument);
+  }, true);
+}
+
+function loadDocument(theHud){
+  hud = theHud;
+  hud.jsterm.clearOutput()
+  browser.addEventListener("load", onLoad, true);
+  content.location = TEST_VIOLATION;
+}
+
+function onLoad(aEvent) {
+  browser.removeEventListener("load", onLoad, true);
+  testViolationMessage();
+}
+
+function testViolationMessage(){
+  let aOutputNode = hud.outputNode;
+
+  waitForSuccess(
+    {
+      name: "CSP policy URI warning displayed successfully",
+      validatorFn: function() {
+        return aOutputNode.querySelector(".webconsole-msg-warn");
+      },
+
+      successFn: function() {
+        //tests on the urlnode
+        let node = aOutputNode.querySelector(".webconsole-msg-warn");
+        isnot(node.textContent.indexOf("violated"), -1,
+                                       "CSP violation message found");
+        finishTest();
+      },
+
+      failureFn: finishTest,
+    }
+  );
+}
diff --git a/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html b/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html
new file mode 100644
index 000000000000..eb0c52c3acb2
--- /dev/null
+++ b/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>Test for Bug 770099 - bad policy-uri</title>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=770099">Mozilla Bug 770099</a>
+</body>
+</html>
diff --git a/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html^headers^ b/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html^headers^
new file mode 100644
index 000000000000..b64692028c62
--- /dev/null
+++ b/browser/devtools/webconsole/test/test_bug_770099_bad_policy_uri.html^headers^
@@ -0,0 +1,2 @@
+X-Content-Security-Policy: policy-uri http://example.com/some_policy
+Content-type: text/html; charset=utf-8
diff --git a/browser/devtools/webconsole/test/test_bug_770099_violation.html b/browser/devtools/webconsole/test/test_bug_770099_violation.html
new file mode 100644
index 000000000000..ccbded87a3ef
--- /dev/null
+++ b/browser/devtools/webconsole/test/test_bug_770099_violation.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>Test for Bug 770099 - policy violation</title>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=770099">Mozilla Bug 770099</a>
+<img src="http://some.example.com/test.png">
+</body>
+</html>
diff --git a/browser/devtools/webconsole/test/test_bug_770099_violation.html^headers^ b/browser/devtools/webconsole/test/test_bug_770099_violation.html^headers^
new file mode 100644
index 000000000000..5374efd3e17b
--- /dev/null
+++ b/browser/devtools/webconsole/test/test_bug_770099_violation.html^headers^
@@ -0,0 +1 @@
+X-Content-Security-Policy: default-src 'self'

From 4fe6aca97c5f12cad7203767745e3be9677eb7ce Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 1 Oct 2012 19:32:31 +0900
Subject: [PATCH 62/64] Bug 791953 Fix lossy conversion warning in gfxFont.h
 r=jfkthame

---
 gfx/thebes/gfxFont.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index f97f78fda9eb..0e0727768439 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -2080,7 +2080,7 @@ public:
     }
 
     float GetDirection() const {
-        return IsRightToLeft() ? -1.0 : 1.0;
+        return IsRightToLeft() ? -1.0f : 1.0f;
     }
 
     bool DisableLigatures() const {

From 9a2d86add73ee72814f5d770ed31f43e496bf0cf Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 1 Oct 2012 10:43:14 +0100
Subject: [PATCH 63/64] Bug 795711 -
 'network.activity.blipIntervalMilliseconds' user pref should be taken into
 account. r=bz

---
 .../base/src/nsSocketTransportService2.cpp    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/netwerk/base/src/nsSocketTransportService2.cpp b/netwerk/base/src/nsSocketTransportService2.cpp
index a112d601ebc6..6f1da27f26b3 100644
--- a/netwerk/base/src/nsSocketTransportService2.cpp
+++ b/netwerk/base/src/nsSocketTransportService2.cpp
@@ -19,6 +19,9 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIOService.h"
 #include "NetworkActivityMonitor.h"
+#include "nsIObserverService.h"
+#include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
 
 
 // XXX: There is no good header file to put these in. :(
@@ -459,18 +462,14 @@ nsSocketTransportService::Init()
     nsCOMPtr<nsIPrefBranch> tmpPrefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
     if (tmpPrefService) {
         tmpPrefService->AddObserver(SEND_BUFFER_PREF, this, false);
-
-        int32_t blipInterval = 0;
-        rv = tmpPrefService->GetIntPref(BLIB_INTERVAL_PREF, &blipInterval);
-        if (NS_SUCCEEDED(rv) && blipInterval > 0) {
-            rv = mozilla::net::NetworkActivityMonitor::Init(blipInterval);
-            if (NS_FAILED(rv)) {
-                NS_WARNING("Can't initialize NetworkActivityMonitor");
-            }
-        }
     }
     UpdatePrefs();
 
+    nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
+    if (obsSvc) {
+        obsSvc->AddObserver(this, "profile-initial-state", false);
+    }
+
     mInitialized = true;
     return NS_OK;
 }
@@ -513,6 +512,11 @@ nsSocketTransportService::Shutdown()
     if (tmpPrefService) 
         tmpPrefService->RemoveObserver(SEND_BUFFER_PREF, this);
 
+    nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
+    if (obsSvc) {
+        obsSvc->RemoveObserver(this, "profile-initial-state");
+    }
+
     mozilla::net::NetworkActivityMonitor::Shutdown();
 
     mInitialized = false;
@@ -861,6 +865,16 @@ nsSocketTransportService::Observe(nsISupports *subject,
 {
     if (!strcmp(topic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
         UpdatePrefs();
+        return NS_OK;
+    }
+
+    if (!strcmp(topic, "profile-initial-state")) {
+        int32_t blipInterval = Preferences::GetInt(BLIB_INTERVAL_PREF, 0);
+        if (blipInterval <= 0) {
+            return NS_OK;
+        }
+
+        return net::NetworkActivityMonitor::Init(blipInterval);
     }
     return NS_OK;
 }

From a2727f8cc09e8ace48c33984ea52704ca58ab69e Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 1 Oct 2012 10:43:53 +0100
Subject: [PATCH 64/64] Bug 795328 -  Refactor some code in
 nsEventListenerManager by using GetTargetAsInnerWindow(). r=smaug

---
 content/events/src/nsEventListenerManager.cpp | 56 +++++--------------
 content/events/src/nsEventListenerManager.h   |  3 -
 2 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index bab91e8d1baa..01d006a731c1 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -173,13 +173,8 @@ nsEventListenerManager::GetInnerWindowForTarget()
     return node->OwnerDoc()->GetInnerWindow();
   }
 
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
-  if (window) {
-    NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
-    return window;
-  }
-
-  return nullptr;
+  nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
+  return window;
 }
 
 already_AddRefed<nsPIDOMWindow>
@@ -290,7 +285,10 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
   } else if (aTypeAtom == nsGkAtoms::ondevicemotion) {
     EnableDevice(NS_DEVICE_MOTION);
   } else if (aTypeAtom == nsGkAtoms::onmoztimechange) {
-    EnableTimeChangeNotifications();
+    nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
+    if (window) {
+      window->EnableTimeChangeNotifications();
+    }
   } else if (aTypeAtom == nsGkAtoms::onmoznetworkupload) {
     nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
     if (window) {
@@ -348,13 +346,11 @@ nsEventListenerManager::IsDeviceType(uint32_t aType)
 void
 nsEventListenerManager::EnableDevice(uint32_t aType)
 {
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
+  nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
   if (!window) {
     return;
   }
 
-  NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
-
   switch (aType) {
     case NS_DEVICE_ORIENTATION:
       window->EnableDeviceSensor(SENSOR_ORIENTATION);
@@ -380,13 +376,11 @@ nsEventListenerManager::EnableDevice(uint32_t aType)
 void
 nsEventListenerManager::DisableDevice(uint32_t aType)
 {
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
+  nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
   if (!window) {
     return;
   }
 
-  NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
-
   switch (aType) {
     case NS_DEVICE_ORIENTATION:
       window->DisableDeviceSensor(SENSOR_ORIENTATION);
@@ -452,7 +446,10 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
   if (deviceType && typeCount == 0) {
     DisableDevice(aType);
   } else if (timeChangeEvent && typeCount == 0) {
-    DisableTimeChangeNotifications();
+    nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
+    if (window) {
+      window->DisableTimeChangeNotifications();
+    }
   } else if (networkEvent && typeCount == 0) {
     nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
     if (window) {
@@ -624,11 +621,8 @@ nsEventListenerManager::SetEventHandler(nsIAtom *aName,
     doc = node->OwnerDoc();
     global = doc->GetScriptGlobalObject();
   } else {
-    nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(mTarget));
+    nsCOMPtr<nsPIDOMWindow> win = GetTargetAsInnerWindow();
     if (win) {
-      NS_ASSERTION(win->IsInnerWindow(),
-                   "Event listener added to outer window!");
-
       nsCOMPtr<nsIDOMDocument> domdoc;
       win->GetDocument(getter_AddRefs(domdoc));
       doc = do_QueryInterface(domdoc);
@@ -1199,27 +1193,3 @@ nsEventListenerManager::UnmarkGrayJSListeners()
     }
   }
 }
-
-void
-nsEventListenerManager::EnableTimeChangeNotifications()
-{
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
-  if (!window) {
-    return;
-  }
-
-  NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
-  window->EnableTimeChangeNotifications();
-}
-
-void
-nsEventListenerManager::DisableTimeChangeNotifications()
-{
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(mTarget);
-  if (!window) {
-    return;
-  }
-
-  NS_ASSERTION(window->IsInnerWindow(), "Target should not be an outer window");
-  window->DisableTimeChangeNotifications();
-}
diff --git a/content/events/src/nsEventListenerManager.h b/content/events/src/nsEventListenerManager.h
index e6409a636e21..ce8119ff3515 100644
--- a/content/events/src/nsEventListenerManager.h
+++ b/content/events/src/nsEventListenerManager.h
@@ -269,9 +269,6 @@ protected:
   void EnableDevice(uint32_t aType);
   void DisableDevice(uint32_t aType);
 
-  void EnableTimeChangeNotifications();
-  void DisableTimeChangeNotifications();
-
 public:
   /**
    * Set the "inline" event listener for aEventName to |v|.  This