From 088fe2bf42ad46089188ece9d5852004f7518b52 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 15 Nov 2013 02:12:43 -0500
Subject: [PATCH 01/92] bug 939049 - staticly type
 nsIDocument::mDocumentContainer and nsDocumentViewerContainer::mContainer
 r=smaug

---
 content/base/public/nsIDocument.h             | 15 ++--
 content/base/src/moz.build                    |  1 +
 content/base/src/nsDocument.cpp               | 79 +++++++++++--------
 content/html/document/src/ImageDocument.cpp   |  5 +-
 content/html/document/src/moz.build           |  1 +
 content/html/document/src/nsHTMLDocument.cpp  |  4 +-
 content/xul/document/src/XULDocument.cpp      |  4 +-
 content/xul/document/src/moz.build            |  1 +
 docshell/base/nsDocShell.cpp                  | 10 +--
 docshell/base/nsDocShell.h                    |  4 +-
 docshell/base/nsIContentViewer.idl            |  3 +-
 docshell/base/nsIDocumentLoaderFactory.idl    |  5 +-
 docshell/shistory/src/nsSHEntryShared.cpp     |  3 +-
 layout/base/moz.build                         |  3 +
 layout/base/nsDocumentViewer.cpp              | 77 +++++++++---------
 layout/build/moz.build                        |  3 +
 layout/build/nsContentDLF.cpp                 | 11 +--
 layout/build/nsContentDLF.h                   |  4 +-
 layout/printing/nsPrintEngine.cpp             |  4 +-
 layout/printing/nsPrintEngine.h               |  2 +-
 .../prefetch/nsOfflineCacheUpdateService.cpp  |  4 +-
 .../directory/nsDirectoryViewer.cpp           |  3 +-
 22 files changed, 138 insertions(+), 108 deletions(-)

diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 1e94bb1fea7..4ac7ced9144 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -20,6 +20,7 @@
 #include "nsPropertyTable.h"             // for member
 #include "nsTHashtable.h"                // for member
 #include "mozilla/dom/DocumentBinding.h"
+#include "mozilla/WeakPtr.h"
 #include "Units.h"
 #include "nsExpirationTracker.h"
 #include "nsClassHashtable.h"
@@ -28,6 +29,8 @@ class imgIRequest;
 class nsAString;
 class nsBindingManager;
 class nsCSSStyleSheet;
+class nsIDocShell;
+class nsDocShell;
 class nsDOMNavigationTiming;
 class nsDOMTouchList;
 class nsEventStates;
@@ -1150,16 +1153,12 @@ public:
    * Set the container (docshell) for this document. Virtual so that
    * docshell can call it.
    */
-  virtual void SetContainer(nsISupports *aContainer);
+  virtual void SetContainer(nsDocShell* aContainer);
 
   /**
    * Get the container (docshell) for this document.
    */
-  already_AddRefed<nsISupports> GetContainer() const
-  {
-    nsCOMPtr<nsISupports> container = do_QueryReferent(mDocumentContainer);
-    return container.forget();
-  }
+  nsISupports* GetContainer() const;
 
   /**
    * Get the container's load context for this document.
@@ -1696,7 +1695,7 @@ public:
    * @param aCloneContainer The container for the clone document.
    */
   virtual already_AddRefed<nsIDocument>
-  CreateStaticClone(nsISupports* aCloneContainer);
+  CreateStaticClone(nsIDocShell* aCloneContainer);
 
   /**
    * If this document is a static clone, this returns the original
@@ -2227,7 +2226,7 @@ protected:
 
   nsWeakPtr mDocumentLoadGroup;
 
-  nsWeakPtr mDocumentContainer;
+  mozilla::WeakPtr<nsDocShell> mDocumentContainer;
 
   nsCString mCharacterSet;
   int32_t mCharacterSetSource;
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 8b46268ee07..a882fb892e3 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -193,6 +193,7 @@ LOCAL_INCLUDES += [
     '/content/xslt/src/xpath',
     '/content/xul/content/src',
     '/content/xul/document/src',
+    '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 6b5feb2e73f..b08e2f42409 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -33,7 +33,7 @@
 #include "nsIBaseWindow.h"
 #include "mozilla/css/Loader.h"
 #include "mozilla/css/ImageLoader.h"
-#include "nsIDocShell.h"
+#include "nsDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsCOMArray.h"
 #include "nsDOMClassInfo.h"
@@ -2203,7 +2203,7 @@ nsDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
     nsIScriptSecurityManager *securityManager =
       nsContentUtils::GetSecurityManager();
     if (securityManager) {
-      nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+      nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
 
       if (!docShell && aLoadGroup) {
         nsCOMPtr<nsIInterfaceRequestor> cbs;
@@ -2699,7 +2699,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
   }
 
   // ----- Enforce frame-ancestor policy on any applied policies
-  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
   if (docShell) {
     bool safeAncestry = false;
 
@@ -2930,7 +2930,7 @@ nsresult
 nsDocument::GetAllowPlugins(bool * aAllowPlugins)
 {
   // First, we ask our docshell if it allows plugins.
-  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
 
   if (docShell) {
     docShell->GetAllowPlugins(aAllowPlugins);
@@ -3398,7 +3398,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData)
   if (aHeaderField == nsGkAtoms::refresh) {
     // We get into this code before we have a script global yet, so get to
     // our container via mDocumentContainer.
-    nsCOMPtr<nsIRefreshURI> refresher = do_QueryReferent(mDocumentContainer);
+    nsCOMPtr<nsIRefreshURI> refresher(mDocumentContainer);
     if (refresher) {
       // Note: using mDocumentURI instead of mBaseURI here, for consistency
       // (used to just use the current URI of our webnavigation, but that
@@ -3479,7 +3479,7 @@ nsDocument::doCreateShell(nsPresContext* aContext,
   mPresShell = shell;
 
   // Make sure to never paint if we belong to an invisible DocShell.
-  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
   if (docShell && docShell->IsInvisible())
     shell->SetNeverPainting(true);
 
@@ -4192,29 +4192,41 @@ NotifyActivityChanged(nsIContent *aContent, void *aUnused)
 }
 
 void
-nsIDocument::SetContainer(nsISupports* aContainer)
+nsIDocument::SetContainer(nsDocShell* aContainer)
 {
-  mDocumentContainer = do_GetWeakReference(aContainer);
-  EnumerateFreezableElements(NotifyActivityChanged, nullptr);
-  // Get the Docshell
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(aContainer);
-  if (docShell) {
-    int32_t itemType;
-    docShell->GetItemType(&itemType);
-    // check itemtype
-    if (itemType == nsIDocShellTreeItem::typeContent) {
-      // check if same type root
-      nsCOMPtr<nsIDocShellTreeItem> sameTypeRoot;
-      docShell->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
-      NS_ASSERTION(sameTypeRoot, "No document shell root tree item from document shell tree item!");
+  if (aContainer) {
+    mDocumentContainer = aContainer->asWeakPtr();
+  } else {
+    mDocumentContainer = WeakPtr<nsDocShell>();
+  }
 
-      if (sameTypeRoot == docShell) {
-        static_cast<nsDocument*>(this)->SetIsTopLevelContentDocument(true);
-      }
+  EnumerateFreezableElements(NotifyActivityChanged, nullptr);
+  if (!aContainer) {
+    return;
+  }
+
+  // Get the Docshell
+  int32_t itemType;
+  aContainer->GetItemType(&itemType);
+  // check itemtype
+  if (itemType == nsIDocShellTreeItem::typeContent) {
+    // check if same type root
+    nsCOMPtr<nsIDocShellTreeItem> sameTypeRoot;
+    aContainer->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
+    NS_ASSERTION(sameTypeRoot, "No document shell root tree item from document shell tree item!");
+
+    if (sameTypeRoot == aContainer) {
+      static_cast<nsDocument*>(this)->SetIsTopLevelContentDocument(true);
     }
   }
 }
 
+nsISupports*
+nsIDocument::GetContainer() const
+{
+  return static_cast<nsIDocShell*>(mDocumentContainer);
+}
+
 void
 nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
 {
@@ -4272,7 +4284,7 @@ nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
 #endif
 
     if (mAllowDNSPrefetch) {
-      nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+      nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
       if (docShell) {
 #ifdef DEBUG
         nsCOMPtr<nsIWebNavigation> webNav =
@@ -4371,8 +4383,7 @@ nsDocument::GetWindowInternal() const
   // the docshell, the outer window might be still obtainable from the it.
   nsCOMPtr<nsPIDOMWindow> win;
   if (mRemovedFromDocShell) {
-    nsCOMPtr<nsIInterfaceRequestor> requestor =
-      do_QueryReferent(mDocumentContainer);
+    nsCOMPtr<nsIInterfaceRequestor> requestor(mDocumentContainer);
     if (requestor) {
       // The docshell returns the outer window we are done.
       win = do_GetInterface(requestor);
@@ -7799,7 +7810,7 @@ nsDocument::GetLayoutHistoryState() const
   if (!mScriptGlobalObject) {
     state = mLayoutHistoryState;
   } else {
-    nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mDocumentContainer));
+    nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
     if (docShell) {
       docShell->GetLayoutHistoryState(getter_AddRefs(state));
     }
@@ -8320,7 +8331,7 @@ nsDocument::CloneDocHelper(nsDocument* clone) const
 
     // |mDocumentContainer| is the container of the document that is being
     // created and not the original container. See CreateStaticClone function().
-    nsCOMPtr<nsIDocumentLoader> docLoader = do_QueryReferent(mDocumentContainer);
+    nsCOMPtr<nsIDocumentLoader> docLoader(mDocumentContainer);
     if (docLoader) {
       docLoader->GetLoadGroup(getter_AddRefs(loadGroup));
     }
@@ -8333,8 +8344,7 @@ nsDocument::CloneDocHelper(nsDocument* clone) const
         clone->ResetToURI(uri, loadGroup, NodePrincipal());
       }
     }
-    nsCOMPtr<nsISupports> container = GetContainer();
-    clone->SetContainer(container);
+    clone->SetContainer(mDocumentContainer);
   }
 
   // Set scripting object
@@ -8845,7 +8855,7 @@ nsIDocument::FlushPendingLinkUpdates()
 }
 
 already_AddRefed<nsIDocument>
-nsIDocument::CreateStaticClone(nsISupports* aCloneContainer)
+nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer)
 {
   nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(this);
   NS_ENSURE_TRUE(domDoc, nullptr);
@@ -8853,10 +8863,11 @@ nsIDocument::CreateStaticClone(nsISupports* aCloneContainer)
 
   // Make document use different container during cloning.
   nsCOMPtr<nsISupports> originalContainer = GetContainer();
-  SetContainer(aCloneContainer);
+  nsCOMPtr<nsIDocShell> originalShell = do_QueryInterface(originalContainer);
+  SetContainer(static_cast<nsDocShell*>(aCloneContainer));
   nsCOMPtr<nsIDOMNode> clonedNode;
   nsresult rv = domDoc->CloneNode(true, 1, getter_AddRefs(clonedNode));
-  SetContainer(originalContainer);
+  SetContainer(static_cast<nsDocShell*>(originalShell.get()));
 
   nsCOMPtr<nsIDocument> clonedDoc;
   if (NS_SUCCEEDED(rv)) {
@@ -10524,7 +10535,7 @@ nsDocument::IsFullScreenEnabled(bool aCallerIsChrome, bool aLogFailure)
 
   // Ensure that all ancestor <iframe> elements have the allowfullscreen
   // boolean attribute set.
-  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
   bool allowed = false;
   if (docShell) {
     docShell->GetFullscreenAllowed(&allowed);
diff --git a/content/html/document/src/ImageDocument.cpp b/content/html/document/src/ImageDocument.cpp
index ebe217d0ccc..efd279ed698 100644
--- a/content/html/document/src/ImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -8,6 +8,7 @@
 #include "nsRect.h"
 #include "nsIImageLoadingContent.h"
 #include "nsGenericHTMLElement.h"
+#include "nsDocShell.h"
 #include "nsIDocumentInlines.h"
 #include "nsDOMTokenList.h"
 #include "nsIDOMHTMLImageElement.h"
@@ -724,7 +725,7 @@ ImageDocument::UpdateTitleAndCharset()
 void
 ImageDocument::ResetZoomLevel()
 {
-  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
   if (docShell) {
     if (nsContentUtils::IsChildOfSameType(this)) {
       return;
@@ -743,7 +744,7 @@ float
 ImageDocument::GetZoomLevel()
 {
   float zoomLevel = mOriginalZoomLevel;
-  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
   if (docShell) {
     nsCOMPtr<nsIContentViewer> cv;
     docShell->GetContentViewer(getter_AddRefs(cv));
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index 2b3daa07843..7e5fe1a3645 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -32,6 +32,7 @@ LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/events/src',
+    '/docshell/base',
     '/dom/base',
     '/layout/style',
     '/xpcom/ds',
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index f68682f53e4..1e46d56a322 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -32,7 +32,7 @@
 #include "nsIContentViewerContainer.h"
 #include "nsIContentViewer.h"
 #include "nsIMarkupDocumentViewer.h"
-#include "nsIDocShell.h"
+#include "nsDocShell.h"
 #include "nsDocShellLoadTypes.h"
 #include "nsIWebNavigation.h"
 #include "nsIBaseWindow.h"
@@ -1362,7 +1362,7 @@ nsHTMLDocument::Open(JSContext* cx,
   }
 
   // check whether we're in the middle of unload.  If so, ignore this call.
-  nsCOMPtr<nsIDocShell> shell = do_QueryReferent(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> shell(mDocumentContainer);
   if (!shell) {
     // We won't be able to create a parser anyway.
     nsCOMPtr<nsIDocument> ret = this;
diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index 88b7d9d5588..8a12125f075 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -38,7 +38,7 @@
 #include "nsIRDFService.h"
 #include "nsIStreamListener.h"
 #include "nsITimer.h"
-#include "nsIDocShell.h"
+#include "nsDocShell.h"
 #include "nsGkAtoms.h"
 #include "nsXMLContentSink.h"
 #include "nsXULContentSink.h"
@@ -4667,7 +4667,7 @@ XULDocument::ParserObserver::OnStopRequest(nsIRequest *request,
 already_AddRefed<nsPIWindowRoot>
 XULDocument::GetWindowRoot()
 {
-    nsCOMPtr<nsIInterfaceRequestor> ir = do_QueryReferent(mDocumentContainer);
+    nsCOMPtr<nsIInterfaceRequestor> ir(mDocumentContainer);
     nsCOMPtr<nsIDOMWindow> window(do_GetInterface(ir));
     nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(window));
     return piWin ? piWin->GetTopWindowRoot() : nullptr;
diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build
index 58485904db5..4c1945575ea 100644
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -28,6 +28,7 @@ LOCAL_INCLUDES += [
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
+    '/docshell/base',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 6f18217b93b..4300f0e314b 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7259,7 +7259,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
       // got Reset() with a channel.
       blankDoc->SetBaseURI(aBaseURI);
 
-      blankDoc->SetContainer(static_cast<nsIDocShell *>(this));
+      blankDoc->SetContainer(this);
 
       // Copy our sandbox flags to the document. These are immutable
       // after being set here.
@@ -7271,7 +7271,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
 
       // hook 'em up
       if (viewer) {
-        viewer->SetContainer(static_cast<nsIContentViewerContainer *>(this));
+        viewer->SetContainer(this);
         Embed(viewer, "", 0);
 
         SetCurrentURI(blankDoc->GetDocumentURI(), nullptr, true, 0);
@@ -7607,7 +7607,7 @@ nsDocShell::RestorePresentation(nsISHEntry *aSHEntry, bool *aRestoring)
     // different one.  We don't currently support restoring the presentation
     // in that case.
 
-    nsCOMPtr<nsISupports> container;
+    nsCOMPtr<nsIDocShell> container;
     viewer->GetContainer(getter_AddRefs(container));
     if (!::SameCOMIdentity(container, GetAsSupports(this))) {
 #ifdef DEBUG_PAGE_CACHE
@@ -8333,13 +8333,13 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
     nsresult rv = docLoaderFactory->CreateInstance("view",
                                                    aOpenedChannel,
                                                    aLoadGroup, aContentType,
-                                                   static_cast<nsIContentViewerContainer*>(this),
+                                                   this,
                                                    nullptr,
                                                    aContentHandler,
                                                    aViewer);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    (*aViewer)->SetContainer(static_cast<nsIContentViewerContainer *>(this));
+    (*aViewer)->SetContainer(this);
     return NS_OK;
 }
 
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 650011cc232..32a59c5a82c 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -18,6 +18,7 @@
 #include "nsIContentViewerContainer.h"
 #include "nsIDOMStorageManager.h"
 #include "nsDocLoader.h"
+#include "mozilla/WeakPtr.h"
 
 // Helper Classes
 #include "nsCOMPtr.h"
@@ -137,7 +138,8 @@ class nsDocShell : public nsDocLoader,
                    public nsIWebShellServices,
                    public nsILinkHandler,
                    public nsIClipboardCommands,
-                   public nsIDOMStorageManager
+                   public nsIDOMStorageManager,
+                   public mozilla::SupportsWeakPtr<nsDocShell>
 {
     friend class nsDSURIContentListener;
 
diff --git a/docshell/base/nsIContentViewer.idl b/docshell/base/nsIContentViewer.idl
index 6610ab66e5f..1fba74fbbc1 100644
--- a/docshell/base/nsIContentViewer.idl
+++ b/docshell/base/nsIContentViewer.idl
@@ -4,6 +4,7 @@
 
 #include "nsISupports.idl"
 
+interface nsIDocShell;
 interface nsIDOMDocument;
 interface nsISHEntry;
 interface nsIPrintSettings;
@@ -34,7 +35,7 @@ interface nsIContentViewer : nsISupports
   [noscript] void init(in nsIWidgetPtr aParentWidget,
                        [const] in nsIntRectRef aBounds);
 
-  attribute nsISupports container;
+  attribute nsIDocShell container;
 
   void loadStart(in nsISupports aDoc);
   void loadComplete(in nsresult aStatus);
diff --git a/docshell/base/nsIDocumentLoaderFactory.idl b/docshell/base/nsIDocumentLoaderFactory.idl
index caacfcd5843..904882c836c 100644
--- a/docshell/base/nsIDocumentLoaderFactory.idl
+++ b/docshell/base/nsIDocumentLoaderFactory.idl
@@ -9,6 +9,7 @@
 interface nsIChannel;
 interface nsIContentViewer;
 interface nsIStreamListener;
+interface nsIDocShell;
 interface nsIDocument;
 interface nsILoadGroup;
 interface nsIPrincipal;
@@ -21,13 +22,13 @@ interface nsIPrincipal;
  * The component is a service, so use GetService, not CreateInstance to get it.
  */
 
-[scriptable, uuid(5e7d2967-5a07-444f-95d5-25b533252d38)]
+[scriptable, uuid(70905274-8494-4e39-b011-d559adde3733)]
 interface nsIDocumentLoaderFactory : nsISupports {
     nsIContentViewer createInstance(in string aCommand,
                               in nsIChannel aChannel,
                               in nsILoadGroup aLoadGroup,
                               in string aContentType, 
-                              in nsISupports aContainer,
+                              in nsIDocShell aContainer,
                               in nsISupports aExtraInfo,
                               out nsIStreamListener aDocListenerResult);
 
diff --git a/docshell/shistory/src/nsSHEntryShared.cpp b/docshell/shistory/src/nsSHEntryShared.cpp
index 5d44492fc8a..e24a6010d5c 100644
--- a/docshell/shistory/src/nsSHEntryShared.cpp
+++ b/docshell/shistory/src/nsSHEntryShared.cpp
@@ -10,6 +10,7 @@
 #include "nsIDocument.h"
 #include "nsIWebNavigation.h"
 #include "nsIContentViewer.h"
+#include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsDocShellEditorData.h"
 #include "nsThreadUtils.h"
@@ -167,7 +168,7 @@ nsSHEntryShared::Expire()
   if (!mContentViewer) {
     return;
   }
-  nsCOMPtr<nsISupports> container;
+  nsCOMPtr<nsIDocShell> container;
   mContentViewer->GetContainer(getter_AddRefs(container));
   nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
   if (!treeItem) {
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 2c6544c1b2e..2ed43247b72 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -111,4 +111,7 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+LOCAL_INCLUDES += [
+    '/docshell/base',
+]
 FINAL_LIBRARY = 'gklayout'
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 0035a2f0c66..4747947e28e 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -36,6 +36,7 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/EncodingUtils.h"
+#include "mozilla/WeakPtr.h"
 
 #include "nsViewManager.h"
 #include "nsView.h"
@@ -48,7 +49,7 @@
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIDocShell.h"
+#include "nsDocShell.h"
 #include "nsIBaseWindow.h"
 #include "nsILayoutHistoryState.h"
 #include "nsCharsetSource.h"
@@ -348,7 +349,7 @@ protected:
   // (ie, non owning) references. If you add any members to this
   // class, please make the ownership explicit (pinkerton, scc).
 
-  nsWeakPtr mContainer; // it owns me!
+  WeakPtr<nsDocShell> mContainer; // it owns me!
   nsWeakPtr mTopContainerWhilePrinting;
   nsRefPtr<nsDeviceContext> mDeviceContext;  // We create and own this baby
 
@@ -576,7 +577,7 @@ nsDocumentViewer::LoadStart(nsISupports *aDoc)
 nsresult
 nsDocumentViewer::SyncParentSubDocMap()
 {
-  nsCOMPtr<nsIDocShellTreeItem> item(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShellTreeItem> item(mContainer);
   nsCOMPtr<nsPIDOMWindow> pwin(do_GetInterface(item));
   nsCOMPtr<nsIContent> content;
 
@@ -610,9 +611,9 @@ nsDocumentViewer::SyncParentSubDocMap()
 }
 
 NS_IMETHODIMP
-nsDocumentViewer::SetContainer(nsISupports* aContainer)
+nsDocumentViewer::SetContainer(nsIDocShell* aContainer)
 {
-  mContainer = do_GetWeakReference(aContainer);
+  mContainer = static_cast<nsDocShell*>(aContainer)->asWeakPtr();
   if (mPresContext) {
     mPresContext->SetContainer(aContainer);
   }
@@ -625,12 +626,11 @@ nsDocumentViewer::SetContainer(nsISupports* aContainer)
 }
 
 NS_IMETHODIMP
-nsDocumentViewer::GetContainer(nsISupports** aResult)
+nsDocumentViewer::GetContainer(nsIDocShell** aResult)
 {
    NS_ENSURE_ARG_POINTER(aResult);
 
-   *aResult = nullptr;
-   nsCOMPtr<nsISupports> container = do_QueryReferent(mContainer);
+   nsCOMPtr<nsIDocShell> container(mContainer);
    container.swap(*aResult);
    return NS_OK;
 }
@@ -873,7 +873,7 @@ nsDocumentViewer::InitInternal(nsIWidget* aParentWidget,
     }
   }
 
-  nsCOMPtr<nsIInterfaceRequestor> requestor(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIInterfaceRequestor> requestor(mContainer);
   if (requestor) {
     if (mPresContext) {
       nsCOMPtr<nsILinkHandler> linkHandler;
@@ -1107,7 +1107,7 @@ nsDocumentViewer::PermitUnload(bool aCallerClosesWindow, bool *aPermitUnload)
     }
   }
 
-  nsCOMPtr<nsIDocShellTreeNode> docShellNode(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShellTreeNode> docShellNode(mContainer);
   nsAutoString text;
   beforeUnload->GetReturnValue(text);
   if (event->GetInternalNSEvent()->mFlags.mDefaultPrevented ||
@@ -1198,7 +1198,7 @@ nsDocumentViewer::ResetCloseWindow()
 {
   mCallerIsClosingWindow = false;
 
-  nsCOMPtr<nsIDocShellTreeNode> docShellNode(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShellTreeNode> docShellNode(mContainer);
   if (docShellNode) {
     int32_t childCount;
     docShellNode->GetChildCount(&childCount);
@@ -1286,7 +1286,7 @@ AttachContainerRecurse(nsIDocShell* aShell)
   if (viewer) {
     nsIDocument* doc = viewer->GetDocument();
     if (doc) {
-      doc->SetContainer(aShell);
+      doc->SetContainer(static_cast<nsDocShell*>(aShell));
     }
     nsRefPtr<nsPresContext> pc;
     viewer->GetPresContext(getter_AddRefs(pc));
@@ -1317,7 +1317,7 @@ nsDocumentViewer::Open(nsISupports *aState, nsISHEntry *aSHEntry)
   NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_INITIALIZED);
 
   if (mDocument)
-    mDocument->SetContainer(nsCOMPtr<nsISupports>(do_QueryReferent(mContainer)));
+    mDocument->SetContainer(mContainer);
 
   nsresult rv = InitInternal(mParentWidget, aState, mBounds, false);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1561,8 +1561,11 @@ nsDocumentViewer::Destroy()
       mPresContext->SetLinkHandler(nullptr);
       mPresContext->SetContainer(nullptr);
     }
-    if (mPresShell)
-      mPresShell->SetForwardingContainer(mContainer);
+    if (mPresShell) {
+      nsWeakPtr container =
+        do_GetWeakReference(static_cast<nsIDocShell*>(mContainer));
+      mPresShell->SetForwardingContainer(container);
+    }
 
     // Do the same for our children.  Note that we need to get the child
     // docshells from the SHEntry now; the docshell will have cleared them.
@@ -1620,7 +1623,7 @@ nsDocumentViewer::Destroy()
 
   mWindow = nullptr;
   mViewManager = nullptr;
-  mContainer = nullptr;
+  mContainer = WeakPtr<nsDocShell>();
 
   return NS_OK;
 }
@@ -1691,8 +1694,7 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
   MOZ_ASSERT(aDocument);
 
   // Set new container
-  nsCOMPtr<nsISupports> container = do_QueryReferent(mContainer);
-  aDocument->SetContainer(container);
+  aDocument->SetContainer(mContainer);
 
   if (mDocument != aDocument) {
     if (mDocument->IsStaticDocument()) {
@@ -1704,7 +1706,8 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
     mDocument = aDocument;
 
     // Set the script global object on the new document
-    nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(container);
+    nsCOMPtr<nsPIDOMWindow> window =
+      do_GetInterface(static_cast<nsIDocShell*>(mContainer.get()));
     if (window) {
       window->SetNewDocument(aDocument, nullptr, aForceReuseInnerWindow);
     }
@@ -1712,7 +1715,7 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
     // Clear the list of old child docshells. Child docshells for the new
     // document will be constructed as frames are created.
     if (!aDocument->IsStaticDocument()) {
-      nsCOMPtr<nsIDocShellTreeNode> node = do_QueryInterface(container);
+      nsCOMPtr<nsIDocShellTreeNode> node(mContainer);
       if (node) {
         int32_t count;
         node->GetChildCount(&count);
@@ -1888,7 +1891,7 @@ nsDocumentViewer::Show(void)
     prevViewer->Destroy();
 
     // Make sure we don't have too many cached ContentViewers
-    nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryReferent(mContainer);
+    nsCOMPtr<nsIDocShellTreeItem> treeItem(mContainer);
     if (treeItem) {
       // We need to find the root DocShell since only that object has an
       // SHistory and we need the SHistory to evict content viewers
@@ -1924,7 +1927,7 @@ nsDocumentViewer::Show(void)
   if (mDocument && !mPresShell) {
     NS_ASSERTION(!mWindow, "Window already created but no presshell?");
 
-    nsCOMPtr<nsIBaseWindow> base_win(do_QueryReferent(mContainer));
+    nsCOMPtr<nsIBaseWindow> base_win(mContainer);
     if (base_win) {
       base_win->GetParentWidget(&mParentWidget);
       if (mParentWidget) {
@@ -2014,7 +2017,7 @@ nsDocumentViewer::Hide(void)
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShell> docShell(mContainer);
   if (docShell) {
     nsCOMPtr<nsILayoutHistoryState> layoutState;
     mPresShell->CaptureHistoryState(getter_AddRefs(layoutState));
@@ -2029,7 +2032,7 @@ nsDocumentViewer::Hide(void)
   mDeviceContext = nullptr;
   mParentWidget  = nullptr;
 
-  nsCOMPtr<nsIBaseWindow> base_win(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIBaseWindow> base_win(mContainer);
 
   if (base_win && !mAttachedToParent) {
     base_win->SetParentWidget(nullptr);
@@ -2114,7 +2117,7 @@ nsDocumentViewer::CreateStyleSet(nsIDocument* aDocument,
   bool shouldOverride = false;
   // We don't want a docshell here for external resource docs, so just
   // look at mContainer.
-  nsCOMPtr<nsIDocShell> ds(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShell> ds(mContainer);
   nsCOMPtr<nsIDOMEventTarget> chromeHandler;
   nsCOMPtr<nsIURI> uri;
   nsRefPtr<nsCSSStyleSheet> csssheet;
@@ -2303,7 +2306,7 @@ nsDocumentViewer::FindContainerView()
   nsView* containerView = nullptr;
 
   if (mContainer) {
-    nsCOMPtr<nsIDocShellTreeItem> docShellItem = do_QueryReferent(mContainer);
+    nsCOMPtr<nsIDocShellTreeItem> docShellItem(mContainer);
     nsCOMPtr<nsPIDOMWindow> pwin(do_GetInterface(docShellItem));
     if (pwin) {
       nsCOMPtr<nsIContent> containerElement = do_QueryInterface(pwin->GetFrameElementInternal());
@@ -2500,7 +2503,7 @@ NS_IMETHODIMP nsDocumentViewer::CopyImage(int32_t aCopyFlags)
   // make noise if we're not in an image
   NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsILoadContext> loadContext(do_QueryReferent(mContainer));
+  nsCOMPtr<nsILoadContext> loadContext(mContainer);
   return nsCopySupport::ImageCopy(node, loadContext, aCopyFlags);
 }
 
@@ -2632,7 +2635,7 @@ NS_IMETHODIMP nsDocumentViewer::ScrollToNode(nsIDOMNode* aNode)
 void
 nsDocumentViewer::CallChildren(CallChildFunc aFunc, void* aClosure)
 {
-  nsCOMPtr<nsIDocShellTreeNode> docShellNode(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShellTreeNode> docShellNode(mContainer);
   if (docShellNode)
   {
     int32_t i;
@@ -3226,7 +3229,7 @@ nsDocumentViewer::GetContentSize(int32_t* aWidth, int32_t* aHeight)
    NS_ENSURE_TRUE(mDocument, NS_ERROR_NOT_AVAILABLE);
 
    // Skip doing this on docshell-less documents for now
-   nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryReferent(mContainer));
+   nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(mContainer);
    NS_ENSURE_TRUE(docShellAsItem, NS_ERROR_NOT_AVAILABLE);
    
    nsCOMPtr<nsIDocShellTreeItem> docShellParent;
@@ -3554,7 +3557,7 @@ nsDocumentViewer::Print(nsIPrintSettings*       aPrintSettings,
     return NS_ERROR_FAILURE;
   }
 
-  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShell> docShell(mContainer);
   NS_ENSURE_STATE(docShell);
 
   // Check to see if this document is still busy
@@ -3664,7 +3667,7 @@ nsDocumentViewer::PrintPreview(nsIPrintSettings* aPrintSettings,
   }
 #endif
 
-  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShell> docShell(mContainer);
   if (!docShell || !mDeviceContext) {
     PR_PL(("Can't Print Preview without device context and docshell"));
     return NS_ERROR_FAILURE;
@@ -4030,7 +4033,7 @@ nsDocumentViewer::ShouldAttachToTopLevel()
   if (!mParentWidget)
     return false;
 
-  nsCOMPtr<nsIDocShellTreeItem> containerItem = do_QueryReferent(mContainer);
+  nsCOMPtr<nsIDocShellTreeItem> containerItem(mContainer);
   if (!containerItem)
     return false;
 
@@ -4098,7 +4101,7 @@ nsDocumentViewer::SetIsPrinting(bool aIsPrinting)
 #ifdef NS_PRINTING
   // Set all the docShells in the docshell tree to be printing.
   // that way if anyone of them tries to "navigate" it can't
-  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(mContainer);
   if (docShellTreeNode || !aIsPrinting) {
     SetIsPrintingInDocShellTree(docShellTreeNode, aIsPrinting, true);
   } else {
@@ -4134,7 +4137,7 @@ nsDocumentViewer::SetIsPrintPreview(bool aIsPrintPreview)
 #ifdef NS_PRINTING
   // Set all the docShells in the docshell tree to be printing.
   // that way if anyone of them tries to "navigate" it can't
-  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(mContainer);
   if (docShellTreeNode || !aIsPrintPreview) {
     SetIsPrintingInDocShellTree(docShellTreeNode, aIsPrintPreview, true);
   }
@@ -4208,7 +4211,7 @@ nsDocumentViewer::ReturnToGalleyPresentation()
   mPrintEngine->Destroy();
   mPrintEngine = nullptr;
 
-  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
+  nsCOMPtr<nsIDocShell> docShell(mContainer);
   ResetFocusState(docShell);
 
   SetTextZoom(mTextZoom);
@@ -4247,8 +4250,8 @@ nsDocumentViewer::OnDonePrinting()
     // We are done printing, now cleanup 
     if (mDeferredWindowClose) {
       mDeferredWindowClose = false;
-      nsCOMPtr<nsISupports> container = do_QueryReferent(mContainer);
-      nsCOMPtr<nsIDOMWindow> win = do_GetInterface(container);
+      nsCOMPtr<nsIDOMWindow> win =
+        do_GetInterface(static_cast<nsIDocShell*>(mContainer));
       if (win)
         win->Close();
     } else if (mClosingWhilePrinting) {
diff --git a/layout/build/moz.build b/layout/build/moz.build
index b0ba967db33..89deba84c76 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -29,4 +29,7 @@ LIBRARY_NAME = 'gklayout'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+LOCAL_INCLUDES += [
+    '/docshell/base',
+]
 FINAL_LIBRARY = 'xul'
diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp
index b2e58c46e10..02c866ce8ef 100644
--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "nsCOMPtr.h"
 #include "nsContentDLF.h"
+#include "nsDocShell.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsIComponentManager.h"
@@ -135,7 +136,7 @@ nsContentDLF::CreateInstance(const char* aCommand,
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
                              const char* aContentType, 
-                             nsISupports* aContainer,
+                             nsIDocShell* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aDocViewer)
@@ -370,7 +371,7 @@ nsresult
 nsContentDLF::CreateDocument(const char* aCommand,
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
-                             nsISupports* aContainer,
+                             nsIDocShell* aContainer,
                              const nsCID& aDocumentCID,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aContentViewer)
@@ -399,7 +400,7 @@ nsContentDLF::CreateDocument(const char* aCommand,
   rv = NS_NewContentViewer(getter_AddRefs(contentViewer));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  doc->SetContainer(aContainer);
+  doc->SetContainer(static_cast<nsDocShell*>(aContainer));
 
   // Initialize the document to begin loading the data.  An
   // nsIStreamListener connected to the parser is returned in
@@ -418,7 +419,7 @@ nsContentDLF::CreateXULDocument(const char* aCommand,
                                 nsIChannel* aChannel,
                                 nsILoadGroup* aLoadGroup,
                                 const char* aContentType,
-                                nsISupports* aContainer,
+                                nsIDocShell* aContainer,
                                 nsISupports* aExtraInfo,
                                 nsIStreamListener** aDocListener,
                                 nsIContentViewer** aContentViewer)
@@ -442,7 +443,7 @@ nsContentDLF::CreateXULDocument(const char* aCommand,
    * aDocListener.
    */
 
-  doc->SetContainer(aContainer);
+  doc->SetContainer(static_cast<nsDocShell*>(aContainer));
 
   rv = doc->StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer, aDocListener, true);
   if (NS_FAILED(rv)) return rv;
diff --git a/layout/build/nsContentDLF.h b/layout/build/nsContentDLF.h
index 327915cc7c3..e44d6b948d5 100644
--- a/layout/build/nsContentDLF.h
+++ b/layout/build/nsContentDLF.h
@@ -33,7 +33,7 @@ public:
   nsresult CreateDocument(const char* aCommand,
                           nsIChannel* aChannel,
                           nsILoadGroup* aLoadGroup,
-                          nsISupports* aContainer,
+                          nsIDocShell* aContainer,
                           const nsCID& aDocumentCID,
                           nsIStreamListener** aDocListener,
                           nsIContentViewer** aContentViewer);
@@ -42,7 +42,7 @@ public:
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
                              const char* aContentType,
-                             nsISupports* aContainer,
+                             nsIDocShell* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aContentViewer);
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index f789c0f3878..4f83efbe1ba 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -293,7 +293,7 @@ void nsPrintEngine::DestroyPrintingData()
 
 //--------------------------------------------------------
 nsresult nsPrintEngine::Initialize(nsIDocumentViewerPrint* aDocViewerPrint, 
-                                   nsIWeakReference*       aContainer,
+                                   nsIDocShell*            aContainer,
                                    nsIDocument*            aDocument,
                                    float                   aScreenDPI,
                                    FILE*                   aDebugFile)
@@ -303,7 +303,7 @@ nsresult nsPrintEngine::Initialize(nsIDocumentViewerPrint* aDocViewerPrint,
   NS_ENSURE_ARG_POINTER(aDocument);
 
   mDocViewerPrint = aDocViewerPrint;
-  mContainer      = aContainer;
+  mContainer      = do_GetWeakReference(aContainer);
   mDocument       = aDocument;
   mScreenDPI      = aScreenDPI;
 
diff --git a/layout/printing/nsPrintEngine.h b/layout/printing/nsPrintEngine.h
index 14e1680477e..ec1b5c5daec 100644
--- a/layout/printing/nsPrintEngine.h
+++ b/layout/printing/nsPrintEngine.h
@@ -82,7 +82,7 @@ public:
   void DestroyPrintingData();
 
   nsresult Initialize(nsIDocumentViewerPrint* aDocViewerPrint, 
-                      nsIWeakReference*       aContainer,
+                      nsIDocShell*            aContainer,
                       nsIDocument*            aDocument,
                       float                   aScreenDPI,
                       FILE*                   aDebugFile);
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
index d3acc291c96..1ab166ac42e 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
@@ -23,6 +23,7 @@
 #include "nsICacheSession.h"
 #include "nsICachingChannel.h"
 #include "nsIContent.h"
+#include "nsIDocShell.h"
 #include "nsIDocumentLoader.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMWindow.h"
@@ -378,8 +379,7 @@ nsOfflineCacheUpdateService::ScheduleOnDocumentStop(nsIURI *aManifestURI,
          this, aManifestURI, aDocumentURI, aDocument));
 
     nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDocument);
-    nsCOMPtr<nsISupports> container = doc->GetContainer();
-    nsCOMPtr<nsIWebProgress> progress = do_QueryInterface(container);
+    nsCOMPtr<nsIWebProgress> progress = do_QueryInterface(doc->GetContainer());
     NS_ENSURE_TRUE(progress, NS_ERROR_INVALID_ARG);
 
     // Proceed with cache update
diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp
index e0d8f991abf..98c84dba4c6 100644
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -17,6 +17,7 @@
 
 #include "nsDirectoryViewer.h"
 #include "nsIDirIndex.h"
+#include "nsIDocShell.h"
 #include "jsapi.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
@@ -1265,7 +1266,7 @@ nsDirectoryViewerFactory::CreateInstance(const char *aCommand,
                                          nsIChannel* aChannel,
                                          nsILoadGroup* aLoadGroup,
                                          const char* aContentType, 
-                                         nsISupports* aContainer,
+                                         nsIDocShell* aContainer,
                                          nsISupports* aExtraInfo,
                                          nsIStreamListener** aDocListenerResult,
                                          nsIContentViewer** aDocViewerResult)

From 37180a93f9e2a70a9ce95206a8f9c065e4aa1a24 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 15 Nov 2013 11:32:12 -0500
Subject: [PATCH 02/92] bug 939049 - get rid of useless QIs r=smaug

---
 accessible/src/base/Logging.cpp               | 30 ++++++++-----------
 .../src/base/nsAccessibilityService.cpp       |  3 +-
 accessible/src/base/nsCoreUtils.cpp           | 14 +++------
 accessible/src/generic/Accessible.cpp         | 10 ++-----
 accessible/src/generic/DocAccessible.cpp      |  9 ++----
 content/base/public/nsIDocument.h             |  7 ++++-
 content/base/src/nsContentUtils.cpp           | 20 ++++---------
 content/base/src/nsDocument.cpp               | 29 ++++++++----------
 content/base/src/nsTreeSanitizer.cpp          |  3 +-
 content/html/content/src/HTMLInputElement.cpp |  7 ++---
 content/html/content/src/HTMLMediaElement.cpp |  9 ++----
 content/xul/document/src/XULDocument.cpp      |  5 ++--
 dom/ipc/TabChild.cpp                          |  3 +-
 dom/ipc/TabParent.cpp                         |  5 +---
 editor/composer/src/nsEditorSpellCheck.cpp    |  3 +-
 editor/libeditor/base/nsEditorUtils.cpp       |  3 +-
 .../text/nsPlaintextDataTransfer.cpp          |  3 +-
 layout/base/nsPresContext.cpp                 |  4 +--
 layout/generic/nsSubDocumentFrame.cpp         |  3 +-
 layout/printing/nsPrintEngine.cpp             |  3 +-
 layout/style/nsFontFaceLoader.cpp             | 23 +++++---------
 layout/xul/base/src/nsContainerBoxObject.cpp  |  9 ++----
 layout/xul/base/src/nsXULPopupManager.cpp     |  3 +-
 .../satchel/nsFormFillController.cpp          |  5 ++--
 24 files changed, 77 insertions(+), 136 deletions(-)

diff --git a/accessible/src/base/Logging.cpp b/accessible/src/base/Logging.cpp
index 0e5b79629ab..435b79f358b 100644
--- a/accessible/src/base/Logging.cpp
+++ b/accessible/src/base/Logging.cpp
@@ -99,22 +99,19 @@ LogDocShellState(nsIDocument* aDocumentNode)
   printf("docshell busy: ");
 
   nsAutoCString docShellBusy;
-  nsCOMPtr<nsISupports> container = aDocumentNode->GetContainer();
-  if (container) {
-    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-    uint32_t busyFlags = nsIDocShell::BUSY_FLAGS_NONE;
-    docShell->GetBusyFlags(&busyFlags);
-    if (busyFlags == nsIDocShell::BUSY_FLAGS_NONE)
-      printf("'none'");
-    if (busyFlags & nsIDocShell::BUSY_FLAGS_BUSY)
-      printf("'busy'");
-    if (busyFlags & nsIDocShell::BUSY_FLAGS_BEFORE_PAGE_LOAD)
-      printf(", 'before page load'");
-    if (busyFlags & nsIDocShell::BUSY_FLAGS_PAGE_LOADING)
-      printf(", 'page loading'");
-  } else {
+  nsCOMPtr<nsIDocShell> docShell = aDocumentNode->GetDocShell();
+  uint32_t busyFlags = nsIDocShell::BUSY_FLAGS_NONE;
+  docShell->GetBusyFlags(&busyFlags);
+  if (busyFlags == nsIDocShell::BUSY_FLAGS_NONE)
+    printf("'none'");
+  if (busyFlags & nsIDocShell::BUSY_FLAGS_BUSY)
+    printf("'busy'");
+  if (busyFlags & nsIDocShell::BUSY_FLAGS_BEFORE_PAGE_LOAD)
+    printf(", 'before page load'");
+  if (busyFlags & nsIDocShell::BUSY_FLAGS_PAGE_LOADING)
+    printf(", 'page loading'");
+
     printf("[failed]");
-  }
 }
 
 static void
@@ -132,8 +129,7 @@ static void
 LogDocShellTree(nsIDocument* aDocumentNode)
 {
   if (aDocumentNode->IsActive()) {
-    nsCOMPtr<nsISupports> container = aDocumentNode->GetContainer();
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
+    nsCOMPtr<nsIDocShellTreeItem> treeItem(aDocumentNode->GetDocShell());
     nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
     treeItem->GetParent(getter_AddRefs(parentTreeItem));
     nsCOMPtr<nsIDocShellTreeItem> rootTreeItem;
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 5804fb43528..0ea3d82ef5f 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -200,8 +200,7 @@ nsAccessibilityService::GetRootDocumentAccessible(nsIPresShell* aPresShell,
   nsIPresShell* ps = aPresShell;
   nsIDocument* documentNode = aPresShell->GetDocument();
   if (documentNode) {
-    nsCOMPtr<nsISupports> container = documentNode->GetContainer();
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
+    nsCOMPtr<nsIDocShellTreeItem> treeItem(documentNode->GetDocShell());
     if (treeItem) {
       nsCOMPtr<nsIDocShellTreeItem> rootTreeItem;
       treeItem->GetRootTreeItem(getter_AddRefs(rootTreeItem));
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index 00ccb9a702a..13aee385f1f 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -394,17 +394,14 @@ nsCoreUtils::GetDocShellFor(nsINode *aNode)
   if (!aNode)
     return nullptr;
 
-  nsCOMPtr<nsISupports> container = aNode->OwnerDoc()->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShell> docShell = aNode->OwnerDoc()->GetDocShell();
   return docShell.forget();
 }
 
 bool
 nsCoreUtils::IsRootDocument(nsIDocument *aDocument)
 {
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
-    do_QueryInterface(container);
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = aDocument->GetDocShell();
   NS_ASSERTION(docShellTreeItem, "No document shell for document!");
 
   nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
@@ -416,9 +413,7 @@ nsCoreUtils::IsRootDocument(nsIDocument *aDocument)
 bool
 nsCoreUtils::IsContentDocument(nsIDocument *aDocument)
 {
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
-    do_QueryInterface(container);
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = aDocument->GetDocShell();
   NS_ASSERTION(docShellTreeItem, "No document shell tree item for document!");
 
   int32_t contentType;
@@ -429,8 +424,7 @@ nsCoreUtils::IsContentDocument(nsIDocument *aDocument)
 bool
 nsCoreUtils::IsTabDocument(nsIDocument* aDocumentNode)
 {
-  nsCOMPtr<nsISupports> container = aDocumentNode->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
+  nsCOMPtr<nsIDocShellTreeItem> treeItem(aDocumentNode->GetDocShell());
 
   nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
   treeItem->GetParent(getter_AddRefs(parentTreeItem));
diff --git a/accessible/src/generic/Accessible.cpp b/accessible/src/generic/Accessible.cpp
index 8f2ce0bdaff..b4c936579e2 100644
--- a/accessible/src/generic/Accessible.cpp
+++ b/accessible/src/generic/Accessible.cpp
@@ -376,10 +376,8 @@ Accessible::AccessKey() const
   nsIDocument* document = mContent->GetCurrentDoc();
   if (!document)
     return KeyBinding();
-  nsCOMPtr<nsISupports> container = document->GetContainer();
-  if (!container)
-    return KeyBinding();
-  nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
+
+  nsCOMPtr<nsIDocShellTreeItem> treeItem(document->GetDocShell());
   if (!treeItem)
     return KeyBinding();
 
@@ -1293,9 +1291,7 @@ Accessible::NativeAttributes()
                                            nsCoreUtils::GetRoleContent(doc));
 
     // Allow ARIA live region markup from outer documents to override
-    nsCOMPtr<nsISupports> container = doc->GetContainer(); 
-    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
-      do_QueryInterface(container);
+    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = doc->GetDocShell();
     if (!docShellTreeItem)
       break;
 
diff --git a/accessible/src/generic/DocAccessible.cpp b/accessible/src/generic/DocAccessible.cpp
index 909c41ab1ba..efc898ced63 100644
--- a/accessible/src/generic/DocAccessible.cpp
+++ b/accessible/src/generic/DocAccessible.cpp
@@ -688,8 +688,7 @@ DocAccessible::GetBoundsRect(nsRect& aBounds, nsIFrame** aRelativeFrame)
 nsresult
 DocAccessible::AddEventListeners()
 {
-  nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(do_QueryInterface(container));
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(mDocumentNode->GetDocShell());
 
   // We want to add a command observer only if the document is content and has
   // an editor.
@@ -721,8 +720,7 @@ DocAccessible::RemoveEventListeners()
   if (mDocumentNode) {
     mDocumentNode->RemoveObserver(this);
 
-    nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
-    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(do_QueryInterface(container));
+    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(mDocumentNode->GetDocShell());
     NS_ASSERTION(docShellTreeItem, "doc should support nsIDocShellTreeItem.");
 
     if (docShellTreeItem) {
@@ -1987,8 +1985,7 @@ DocAccessible::ShutdownChildrenInSubtree(Accessible* aAccessible)
 bool
 DocAccessible::IsLoadEventTarget() const
 {
-  nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShellTreeItem> treeItem = mDocumentNode->GetDocShell();
   NS_ASSERTION(treeItem, "No document shell for document!");
 
   nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 4ac7ced9144..120ce2172ef 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -1165,6 +1165,11 @@ public:
    */
   nsILoadContext* GetLoadContext() const;
 
+  /**
+   * Get docshell the for this document.
+   */
+  nsIDocShell* GetDocShell() const;
+
   /**
    * Set and get XML declaration. If aVersion is null there is no declaration.
    * aStandalone takes values -1, 0 and 1 indicating respectively that there
@@ -1525,7 +1530,7 @@ public:
   void SetDisplayDocument(nsIDocument* aDisplayDocument)
   {
     NS_PRECONDITION(!GetShell() &&
-                    !nsCOMPtr<nsISupports>(GetContainer()) &&
+                    !GetContainer() &&
                     !GetWindow(),
                     "Shouldn't set mDisplayDocument on documents that already "
                     "have a presentation or a docshell or a window");
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 787a1d5fd2c..f7a7a33a6be 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -2622,10 +2622,7 @@ nsContentUtils::CanLoadImage(nsIURI* aURI, nsISupports* aContext,
   uint32_t appType = nsIDocShell::APP_TYPE_UNKNOWN;
 
   {
-    nsCOMPtr<nsISupports> container = aLoadingDocument->GetContainer();
-    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
-      do_QueryInterface(container);
-
+    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = aLoadingDocument->GetDocShell();
     if (docShellTreeItem) {
       nsCOMPtr<nsIDocShellTreeItem> root;
       docShellTreeItem->GetRootTreeItem(getter_AddRefs(root));
@@ -3153,8 +3150,7 @@ nsContentUtils::IsChromeDoc(nsIDocument *aDocument)
 bool
 nsContentUtils::IsChildOfSameType(nsIDocument* aDoc)
 {
-  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(container));
+  nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(aDoc->GetDocShell());
   nsCOMPtr<nsIDocShellTreeItem> sameTypeParent;
   if (docShellAsItem) {
     docShellAsItem->GetSameTypeParent(getter_AddRefs(sameTypeParent));
@@ -3235,8 +3231,7 @@ nsContentUtils::IsInChromeDocshell(nsIDocument *aDocument)
     return IsInChromeDocshell(aDocument->GetDisplayDocument());
   }
 
-  nsCOMPtr<nsISupports> docContainer = aDocument->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShell(do_QueryInterface(docContainer));
+  nsCOMPtr<nsIDocShellTreeItem> docShell(aDocument->GetDocShell());
   int32_t itemType = nsIDocShellTreeItem::typeContent;
   if (docShell) {
     docShell->GetItemType(&itemType);
@@ -4976,8 +4971,7 @@ nsContentUtils::HidePopupsInDocument(nsIDocument* aDocument)
 #ifdef MOZ_XUL
   nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
   if (pm && aDocument) {
-    nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-    nsCOMPtr<nsIDocShellTreeItem> docShellToHide = do_QueryInterface(container);
+    nsCOMPtr<nsIDocShellTreeItem> docShellToHide = aDocument->GetDocShell();
     if (docShellToHide)
       pm->HidePopupsInDocShell(docShellToHide);
   }
@@ -5877,8 +5871,7 @@ nsContentUtils::IsSubDocumentTabbable(nsIContent* aContent)
     return false;
   }
 
-  nsCOMPtr<nsISupports> container = subDoc->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShell> docShell = subDoc->GetDocShell();
   if (!docShell) {
     return false;
   }
@@ -5988,8 +5981,7 @@ nsContentUtils::FindPresShellForDocument(const nsIDocument* aDoc)
     return shell;
   }
 
-  nsCOMPtr<nsISupports> container = doc->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = doc->GetDocShell();
   while (docShellTreeItem) {
     // We may be in a display:none subdocument, or we may not have a presshell
     // created yet.
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index b08e2f42409..31337428e99 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -8862,12 +8862,11 @@ nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer)
   mCreatingStaticClone = true;
 
   // Make document use different container during cloning.
-  nsCOMPtr<nsISupports> originalContainer = GetContainer();
-  nsCOMPtr<nsIDocShell> originalShell = do_QueryInterface(originalContainer);
+  nsRefPtr<nsDocShell> originalShell = mDocumentContainer.get();
   SetContainer(static_cast<nsDocShell*>(aCloneContainer));
   nsCOMPtr<nsIDOMNode> clonedNode;
   nsresult rv = domDoc->CloneNode(true, 1, getter_AddRefs(clonedNode));
-  SetContainer(static_cast<nsDocShell*>(originalShell.get()));
+  SetContainer(originalShell);
 
   nsCOMPtr<nsIDocument> clonedDoc;
   if (NS_SUCCEEDED(rv)) {
@@ -10173,8 +10172,7 @@ nsDocument::FullScreenStackTop()
 static bool
 IsInActiveTab(nsIDocument* aDoc)
 {
-  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
-  nsCOMPtr<nsIDocShell> docshell = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShell> docshell = aDoc->GetDocShell();
   if (!docshell) {
     return false;
   }
@@ -10185,12 +10183,8 @@ IsInActiveTab(nsIDocument* aDoc)
     return false;
   }
 
-  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(container);
-  if (!dsti) {
-    return false;
-  }
   nsCOMPtr<nsIDocShellTreeItem> rootItem;
-  dsti->GetRootTreeItem(getter_AddRefs(rootItem));
+  docshell->GetRootTreeItem(getter_AddRefs(rootItem));
   if (!rootItem) {
     return false;
   }
@@ -10849,7 +10843,7 @@ nsDocument::ShouldLockPointer(Element* aElement, Element* aCurrentLock,
 
   // Check if the element is in a document with a docshell.
   nsCOMPtr<nsIDocument> ownerDoc = aElement->OwnerDoc();
-  if (!nsCOMPtr<nsISupports>(ownerDoc->GetContainer())) {
+  if (!ownerDoc->GetContainer()) {
     return false;
   }
   nsCOMPtr<nsPIDOMWindow> ownerWindow = ownerDoc->GetWindow();
@@ -11420,12 +11414,13 @@ nsIDocument::SetContentTypeInternal(const nsACString& aType)
 nsILoadContext*
 nsIDocument::GetLoadContext() const
 {
-  nsCOMPtr<nsISupports> container = GetContainer();
-  if (container) {
-    nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
-    return loadContext;
-  }
-  return nullptr;
+  return mDocumentContainer;
+}
+
+nsIDocShell*
+nsIDocument::GetDocShell() const
+{
+  return mDocumentContainer;
 }
 
 void
diff --git a/content/base/src/nsTreeSanitizer.cpp b/content/base/src/nsTreeSanitizer.cpp
index f43349abf0a..fe88ae2d0ed 100644
--- a/content/base/src/nsTreeSanitizer.cpp
+++ b/content/base/src/nsTreeSanitizer.cpp
@@ -1359,8 +1359,7 @@ nsTreeSanitizer::Sanitize(nsIDocument* aDocument)
   // here that notifies / does not notify or that fires mutation events if
   // in tree.
 #ifdef DEBUG
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  NS_PRECONDITION(!container, "The document is in a shell.");
+  NS_PRECONDITION(!aDocument->GetContainer(), "The document is in a shell.");
   nsRefPtr<mozilla::dom::Element> root = aDocument->GetRootElement();
   NS_PRECONDITION(root->IsHTML(nsGkAtoms::html), "Not HTML root.");
 #endif
diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
index c1033db7152..2b41e1c92e2 100644
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -993,9 +993,7 @@ UploadLastDir::FetchDirectoryAndDisplayPicker(nsIDocument* aDoc,
   nsIURI* docURI = aDoc->GetDocumentURI();
   NS_PRECONDITION(docURI, "docURI is null");
 
-  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
-  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
-
+  nsCOMPtr<nsILoadContext> loadContext = aDoc->GetLoadContext();
   nsCOMPtr<nsIContentPrefCallback2> prefCallback = 
     new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback);
 
@@ -1046,8 +1044,7 @@ UploadLastDir::StoreLastUsedDirectory(nsIDocument* aDoc, nsIFile* aDir)
     return NS_ERROR_OUT_OF_MEMORY;
   prefValue->SetAsAString(unicodePath);
 
-  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
-  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
+  nsCOMPtr<nsILoadContext> loadContext = aDoc->GetLoadContext();
   return contentPrefService->Set(spec, CPS_PREF_NAME, prefValue, loadContext, nullptr);
 }
 
diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp
index a796d8fe1a8..27a4c920bae 100644
--- a/content/html/content/src/HTMLMediaElement.cpp
+++ b/content/html/content/src/HTMLMediaElement.cpp
@@ -1083,12 +1083,9 @@ nsresult HTMLMediaElement::LoadResource()
   }
 
   // Check if media is allowed for the docshell.
-  nsCOMPtr<nsISupports> container = OwnerDoc()->GetContainer();
-  if (container) {
-    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-    if (docShell && !docShell->GetAllowMedia()) {
-      return NS_ERROR_FAILURE;
-    }
+  nsCOMPtr<nsIDocShell> docShell = OwnerDoc()->GetDocShell();
+  if (docShell && !docShell->GetAllowMedia()) {
+    return NS_ERROR_FAILURE;
   }
 
   int16_t shouldLoad = nsIContentPolicy::ACCEPT;
diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index 8a12125f075..a655f7451b2 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -3187,8 +3187,7 @@ XULDocument::DoneWalking()
         // Before starting layout, check whether we're a toplevel chrome
         // window.  If we are, set our chrome flags now, so that we don't have
         // to restyle the whole frame tree after StartLayout.
-        nsCOMPtr<nsISupports> container = GetContainer();
-        nsCOMPtr<nsIDocShellTreeItem> item = do_QueryInterface(container);
+        nsCOMPtr<nsIDocShellTreeItem> item = GetDocShell();
         if (item) {
             nsCOMPtr<nsIDocShellTreeOwner> owner;
             item->GetTreeOwner(getter_AddRefs(owner));
@@ -3196,7 +3195,7 @@ XULDocument::DoneWalking()
             if (xulWin) {
                 nsCOMPtr<nsIDocShell> xulWinShell;
                 xulWin->GetDocShell(getter_AddRefs(xulWinShell));
-                if (SameCOMIdentity(xulWinShell, container)) {
+                if (SameCOMIdentity(xulWinShell, item)) {
                     // We're the chrome document!  Apply our chrome flags now.
                     xulWin->ApplyChromeFlags();
                 }
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 4fc014c5211..e5be14bfe5a 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -2483,8 +2483,7 @@ TabChild::GetFrom(nsIPresShell* aPresShell)
   if (!doc) {
       return nullptr;
   }
-  nsCOMPtr<nsISupports> container = doc->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
+  nsCOMPtr<nsIDocShell> docShell(doc->GetDocShell());
   return GetFrom(docShell);
 }
 
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 64ac8dce6f7..6eeee587e9d 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -842,10 +842,7 @@ TabParent::RecvSetStatus(const uint32_t& aType, const nsString& aStatus)
 {
   nsCOMPtr<nsIContent> frame = do_QueryInterface(mFrameElement);
   if (frame) {
-    nsCOMPtr<nsISupports> container = frame->OwnerDoc()->GetContainer();
-    if (!container)
-      return true;
-    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+    nsCOMPtr<nsIDocShell> docShell = frame->OwnerDoc()->GetDocShell();
     if (!docShell)
       return true;
     nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
diff --git a/editor/composer/src/nsEditorSpellCheck.cpp b/editor/composer/src/nsEditorSpellCheck.cpp
index 7362c88da08..21f1d827d91 100644
--- a/editor/composer/src/nsEditorSpellCheck.cpp
+++ b/editor/composer/src/nsEditorSpellCheck.cpp
@@ -97,8 +97,7 @@ GetLoadContext(nsIEditor* aEditor)
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
   NS_ENSURE_TRUE(doc, nullptr);
 
-  nsCOMPtr<nsISupports> container = doc->GetContainer();
-  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
+  nsCOMPtr<nsILoadContext> loadContext = doc->GetLoadContext();
   return loadContext.forget();
 }
 
diff --git a/editor/libeditor/base/nsEditorUtils.cpp b/editor/libeditor/base/nsEditorUtils.cpp
index d5ee5afd299..4d7b61f42b7 100644
--- a/editor/libeditor/base/nsEditorUtils.cpp
+++ b/editor/libeditor/base/nsEditorUtils.cpp
@@ -189,8 +189,7 @@ nsEditorHookUtils::GetHookEnumeratorFromDocument(nsIDOMDocument *aDoc,
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDoc);
   NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsISupports> container = doc->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShell> docShell = doc->GetDocShell();
   nsCOMPtr<nsIClipboardDragDropHookList> hookObj = do_GetInterface(docShell);
   NS_ENSURE_TRUE(hookObj, NS_ERROR_FAILURE);
 
diff --git a/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/editor/libeditor/text/nsPlaintextDataTransfer.cpp
index 1724576712a..8f5409b0441 100644
--- a/editor/libeditor/text/nsPlaintextDataTransfer.cpp
+++ b/editor/libeditor/text/nsPlaintextDataTransfer.cpp
@@ -432,8 +432,7 @@ bool nsPlaintextEditor::IsSafeToInsertData(nsIDOMDocument* aSourceDoc)
 
   nsCOMPtr<nsIDocument> destdoc = GetDocument();
   NS_ASSERTION(destdoc, "Where is our destination doc?");
-  nsCOMPtr<nsISupports> container = destdoc->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShellTreeItem> dsti = destdoc->GetDocShell();
   nsCOMPtr<nsIDocShellTreeItem> root;
   if (dsti)
     dsti->GetRootTreeItem(getter_AddRefs(root));
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 2b54fe89ffd..4b9ce74c275 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -958,9 +958,7 @@ nsPresContext::Init(nsDeviceContext* aDeviceContext)
                    "How did we get a presshell?");
 
       // We don't have our container set yet at this point
-      nsCOMPtr<nsISupports> ourContainer = mDocument->GetContainer();
-
-      nsCOMPtr<nsIDocShellTreeItem> ourItem = do_QueryInterface(ourContainer);
+      nsCOMPtr<nsIDocShellTreeItem> ourItem = mDocument->GetDocShell();
       if (ourItem) {
         nsCOMPtr<nsIDocShellTreeItem> parentItem;
         ourItem->GetSameTypeParent(getter_AddRefs(parentItem));
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index d75992b0a1a..3dfa4c59e59 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -981,8 +981,7 @@ EndSwapDocShellsForDocument(nsIDocument* aDocument, void*)
   // Our docshell and view trees have been updated for the new hierarchy.
   // Now also update all nsDeviceContext::mWidget to that of the
   // container view in the new hierarchy.
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  nsCOMPtr<nsIDocShell> ds = do_QueryInterface(container);
+  nsCOMPtr<nsIDocShell> ds = aDocument->GetDocShell();
   if (ds) {
     nsCOMPtr<nsIContentViewer> cv;
     ds->GetContentViewer(getter_AddRefs(cv));
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 4f83efbe1ba..31445e87fac 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -1335,8 +1335,7 @@ nsPrintEngine::MapContentForPO(nsPrintObject*   aPO,
   nsIDocument* subDoc = doc->GetSubDocumentFor(aContent);
 
   if (subDoc) {
-    nsCOMPtr<nsISupports> container = subDoc->GetContainer();
-    nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
+    nsCOMPtr<nsIDocShell> docShell(subDoc->GetDocShell());
 
     if (docShell) {
       nsPrintObject * po = nullptr;
diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp
index a5a043c09ac..bbd7ddbdf80 100644
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -876,15 +876,13 @@ nsUserFontSet::CheckFontLoad(const gfxFontFaceSrc* aFontFaceSrc,
   }
 
   *aBypassCache = false;
-  nsCOMPtr<nsISupports> container = ps->GetDocument()->GetContainer();
-  if (container) {
-    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-    if (docShell) {
-      uint32_t loadType;
-      if (NS_SUCCEEDED(docShell->GetLoadType(&loadType))) {
-        if ((loadType >> 16) & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
-          *aBypassCache = true;
-        }
+
+  nsCOMPtr<nsIDocShell> docShell = ps->GetDocument()->GetDocShell();
+  if (docShell) {
+    uint32_t loadType;
+    if (NS_SUCCEEDED(docShell->GetLoadType(&loadType))) {
+      if ((loadType >> 16) & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
+        *aBypassCache = true;
       }
     }
   }
@@ -982,11 +980,6 @@ nsUserFontSet::GetPrivateBrowsing()
     return false;
   }
 
-  nsCOMPtr<nsISupports> container = ps->GetDocument()->GetContainer();
-  if (!container) {
-    return false;
-  }
-
-  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
+  nsCOMPtr<nsILoadContext> loadContext = ps->GetDocument()->GetLoadContext();
   return loadContext && loadContext->UsePrivateBrowsing();
 }
diff --git a/layout/xul/base/src/nsContainerBoxObject.cpp b/layout/xul/base/src/nsContainerBoxObject.cpp
index 2e5e1aa4387..9bcac0236ff 100644
--- a/layout/xul/base/src/nsContainerBoxObject.cpp
+++ b/layout/xul/base/src/nsContainerBoxObject.cpp
@@ -80,13 +80,8 @@ NS_IMETHODIMP nsContainerBoxObject::GetDocShell(nsIDocShell** aResult)
     return NS_OK;
   }
 
-  nsCOMPtr<nsISupports> container = sub_doc->GetContainer();
-
-  if (!container) {
-    return NS_OK;
-  }
-
-  return CallQueryInterface(container, aResult);
+  NS_IF_ADDREF(*aResult = sub_doc->GetDocShell());
+  return NS_OK;
 }
 
 nsresult
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index 919e7711c53..e666547c46d 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -1061,8 +1061,7 @@ nsXULPopupManager::HidePopupsInList(const nsTArray<nsMenuPopupFrame *> &aFrames,
 bool
 nsXULPopupManager::IsChildOfDocShell(nsIDocument* aDoc, nsIDocShellTreeItem* aExpected)
 {
-  nsCOMPtr<nsISupports> doc = aDoc->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> docShellItem(do_QueryInterface(doc));
+  nsCOMPtr<nsIDocShellTreeItem> docShellItem(aDoc->GetDocShell());
   while(docShellItem) {
     if (docShellItem == aExpected)
       return true;
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp
index 4499fd14f7b..2317ffef342 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -584,9 +584,8 @@ nsFormFillController::GetInPrivateContext(bool *aInPrivateContext)
   nsCOMPtr<nsIDOMElement> element = do_QueryInterface(mFocusedInput);
   element->GetOwnerDocument(getter_AddRefs(inputDoc));
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(inputDoc);
-  nsCOMPtr<nsISupports> container = doc->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
+  nsCOMPtr<nsIDocShell> docShell = doc->GetDocShell();
+  nsCOMPtr<nsILoadContext> loadContext = doc->GetLoadContext();
   *aInPrivateContext = loadContext && loadContext->UsePrivateBrowsing();
   return NS_OK;
 }

From 4b8bd6bfb0fa6f6b83c3cdc1463fbf7d505f467f Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Mon, 16 Sep 2013 14:44:25 -0400
Subject: [PATCH 03/92] bug 914925 - fix --debugger for mochitest on OS X.
 r=jmaher

---
 build/automation.py.in              | 4 ++--
 build/automationutils.py            | 4 ++--
 build/mobile/remoteautomation.py    | 6 +++---
 testing/mochitest/runtests.py       | 6 +++---
 testing/mochitest/runtestsremote.py | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index 61625e59c3f..5898e211a8f 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -471,7 +471,7 @@ class Automation(object):
     os.unlink(pwfilePath)
     return 0
 
-  def environment(self, env = None, xrePath = None, crashreporter = True):
+  def environment(self, env=None, xrePath=None, crashreporter=True, debugger=False):
     if xrePath == None:
       xrePath = self.DIST_BIN
     if env == None:
@@ -490,7 +490,7 @@ class Automation(object):
     elif self.IS_WIN32:
       env["PATH"] = env["PATH"] + ";" + str(ldLibraryPath)
 
-    if crashreporter:
+    if crashreporter and not debugger:
       env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
       env['MOZ_CRASHREPORTER'] = '1'
     else:
diff --git a/build/automationutils.py b/build/automationutils.py
index 7cf803889bc..367419a56b5 100644
--- a/build/automationutils.py
+++ b/build/automationutils.py
@@ -402,7 +402,7 @@ def systemMemory():
   """
   return int(os.popen("free").readlines()[1].split()[1])
 
-def environment(xrePath, env=None, crashreporter=True):
+def environment(xrePath, env=None, crashreporter=True, debugger=False):
   """populate OS environment variables for mochitest"""
 
   env = os.environ.copy() if env is None else env
@@ -430,7 +430,7 @@ def environment(xrePath, env=None, crashreporter=True):
   env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1'
   env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
 
-  if crashreporter:
+  if crashreporter and not debugger:
     env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
     env['MOZ_CRASHREPORTER'] = '1'
   else:
diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py
index be0bd80700b..75b4a517a5f 100644
--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -48,7 +48,7 @@ class RemoteAutomation(Automation):
         self._remoteLog = logfile
 
     # Set up what we need for the remote environment
-    def environment(self, env = None, xrePath = None, crashreporter = True):
+    def environment(self, env=None, xrePath=None, crashreporter=True, debugger=False):
         # Because we are running remote, we don't want to mimic the local env
         # so no copying of os.environ
         if env is None:
@@ -56,11 +56,11 @@ class RemoteAutomation(Automation):
 
         # Except for the mochitest results table hiding option, which isn't
         # passed to runtestsremote.py as an actual option, but through the
-        # MOZ_CRASHREPORTER_DISABLE environment variable.
+        # MOZ_HIDE_RESULTS_TABLE environment variable.
         if 'MOZ_HIDE_RESULTS_TABLE' in os.environ:
             env['MOZ_HIDE_RESULTS_TABLE'] = os.environ['MOZ_HIDE_RESULTS_TABLE']
 
-        if crashreporter:
+        if crashreporter and not debugger:
             env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
             env['MOZ_CRASHREPORTER'] = '1'
         else:
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 3e0589a86ca..2f89ab53699 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -619,9 +619,9 @@ class Mochitest(MochitestUtilsMixin):
     self.copyExtraFilesToProfile(options)
     return manifest
 
-  def buildBrowserEnv(self, options):
+  def buildBrowserEnv(self, options, debugger=False):
     """build the environment variables for the specific test and operating system"""
-    browserEnv = self.environment(xrePath=options.xrePath)
+    browserEnv = self.environment(xrePath=options.xrePath, debugger=debugger)
 
     # These variables are necessary for correct application startup; change
     # via the commandline at your own risk.
@@ -941,7 +941,7 @@ class Mochitest(MochitestUtilsMixin):
 
     self.leak_report_file = os.path.join(options.profilePath, "runtests_leaks.log")
 
-    browserEnv = self.buildBrowserEnv(options)
+    browserEnv = self.buildBrowserEnv(options, debuggerInfo is not None)
     if browserEnv is None:
       return 1
 
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index 679ba383b85..a401c4dadc6 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -522,8 +522,8 @@ class MochiRemote(Mochitest):
         self._dm.pushFile(fHandle.name, os.path.join(deviceRoot, "robotium.config"))
         os.unlink(fHandle.name)
 
-    def buildBrowserEnv(self, options):
-        browserEnv = Mochitest.buildBrowserEnv(self, options)
+    def buildBrowserEnv(self, options, debugger=False):
+        browserEnv = Mochitest.buildBrowserEnv(self, options, debugger=debugger)
         self.buildRobotiumConfig(options, browserEnv)
         return browserEnv
 

From 1bc3d8205a971bf4b1b9d3c6387fd2ba779691f0 Mon Sep 17 00:00:00 2001
From: Asaf Romano <mano@mozilla.com>
Date: Tue, 19 Nov 2013 17:13:27 +0200
Subject: [PATCH 04/92] Bug 914687 - API for presetting GUIDs on bookmarks.
 r=mak. sr=gavin

---
 .../places/nsINavBookmarksService.idl         | 48 +++++++---
 toolkit/components/places/nsNavBookmarks.cpp  | 48 +++++++---
 toolkit/components/places/nsNavBookmarks.h    |  5 +-
 .../tests/unit/test_pageGuid_bookmarkGuid.js  | 93 +++++++++++++++----
 4 files changed, 145 insertions(+), 49 deletions(-)

diff --git a/toolkit/components/places/nsINavBookmarksService.idl b/toolkit/components/places/nsINavBookmarksService.idl
index d3b70a7b649..e652ce9b79d 100644
--- a/toolkit/components/places/nsINavBookmarksService.idl
+++ b/toolkit/components/places/nsINavBookmarksService.idl
@@ -100,7 +100,7 @@ interface nsINavBookmarkObserver : nsISupports
   /**
    * Notifies that an item's information has changed.  This will be called
    * whenever any attributes like "title" are changed.
-   * 
+   *
    * @param aItemId
    *        The id of the item that was changed.
    * @param aProperty
@@ -223,7 +223,7 @@ interface nsINavBookmarkObserver : nsISupports
  * folders.  A URI in history can be contained in one or more such folders.
  */
 
-[scriptable, uuid(2299598b-8d83-4b67-9b13-b6d4707dcf7b)]
+[scriptable, uuid(A78EA368-E28E-462E-897A-26606D4DDCE6)]
 interface nsINavBookmarksService : nsISupports
 {
   /**
@@ -276,13 +276,19 @@ interface nsINavBookmarksService : nsISupports
    *         The index to insert at, or DEFAULT_INDEX to append
    *  @param aTitle
    *         The title for the new bookmark
+   *  @param [optional] aGUID
+   *         The GUID to be set for the new item.  If not set, a new GUID is
+   *         generated.  Unless you've a very sound reason, such as an undo
+   *         manager implementation, do not pass this argument.
    *  @return The ID of the newly-created bookmark.
    *
    *  @note aTitle will be truncated to TITLE_LENGTH_MAX and
    *        aURI will be truncated to URI_LENGTH_MAX.
+   *  @throws if aGUID is malformed.
    */
   long long insertBookmark(in long long aParentId, in nsIURI aURI,
-                           in long aIndex, in AUTF8String aTitle);
+                           in long aIndex, in AUTF8String aTitle,
+                           [optional] in ACString aGUID);
 
   /**
    * Removes a child item. Used to delete a bookmark or separator.
@@ -299,24 +305,30 @@ interface nsINavBookmarksService : nsISupports
    *         The name of the new folder
    *  @param aIndex
    *         The index to insert at, or DEFAULT_INDEX to append
+   *  @param [optional] aGUID
+   *         The GUID to be set for the new item.  If not set, a new GUID is
+   *         generated.  Unless you've a very sound reason, such as an undo
+   *         manager implementation, do not pass this argument.
    *  @return The ID of the newly-inserted folder.
+   *  @throws if aGUID is malformed.
    */
   long long createFolder(in long long aParentFolder, in AUTF8String name,
-                         in long index);
+                         in long index,
+                         [optional] in ACString aGUID);
 
   /**
    * Gets an undo-able transaction for removing a folder from the bookmarks
-   * tree. 
+   * tree.
    *  @param aItemId
    *         The id of the folder to remove.
-   *  @return An object implementing nsITransaction that can be used to undo 
-   *          or redo the action. 
+   *  @return An object implementing nsITransaction that can be used to undo
+   *          or redo the action.
    *
-   * This method exists because complex delete->undo operations rely on 
-   * recreated folders to have the same ID they had before they were deleted, 
-   * so that any other items deleted in different transactions can be 
-   * re-inserted correctly. This provides a safe encapsulation of this 
-   * functionality without exposing the ability to recreate folders with 
+   * This method exists because complex delete->undo operations rely on
+   * recreated folders to have the same ID they had before they were deleted,
+   * so that any other items deleted in different transactions can be
+   * re-inserted correctly. This provides a safe encapsulation of this
+   * functionality without exposing the ability to recreate folders with
    * specific IDs (potentially dangerous if abused by other code!) in the
    * public API.
    */
@@ -352,9 +364,15 @@ interface nsINavBookmarksService : nsISupports
    *         The id of the parent folder
    *  @param aIndex
    *         The separator's index under folder, or DEFAULT_INDEX to append
+   *  @param [optional] aGUID
+   *         The GUID to be set for the new item.  If not set, a new GUID is
+   *         generated.  Unless you've a very sound reason, such as an undo
+   *         manager implementation, do not pass this argument.
    *  @return The ID of the new separator.
+   *  @throws if aGUID is malformed.
    */
-  long long insertSeparator(in long long aParentId, in long aIndex);
+  long long insertSeparator(in long long aParentId, in long aIndex,
+                            [optional] in ACString aGUID);
 
   /**
    * Get the itemId given the containing folder and the index.
@@ -437,7 +455,7 @@ interface nsINavBookmarksService : nsISupports
    *
    *  @param aItemId    The id of the item to modify
    *  @param aNewIndex  The new index
-   * 
+   *
    *  @throws If aNewIndex is out of bounds.
    */
   void setItemIndex(in long long aItemId, in long aNewIndex);
@@ -554,7 +572,7 @@ interface nsINavBookmarksService : nsISupports
    * Runs the passed callback inside of a database transaction.
    * Use this when a lot of things are about to change, for example
    * adding or deleting a large number of bookmark items. Calls can
-   * be nested. Observers are notified when batches begin and end, via 
+   * be nested. Observers are notified when batches begin and end, via
    * nsINavBookmarkObserver.onBeginUpdateBatch/onEndUpdateBatch.
    *
    * @param aCallback
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
index b18f8ec9109..1879a078160 100644
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -368,7 +368,7 @@ nsNavBookmarks::AdjustIndices(int64_t aFolderId,
 
   rv = stmt->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
- 
+
   return NS_OK;
 }
 
@@ -438,7 +438,7 @@ nsNavBookmarks::InsertBookmarkInDB(int64_t aPlaceId,
        "dateAdded, lastModified, guid) "
     "VALUES (:item_id, :page_id, :item_type, :parent, :item_index, "
             ":item_title, :date_added, :last_modified, "
-            "GENERATE_GUID())"
+            "IFNULL(:item_guid, GENERATE_GUID()))"
   );
   NS_ENSURE_STATE(stmt);
   mozStorageStatementScoper scoper(stmt);
@@ -482,6 +482,17 @@ nsNavBookmarks::InsertBookmarkInDB(int64_t aPlaceId,
   }
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // Could use IsEmpty because our callers check for GUID validity,
+  // but it doesn't hurt.
+  if (_guid.Length() == 12) {
+    MOZ_ASSERT(IsValidGUID(_guid));
+    rv = stmt->BindUTF8StringByName(NS_LITERAL_CSTRING("item_guid"), _guid);
+  }
+  else {
+    rv = stmt->BindNullByName(NS_LITERAL_CSTRING("item_guid"));
+  }
+  NS_ENSURE_SUCCESS(rv, rv);
+
   rv = stmt->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -551,12 +562,16 @@ nsNavBookmarks::InsertBookmark(int64_t aFolder,
                                nsIURI* aURI,
                                int32_t aIndex,
                                const nsACString& aTitle,
+                               const nsACString& aGUID,
                                int64_t* aNewBookmarkId)
 {
   NS_ENSURE_ARG(aURI);
   NS_ENSURE_ARG_POINTER(aNewBookmarkId);
   NS_ENSURE_ARG_MIN(aIndex, nsINavBookmarksService::DEFAULT_INDEX);
 
+  if (!aGUID.IsEmpty() && !IsValidGUID(aGUID))
+    return NS_ERROR_INVALID_ARG;
+
   mozStorageTransaction transaction(mDB->MainConn(), false);
 
   nsNavHistory* history = nsNavHistory::GetHistoryService();
@@ -585,7 +600,7 @@ nsNavBookmarks::InsertBookmark(int64_t aFolder,
 
   *aNewBookmarkId = -1;
   PRTime dateAdded = PR_Now();
-  nsAutoCString guid;
+  nsAutoCString guid(aGUID);
   nsCString title;
   TruncateTitle(aTitle, title);
 
@@ -753,18 +768,22 @@ nsNavBookmarks::RemoveItem(int64_t aItemId)
 
 NS_IMETHODIMP
 nsNavBookmarks::CreateFolder(int64_t aParent, const nsACString& aName,
-                             int32_t aIndex, int64_t* aNewFolder)
+                             int32_t aIndex, const nsACString& aGUID,
+                             int64_t* aNewFolder)
 {
   // NOTE: aParent can be null for root creation, so not checked
   NS_ENSURE_ARG_POINTER(aNewFolder);
 
+  if (!aGUID.IsEmpty() && !IsValidGUID(aGUID))
+    return NS_ERROR_INVALID_ARG;
+
   // CreateContainerWithID returns the index of the new folder, but that's not
   // used here.  To avoid any risk of corrupting data should this function
   // be changed, we'll use a local variable to hold it.  The true argument
   // will cause notifications to be sent to bookmark observers.
   int32_t localIndex = aIndex;
   nsresult rv = CreateContainerWithID(-1, aParent, aName, true, &localIndex,
-                                      aNewFolder);
+                                      aGUID, aNewFolder);
   NS_ENSURE_SUCCESS(rv, rv);
   return NS_OK;
 }
@@ -815,6 +834,7 @@ nsNavBookmarks::CreateContainerWithID(int64_t aItemId,
                                       const nsACString& aTitle,
                                       bool aIsBookmarkFolder,
                                       int32_t* aIndex,
+                                      const nsACString& aGUID,
                                       int64_t* aNewFolder)
 {
   NS_ENSURE_ARG_MIN(*aIndex, nsINavBookmarksService::DEFAULT_INDEX);
@@ -840,7 +860,7 @@ nsNavBookmarks::CreateContainerWithID(int64_t aItemId,
 
   *aNewFolder = aItemId;
   PRTime dateAdded = PR_Now();
-  nsAutoCString guid;
+  nsAutoCString guid(aGUID);
   nsCString title;
   TruncateTitle(aTitle, title);
 
@@ -865,12 +885,16 @@ nsNavBookmarks::CreateContainerWithID(int64_t aItemId,
 NS_IMETHODIMP
 nsNavBookmarks::InsertSeparator(int64_t aParent,
                                 int32_t aIndex,
+                                const nsACString& aGUID,
                                 int64_t* aNewItemId)
 {
   NS_ENSURE_ARG_MIN(aParent, 1);
   NS_ENSURE_ARG_MIN(aIndex, nsINavBookmarksService::DEFAULT_INDEX);
   NS_ENSURE_ARG_POINTER(aNewItemId);
 
+  if (!aGUID.IsEmpty() && !IsValidGUID(aGUID))
+    return NS_ERROR_INVALID_ARG;
+
   // Get the correct index for insertion.  This also ensures the parent exists.
   int32_t index, folderCount;
   int64_t grandParentId;
@@ -895,7 +919,7 @@ nsNavBookmarks::InsertSeparator(int64_t aParent,
   // Set a NULL title rather than an empty string.
   nsCString voidString;
   voidString.SetIsVoid(true);
-  nsAutoCString guid;
+  nsAutoCString guid(aGUID);
   PRTime dateAdded = PR_Now();
   rv = InsertBookmarkInDB(-1, SEPARATOR, aParent, index, voidString, dateAdded,
                           0, folderGuid, grandParentId, nullptr,
@@ -991,9 +1015,9 @@ nsNavBookmarks::GetRemoveFolderTransaction(int64_t aFolderId, nsITransaction** a
   NS_ENSURE_ARG_POINTER(aResult);
 
   // Create and initialize a RemoveFolderTransaction object that can be used to
-  // recreate the folder safely later. 
+  // recreate the folder safely later.
 
-  RemoveFolderTransaction* rft = 
+  RemoveFolderTransaction* rft =
     new RemoveFolderTransaction(aFolderId);
   if (!rft)
     return NS_ERROR_OUT_OF_MEMORY;
@@ -2052,7 +2076,7 @@ nsNavBookmarks::GetBookmarkedURIFor(nsIURI* aURI, nsIURI** _retval)
       "UNION ALL "
       "SELECT COALESCE(grandparent.place_id, parent.place_id) AS r_place_id "
       "FROM moz_historyvisits dest "
-      "LEFT JOIN moz_historyvisits parent ON parent.id = dest.from_visit " 
+      "LEFT JOIN moz_historyvisits parent ON parent.id = dest.from_visit "
                                         "AND dest.visit_type IN (%d, %d) "
       "LEFT JOIN moz_historyvisits grandparent ON parent.from_visit = grandparent.id "
                                              "AND parent.visit_type IN (%d, %d) "
@@ -2836,7 +2860,7 @@ nsNavBookmarks::OnPageChanged(nsIURI* aURI,
     if (isPlaceURI) {
       nsNavHistory* history = nsNavHistory::GetHistoryService();
       NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-  
+
       nsCOMArray<nsNavHistoryQuery> queries;
       nsCOMPtr<nsNavHistoryQueryOptions> options;
       rv = history->QueryStringToQueryArray(changeData.bookmark.url,
@@ -2846,7 +2870,7 @@ nsNavBookmarks::OnPageChanged(nsIURI* aURI,
       if (queries.Count() == 1 && queries[0]->Folders().Length() == 1) {
         // Fetch missing data.
         rv = FetchItemInfo(queries[0]->Folders()[0], changeData.bookmark);
-        NS_ENSURE_SUCCESS(rv, rv);        
+        NS_ENSURE_SUCCESS(rv, rv);
         NotifyItemChanged(changeData);
       }
     }
diff --git a/toolkit/components/places/nsNavBookmarks.h b/toolkit/components/places/nsNavBookmarks.h
index b0e4e2319fb..5159bd9e679 100644
--- a/toolkit/components/places/nsNavBookmarks.h
+++ b/toolkit/components/places/nsNavBookmarks.h
@@ -184,6 +184,7 @@ public:
                                  const nsACString& aTitle,
                                  bool aIsBookmarkFolder,
                                  int32_t* aIndex,
+                                 const nsACString& aGUID,
                                  int64_t* aNewFolder);
 
   /**
@@ -396,7 +397,7 @@ private:
       NS_ENSURE_TRUE(bookmarks, NS_ERROR_OUT_OF_MEMORY);
       int64_t newFolder;
       return bookmarks->CreateContainerWithID(mID, mParent, mTitle, true,
-                                              &mIndex, &newFolder); 
+                                              &mIndex, EmptyCString(), &newFolder);
     }
 
     NS_IMETHOD RedoTransaction() {
@@ -407,7 +408,7 @@ private:
       *aResult = false;
       return NS_OK;
     }
-    
+
     NS_IMETHOD Merge(nsITransaction* aTransaction, bool* aResult) {
       *aResult = false;
       return NS_OK;
diff --git a/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js b/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js
index 2d8f82b5bb4..75d64528c49 100644
--- a/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js
+++ b/toolkit/components/places/tests/unit/test_pageGuid_bookmarkGuid.js
@@ -22,13 +22,7 @@ add_task(function test_addBookmarksAndCheckGuids() {
   let s1 = bmsvc.insertSeparator(folder, bmsvc.DEFAULT_INDEX);
   let f1 = bmsvc.createFolder(folder, "test folder 2", bmsvc.DEFAULT_INDEX);
 
-  let options = histsvc.getNewQueryOptions();
-  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
-  let query = histsvc.getNewQuery();
-  query.setFolders([folder], 1);
-  let result = histsvc.executeQuery(query, options);
-  let root = result.root;
-  root.containerOpen = true;
+  let root = PlacesUtils.getFolderContents(folder).root;
   do_check_eq(root.childCount, 5);
 
   // check bookmark guids
@@ -71,13 +65,7 @@ add_task(function test_updateBookmarksAndCheckGuids() {
                                 bmsvc.DEFAULT_INDEX, "1 title");
   let f1 = bmsvc.createFolder(folder, "test folder 2", bmsvc.DEFAULT_INDEX);
 
-  let options = histsvc.getNewQueryOptions();
-  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
-  let query = histsvc.getNewQuery();
-  query.setFolders([folder], 1);
-  let result = histsvc.executeQuery(query, options);
-  let root = result.root;
-  root.containerOpen = true;
+  let root = PlacesUtils.getFolderContents(folder).root;
   do_check_eq(root.childCount, 2);
 
   // ensure the bookmark and page guids remain the same after modifing other property.
@@ -110,18 +98,83 @@ add_task(function test_addVisitAndCheckGuid() {
   let options = histsvc.getNewQueryOptions();
   let query = histsvc.getNewQuery();
   query.uri = sourceURI;
-  result = histsvc.executeQuery(query, options);
-  let root = result.root;
+  let root = histsvc.executeQuery(query, options).root;
   root.containerOpen = true;
   do_check_eq(root.childCount, 1);
 
-  pageGuidZero = root.getChild(0).pageGuid;
-  do_check_eq(pageGuidZero.length, 12);
-
+  do_check_valid_places_guid(root.getChild(0).pageGuid);
   do_check_eq(root.getChild(0).bookmarkGuid, "");
-
   root.containerOpen = false;
 
   yield promiseClearHistory();
 });
 
+add_task(function test_addItemsWithInvalidGUIDsFails() {
+  const INVALID_GUID = "XYZ";
+  try {
+    bmsvc.createFolder(bmsvc.placesRoot, "XYZ folder",
+                       bmsvc.DEFAULT_INDEX, INVALID_GUID);
+    do_throw("Adding a folder with an invalid guid should fail");
+  }
+  catch(ex) { }
+
+  let folder = bmsvc.createFolder(bmsvc.placesRoot, "test folder",
+                                  bmsvc.DEFAULT_INDEX);
+  try {
+    bmsvc.insertBookmark(folder, uri("http://test.tld"), bmsvc.DEFAULT_INDEX,
+                         "title", INVALID_GUID);
+    do_throw("Adding a bookmark with an invalid guid should fail");
+  }
+  catch(ex) { }
+
+  try {
+    bmsvc.insertSeparator(folder, bmsvc.DEFAULT_INDEX, INVALID_GUID);
+    do_throw("Adding a separator with an invalid guid should fail");
+  }
+  catch(ex) { }
+
+  remove_all_bookmarks();
+});
+
+add_task(function test_addItemsWithGUIDs() {
+  const FOLDER_GUID     = "FOLDER--GUID";
+  const BOOKMARK_GUID   = "BM------GUID";
+  const SEPARATOR_GUID  = "SEP-----GUID";
+
+  let folder = bmsvc.createFolder(bmsvc.placesRoot, "test folder",
+                                  bmsvc.DEFAULT_INDEX, FOLDER_GUID);
+  bmsvc.insertBookmark(folder, uri("http://test1.com/"), bmsvc.DEFAULT_INDEX,
+                       "1 title", BOOKMARK_GUID);
+  bmsvc.insertSeparator(folder, bmsvc.DEFAULT_INDEX, SEPARATOR_GUID);
+
+  let root = PlacesUtils.getFolderContents(folder).root;
+  do_check_eq(root.childCount, 2);
+  do_check_eq(root.bookmarkGuid, FOLDER_GUID);
+  do_check_eq(root.getChild(0).bookmarkGuid, BOOKMARK_GUID);
+  do_check_eq(root.getChild(1).bookmarkGuid, SEPARATOR_GUID);
+
+  root.containerOpen = false;
+  remove_all_bookmarks();
+});
+
+add_task(function test_emptyGUIDIgnored() {
+  let folder = bmsvc.createFolder(bmsvc.placesRoot, "test folder",
+                                  bmsvc.DEFAULT_INDEX, "");
+  do_check_valid_places_guid(PlacesUtils.getFolderContents(folder)
+                                        .root.bookmarkGuid);
+  remove_all_bookmarks();
+});
+
+add_task(function test_usingSameGUIDFails() {
+  const GUID = "XYZXYZXYZXYZ";
+  bmsvc.createFolder(bmsvc.placesRoot, "test folder",
+                     bmsvc.DEFAULT_INDEX, GUID);
+  try {
+    bmsvc.createFolder(bmsvc.placesRoot, "test folder 2",
+                       bmsvc.DEFAULT_INDEX, GUID);
+    do_throw("Using the same guid twice should fail");
+  }
+  catch(ex) { }
+
+  remove_all_bookmarks();
+});

From 4752b723fed1b9d330100f6aa683c49cfb3836f8 Mon Sep 17 00:00:00 2001
From: Jan Varga <jan.varga@gmail.com>
Date: Tue, 19 Nov 2013 08:36:12 +0100
Subject: [PATCH 05/92] Bug 921478 - Remove BackstagePass IDB constructor
 resolve hook and use Cu.importGlobalProperties. r=bholley,bent

--HG--
rename : dom/indexedDB/test/test_globalObjects.xul => dom/indexedDB/test/test_globalObjects_chrome.xul
rename : dom/indexedDB/test/test_globalObjects.html => dom/indexedDB/test/test_globalObjects_content.html
rename : dom/indexedDB/test/unit/test_globalObjects.js => dom/indexedDB/test/unit/test_globalObjects_xpc.js
---
 dom/base/IndexedDBHelper.jsm                  |   1 +
 dom/contacts/fallback/ContactDB.jsm           |   1 +
 dom/contacts/tests/test_contacts_upgrade.html |   1 +
 dom/indexedDB/IndexedDatabaseManager.cpp      | 183 +++---------------
 dom/indexedDB/IndexedDatabaseManager.h        |  12 +-
 dom/indexedDB/test/chrome.ini                 |   3 +-
 dom/indexedDB/test/chromeHelpers.js           |  12 +-
 dom/indexedDB/test/mochitest.ini              |   2 +-
 .../test/test_globalObjects_chrome.xul        |  43 ++++
 ...s.html => test_globalObjects_content.html} |   0
 ...jects.xul => test_globalObjects_other.xul} |  20 +-
 dom/indexedDB/test/unit/GlobalObjectsChild.js |   2 +
 .../test/unit/GlobalObjectsComponent.js       |   5 +-
 .../test/unit/GlobalObjectsModule.jsm         |   2 +
 dom/indexedDB/test/unit/head.js               |  18 +-
 dom/indexedDB/test/unit/mochitest.ini         |   3 +-
 ...Objects.js => test_globalObjects_other.js} |  21 +-
 .../test/unit/test_globalObjects_xpc.js       |  26 +++
 dom/indexedDB/test/unit/xpcshell.ini          |   5 +-
 .../src/gonk/MobileMessageDatabaseService.js  |   1 +
 dom/network/src/NetworkStatsDB.jsm            |   1 +
 dom/push/src/PushService.jsm                  |   1 +
 js/xpconnect/src/Sandbox.cpp                  |   3 +-
 js/xpconnect/src/XPCRuntimeService.cpp        |  10 -
 js/xpconnect/src/nsXPConnect.cpp              |   7 -
 testing/mochitest/b2g-desktop.json            |   2 +-
 26 files changed, 153 insertions(+), 232 deletions(-)
 create mode 100644 dom/indexedDB/test/test_globalObjects_chrome.xul
 rename dom/indexedDB/test/{test_globalObjects.html => test_globalObjects_content.html} (100%)
 rename dom/indexedDB/test/{test_globalObjects.xul => test_globalObjects_other.xul} (82%)
 rename dom/indexedDB/test/unit/{test_globalObjects.js => test_globalObjects_other.js} (81%)
 create mode 100644 dom/indexedDB/test/unit/test_globalObjects_xpc.js

diff --git a/dom/base/IndexedDBHelper.jsm b/dom/base/IndexedDBHelper.jsm
index 818921ff50a..1a4302996cf 100644
--- a/dom/base/IndexedDBHelper.jsm
+++ b/dom/base/IndexedDBHelper.jsm
@@ -20,6 +20,7 @@ this.EXPORTED_SYMBOLS = ["IndexedDBHelper"];
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.importGlobalProperties(["indexedDB"]);
 
 this.IndexedDBHelper = function IndexedDBHelper() {}
 
diff --git a/dom/contacts/fallback/ContactDB.jsm b/dom/contacts/fallback/ContactDB.jsm
index c0db32c36fe..52ec9f3118c 100644
--- a/dom/contacts/fallback/ContactDB.jsm
+++ b/dom/contacts/fallback/ContactDB.jsm
@@ -18,6 +18,7 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
 Cu.import("resource://gre/modules/PhoneNumberUtils.jsm");
+Cu.importGlobalProperties(["indexedDB"]);
 
 const DB_NAME = "contacts";
 const DB_VERSION = 18;
diff --git a/dom/contacts/tests/test_contacts_upgrade.html b/dom/contacts/tests/test_contacts_upgrade.html
index b4438292aaa..b271fe65519 100644
--- a/dom/contacts/tests/test_contacts_upgrade.html
+++ b/dom/contacts/tests/test_contacts_upgrade.html
@@ -148,6 +148,7 @@ function makeFailure(reason) {
 
 const {Cc, Ci, Cu} = SpecialPowers;
 Cu.import("resource://gre/modules/ContactDB.jsm", window);
+Cu.importGlobalProperties(["indexedDB"]);
 
 let cdb = new ContactDB();
 cdb.init();
diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp
index 67fb0b19cbc..aefb62cccf4 100644
--- a/dom/indexedDB/IndexedDatabaseManager.cpp
+++ b/dom/indexedDB/IndexedDatabaseManager.cpp
@@ -111,35 +111,6 @@ mozilla::StaticRefPtr<IndexedDatabaseManager> gInstance;
 mozilla::Atomic<int32_t> gInitialized(0);
 mozilla::Atomic<int32_t> gClosed(0);
 
-// See ResolveConstructors below.
-struct ConstructorInfo {
-  const char* const name;
-  JS::Handle<JSObject*> (* const resolve)(JSContext*, JS::Handle<JSObject*>,
-                                          bool);
-  jsid id;
-};
-
-ConstructorInfo gConstructorInfo[] = {
-
-#define BINDING_ENTRY(_name) \
-  { #_name, _name##Binding::GetConstructorObject, JSID_VOID },
-
-  BINDING_ENTRY(IDBCursor)
-  BINDING_ENTRY(IDBCursorWithValue)
-  BINDING_ENTRY(IDBDatabase)
-  BINDING_ENTRY(IDBFactory)
-  BINDING_ENTRY(IDBFileHandle)
-  BINDING_ENTRY(IDBIndex)
-  BINDING_ENTRY(IDBKeyRange)
-  BINDING_ENTRY(IDBObjectStore)
-  BINDING_ENTRY(IDBOpenDBRequest)
-  BINDING_ENTRY(IDBRequest)
-  BINDING_ENTRY(IDBTransaction)
-  BINDING_ENTRY(IDBVersionChangeEvent)
-
-#undef BINDING_ENTRY
-};
-
 class AsyncDeleteFileRunnable MOZ_FINAL : public nsIRunnable
 {
 public:
@@ -207,53 +178,6 @@ struct MOZ_STACK_CLASS InvalidateInfo
   const nsACString& pattern;
 };
 
-bool
-GetIndexedDB(JSContext* aCx, JS::Handle<JSObject*> aGlobal,
-             JS::MutableHandle<JS::Value> aResult)
-{
-  MOZ_ASSERT(nsContentUtils::IsCallerChrome(), "Only for chrome!");
-  MOZ_ASSERT(js::GetObjectClass(aGlobal)->flags & JSCLASS_DOM_GLOBAL,
-             "Not a global object!");
-
-  nsRefPtr<IDBFactory> factory;
-  if (NS_FAILED(IDBFactory::Create(aCx, aGlobal, nullptr,
-                                   getter_AddRefs(factory)))) {
-    return false;
-  }
-
-  MOZ_ASSERT(factory, "This should never fail for chrome!");
-
-  return !!WrapNewBindingObject(aCx, aGlobal, factory, aResult);
-}
-
-bool
-IndexedDBLazyGetter(JSContext* aCx, JS::Handle<JSObject*> aGlobal,
-                    JS::Handle<jsid> aId, JS::MutableHandle<JS::Value> aVp)
-{
-  MOZ_ASSERT(nsContentUtils::IsCallerChrome(), "Only for chrome!");
-  MOZ_ASSERT(JSID_IS_STRING(aId), "Bad id!");
-  MOZ_ASSERT(JS_FlatStringEqualsAscii(JSID_TO_FLAT_STRING(aId), IDB_STR),
-             "Bad id!");
-
-  JS::Rooted<JSObject*> global(aCx, CheckedUnwrap(aGlobal,
-                                                  /* stopAtOuter = */ false));
-  NS_ENSURE_TRUE(global, false);
-  NS_ENSURE_TRUE(js::GetObjectClass(global)->flags & JSCLASS_DOM_GLOBAL, false);
-
-  JS::Rooted<JS::Value> indexedDB(aCx);
-  if (!GetIndexedDB(aCx, global, &indexedDB)) {
-    return false;
-  }
-
-  if (!JS_DefinePropertyById(aCx, global, aId, indexedDB, nullptr, nullptr,
-                             JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  aVp.set(indexedDB);
-  return true;
-}
-
 } // anonymous namespace
 
 IndexedDatabaseManager::IndexedDatabaseManager()
@@ -482,32 +406,39 @@ IndexedDatabaseManager::TabContextMayAccessOrigin(const TabContext& aContext,
 
 // static
 bool
-IndexedDatabaseManager::DefineConstructors(JSContext* aCx,
-                                           JS::Handle<JSObject*> aGlobal)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  for (uint32_t i = 0; i < mozilla::ArrayLength(gConstructorInfo); i++) {
-    if (!gConstructorInfo[i].resolve(aCx, aGlobal, true)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-// static
-bool
-IndexedDatabaseManager::DefineIndexedDBGetter(JSContext* aCx,
-                                              JS::Handle<JSObject*> aGlobal)
+IndexedDatabaseManager::DefineIndexedDB(JSContext* aCx,
+                                        JS::Handle<JSObject*> aGlobal)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(nsContentUtils::IsCallerChrome(), "Only for chrome!");
   MOZ_ASSERT(js::GetObjectClass(aGlobal)->flags & JSCLASS_DOM_GLOBAL,
              "Passed object is not a global object!");
 
+  if (!IDBCursorBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBCursorWithValueBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBDatabaseBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBFactoryBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBFileHandleBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBIndexBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBKeyRangeBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBObjectStoreBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBOpenDBRequestBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBRequestBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBTransactionBinding::GetConstructorObject(aCx, aGlobal) ||
+      !IDBVersionChangeEventBinding::GetConstructorObject(aCx, aGlobal)) {
+    return false;
+  }
+
+  nsRefPtr<IDBFactory> factory;
+  if (NS_FAILED(IDBFactory::Create(aCx, aGlobal, nullptr,
+                                   getter_AddRefs(factory)))) {
+    return false;
+  }
+
+  MOZ_ASSERT(factory, "This should never fail for chrome!");
+
   JS::Rooted<JS::Value> indexedDB(aCx);
-  if (!GetIndexedDB(aCx, aGlobal, &indexedDB)) {
+  if (!WrapNewBindingObject(aCx, aGlobal, factory, &indexedDB)) {
     return false;
   }
 
@@ -515,20 +446,6 @@ IndexedDatabaseManager::DefineIndexedDBGetter(JSContext* aCx,
                            JSPROP_ENUMERATE);
 }
 
-// static
-bool
-IndexedDatabaseManager::DefineIndexedDBLazyGetter(JSContext* aCx,
-                                                  JS::Handle<JSObject*> aGlobal)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(nsContentUtils::IsCallerChrome(), "Only for chrome!");
-  MOZ_ASSERT(js::GetObjectClass(aGlobal)->flags & JSCLASS_DOM_GLOBAL,
-             "Passed object is not a global object!");
-
-  return JS_DefineProperty(aCx, aGlobal, IDB_STR, JSVAL_VOID,
-                           IndexedDBLazyGetter, nullptr, 0);
-}
-
 // static
 bool
 IndexedDatabaseManager::IsClosed()
@@ -749,7 +666,7 @@ IndexedDatabaseManager::InitWindowless(const jsval& aGlobal, JSContext* aCx)
     return NS_ERROR_FAILURE;
   }
 
-  if (!DefineConstructors(aCx, global) || !DefineIndexedDBGetter(aCx, global)) {
+  if (!DefineIndexedDB(aCx, global)) {
     return NS_ERROR_FAILURE;
   }
 
@@ -1001,49 +918,3 @@ GetFileReferencesHelper::Run()
 
   return NS_OK;
 }
-
-BEGIN_INDEXEDDB_NAMESPACE
-
-bool
-ResolveConstructors(JSContext* aCx, JS::Handle<JSObject*> aObj,
-                    JS::Handle<jsid> aId, JS::MutableHandle<JSObject*> aObjp)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // The first time this function is called we need to intern all the strings we
-  // care about.
-  if (JSID_IS_VOID(gConstructorInfo[0].id)) {
-    for (uint32_t i = 0; i < mozilla::ArrayLength(gConstructorInfo); i++) {
-      JS::Rooted<JSString*> str(aCx,
-                                JS_InternString(aCx, gConstructorInfo[i].name));
-      if (!str) {
-        NS_WARNING("Failed to intern string!");
-        while (i) {
-          gConstructorInfo[--i].id = JSID_VOID;
-        }
-        return false;
-      }
-      gConstructorInfo[i].id = INTERNED_STRING_TO_JSID(aCx, str);
-    }
-  }
-
-  // Now resolve.
-  for (uint32_t i = 0; i < mozilla::ArrayLength(gConstructorInfo); i++) {
-    if (gConstructorInfo[i].id == aId) {
-      JS::Rooted<JSObject*> constructor(aCx,
-        gConstructorInfo[i].resolve(aCx, aObj, true));
-      if (!constructor) {
-        return false;
-      }
-
-      aObjp.set(aObj);
-      return true;
-    }
-  }
-
-  // Not resolved.
-  aObjp.set(nullptr);
-  return true;
-}
-
-END_INDEXEDDB_NAMESPACE
diff --git a/dom/indexedDB/IndexedDatabaseManager.h b/dom/indexedDB/IndexedDatabaseManager.h
index e81236fbc7b..c3ec871fa07 100644
--- a/dom/indexedDB/IndexedDatabaseManager.h
+++ b/dom/indexedDB/IndexedDatabaseManager.h
@@ -140,13 +140,7 @@ public:
                             const nsACString& aOrigin);
 
   static bool
-  DefineConstructors(JSContext* aCx, JS::Handle<JSObject*> aGlobal);
-
-  static bool
-  DefineIndexedDBGetter(JSContext* aCx, JS::Handle<JSObject*> aGlobal);
-
-  static bool
-  DefineIndexedDBLazyGetter(JSContext* aCx, JS::Handle<JSObject*> aGlobal);
+  DefineIndexedDB(JSContext* aCx, JS::Handle<JSObject*> aGlobal);
 
 private:
   IndexedDatabaseManager();
@@ -176,10 +170,6 @@ private:
   static mozilla::Atomic<int32_t> sLowDiskSpaceMode;
 };
 
-bool
-ResolveConstructors(JSContext* aCx, JS::Handle<JSObject*> aObj,
-                    JS::Handle<jsid> aId, JS::MutableHandle<JSObject*> aObjp);
-
 END_INDEXEDDB_NAMESPACE
 
 #endif /* mozilla_dom_indexeddb_indexeddatabasemanager_h__ */
diff --git a/dom/indexedDB/test/chrome.ini b/dom/indexedDB/test/chrome.ini
index 636a72c429d..a809b45b5d1 100644
--- a/dom/indexedDB/test/chrome.ini
+++ b/dom/indexedDB/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
 support-files = chromeHelpers.js
 
-[test_globalObjects.xul]
+[test_globalObjects_chrome.xul]
+[test_globalObjects_other.xul]
diff --git a/dom/indexedDB/test/chromeHelpers.js b/dom/indexedDB/test/chromeHelpers.js
index 1233661060b..cb86f2747ec 100644
--- a/dom/indexedDB/test/chromeHelpers.js
+++ b/dom/indexedDB/test/chromeHelpers.js
@@ -7,11 +7,15 @@ const { 'classes': Cc, 'interfaces': Ci, 'utils': Cu } = Components;
 
 let testGenerator = testSteps();
 
-function runTest()
-{
-  SimpleTest.waitForExplicitFinish();
+if (!window.runTest) {
+  window.runTest = function()
+  {
+    Cu.importGlobalProperties(["indexedDB"]);
 
-  testGenerator.next();
+    SimpleTest.waitForExplicitFinish();
+
+    testGenerator.next();
+  }
 }
 
 function finishTest()
diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini
index 54783fece01..4f9e4b9eae3 100644
--- a/dom/indexedDB/test/mochitest.ini
+++ b/dom/indexedDB/test/mochitest.ini
@@ -58,7 +58,7 @@ support-files =
 [test_filehandle_store_snapshot.html]
 [test_getAll.html]
 [test_get_filehandle.html]
-[test_globalObjects.html]
+[test_globalObjects_content.html]
 [test_global_data.html]
 [test_index_empty_keyPath.html]
 [test_index_getAll.html]
diff --git a/dom/indexedDB/test/test_globalObjects_chrome.xul b/dom/indexedDB/test/test_globalObjects_chrome.xul
new file mode 100644
index 00000000000..47e967d9692
--- /dev/null
+++ b/dom/indexedDB/test/test_globalObjects_chrome.xul
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<window title="Mozilla Bug 832883"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="runTest();">
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <script type="application/javascript;version=1.7">
+  <![CDATA[
+  function testSteps() {
+    const name = window.location.pathname;
+
+    // Test for IDBKeyRange and indexedDB availability in chrome windows.
+    var keyRange = IDBKeyRange.only(42);
+    ok(keyRange, "Got keyRange");
+
+    var request = indexedDB.open(name, 1);
+    request.onerror = errorHandler;
+    request.onsuccess = grabEventAndContinueHandler;
+    let event = yield undefined;
+
+    let db = event.target.result;
+    ok(db, "Got database");
+
+    finishTest();
+    yield undefined;
+  }
+  ]]>
+  </script>
+
+  <script type="text/javascript;version=1.7" src="chromeHelpers.js"></script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=832883"
+     target="_blank">Mozilla Bug 832883</a>
+  </body>
+</window>
diff --git a/dom/indexedDB/test/test_globalObjects.html b/dom/indexedDB/test/test_globalObjects_content.html
similarity index 100%
rename from dom/indexedDB/test/test_globalObjects.html
rename to dom/indexedDB/test/test_globalObjects_content.html
diff --git a/dom/indexedDB/test/test_globalObjects.xul b/dom/indexedDB/test/test_globalObjects_other.xul
similarity index 82%
rename from dom/indexedDB/test/test_globalObjects.xul
rename to dom/indexedDB/test/test_globalObjects_other.xul
index c3d2520a2c7..cfab5deace9 100644
--- a/dom/indexedDB/test/test_globalObjects.xul
+++ b/dom/indexedDB/test/test_globalObjects_other.xul
@@ -14,20 +14,6 @@
   <script type="application/javascript;version=1.7">
   <![CDATA[
   function testSteps() {
-    const name = window.location.pathname;
-
-    // Test for IDBKeyRange and indexedDB availability in chrome windows.
-    var keyRange = IDBKeyRange.only(42);
-    ok(keyRange, "Got keyRange");
-
-    var request = indexedDB.open(name, 1);
-    request.onerror = errorHandler;
-    request.onsuccess = grabEventAndContinueHandler;
-    let event = yield undefined;
-
-    let db = event.target.result;
-    ok(db, "Got database");
-
     // Test for IDBKeyRange and indexedDB availability in bootstrap files.
     let test = Cc["@mozilla.org/dom/indexeddb/GlobalObjectsComponent;1"].
                createInstance(Ci.nsISupports).wrappedJSObject;
@@ -60,6 +46,12 @@
     finishTest();
     yield undefined;
   }
+
+  window.runTest = function() {
+    SimpleTest.waitForExplicitFinish();
+
+    testGenerator.next();
+  }
   ]]>
   </script>
 
diff --git a/dom/indexedDB/test/unit/GlobalObjectsChild.js b/dom/indexedDB/test/unit/GlobalObjectsChild.js
index 586d27f7b4f..5351ff2f1a9 100644
--- a/dom/indexedDB/test/unit/GlobalObjectsChild.js
+++ b/dom/indexedDB/test/unit/GlobalObjectsChild.js
@@ -18,6 +18,8 @@ function finishTest()
 function run_test() {
   const name = "Splendid Test";
 
+  Cu.importGlobalProperties(["indexedDB"]);
+
   do_test_pending();
 
   let keyRange = IDBKeyRange.only(42);
diff --git a/dom/indexedDB/test/unit/GlobalObjectsComponent.js b/dom/indexedDB/test/unit/GlobalObjectsComponent.js
index 01c3e23dafc..44bc1afe9b6 100644
--- a/dom/indexedDB/test/unit/GlobalObjectsComponent.js
+++ b/dom/indexedDB/test/unit/GlobalObjectsComponent.js
@@ -3,7 +3,10 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.importGlobalProperties(["indexedDB"]);
 
 function GlobalObjectsComponent() {
   this.wrappedJSObject = this;
diff --git a/dom/indexedDB/test/unit/GlobalObjectsModule.jsm b/dom/indexedDB/test/unit/GlobalObjectsModule.jsm
index cb085b6f335..fe214f722e7 100644
--- a/dom/indexedDB/test/unit/GlobalObjectsModule.jsm
+++ b/dom/indexedDB/test/unit/GlobalObjectsModule.jsm
@@ -3,6 +3,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+Components.utils.importGlobalProperties(["indexedDB"]);
+
 this.EXPORTED_SYMBOLS = [
   "GlobalObjectsModule"
 ];
diff --git a/dom/indexedDB/test/unit/head.js b/dom/indexedDB/test/unit/head.js
index b3757ec25bb..1ec20b3463e 100644
--- a/dom/indexedDB/test/unit/head.js
+++ b/dom/indexedDB/test/unit/head.js
@@ -38,15 +38,19 @@ function run_test() {
   runTest();
 };
 
-function runTest()
-{
-  // XPCShell does not get a profile by default.
-  do_get_profile();
+if (!this.runTest) {
+  this.runTest = function()
+  {
+    // XPCShell does not get a profile by default.
+    do_get_profile();
 
-  enableExperimental();
+    enableExperimental();
 
-  do_test_pending();
-  testGenerator.next();
+    Cu.importGlobalProperties(["indexedDB"]);
+
+    do_test_pending();
+    testGenerator.next();
+  }
 }
 
 function finishTest()
diff --git a/dom/indexedDB/test/unit/mochitest.ini b/dom/indexedDB/test/unit/mochitest.ini
index e2823e9587f..e0fcdf40d12 100644
--- a/dom/indexedDB/test/unit/mochitest.ini
+++ b/dom/indexedDB/test/unit/mochitest.ini
@@ -18,8 +18,9 @@
 [test_deleteDatabase_interactions.js]
 [test_event_source.js]
 [test_getAll.js]
-[test_globalObjects.js]
 [test_globalObjects_ipc.js]
+[test_globalObjects_other.js]
+[test_globalObjects_xpc.js]
 [test_global_data.js]
 [test_index_empty_keyPath.js]
 [test_index_getAll.js]
diff --git a/dom/indexedDB/test/unit/test_globalObjects.js b/dom/indexedDB/test/unit/test_globalObjects_other.js
similarity index 81%
rename from dom/indexedDB/test/unit/test_globalObjects.js
rename to dom/indexedDB/test/unit/test_globalObjects_other.js
index 40ae45fcd0f..a1338459c83 100644
--- a/dom/indexedDB/test/unit/test_globalObjects.js
+++ b/dom/indexedDB/test/unit/test_globalObjects_other.js
@@ -7,8 +7,6 @@ var testGenerator = testSteps();
 
 function testSteps()
 {
-  const name = "Splendid Test";
-
   let ioService =
     Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
 
@@ -18,18 +16,6 @@ function testSteps()
     return uri.spec;
   }
 
-  // Test for IDBKeyRange and indexedDB availability in xpcshell.
-  let keyRange = IDBKeyRange.only(42);
-  ok(keyRange, "Got keyRange");
-
-  let request = indexedDB.open(name, 1);
-  request.onerror = errorHandler;
-  request.onsuccess = grabEventAndContinueHandler;
-  let event = yield undefined;
-
-  let db = event.target.result;
-  ok(db, "Got database");
-
   // Test for IDBKeyRange and indexedDB availability in JS modules.
   Cu.import(getSpec("GlobalObjectsModule.jsm"));
   let test = new GlobalObjectsModule();
@@ -65,3 +51,10 @@ function testSteps()
   finishTest();
   yield undefined;
 }
+
+this.runTest = function() {
+  do_get_profile();
+
+  do_test_pending();
+  testGenerator.next();
+}
diff --git a/dom/indexedDB/test/unit/test_globalObjects_xpc.js b/dom/indexedDB/test/unit/test_globalObjects_xpc.js
new file mode 100644
index 00000000000..57611d04690
--- /dev/null
+++ b/dom/indexedDB/test/unit/test_globalObjects_xpc.js
@@ -0,0 +1,26 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+var testGenerator = testSteps();
+
+function testSteps()
+{
+  const name = "Splendid Test";
+
+  // Test for IDBKeyRange and indexedDB availability in xpcshell.
+  let keyRange = IDBKeyRange.only(42);
+  ok(keyRange, "Got keyRange");
+
+  let request = indexedDB.open(name, 1);
+  request.onerror = errorHandler;
+  request.onsuccess = grabEventAndContinueHandler;
+  let event = yield undefined;
+
+  let db = event.target.result;
+  ok(db, "Got database");
+
+  finishTest();
+  yield undefined;
+}
diff --git a/dom/indexedDB/test/unit/xpcshell.ini b/dom/indexedDB/test/unit/xpcshell.ini
index fdfedcedb64..d3e19e5e52c 100644
--- a/dom/indexedDB/test/unit/xpcshell.ini
+++ b/dom/indexedDB/test/unit/xpcshell.ini
@@ -28,10 +28,11 @@ support-files =
 [test_deleteDatabase_interactions.js]
 [test_event_source.js]
 [test_getAll.js]
-[test_globalObjects.js]
 [test_globalObjects_ipc.js]
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
-skip-if = os == "mac" || os == "android"
+#skip-if = os == "mac" || os == "android"
+[test_globalObjects_other.js]
+[test_globalObjects_xpc.js]
 [test_global_data.js]
 [test_index_empty_keyPath.js]
 [test_index_getAll.js]
diff --git a/dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js b/dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js
index e17a37c63f2..918a8d1f853 100644
--- a/dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js
+++ b/dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js
@@ -9,6 +9,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PhoneNumberUtils.jsm");
+Cu.importGlobalProperties(["indexedDB"]);
 
 const RIL_MOBILEMESSAGEDATABASESERVICE_CONTRACTID =
   "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1";
diff --git a/dom/network/src/NetworkStatsDB.jsm b/dom/network/src/NetworkStatsDB.jsm
index 3d22ef9ca13..c8e64347cbf 100644
--- a/dom/network/src/NetworkStatsDB.jsm
+++ b/dom/network/src/NetworkStatsDB.jsm
@@ -13,6 +13,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
+Cu.importGlobalProperties(["indexedDB"]);
 
 const DB_NAME = "net_stats";
 const DB_VERSION = 3;
diff --git a/dom/push/src/PushService.jsm b/dom/push/src/PushService.jsm
index 92295580a36..ae22aabf6fb 100644
--- a/dom/push/src/PushService.jsm
+++ b/dom/push/src/PushService.jsm
@@ -23,6 +23,7 @@ Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
+Cu.importGlobalProperties(["indexedDB"]);
 
 XPCOMUtils.defineLazyModuleGetter(this, "AlarmService",
                                   "resource://gre/modules/AlarmService.jsm");
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index fbe0c506b67..aaeacde6ea7 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -948,8 +948,7 @@ bool
 xpc::GlobalProperties::Define(JSContext *cx, JS::HandleObject obj)
 {
     if (indexedDB && AccessCheck::isChrome(obj) &&
-        (!IndexedDatabaseManager::DefineConstructors(cx, obj) ||
-         !IndexedDatabaseManager::DefineIndexedDBGetter(cx, obj)))
+        !IndexedDatabaseManager::DefineIndexedDB(cx, obj))
         return false;
 
     if (XMLHttpRequest &&
diff --git a/js/xpconnect/src/XPCRuntimeService.cpp b/js/xpconnect/src/XPCRuntimeService.cpp
index 188a15c98aa..5499df49cac 100644
--- a/js/xpconnect/src/XPCRuntimeService.cpp
+++ b/js/xpconnect/src/XPCRuntimeService.cpp
@@ -10,11 +10,9 @@
 #include "nsDOMClassInfo.h"
 #include "nsIPrincipal.h"
 
-#include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
 #include "mozilla/dom/workers/Workers.h"
 
 using mozilla::dom::workers::ResolveWorkerClasses;
-namespace indexedDB = mozilla::dom::indexedDB;
 
 NS_INTERFACE_MAP_BEGIN(BackstagePass)
   NS_INTERFACE_MAP_ENTRY(nsIGlobalObject)
@@ -75,14 +73,6 @@ BackstagePass::NewResolve(nsIXPConnectWrappedNative *wrapper,
         return NS_OK;
     }
 
-    *_retval = indexedDB::ResolveConstructors(cx, obj, id, &objp);
-    NS_ENSURE_TRUE(*_retval, NS_ERROR_FAILURE);
-
-    if (objp) {
-        *objpArg = objp;
-        return NS_OK;
-    }
-
     return NS_OK;
 }
 
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index ba6235a08c0..f730f7e2fea 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -515,7 +515,6 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
     MOZ_ASSERT(js::GetObjectClass(global)->flags & JSCLASS_DOM_GLOBAL);
 
     // Init WebIDL binding constructors wanted on all XPConnect globals.
-    // Additional bindings may be created lazily, see BackstagePass::NewResolve.
     //
     // XXX Please do not add any additional classes here without the approval of
     //     the XPConnect module owner.
@@ -525,12 +524,6 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
         return UnexpectedFailure(NS_ERROR_FAILURE);
     }
 
-    if (nsContentUtils::IsSystemPrincipal(aPrincipal) &&
-        !IndexedDatabaseManager::DefineIndexedDBLazyGetter(aJSContext,
-                                                           global)) {
-        return UnexpectedFailure(NS_ERROR_FAILURE);
-    }
-
     wrappedGlobal.forget(_retval);
     return NS_OK;
 }
diff --git a/testing/mochitest/b2g-desktop.json b/testing/mochitest/b2g-desktop.json
index e35b43faa6d..e5c10293148 100644
--- a/testing/mochitest/b2g-desktop.json
+++ b/testing/mochitest/b2g-desktop.json
@@ -537,7 +537,7 @@
     "dom/indexedDB/test/test_filehandle_store_snapshot.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_getAll.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_get_filehandle.html": "Bug 931116, b2g desktop specific, initial triage",
-    "dom/indexedDB/test/test_globalObjects.html": "Bug 931116, b2g desktop specific, initial triage",
+    "dom/indexedDB/test/test_globalObjects_content.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_global_data.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_index_empty_keyPath.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_index_getAll.html": "Bug 931116, b2g desktop specific, initial triage",

From 38b3276d7a83960e05256603148673e9a4347234 Mon Sep 17 00:00:00 2001
From: Vendelin Ruzicka <vendo.ruzicka@gmail.com>
Date: Tue, 19 Nov 2013 08:36:33 +0100
Subject: [PATCH 06/92] Bug 921478 - Part 2: Convert test_contacts_upgrade.html
 to real chrome mochitest. r=bent

--HG--
rename : dom/contacts/tests/test_contacts_upgrade.html => dom/contacts/tests/test_contacts_upgrade.xul
---
 dom/contacts/tests/chrome.ini                 |   2 +-
 dom/contacts/tests/test_contacts_upgrade.html | 279 ------------------
 dom/contacts/tests/test_contacts_upgrade.xul  | 279 ++++++++++++++++++
 dom/datastore/DataStore.jsm                   |   1 +
 dom/datastore/DataStoreDB.jsm                 |   1 +
 dom/indexedDB/IndexedDatabaseManager.cpp      |   3 +-
 dom/indexedDB/test/unit/xpcshell.ini          |   2 +-
 7 files changed, 285 insertions(+), 282 deletions(-)
 delete mode 100644 dom/contacts/tests/test_contacts_upgrade.html
 create mode 100644 dom/contacts/tests/test_contacts_upgrade.xul

diff --git a/dom/contacts/tests/chrome.ini b/dom/contacts/tests/chrome.ini
index 3ed06c21260..073b9ace36b 100644
--- a/dom/contacts/tests/chrome.ini
+++ b/dom/contacts/tests/chrome.ini
@@ -1,3 +1,3 @@
 [DEFAULT]
 
-[test_contacts_upgrade.html]
+[test_contacts_upgrade.xul]
diff --git a/dom/contacts/tests/test_contacts_upgrade.html b/dom/contacts/tests/test_contacts_upgrade.html
deleted file mode 100644
index b271fe65519..00000000000
--- a/dom/contacts/tests/test_contacts_upgrade.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=889239
--->
-<head>
-  <title>Test for Bug 889239</title>
-  <script type="application/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="application/javascript" src="chrome://mochikit/content/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=889239">Mozilla Bug 889239</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-</div>
-<pre id="test">
-<script class="testbody" type="application/javascript;version=1.7">
-"use strict";
-
-var isAndroid = (navigator.userAgent.indexOf("Android") !== -1);
-
-function checkStr(str1, str2, msg) {
-  if (str1 ^ str2) {
-    ok(false, "Expected both strings to be either present or absent");
-    return;
-  }
-  is(str1, str2, msg);
-}
-
-function checkStrArray(str1, str2, msg) {
-  // comparing /[null(,null)+]/ and undefined should pass
-  function nonNull(e) {
-    return e != null;
-  }
-  if ((Array.isArray(str1) && str1.filter(nonNull).length == 0 && str2 == undefined)
-     ||(Array.isArray(str2) && str2.filter(nonNull).length == 0 && str1 == undefined)) {
-    ok(true, msg);
-  } else if (str1) {
-    is(JSON.stringify(typeof str1 == "string" ? [str1] : str1), JSON.stringify(typeof str2 == "string" ? [str2] : str2), msg);
-  }
-}
-
-function checkAddress(adr1, adr2) {
-  if (adr1 ^ adr2) {
-    ok(false, "Expected both adrs to be either present or absent");
-    return;
-  }
-  checkStrArray(adr1.type, adr2.type, "Same type");
-  checkStrArray(adr1.streetAddress, adr2.streetAddress, "Same streetAddress");
-  checkStrArray(adr1.locality, adr2.locality, "Same locality");
-  checkStrArray(adr1.region, adr2.region, "Same region");
-  checkStrArray(adr1.postalCode, adr2.postalCode, "Same postalCode");
-  checkStrArray(adr1.countryName, adr2.countryName, "Same countryName");
-  is(adr1.pref, adr2.pref, "Same pref");
-}
-
-function checkTel(tel1, tel2) {
-  if (tel1 ^ tel2) {
-    ok(false, "Expected both tels to be either present or absent");
-    return;
-  }
-  checkStrArray(tel1.type, tel2.type, "Same type");
-  checkStrArray(tel1.value, tel2.value, "Same value");
-  checkStrArray(tel1.carrier, tel2.carrier, "Same carrier");
-  is(tel1.pref, tel2.pref, "Same pref");
-}
-
-function checkField(field1, field2) {
-  if (field1 ^ field2) {
-    ok(false, "Expected both fields to be either present or absent");
-    return;
-  }
-  checkStrArray(field1.type, field2.type, "Same type");
-  checkStrArray(field1.value, field2.value, "Same value");
-  is(field1.pref, field2.pref, "Same pref");
-}
-
-function checkDBContacts(dbContact1, dbContact2) {
-  let contact1 = dbContact1.properties;
-  let contact2 = dbContact2.properties;
-
-  checkStrArray(contact1.name, contact2.name, "Same name");
-  checkStrArray(contact1.honorificPrefix, contact2.honorificPrefix, "Same honorificPrefix");
-  checkStrArray(contact1.givenName, contact2.givenName, "Same givenName");
-  checkStrArray(contact1.additionalName, contact2.additionalName, "Same additionalName");
-  checkStrArray(contact1.familyName, contact2.familyName, "Same familyName");
-  checkStrArray(contact1.honorificSuffix, contact2.honorificSuffix, "Same honorificSuffix");
-  checkStrArray(contact1.nickname, contact2.nickname, "Same nickname");
-  checkStrArray(contact1.category, contact2.category, "Same category");
-  checkStrArray(contact1.org, contact2.org, "Same org");
-  checkStrArray(contact1.jobTitle, contact2.jobTitle, "Same jobTitle");
-  is(contact1.bday ? contact1.bday.valueOf() : null, contact2.bday ? contact2.bday.valueOf() : null, "Same birthday");
-  checkStrArray(contact1.note, contact2.note, "Same note");
-  is(contact1.anniversary ? contact1.anniversary.valueOf() : null , contact2.anniversary ? contact2.anniversary.valueOf() : null, "Same anniversary");
-  checkStr(contact1.sex, contact2.sex, "Same sex");
-  checkStr(contact1.genderIdentity, contact2.genderIdentity, "Same genderIdentity");
-  checkStrArray(contact1.key, contact2.key, "Same key");
-
-  is(contact1.email.length, contact2.email.length, "Same number of emails");
-  for (let i = 0; i < contact1.email.length; ++i) {
-    checkField(contact1.email[i], contact2.email[i]);
-  }
-
-  is(contact1.adr.length, contact2.adr.length, "Same number of adrs");
-  for (var i in contact1.adr) {
-    checkAddress(contact1.adr[i], contact2.adr[i]);
-  }
-
-  is(contact1.tel.length, contact2.tel.length, "Same number of tels");
-  for (var i in contact1.tel) {
-    checkTel(contact1.tel[i], contact2.tel[i]);
-  }
-
-  is(contact1.url.length, contact2.url.length, "Same number of urls");
-  for (var i in contact1.url) {
-    checkField(contact1.url[i], contact2.url[i]);
-  }
-
-  is(contact1.impp.length, contact2.impp.length, "Same number of impps");
-  for (var i in contact1.impp) {
-    checkField(contact1.impp[i], contact2.impp[i]);
-  }
-
-  // test search indexes
-  contact1 = dbContact1.search;
-  contact2 = dbContact2.search;
-  checkStrArray(contact1.category, contact2.category, "Same cateogry index");
-  checkStrArray(contact1.email, contact2.email, "Same email index");
-  checkStrArray(contact1.emailLowerCase, contact2.emailLowerCase, "Same emailLowerCase index");
-  checkStrArray(contact1.familyName, contact2.familyName, "Same familyName index");
-  checkStrArray(contact1.familyNameLowerCase, contact2.familyNameLowerCase, "Same familyNameLowerCase index");
-  checkStrArray(contact1.givenName, contact2.givenName, "Same givenName index");
-  checkStrArray(contact1.givenNameLowerCase, contact2.givenNameLowerCase, "Same givenNameLowerCase index");
-  checkStrArray(contact1.name, contact2.name, "Same name index");
-  checkStrArray(contact1.tel, contact2.tel, "Same tel index");
-  checkStrArray(contact1.telLowerCase, contact2.telLowerCase, "Same telLowerCase index");
-  checkStrArray(contact1.telMatch, contact2.telMatch, "Same telMatch index");
-}
-
-function makeFailure(reason) {
-  return function() {
-    ok(false, reason);
-    SimpleTest.finish();
-  };
-};
-
-const {Cc, Ci, Cu} = SpecialPowers;
-Cu.import("resource://gre/modules/ContactDB.jsm", window);
-Cu.importGlobalProperties(["indexedDB"]);
-
-let cdb = new ContactDB();
-cdb.init();
-
-let CONTACT_PROPS = {
-  id: "ab74671e36be41b680f8f030e7e24ea2",
-  properties: {
-    name: ["Magnificentest foo bar the third"],
-    givenName: ["foo"],
-    familyName: ["bar"],
-    honorificPrefix: ["magnificentest"],
-    honorificSuffix: ["the third"],
-    additionalName: ["addl"],
-    nickname: ["foo"],
-    tel: [
-      {type: ["mobile"], value: "+12345678901", carrier: "ACME Telecommunications", pref: true},
-      {type: ["home", "custom"], value: "7932012346", pref: false},
-    ],
-    email: [{type: ["work"], value: "a@b.c"}, {value: "b@c.d", pref: true}],
-    adr: [
-      {
-        type: ["home"],
-        streetAddress: "street 1",
-        locality: "locality 1",
-        region: "region 1",
-        postalCode: "postal code 1",
-        countryName: "country 1",
-      }
-    ],
-    impp: [{type: ["aim"], value:"im1", pref: true}, {value: "im2"}],
-    org: ["org1", "org2"],
-    jobTitle: ["boss", "superboss"],
-    bday: new Date("1980, 12, 01"),
-    note: ["bla bla bla"],
-    category: ["cat1", "cat2"],
-    url: [{type: ["work", "work2"], value: "www.1.com", pref: true}, {value: "www2.com"}],
-    anniversary: new Date("2000, 12, 01"),
-    sex: "male",
-    genderIdentity: "trisexual",
-    key: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAC4jAAAuIwF4pT92AAACrElEQVQozwXBTW8bRRgA4Hfemf1er7/iJI4Tq7VFlEZN1VZIlapy4MQBTkXcuSH+G/APKnGAAyCVCqmtCHETp64db5zdtdf7NbMzw/OQH378HkCZpmmapqYMy8yrNnadS6026HC/Z7k+SCkEBwKEEKaUQtQAmlDqrucH23nH4BRkJVRcwmod5gcn6LehFgCaEIIalFZaEcLCq73w355RdvY7nfGQGVTlmRXfqMlrUaSUMUQkhCISJIggKj3/YBHt7PRbpy+cwbF7dN/0vEqTMoo3s0tmGAAAoJAgImMq3xZ5WTPbHj4Mho8Nf+QcPtZBLxEkqeQ2WmklkRCtNdNaI1KpVCnqOC3j5ZK++4vnm6xSWZpzwQtRV2mOiBoRpEKtNQAQggjQcCwqinRxJeKlWW93dlqEsa2QRZbF85nWBAAZY4YUgl9fRJWKVuWgmhwHhpD1+ZrfVjAN867rMCne//rq7OuXjWaLCVHnOWHgFDwMw+Tvi09PdhtJXoVC7bWDIi8Lg8qyMk3rYjLzvJh2O30hwK6TpiG7zWDcck9GR17D9wxDcH7/oNtElRa1aZuLDJN4S7/87tssLVg0/eZs/3h0D5R89vR0v+1AVT0YHX31ZDy9uv7IeJrryeyu2+nS50/PqOXM5qt8Nf/jv08UwTfN27vkchldLpPf/nx/nqSz5sbzhkTYzLRppzNYre/ycrMIZwqsHdf96fd/Xr354AYBr/jESWhgGb6zVSuGrrQS1j4Zk8nc2Hs7frFb3Phc6+fOKDGLKOJTHvlj2u85N4t6vbw7OM4YRVquboPdsPNZ9eb8pvfAOf2iN4dN3EzWadnoO5JY19Oo0TYtw1t8TBqBR9v7wbOXROLWtZ3PH937+ZfXrb6BUHEbXL+FCIfDw92e5zebg8GR54r/AaMVcBxE6hgPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA3LTIxVDEwOjUzOjE5LTA0OjAwYyXbYgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNy0yMVQxMDo1MzoxOS0wNDowMBJ4Y94AAAARdEVYdGpwZWc6Y29sb3JzcGFjZQAyLHVVnwAAACB0RVh0anBlZzpzYW1wbGluZy1mYWN0b3IAMXgxLDF4MSwxeDHplfxwAAAAAElFTkSuQmCC"
-  }
-};
-
-function deleteDatabase(then) {
-  cdb.close();
-  let req = indexedDB.deleteDatabase(DB_NAME);
-  req.onsuccess = then;
-  req.onblocked = makeFailure("blocked");
-  req.onupgradeneeded = makeFailure("onupgradeneeded");
-  req.onerror = makeFailure("onerror");
-}
-
-function saveContact() {
-  // takes fast upgrade path
-  cdb.saveContact(CONTACT_PROPS,
-    function() {
-      ok(true, "Saved contact successfully");
-      next();
-    }
-  );
-}
-
-function getContact(callback) {
-  return function() {
-    let req = indexedDB.open(STORE_NAME, DB_VERSION);
-    req.onsuccess = function(event) {
-      let db = event.target.result;
-      let txn = db.transaction([STORE_NAME], "readonly");
-      txn.onabort = makeFailure("Failed to open transaction");
-      let r2 = txn.objectStore(STORE_NAME).get(CONTACT_PROPS.id);
-      r2.onsuccess = function() {
-        db.close();
-        callback(r2.result);
-      };
-      r2.onerror = makeFailure("Failed to get contact");
-    };
-  };
-}
-
-let savedContact;
-
-let Tests = [
-  saveContact,
-
-  getContact(function(contact) {
-    savedContact = contact;
-    next();
-  }),
-
-  function() {
-    deleteDatabase(function() {
-      info("slow upgrade");
-      cdb.useFastUpgrade = false;
-      cdb.init();
-      next();
-    });
-  },
-
-  saveContact,
-
-  getContact(function(contact) {
-    checkDBContacts(savedContact, contact);
-    next();
-  }),
-];
-
-function next() {
-  let step = Tests.shift();
-  if (step) {
-    step();
-  } else {
-    info("All done");
-    SimpleTest.finish();
-  }
-}
-
-// Skip tests on Android
-if (!isAndroid) {
-  SimpleTest.waitForExplicitFinish();
-  next();
-} else {
-  ok(true, "Skip test on Android");
-}
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/dom/contacts/tests/test_contacts_upgrade.xul b/dom/contacts/tests/test_contacts_upgrade.xul
new file mode 100644
index 00000000000..c9b90d111e4
--- /dev/null
+++ b/dom/contacts/tests/test_contacts_upgrade.xul
@@ -0,0 +1,279 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<window title="Mozilla Bug 889239"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <script type="application/javascript;version=1.7">
+  <![CDATA[
+  "use strict";
+
+  var isAndroid = (navigator.userAgent.indexOf("Android") !== -1);
+
+  function checkStr(str1, str2, msg) {
+    if (str1 ^ str2) {
+      ok(false, "Expected both strings to be either present or absent");
+      return;
+    }
+    is(str1, str2, msg);
+  }
+
+  function checkStrArray(str1, str2, msg) {
+    // comparing /[null(,null)+]/ and undefined should pass
+    function nonNull(e) {
+      return e != null;
+    }
+    if ((Array.isArray(str1) && str1.filter(nonNull).length == 0 && str2 == undefined)
+       ||(Array.isArray(str2) && str2.filter(nonNull).length == 0 && str1 == undefined)) {
+      ok(true, msg);
+    } else if (str1) {
+      is(JSON.stringify(typeof str1 == "string" ? [str1] : str1), JSON.stringify(typeof str2 == "string" ? [str2] : str2), msg);
+    }
+  }
+
+  function checkAddress(adr1, adr2) {
+    if (adr1 ^ adr2) {
+      ok(false, "Expected both adrs to be either present or absent");
+      return;
+    }
+    checkStrArray(adr1.type, adr2.type, "Same type");
+    checkStrArray(adr1.streetAddress, adr2.streetAddress, "Same streetAddress");
+    checkStrArray(adr1.locality, adr2.locality, "Same locality");
+    checkStrArray(adr1.region, adr2.region, "Same region");
+    checkStrArray(adr1.postalCode, adr2.postalCode, "Same postalCode");
+    checkStrArray(adr1.countryName, adr2.countryName, "Same countryName");
+    is(adr1.pref, adr2.pref, "Same pref");
+  }
+
+  function checkTel(tel1, tel2) {
+    if (tel1 ^ tel2) {
+      ok(false, "Expected both tels to be either present or absent");
+      return;
+    }
+    checkStrArray(tel1.type, tel2.type, "Same type");
+    checkStrArray(tel1.value, tel2.value, "Same value");
+    checkStrArray(tel1.carrier, tel2.carrier, "Same carrier");
+    is(tel1.pref, tel2.pref, "Same pref");
+  }
+
+  function checkField(field1, field2) {
+    if (field1 ^ field2) {
+      ok(false, "Expected both fields to be either present or absent");
+      return;
+    }
+    checkStrArray(field1.type, field2.type, "Same type");
+    checkStrArray(field1.value, field2.value, "Same value");
+    is(field1.pref, field2.pref, "Same pref");
+  }
+
+  function checkDBContacts(dbContact1, dbContact2) {
+    let contact1 = dbContact1.properties;
+    let contact2 = dbContact2.properties;
+
+    checkStrArray(contact1.name, contact2.name, "Same name");
+    checkStrArray(contact1.honorificPrefix, contact2.honorificPrefix, "Same honorificPrefix");
+    checkStrArray(contact1.givenName, contact2.givenName, "Same givenName");
+    checkStrArray(contact1.additionalName, contact2.additionalName, "Same additionalName");
+    checkStrArray(contact1.familyName, contact2.familyName, "Same familyName");
+    checkStrArray(contact1.honorificSuffix, contact2.honorificSuffix, "Same honorificSuffix");
+    checkStrArray(contact1.nickname, contact2.nickname, "Same nickname");
+    checkStrArray(contact1.category, contact2.category, "Same category");
+    checkStrArray(contact1.org, contact2.org, "Same org");
+    checkStrArray(contact1.jobTitle, contact2.jobTitle, "Same jobTitle");
+    is(contact1.bday ? contact1.bday.valueOf() : null, contact2.bday ? contact2.bday.valueOf() : null, "Same birthday");
+    checkStrArray(contact1.note, contact2.note, "Same note");
+    is(contact1.anniversary ? contact1.anniversary.valueOf() : null , contact2.anniversary ? contact2.anniversary.valueOf() : null, "Same anniversary");
+    checkStr(contact1.sex, contact2.sex, "Same sex");
+    checkStr(contact1.genderIdentity, contact2.genderIdentity, "Same genderIdentity");
+    checkStrArray(contact1.key, contact2.key, "Same key");
+
+    is(contact1.email.length, contact2.email.length, "Same number of emails");
+    for (let i = 0; i < contact1.email.length; ++i) {
+      checkField(contact1.email[i], contact2.email[i]);
+    }
+
+    is(contact1.adr.length, contact2.adr.length, "Same number of adrs");
+    for (var i in contact1.adr) {
+      checkAddress(contact1.adr[i], contact2.adr[i]);
+    }
+
+    is(contact1.tel.length, contact2.tel.length, "Same number of tels");
+    for (var i in contact1.tel) {
+      checkTel(contact1.tel[i], contact2.tel[i]);
+    }
+
+    is(contact1.url.length, contact2.url.length, "Same number of urls");
+    for (var i in contact1.url) {
+      checkField(contact1.url[i], contact2.url[i]);
+    }
+
+    is(contact1.impp.length, contact2.impp.length, "Same number of impps");
+    for (var i in contact1.impp) {
+      checkField(contact1.impp[i], contact2.impp[i]);
+    }
+
+    // test search indexes
+    contact1 = dbContact1.search;
+    contact2 = dbContact2.search;
+    checkStrArray(contact1.category, contact2.category, "Same cateogry index");
+    checkStrArray(contact1.email, contact2.email, "Same email index");
+    checkStrArray(contact1.emailLowerCase, contact2.emailLowerCase, "Same emailLowerCase index");
+    checkStrArray(contact1.familyName, contact2.familyName, "Same familyName index");
+    checkStrArray(contact1.familyNameLowerCase, contact2.familyNameLowerCase, "Same familyNameLowerCase index");
+    checkStrArray(contact1.givenName, contact2.givenName, "Same givenName index");
+    checkStrArray(contact1.givenNameLowerCase, contact2.givenNameLowerCase, "Same givenNameLowerCase index");
+    checkStrArray(contact1.name, contact2.name, "Same name index");
+    checkStrArray(contact1.tel, contact2.tel, "Same tel index");
+    checkStrArray(contact1.telLowerCase, contact2.telLowerCase, "Same telLowerCase index");
+    checkStrArray(contact1.telMatch, contact2.telMatch, "Same telMatch index");
+  }
+
+  function makeFailure(reason) {
+    return function() {
+      ok(false, reason);
+      SimpleTest.finish();
+    };
+  };
+
+  const { 'utils': Cu } = Components;
+  Cu.import("resource://gre/modules/ContactDB.jsm", window);
+  Cu.importGlobalProperties(["indexedDB"]);
+
+  let cdb = new ContactDB();
+  cdb.init();
+
+  let CONTACT_PROPS = {
+    id: "ab74671e36be41b680f8f030e7e24ea2",
+    properties: {
+      name: ["Magnificentest foo bar the third"],
+      givenName: ["foo"],
+      familyName: ["bar"],
+      honorificPrefix: ["magnificentest"],
+      honorificSuffix: ["the third"],
+      additionalName: ["addl"],
+      nickname: ["foo"],
+      tel: [
+        {type: ["mobile"], value: "+12345678901", carrier: "ACME Telecommunications", pref: true},
+        {type: ["home", "custom"], value: "7932012346", pref: false},
+      ],
+      email: [{type: ["work"], value: "a@b.c"}, {value: "b@c.d", pref: true}],
+      adr: [
+        {
+          type: ["home"],
+          streetAddress: "street 1",
+          locality: "locality 1",
+          region: "region 1",
+          postalCode: "postal code 1",
+          countryName: "country 1",
+        }
+      ],
+      impp: [{type: ["aim"], value:"im1", pref: true}, {value: "im2"}],
+      org: ["org1", "org2"],
+      jobTitle: ["boss", "superboss"],
+      bday: new Date("1980, 12, 01"),
+      note: ["bla bla bla"],
+      category: ["cat1", "cat2"],
+      url: [{type: ["work", "work2"], value: "www.1.com", pref: true}, {value: "www2.com"}],
+      anniversary: new Date("2000, 12, 01"),
+      sex: "male",
+      genderIdentity: "trisexual",
+      key: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAC4jAAAuIwF4pT92AAACrElEQVQozwXBTW8bRRgA4Hfemf1er7/iJI4Tq7VFlEZN1VZIlapy4MQBTkXcuSH+G/APKnGAAyCVCqmtCHETp64db5zdtdf7NbMzw/OQH378HkCZpmmapqYMy8yrNnadS6026HC/Z7k+SCkEBwKEEKaUQtQAmlDqrucH23nH4BRkJVRcwmod5gcn6LehFgCaEIIalFZaEcLCq73w355RdvY7nfGQGVTlmRXfqMlrUaSUMUQkhCISJIggKj3/YBHt7PRbpy+cwbF7dN/0vEqTMoo3s0tmGAAAoJAgImMq3xZ5WTPbHj4Mho8Nf+QcPtZBLxEkqeQ2WmklkRCtNdNaI1KpVCnqOC3j5ZK++4vnm6xSWZpzwQtRV2mOiBoRpEKtNQAQggjQcCwqinRxJeKlWW93dlqEsa2QRZbF85nWBAAZY4YUgl9fRJWKVuWgmhwHhpD1+ZrfVjAN867rMCne//rq7OuXjWaLCVHnOWHgFDwMw+Tvi09PdhtJXoVC7bWDIi8Lg8qyMk3rYjLzvJh2O30hwK6TpiG7zWDcck9GR17D9wxDcH7/oNtElRa1aZuLDJN4S7/87tssLVg0/eZs/3h0D5R89vR0v+1AVT0YHX31ZDy9uv7IeJrryeyu2+nS50/PqOXM5qt8Nf/jv08UwTfN27vkchldLpPf/nx/nqSz5sbzhkTYzLRppzNYre/ycrMIZwqsHdf96fd/Xr354AYBr/jESWhgGb6zVSuGrrQS1j4Zk8nc2Hs7frFb3Phc6+fOKDGLKOJTHvlj2u85N4t6vbw7OM4YRVquboPdsPNZ9eb8pvfAOf2iN4dN3EzWadnoO5JY19Oo0TYtw1t8TBqBR9v7wbOXROLWtZ3PH937+ZfXrb6BUHEbXL+FCIfDw92e5zebg8GR54r/AaMVcBxE6hgPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA3LTIxVDEwOjUzOjE5LTA0OjAwYyXbYgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNy0yMVQxMDo1MzoxOS0wNDowMBJ4Y94AAAARdEVYdGpwZWc6Y29sb3JzcGFjZQAyLHVVnwAAACB0RVh0anBlZzpzYW1wbGluZy1mYWN0b3IAMXgxLDF4MSwxeDHplfxwAAAAAElFTkSuQmCC"
+    }
+  };
+
+  function deleteDatabase(then) {
+    cdb.close();
+    let req = indexedDB.deleteDatabase(DB_NAME);
+    req.onsuccess = then;
+    req.onblocked = makeFailure("blocked");
+    req.onupgradeneeded = makeFailure("onupgradeneeded");
+    req.onerror = makeFailure("onerror");
+  }
+
+  function saveContact() {
+    // takes fast upgrade path
+    cdb.saveContact(CONTACT_PROPS,
+      function() {
+        ok(true, "Saved contact successfully");
+        next();
+      }
+    );
+  }
+
+  function getContact(callback) {
+    return function() {
+      let req = indexedDB.open(STORE_NAME, DB_VERSION);
+      req.onsuccess = function(event) {
+        let db = event.target.result;
+        let txn = db.transaction([STORE_NAME], "readonly");
+        txn.onabort = makeFailure("Failed to open transaction");
+        let r2 = txn.objectStore(STORE_NAME).get(CONTACT_PROPS.id);
+        r2.onsuccess = function() {
+          db.close();
+          callback(r2.result);
+        };
+        r2.onerror = makeFailure("Failed to get contact");
+      };
+    };
+  }
+
+  let savedContact;
+
+  let Tests = [
+    saveContact,
+
+    getContact(function(contact) {
+      savedContact = contact;
+      next();
+    }),
+
+    function() {
+      deleteDatabase(function() {
+        info("slow upgrade");
+        cdb.useFastUpgrade = false;
+        cdb.init();
+        next();
+      });
+    },
+
+    saveContact,
+
+    getContact(function(contact) {
+      checkDBContacts(savedContact, contact);
+      next();
+    }),
+  ];
+
+  function next() {
+    let step = Tests.shift();
+    if (step) {
+      step();
+    } else {
+      info("All done");
+      SimpleTest.finish();
+    }
+  }
+
+  // Skip tests on Android
+  if (!isAndroid) {
+    SimpleTest.waitForExplicitFinish();
+    next();
+  } else {
+    ok(true, "Skip test on Android");
+  }
+
+  ]]>
+  </script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=889239"
+     target="_blank">Mozilla Bug 889239</a>
+  </body>
+</window>
diff --git a/dom/datastore/DataStore.jsm b/dom/datastore/DataStore.jsm
index f6b3ad6b6d0..afe1a2645f1 100644
--- a/dom/datastore/DataStore.jsm
+++ b/dom/datastore/DataStore.jsm
@@ -28,6 +28,7 @@ Cu.import("resource://gre/modules/DataStoreDB.jsm");
 Cu.import("resource://gre/modules/ObjectWrapper.jsm");
 Cu.import('resource://gre/modules/Services.jsm');
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+Cu.importGlobalProperties(["indexedDB"]);
 
 XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
                                    "@mozilla.org/childprocessmessagemanager;1",
diff --git a/dom/datastore/DataStoreDB.jsm b/dom/datastore/DataStoreDB.jsm
index 75c3fdb8af1..bf538355075 100644
--- a/dom/datastore/DataStoreDB.jsm
+++ b/dom/datastore/DataStoreDB.jsm
@@ -19,6 +19,7 @@ const DATASTOREDB_REVISION_INDEX = 'revisionIndex';
 
 Cu.import('resource://gre/modules/IndexedDBHelper.jsm');
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.importGlobalProperties(["indexedDB"]);
 
 XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
                                    "@mozilla.org/uuid-generator;1",
diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp
index aefb62cccf4..90cf8514408 100644
--- a/dom/indexedDB/IndexedDatabaseManager.cpp
+++ b/dom/indexedDB/IndexedDatabaseManager.cpp
@@ -425,7 +425,8 @@ IndexedDatabaseManager::DefineIndexedDB(JSContext* aCx,
       !IDBOpenDBRequestBinding::GetConstructorObject(aCx, aGlobal) ||
       !IDBRequestBinding::GetConstructorObject(aCx, aGlobal) ||
       !IDBTransactionBinding::GetConstructorObject(aCx, aGlobal) ||
-      !IDBVersionChangeEventBinding::GetConstructorObject(aCx, aGlobal)) {
+      !IDBVersionChangeEventBinding::GetConstructorObject(aCx, aGlobal))
+  {
     return false;
   }
 
diff --git a/dom/indexedDB/test/unit/xpcshell.ini b/dom/indexedDB/test/unit/xpcshell.ini
index d3e19e5e52c..7f9a8a54b12 100644
--- a/dom/indexedDB/test/unit/xpcshell.ini
+++ b/dom/indexedDB/test/unit/xpcshell.ini
@@ -30,7 +30,7 @@ support-files =
 [test_getAll.js]
 [test_globalObjects_ipc.js]
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
-#skip-if = os == "mac" || os == "android"
+skip-if = os == "mac" || os == "android"
 [test_globalObjects_other.js]
 [test_globalObjects_xpc.js]
 [test_global_data.js]

From 83330ed1eb35f0b869c7dac4331f5b528c084950 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Tue, 19 Nov 2013 07:35:17 -0800
Subject: [PATCH 07/92] Back out babac1cc0741:ad287f78608a (bug 939049) for OS
 X build bustage CLOSED TREE

---
 accessible/src/base/Logging.cpp               |  30 +++---
 .../src/base/nsAccessibilityService.cpp       |   3 +-
 accessible/src/base/nsCoreUtils.cpp           |  14 ++-
 accessible/src/generic/Accessible.cpp         |  10 +-
 accessible/src/generic/DocAccessible.cpp      |   9 +-
 content/base/public/nsIDocument.h             |  22 ++--
 content/base/src/moz.build                    |   1 -
 content/base/src/nsContentUtils.cpp           |  20 ++--
 content/base/src/nsDocument.cpp               | 100 ++++++++----------
 content/base/src/nsTreeSanitizer.cpp          |   3 +-
 content/html/content/src/HTMLInputElement.cpp |   7 +-
 content/html/content/src/HTMLMediaElement.cpp |   9 +-
 content/html/document/src/ImageDocument.cpp   |   5 +-
 content/html/document/src/moz.build           |   1 -
 content/html/document/src/nsHTMLDocument.cpp  |   4 +-
 content/xul/document/src/XULDocument.cpp      |   9 +-
 content/xul/document/src/moz.build            |   1 -
 docshell/base/nsDocShell.cpp                  |  10 +-
 docshell/base/nsDocShell.h                    |   4 +-
 docshell/base/nsIContentViewer.idl            |   3 +-
 docshell/base/nsIDocumentLoaderFactory.idl    |   5 +-
 docshell/shistory/src/nsSHEntryShared.cpp     |   3 +-
 dom/ipc/TabChild.cpp                          |   3 +-
 dom/ipc/TabParent.cpp                         |   5 +-
 editor/composer/src/nsEditorSpellCheck.cpp    |   3 +-
 editor/libeditor/base/nsEditorUtils.cpp       |   3 +-
 .../text/nsPlaintextDataTransfer.cpp          |   3 +-
 layout/base/moz.build                         |   3 -
 layout/base/nsDocumentViewer.cpp              |  77 +++++++-------
 layout/base/nsPresContext.cpp                 |   4 +-
 layout/build/moz.build                        |   3 -
 layout/build/nsContentDLF.cpp                 |  11 +-
 layout/build/nsContentDLF.h                   |   4 +-
 layout/generic/nsSubDocumentFrame.cpp         |   3 +-
 layout/printing/nsPrintEngine.cpp             |   7 +-
 layout/printing/nsPrintEngine.h               |   2 +-
 layout/style/nsFontFaceLoader.cpp             |  23 ++--
 layout/xul/base/src/nsContainerBoxObject.cpp  |   9 +-
 layout/xul/base/src/nsXULPopupManager.cpp     |   3 +-
 .../satchel/nsFormFillController.cpp          |   5 +-
 .../prefetch/nsOfflineCacheUpdateService.cpp  |   4 +-
 .../directory/nsDirectoryViewer.cpp           |   3 +-
 42 files changed, 240 insertions(+), 211 deletions(-)

diff --git a/accessible/src/base/Logging.cpp b/accessible/src/base/Logging.cpp
index 435b79f358b..0e5b79629ab 100644
--- a/accessible/src/base/Logging.cpp
+++ b/accessible/src/base/Logging.cpp
@@ -99,19 +99,22 @@ LogDocShellState(nsIDocument* aDocumentNode)
   printf("docshell busy: ");
 
   nsAutoCString docShellBusy;
-  nsCOMPtr<nsIDocShell> docShell = aDocumentNode->GetDocShell();
-  uint32_t busyFlags = nsIDocShell::BUSY_FLAGS_NONE;
-  docShell->GetBusyFlags(&busyFlags);
-  if (busyFlags == nsIDocShell::BUSY_FLAGS_NONE)
-    printf("'none'");
-  if (busyFlags & nsIDocShell::BUSY_FLAGS_BUSY)
-    printf("'busy'");
-  if (busyFlags & nsIDocShell::BUSY_FLAGS_BEFORE_PAGE_LOAD)
-    printf(", 'before page load'");
-  if (busyFlags & nsIDocShell::BUSY_FLAGS_PAGE_LOADING)
-    printf(", 'page loading'");
-
+  nsCOMPtr<nsISupports> container = aDocumentNode->GetContainer();
+  if (container) {
+    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+    uint32_t busyFlags = nsIDocShell::BUSY_FLAGS_NONE;
+    docShell->GetBusyFlags(&busyFlags);
+    if (busyFlags == nsIDocShell::BUSY_FLAGS_NONE)
+      printf("'none'");
+    if (busyFlags & nsIDocShell::BUSY_FLAGS_BUSY)
+      printf("'busy'");
+    if (busyFlags & nsIDocShell::BUSY_FLAGS_BEFORE_PAGE_LOAD)
+      printf(", 'before page load'");
+    if (busyFlags & nsIDocShell::BUSY_FLAGS_PAGE_LOADING)
+      printf(", 'page loading'");
+  } else {
     printf("[failed]");
+  }
 }
 
 static void
@@ -129,7 +132,8 @@ static void
 LogDocShellTree(nsIDocument* aDocumentNode)
 {
   if (aDocumentNode->IsActive()) {
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(aDocumentNode->GetDocShell());
+    nsCOMPtr<nsISupports> container = aDocumentNode->GetContainer();
+    nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
     nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
     treeItem->GetParent(getter_AddRefs(parentTreeItem));
     nsCOMPtr<nsIDocShellTreeItem> rootTreeItem;
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 0ea3d82ef5f..5804fb43528 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -200,7 +200,8 @@ nsAccessibilityService::GetRootDocumentAccessible(nsIPresShell* aPresShell,
   nsIPresShell* ps = aPresShell;
   nsIDocument* documentNode = aPresShell->GetDocument();
   if (documentNode) {
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(documentNode->GetDocShell());
+    nsCOMPtr<nsISupports> container = documentNode->GetContainer();
+    nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
     if (treeItem) {
       nsCOMPtr<nsIDocShellTreeItem> rootTreeItem;
       treeItem->GetRootTreeItem(getter_AddRefs(rootTreeItem));
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index 13aee385f1f..00ccb9a702a 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -394,14 +394,17 @@ nsCoreUtils::GetDocShellFor(nsINode *aNode)
   if (!aNode)
     return nullptr;
 
-  nsCOMPtr<nsIDocShell> docShell = aNode->OwnerDoc()->GetDocShell();
+  nsCOMPtr<nsISupports> container = aNode->OwnerDoc()->GetContainer();
+  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
   return docShell.forget();
 }
 
 bool
 nsCoreUtils::IsRootDocument(nsIDocument *aDocument)
 {
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = aDocument->GetDocShell();
+  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
+    do_QueryInterface(container);
   NS_ASSERTION(docShellTreeItem, "No document shell for document!");
 
   nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
@@ -413,7 +416,9 @@ nsCoreUtils::IsRootDocument(nsIDocument *aDocument)
 bool
 nsCoreUtils::IsContentDocument(nsIDocument *aDocument)
 {
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = aDocument->GetDocShell();
+  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
+    do_QueryInterface(container);
   NS_ASSERTION(docShellTreeItem, "No document shell tree item for document!");
 
   int32_t contentType;
@@ -424,7 +429,8 @@ nsCoreUtils::IsContentDocument(nsIDocument *aDocument)
 bool
 nsCoreUtils::IsTabDocument(nsIDocument* aDocumentNode)
 {
-  nsCOMPtr<nsIDocShellTreeItem> treeItem(aDocumentNode->GetDocShell());
+  nsCOMPtr<nsISupports> container = aDocumentNode->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
 
   nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
   treeItem->GetParent(getter_AddRefs(parentTreeItem));
diff --git a/accessible/src/generic/Accessible.cpp b/accessible/src/generic/Accessible.cpp
index b4c936579e2..8f2ce0bdaff 100644
--- a/accessible/src/generic/Accessible.cpp
+++ b/accessible/src/generic/Accessible.cpp
@@ -376,8 +376,10 @@ Accessible::AccessKey() const
   nsIDocument* document = mContent->GetCurrentDoc();
   if (!document)
     return KeyBinding();
-
-  nsCOMPtr<nsIDocShellTreeItem> treeItem(document->GetDocShell());
+  nsCOMPtr<nsISupports> container = document->GetContainer();
+  if (!container)
+    return KeyBinding();
+  nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(container));
   if (!treeItem)
     return KeyBinding();
 
@@ -1291,7 +1293,9 @@ Accessible::NativeAttributes()
                                            nsCoreUtils::GetRoleContent(doc));
 
     // Allow ARIA live region markup from outer documents to override
-    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = doc->GetDocShell();
+    nsCOMPtr<nsISupports> container = doc->GetContainer(); 
+    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
+      do_QueryInterface(container);
     if (!docShellTreeItem)
       break;
 
diff --git a/accessible/src/generic/DocAccessible.cpp b/accessible/src/generic/DocAccessible.cpp
index efc898ced63..909c41ab1ba 100644
--- a/accessible/src/generic/DocAccessible.cpp
+++ b/accessible/src/generic/DocAccessible.cpp
@@ -688,7 +688,8 @@ DocAccessible::GetBoundsRect(nsRect& aBounds, nsIFrame** aRelativeFrame)
 nsresult
 DocAccessible::AddEventListeners()
 {
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(mDocumentNode->GetDocShell());
+  nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(do_QueryInterface(container));
 
   // We want to add a command observer only if the document is content and has
   // an editor.
@@ -720,7 +721,8 @@ DocAccessible::RemoveEventListeners()
   if (mDocumentNode) {
     mDocumentNode->RemoveObserver(this);
 
-    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(mDocumentNode->GetDocShell());
+    nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
+    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(do_QueryInterface(container));
     NS_ASSERTION(docShellTreeItem, "doc should support nsIDocShellTreeItem.");
 
     if (docShellTreeItem) {
@@ -1985,7 +1987,8 @@ DocAccessible::ShutdownChildrenInSubtree(Accessible* aAccessible)
 bool
 DocAccessible::IsLoadEventTarget() const
 {
-  nsCOMPtr<nsIDocShellTreeItem> treeItem = mDocumentNode->GetDocShell();
+  nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
   NS_ASSERTION(treeItem, "No document shell for document!");
 
   nsCOMPtr<nsIDocShellTreeItem> parentTreeItem;
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 120ce2172ef..1e94bb1fea7 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -20,7 +20,6 @@
 #include "nsPropertyTable.h"             // for member
 #include "nsTHashtable.h"                // for member
 #include "mozilla/dom/DocumentBinding.h"
-#include "mozilla/WeakPtr.h"
 #include "Units.h"
 #include "nsExpirationTracker.h"
 #include "nsClassHashtable.h"
@@ -29,8 +28,6 @@ class imgIRequest;
 class nsAString;
 class nsBindingManager;
 class nsCSSStyleSheet;
-class nsIDocShell;
-class nsDocShell;
 class nsDOMNavigationTiming;
 class nsDOMTouchList;
 class nsEventStates;
@@ -1153,23 +1150,22 @@ public:
    * Set the container (docshell) for this document. Virtual so that
    * docshell can call it.
    */
-  virtual void SetContainer(nsDocShell* aContainer);
+  virtual void SetContainer(nsISupports *aContainer);
 
   /**
    * Get the container (docshell) for this document.
    */
-  nsISupports* GetContainer() const;
+  already_AddRefed<nsISupports> GetContainer() const
+  {
+    nsCOMPtr<nsISupports> container = do_QueryReferent(mDocumentContainer);
+    return container.forget();
+  }
 
   /**
    * Get the container's load context for this document.
    */
   nsILoadContext* GetLoadContext() const;
 
-  /**
-   * Get docshell the for this document.
-   */
-  nsIDocShell* GetDocShell() const;
-
   /**
    * Set and get XML declaration. If aVersion is null there is no declaration.
    * aStandalone takes values -1, 0 and 1 indicating respectively that there
@@ -1530,7 +1526,7 @@ public:
   void SetDisplayDocument(nsIDocument* aDisplayDocument)
   {
     NS_PRECONDITION(!GetShell() &&
-                    !GetContainer() &&
+                    !nsCOMPtr<nsISupports>(GetContainer()) &&
                     !GetWindow(),
                     "Shouldn't set mDisplayDocument on documents that already "
                     "have a presentation or a docshell or a window");
@@ -1700,7 +1696,7 @@ public:
    * @param aCloneContainer The container for the clone document.
    */
   virtual already_AddRefed<nsIDocument>
-  CreateStaticClone(nsIDocShell* aCloneContainer);
+  CreateStaticClone(nsISupports* aCloneContainer);
 
   /**
    * If this document is a static clone, this returns the original
@@ -2231,7 +2227,7 @@ protected:
 
   nsWeakPtr mDocumentLoadGroup;
 
-  mozilla::WeakPtr<nsDocShell> mDocumentContainer;
+  nsWeakPtr mDocumentContainer;
 
   nsCString mCharacterSet;
   int32_t mCharacterSetSource;
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index a882fb892e3..8b46268ee07 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -193,7 +193,6 @@ LOCAL_INCLUDES += [
     '/content/xslt/src/xpath',
     '/content/xul/content/src',
     '/content/xul/document/src',
-    '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index f7a7a33a6be..787a1d5fd2c 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -2622,7 +2622,10 @@ nsContentUtils::CanLoadImage(nsIURI* aURI, nsISupports* aContext,
   uint32_t appType = nsIDocShell::APP_TYPE_UNKNOWN;
 
   {
-    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = aLoadingDocument->GetDocShell();
+    nsCOMPtr<nsISupports> container = aLoadingDocument->GetContainer();
+    nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
+      do_QueryInterface(container);
+
     if (docShellTreeItem) {
       nsCOMPtr<nsIDocShellTreeItem> root;
       docShellTreeItem->GetRootTreeItem(getter_AddRefs(root));
@@ -3150,7 +3153,8 @@ nsContentUtils::IsChromeDoc(nsIDocument *aDocument)
 bool
 nsContentUtils::IsChildOfSameType(nsIDocument* aDoc)
 {
-  nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(aDoc->GetDocShell());
+  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(container));
   nsCOMPtr<nsIDocShellTreeItem> sameTypeParent;
   if (docShellAsItem) {
     docShellAsItem->GetSameTypeParent(getter_AddRefs(sameTypeParent));
@@ -3231,7 +3235,8 @@ nsContentUtils::IsInChromeDocshell(nsIDocument *aDocument)
     return IsInChromeDocshell(aDocument->GetDisplayDocument());
   }
 
-  nsCOMPtr<nsIDocShellTreeItem> docShell(aDocument->GetDocShell());
+  nsCOMPtr<nsISupports> docContainer = aDocument->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShell(do_QueryInterface(docContainer));
   int32_t itemType = nsIDocShellTreeItem::typeContent;
   if (docShell) {
     docShell->GetItemType(&itemType);
@@ -4971,7 +4976,8 @@ nsContentUtils::HidePopupsInDocument(nsIDocument* aDocument)
 #ifdef MOZ_XUL
   nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
   if (pm && aDocument) {
-    nsCOMPtr<nsIDocShellTreeItem> docShellToHide = aDocument->GetDocShell();
+    nsCOMPtr<nsISupports> container = aDocument->GetContainer();
+    nsCOMPtr<nsIDocShellTreeItem> docShellToHide = do_QueryInterface(container);
     if (docShellToHide)
       pm->HidePopupsInDocShell(docShellToHide);
   }
@@ -5871,7 +5877,8 @@ nsContentUtils::IsSubDocumentTabbable(nsIContent* aContent)
     return false;
   }
 
-  nsCOMPtr<nsIDocShell> docShell = subDoc->GetDocShell();
+  nsCOMPtr<nsISupports> container = subDoc->GetContainer();
+  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
   if (!docShell) {
     return false;
   }
@@ -5981,7 +5988,8 @@ nsContentUtils::FindPresShellForDocument(const nsIDocument* aDoc)
     return shell;
   }
 
-  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = doc->GetDocShell();
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = do_QueryInterface(container);
   while (docShellTreeItem) {
     // We may be in a display:none subdocument, or we may not have a presshell
     // created yet.
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 31337428e99..6b5feb2e73f 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -33,7 +33,7 @@
 #include "nsIBaseWindow.h"
 #include "mozilla/css/Loader.h"
 #include "mozilla/css/ImageLoader.h"
-#include "nsDocShell.h"
+#include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsCOMArray.h"
 #include "nsDOMClassInfo.h"
@@ -2203,7 +2203,7 @@ nsDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
     nsIScriptSecurityManager *securityManager =
       nsContentUtils::GetSecurityManager();
     if (securityManager) {
-      nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+      nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
 
       if (!docShell && aLoadGroup) {
         nsCOMPtr<nsIInterfaceRequestor> cbs;
@@ -2699,7 +2699,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
   }
 
   // ----- Enforce frame-ancestor policy on any applied policies
-  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
   if (docShell) {
     bool safeAncestry = false;
 
@@ -2930,7 +2930,7 @@ nsresult
 nsDocument::GetAllowPlugins(bool * aAllowPlugins)
 {
   // First, we ask our docshell if it allows plugins.
-  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
 
   if (docShell) {
     docShell->GetAllowPlugins(aAllowPlugins);
@@ -3398,7 +3398,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData)
   if (aHeaderField == nsGkAtoms::refresh) {
     // We get into this code before we have a script global yet, so get to
     // our container via mDocumentContainer.
-    nsCOMPtr<nsIRefreshURI> refresher(mDocumentContainer);
+    nsCOMPtr<nsIRefreshURI> refresher = do_QueryReferent(mDocumentContainer);
     if (refresher) {
       // Note: using mDocumentURI instead of mBaseURI here, for consistency
       // (used to just use the current URI of our webnavigation, but that
@@ -3479,7 +3479,7 @@ nsDocument::doCreateShell(nsPresContext* aContext,
   mPresShell = shell;
 
   // Make sure to never paint if we belong to an invisible DocShell.
-  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
   if (docShell && docShell->IsInvisible())
     shell->SetNeverPainting(true);
 
@@ -4192,41 +4192,29 @@ NotifyActivityChanged(nsIContent *aContent, void *aUnused)
 }
 
 void
-nsIDocument::SetContainer(nsDocShell* aContainer)
+nsIDocument::SetContainer(nsISupports* aContainer)
 {
-  if (aContainer) {
-    mDocumentContainer = aContainer->asWeakPtr();
-  } else {
-    mDocumentContainer = WeakPtr<nsDocShell>();
-  }
-
+  mDocumentContainer = do_GetWeakReference(aContainer);
   EnumerateFreezableElements(NotifyActivityChanged, nullptr);
-  if (!aContainer) {
-    return;
-  }
-
   // Get the Docshell
-  int32_t itemType;
-  aContainer->GetItemType(&itemType);
-  // check itemtype
-  if (itemType == nsIDocShellTreeItem::typeContent) {
-    // check if same type root
-    nsCOMPtr<nsIDocShellTreeItem> sameTypeRoot;
-    aContainer->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
-    NS_ASSERTION(sameTypeRoot, "No document shell root tree item from document shell tree item!");
+  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(aContainer);
+  if (docShell) {
+    int32_t itemType;
+    docShell->GetItemType(&itemType);
+    // check itemtype
+    if (itemType == nsIDocShellTreeItem::typeContent) {
+      // check if same type root
+      nsCOMPtr<nsIDocShellTreeItem> sameTypeRoot;
+      docShell->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
+      NS_ASSERTION(sameTypeRoot, "No document shell root tree item from document shell tree item!");
 
-    if (sameTypeRoot == aContainer) {
-      static_cast<nsDocument*>(this)->SetIsTopLevelContentDocument(true);
+      if (sameTypeRoot == docShell) {
+        static_cast<nsDocument*>(this)->SetIsTopLevelContentDocument(true);
+      }
     }
   }
 }
 
-nsISupports*
-nsIDocument::GetContainer() const
-{
-  return static_cast<nsIDocShell*>(mDocumentContainer);
-}
-
 void
 nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
 {
@@ -4284,7 +4272,7 @@ nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
 #endif
 
     if (mAllowDNSPrefetch) {
-      nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+      nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
       if (docShell) {
 #ifdef DEBUG
         nsCOMPtr<nsIWebNavigation> webNav =
@@ -4383,7 +4371,8 @@ nsDocument::GetWindowInternal() const
   // the docshell, the outer window might be still obtainable from the it.
   nsCOMPtr<nsPIDOMWindow> win;
   if (mRemovedFromDocShell) {
-    nsCOMPtr<nsIInterfaceRequestor> requestor(mDocumentContainer);
+    nsCOMPtr<nsIInterfaceRequestor> requestor =
+      do_QueryReferent(mDocumentContainer);
     if (requestor) {
       // The docshell returns the outer window we are done.
       win = do_GetInterface(requestor);
@@ -7810,7 +7799,7 @@ nsDocument::GetLayoutHistoryState() const
   if (!mScriptGlobalObject) {
     state = mLayoutHistoryState;
   } else {
-    nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+    nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mDocumentContainer));
     if (docShell) {
       docShell->GetLayoutHistoryState(getter_AddRefs(state));
     }
@@ -8331,7 +8320,7 @@ nsDocument::CloneDocHelper(nsDocument* clone) const
 
     // |mDocumentContainer| is the container of the document that is being
     // created and not the original container. See CreateStaticClone function().
-    nsCOMPtr<nsIDocumentLoader> docLoader(mDocumentContainer);
+    nsCOMPtr<nsIDocumentLoader> docLoader = do_QueryReferent(mDocumentContainer);
     if (docLoader) {
       docLoader->GetLoadGroup(getter_AddRefs(loadGroup));
     }
@@ -8344,7 +8333,8 @@ nsDocument::CloneDocHelper(nsDocument* clone) const
         clone->ResetToURI(uri, loadGroup, NodePrincipal());
       }
     }
-    clone->SetContainer(mDocumentContainer);
+    nsCOMPtr<nsISupports> container = GetContainer();
+    clone->SetContainer(container);
   }
 
   // Set scripting object
@@ -8855,18 +8845,18 @@ nsIDocument::FlushPendingLinkUpdates()
 }
 
 already_AddRefed<nsIDocument>
-nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer)
+nsIDocument::CreateStaticClone(nsISupports* aCloneContainer)
 {
   nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(this);
   NS_ENSURE_TRUE(domDoc, nullptr);
   mCreatingStaticClone = true;
 
   // Make document use different container during cloning.
-  nsRefPtr<nsDocShell> originalShell = mDocumentContainer.get();
-  SetContainer(static_cast<nsDocShell*>(aCloneContainer));
+  nsCOMPtr<nsISupports> originalContainer = GetContainer();
+  SetContainer(aCloneContainer);
   nsCOMPtr<nsIDOMNode> clonedNode;
   nsresult rv = domDoc->CloneNode(true, 1, getter_AddRefs(clonedNode));
-  SetContainer(originalShell);
+  SetContainer(originalContainer);
 
   nsCOMPtr<nsIDocument> clonedDoc;
   if (NS_SUCCEEDED(rv)) {
@@ -10172,7 +10162,8 @@ nsDocument::FullScreenStackTop()
 static bool
 IsInActiveTab(nsIDocument* aDoc)
 {
-  nsCOMPtr<nsIDocShell> docshell = aDoc->GetDocShell();
+  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
+  nsCOMPtr<nsIDocShell> docshell = do_QueryInterface(container);
   if (!docshell) {
     return false;
   }
@@ -10183,8 +10174,12 @@ IsInActiveTab(nsIDocument* aDoc)
     return false;
   }
 
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(container);
+  if (!dsti) {
+    return false;
+  }
   nsCOMPtr<nsIDocShellTreeItem> rootItem;
-  docshell->GetRootTreeItem(getter_AddRefs(rootItem));
+  dsti->GetRootTreeItem(getter_AddRefs(rootItem));
   if (!rootItem) {
     return false;
   }
@@ -10529,7 +10524,7 @@ nsDocument::IsFullScreenEnabled(bool aCallerIsChrome, bool aLogFailure)
 
   // Ensure that all ancestor <iframe> elements have the allowfullscreen
   // boolean attribute set.
-  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
   bool allowed = false;
   if (docShell) {
     docShell->GetFullscreenAllowed(&allowed);
@@ -10843,7 +10838,7 @@ nsDocument::ShouldLockPointer(Element* aElement, Element* aCurrentLock,
 
   // Check if the element is in a document with a docshell.
   nsCOMPtr<nsIDocument> ownerDoc = aElement->OwnerDoc();
-  if (!ownerDoc->GetContainer()) {
+  if (!nsCOMPtr<nsISupports>(ownerDoc->GetContainer())) {
     return false;
   }
   nsCOMPtr<nsPIDOMWindow> ownerWindow = ownerDoc->GetWindow();
@@ -11414,13 +11409,12 @@ nsIDocument::SetContentTypeInternal(const nsACString& aType)
 nsILoadContext*
 nsIDocument::GetLoadContext() const
 {
-  return mDocumentContainer;
-}
-
-nsIDocShell*
-nsIDocument::GetDocShell() const
-{
-  return mDocumentContainer;
+  nsCOMPtr<nsISupports> container = GetContainer();
+  if (container) {
+    nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
+    return loadContext;
+  }
+  return nullptr;
 }
 
 void
diff --git a/content/base/src/nsTreeSanitizer.cpp b/content/base/src/nsTreeSanitizer.cpp
index fe88ae2d0ed..f43349abf0a 100644
--- a/content/base/src/nsTreeSanitizer.cpp
+++ b/content/base/src/nsTreeSanitizer.cpp
@@ -1359,7 +1359,8 @@ nsTreeSanitizer::Sanitize(nsIDocument* aDocument)
   // here that notifies / does not notify or that fires mutation events if
   // in tree.
 #ifdef DEBUG
-  NS_PRECONDITION(!aDocument->GetContainer(), "The document is in a shell.");
+  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
+  NS_PRECONDITION(!container, "The document is in a shell.");
   nsRefPtr<mozilla::dom::Element> root = aDocument->GetRootElement();
   NS_PRECONDITION(root->IsHTML(nsGkAtoms::html), "Not HTML root.");
 #endif
diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
index 2b41e1c92e2..c1033db7152 100644
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -993,7 +993,9 @@ UploadLastDir::FetchDirectoryAndDisplayPicker(nsIDocument* aDoc,
   nsIURI* docURI = aDoc->GetDocumentURI();
   NS_PRECONDITION(docURI, "docURI is null");
 
-  nsCOMPtr<nsILoadContext> loadContext = aDoc->GetLoadContext();
+  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
+  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
+
   nsCOMPtr<nsIContentPrefCallback2> prefCallback = 
     new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback);
 
@@ -1044,7 +1046,8 @@ UploadLastDir::StoreLastUsedDirectory(nsIDocument* aDoc, nsIFile* aDir)
     return NS_ERROR_OUT_OF_MEMORY;
   prefValue->SetAsAString(unicodePath);
 
-  nsCOMPtr<nsILoadContext> loadContext = aDoc->GetLoadContext();
+  nsCOMPtr<nsISupports> container = aDoc->GetContainer();
+  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
   return contentPrefService->Set(spec, CPS_PREF_NAME, prefValue, loadContext, nullptr);
 }
 
diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp
index 27a4c920bae..a796d8fe1a8 100644
--- a/content/html/content/src/HTMLMediaElement.cpp
+++ b/content/html/content/src/HTMLMediaElement.cpp
@@ -1083,9 +1083,12 @@ nsresult HTMLMediaElement::LoadResource()
   }
 
   // Check if media is allowed for the docshell.
-  nsCOMPtr<nsIDocShell> docShell = OwnerDoc()->GetDocShell();
-  if (docShell && !docShell->GetAllowMedia()) {
-    return NS_ERROR_FAILURE;
+  nsCOMPtr<nsISupports> container = OwnerDoc()->GetContainer();
+  if (container) {
+    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+    if (docShell && !docShell->GetAllowMedia()) {
+      return NS_ERROR_FAILURE;
+    }
   }
 
   int16_t shouldLoad = nsIContentPolicy::ACCEPT;
diff --git a/content/html/document/src/ImageDocument.cpp b/content/html/document/src/ImageDocument.cpp
index efd279ed698..ebe217d0ccc 100644
--- a/content/html/document/src/ImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -8,7 +8,6 @@
 #include "nsRect.h"
 #include "nsIImageLoadingContent.h"
 #include "nsGenericHTMLElement.h"
-#include "nsDocShell.h"
 #include "nsIDocumentInlines.h"
 #include "nsDOMTokenList.h"
 #include "nsIDOMHTMLImageElement.h"
@@ -725,7 +724,7 @@ ImageDocument::UpdateTitleAndCharset()
 void
 ImageDocument::ResetZoomLevel()
 {
-  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
   if (docShell) {
     if (nsContentUtils::IsChildOfSameType(this)) {
       return;
@@ -744,7 +743,7 @@ float
 ImageDocument::GetZoomLevel()
 {
   float zoomLevel = mOriginalZoomLevel;
-  nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
   if (docShell) {
     nsCOMPtr<nsIContentViewer> cv;
     docShell->GetContentViewer(getter_AddRefs(cv));
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index 7e5fe1a3645..2b3daa07843 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -32,7 +32,6 @@ LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/events/src',
-    '/docshell/base',
     '/dom/base',
     '/layout/style',
     '/xpcom/ds',
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 1e46d56a322..f68682f53e4 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -32,7 +32,7 @@
 #include "nsIContentViewerContainer.h"
 #include "nsIContentViewer.h"
 #include "nsIMarkupDocumentViewer.h"
-#include "nsDocShell.h"
+#include "nsIDocShell.h"
 #include "nsDocShellLoadTypes.h"
 #include "nsIWebNavigation.h"
 #include "nsIBaseWindow.h"
@@ -1362,7 +1362,7 @@ nsHTMLDocument::Open(JSContext* cx,
   }
 
   // check whether we're in the middle of unload.  If so, ignore this call.
-  nsCOMPtr<nsIDocShell> shell(mDocumentContainer);
+  nsCOMPtr<nsIDocShell> shell = do_QueryReferent(mDocumentContainer);
   if (!shell) {
     // We won't be able to create a parser anyway.
     nsCOMPtr<nsIDocument> ret = this;
diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp
index a655f7451b2..88b7d9d5588 100644
--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -38,7 +38,7 @@
 #include "nsIRDFService.h"
 #include "nsIStreamListener.h"
 #include "nsITimer.h"
-#include "nsDocShell.h"
+#include "nsIDocShell.h"
 #include "nsGkAtoms.h"
 #include "nsXMLContentSink.h"
 #include "nsXULContentSink.h"
@@ -3187,7 +3187,8 @@ XULDocument::DoneWalking()
         // Before starting layout, check whether we're a toplevel chrome
         // window.  If we are, set our chrome flags now, so that we don't have
         // to restyle the whole frame tree after StartLayout.
-        nsCOMPtr<nsIDocShellTreeItem> item = GetDocShell();
+        nsCOMPtr<nsISupports> container = GetContainer();
+        nsCOMPtr<nsIDocShellTreeItem> item = do_QueryInterface(container);
         if (item) {
             nsCOMPtr<nsIDocShellTreeOwner> owner;
             item->GetTreeOwner(getter_AddRefs(owner));
@@ -3195,7 +3196,7 @@ XULDocument::DoneWalking()
             if (xulWin) {
                 nsCOMPtr<nsIDocShell> xulWinShell;
                 xulWin->GetDocShell(getter_AddRefs(xulWinShell));
-                if (SameCOMIdentity(xulWinShell, item)) {
+                if (SameCOMIdentity(xulWinShell, container)) {
                     // We're the chrome document!  Apply our chrome flags now.
                     xulWin->ApplyChromeFlags();
                 }
@@ -4666,7 +4667,7 @@ XULDocument::ParserObserver::OnStopRequest(nsIRequest *request,
 already_AddRefed<nsPIWindowRoot>
 XULDocument::GetWindowRoot()
 {
-    nsCOMPtr<nsIInterfaceRequestor> ir(mDocumentContainer);
+    nsCOMPtr<nsIInterfaceRequestor> ir = do_QueryReferent(mDocumentContainer);
     nsCOMPtr<nsIDOMWindow> window(do_GetInterface(ir));
     nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(window));
     return piWin ? piWin->GetTopWindowRoot() : nullptr;
diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build
index 4c1945575ea..58485904db5 100644
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -28,7 +28,6 @@ LOCAL_INCLUDES += [
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
-    '/docshell/base',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 4300f0e314b..6f18217b93b 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7259,7 +7259,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
       // got Reset() with a channel.
       blankDoc->SetBaseURI(aBaseURI);
 
-      blankDoc->SetContainer(this);
+      blankDoc->SetContainer(static_cast<nsIDocShell *>(this));
 
       // Copy our sandbox flags to the document. These are immutable
       // after being set here.
@@ -7271,7 +7271,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
 
       // hook 'em up
       if (viewer) {
-        viewer->SetContainer(this);
+        viewer->SetContainer(static_cast<nsIContentViewerContainer *>(this));
         Embed(viewer, "", 0);
 
         SetCurrentURI(blankDoc->GetDocumentURI(), nullptr, true, 0);
@@ -7607,7 +7607,7 @@ nsDocShell::RestorePresentation(nsISHEntry *aSHEntry, bool *aRestoring)
     // different one.  We don't currently support restoring the presentation
     // in that case.
 
-    nsCOMPtr<nsIDocShell> container;
+    nsCOMPtr<nsISupports> container;
     viewer->GetContainer(getter_AddRefs(container));
     if (!::SameCOMIdentity(container, GetAsSupports(this))) {
 #ifdef DEBUG_PAGE_CACHE
@@ -8333,13 +8333,13 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
     nsresult rv = docLoaderFactory->CreateInstance("view",
                                                    aOpenedChannel,
                                                    aLoadGroup, aContentType,
-                                                   this,
+                                                   static_cast<nsIContentViewerContainer*>(this),
                                                    nullptr,
                                                    aContentHandler,
                                                    aViewer);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    (*aViewer)->SetContainer(this);
+    (*aViewer)->SetContainer(static_cast<nsIContentViewerContainer *>(this));
     return NS_OK;
 }
 
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 32a59c5a82c..650011cc232 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -18,7 +18,6 @@
 #include "nsIContentViewerContainer.h"
 #include "nsIDOMStorageManager.h"
 #include "nsDocLoader.h"
-#include "mozilla/WeakPtr.h"
 
 // Helper Classes
 #include "nsCOMPtr.h"
@@ -138,8 +137,7 @@ class nsDocShell : public nsDocLoader,
                    public nsIWebShellServices,
                    public nsILinkHandler,
                    public nsIClipboardCommands,
-                   public nsIDOMStorageManager,
-                   public mozilla::SupportsWeakPtr<nsDocShell>
+                   public nsIDOMStorageManager
 {
     friend class nsDSURIContentListener;
 
diff --git a/docshell/base/nsIContentViewer.idl b/docshell/base/nsIContentViewer.idl
index 1fba74fbbc1..6610ab66e5f 100644
--- a/docshell/base/nsIContentViewer.idl
+++ b/docshell/base/nsIContentViewer.idl
@@ -4,7 +4,6 @@
 
 #include "nsISupports.idl"
 
-interface nsIDocShell;
 interface nsIDOMDocument;
 interface nsISHEntry;
 interface nsIPrintSettings;
@@ -35,7 +34,7 @@ interface nsIContentViewer : nsISupports
   [noscript] void init(in nsIWidgetPtr aParentWidget,
                        [const] in nsIntRectRef aBounds);
 
-  attribute nsIDocShell container;
+  attribute nsISupports container;
 
   void loadStart(in nsISupports aDoc);
   void loadComplete(in nsresult aStatus);
diff --git a/docshell/base/nsIDocumentLoaderFactory.idl b/docshell/base/nsIDocumentLoaderFactory.idl
index 904882c836c..caacfcd5843 100644
--- a/docshell/base/nsIDocumentLoaderFactory.idl
+++ b/docshell/base/nsIDocumentLoaderFactory.idl
@@ -9,7 +9,6 @@
 interface nsIChannel;
 interface nsIContentViewer;
 interface nsIStreamListener;
-interface nsIDocShell;
 interface nsIDocument;
 interface nsILoadGroup;
 interface nsIPrincipal;
@@ -22,13 +21,13 @@ interface nsIPrincipal;
  * The component is a service, so use GetService, not CreateInstance to get it.
  */
 
-[scriptable, uuid(70905274-8494-4e39-b011-d559adde3733)]
+[scriptable, uuid(5e7d2967-5a07-444f-95d5-25b533252d38)]
 interface nsIDocumentLoaderFactory : nsISupports {
     nsIContentViewer createInstance(in string aCommand,
                               in nsIChannel aChannel,
                               in nsILoadGroup aLoadGroup,
                               in string aContentType, 
-                              in nsIDocShell aContainer,
+                              in nsISupports aContainer,
                               in nsISupports aExtraInfo,
                               out nsIStreamListener aDocListenerResult);
 
diff --git a/docshell/shistory/src/nsSHEntryShared.cpp b/docshell/shistory/src/nsSHEntryShared.cpp
index e24a6010d5c..5d44492fc8a 100644
--- a/docshell/shistory/src/nsSHEntryShared.cpp
+++ b/docshell/shistory/src/nsSHEntryShared.cpp
@@ -10,7 +10,6 @@
 #include "nsIDocument.h"
 #include "nsIWebNavigation.h"
 #include "nsIContentViewer.h"
-#include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsDocShellEditorData.h"
 #include "nsThreadUtils.h"
@@ -168,7 +167,7 @@ nsSHEntryShared::Expire()
   if (!mContentViewer) {
     return;
   }
-  nsCOMPtr<nsIDocShell> container;
+  nsCOMPtr<nsISupports> container;
   mContentViewer->GetContainer(getter_AddRefs(container));
   nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
   if (!treeItem) {
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index e5be14bfe5a..4fc014c5211 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -2483,7 +2483,8 @@ TabChild::GetFrom(nsIPresShell* aPresShell)
   if (!doc) {
       return nullptr;
   }
-  nsCOMPtr<nsIDocShell> docShell(doc->GetDocShell());
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
   return GetFrom(docShell);
 }
 
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 6eeee587e9d..64ac8dce6f7 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -842,7 +842,10 @@ TabParent::RecvSetStatus(const uint32_t& aType, const nsString& aStatus)
 {
   nsCOMPtr<nsIContent> frame = do_QueryInterface(mFrameElement);
   if (frame) {
-    nsCOMPtr<nsIDocShell> docShell = frame->OwnerDoc()->GetDocShell();
+    nsCOMPtr<nsISupports> container = frame->OwnerDoc()->GetContainer();
+    if (!container)
+      return true;
+    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
     if (!docShell)
       return true;
     nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
diff --git a/editor/composer/src/nsEditorSpellCheck.cpp b/editor/composer/src/nsEditorSpellCheck.cpp
index 21f1d827d91..7362c88da08 100644
--- a/editor/composer/src/nsEditorSpellCheck.cpp
+++ b/editor/composer/src/nsEditorSpellCheck.cpp
@@ -97,7 +97,8 @@ GetLoadContext(nsIEditor* aEditor)
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
   NS_ENSURE_TRUE(doc, nullptr);
 
-  nsCOMPtr<nsILoadContext> loadContext = doc->GetLoadContext();
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
   return loadContext.forget();
 }
 
diff --git a/editor/libeditor/base/nsEditorUtils.cpp b/editor/libeditor/base/nsEditorUtils.cpp
index 4d7b61f42b7..d5ee5afd299 100644
--- a/editor/libeditor/base/nsEditorUtils.cpp
+++ b/editor/libeditor/base/nsEditorUtils.cpp
@@ -189,7 +189,8 @@ nsEditorHookUtils::GetHookEnumeratorFromDocument(nsIDOMDocument *aDoc,
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDoc);
   NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIDocShell> docShell = doc->GetDocShell();
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
   nsCOMPtr<nsIClipboardDragDropHookList> hookObj = do_GetInterface(docShell);
   NS_ENSURE_TRUE(hookObj, NS_ERROR_FAILURE);
 
diff --git a/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/editor/libeditor/text/nsPlaintextDataTransfer.cpp
index 8f5409b0441..1724576712a 100644
--- a/editor/libeditor/text/nsPlaintextDataTransfer.cpp
+++ b/editor/libeditor/text/nsPlaintextDataTransfer.cpp
@@ -432,7 +432,8 @@ bool nsPlaintextEditor::IsSafeToInsertData(nsIDOMDocument* aSourceDoc)
 
   nsCOMPtr<nsIDocument> destdoc = GetDocument();
   NS_ASSERTION(destdoc, "Where is our destination doc?");
-  nsCOMPtr<nsIDocShellTreeItem> dsti = destdoc->GetDocShell();
+  nsCOMPtr<nsISupports> container = destdoc->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(container);
   nsCOMPtr<nsIDocShellTreeItem> root;
   if (dsti)
     dsti->GetRootTreeItem(getter_AddRefs(root));
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 2ed43247b72..2c6544c1b2e 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -111,7 +111,4 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-LOCAL_INCLUDES += [
-    '/docshell/base',
-]
 FINAL_LIBRARY = 'gklayout'
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 4747947e28e..0035a2f0c66 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -36,7 +36,6 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/EncodingUtils.h"
-#include "mozilla/WeakPtr.h"
 
 #include "nsViewManager.h"
 #include "nsView.h"
@@ -49,7 +48,7 @@
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsDocShell.h"
+#include "nsIDocShell.h"
 #include "nsIBaseWindow.h"
 #include "nsILayoutHistoryState.h"
 #include "nsCharsetSource.h"
@@ -349,7 +348,7 @@ protected:
   // (ie, non owning) references. If you add any members to this
   // class, please make the ownership explicit (pinkerton, scc).
 
-  WeakPtr<nsDocShell> mContainer; // it owns me!
+  nsWeakPtr mContainer; // it owns me!
   nsWeakPtr mTopContainerWhilePrinting;
   nsRefPtr<nsDeviceContext> mDeviceContext;  // We create and own this baby
 
@@ -577,7 +576,7 @@ nsDocumentViewer::LoadStart(nsISupports *aDoc)
 nsresult
 nsDocumentViewer::SyncParentSubDocMap()
 {
-  nsCOMPtr<nsIDocShellTreeItem> item(mContainer);
+  nsCOMPtr<nsIDocShellTreeItem> item(do_QueryReferent(mContainer));
   nsCOMPtr<nsPIDOMWindow> pwin(do_GetInterface(item));
   nsCOMPtr<nsIContent> content;
 
@@ -611,9 +610,9 @@ nsDocumentViewer::SyncParentSubDocMap()
 }
 
 NS_IMETHODIMP
-nsDocumentViewer::SetContainer(nsIDocShell* aContainer)
+nsDocumentViewer::SetContainer(nsISupports* aContainer)
 {
-  mContainer = static_cast<nsDocShell*>(aContainer)->asWeakPtr();
+  mContainer = do_GetWeakReference(aContainer);
   if (mPresContext) {
     mPresContext->SetContainer(aContainer);
   }
@@ -626,11 +625,12 @@ nsDocumentViewer::SetContainer(nsIDocShell* aContainer)
 }
 
 NS_IMETHODIMP
-nsDocumentViewer::GetContainer(nsIDocShell** aResult)
+nsDocumentViewer::GetContainer(nsISupports** aResult)
 {
    NS_ENSURE_ARG_POINTER(aResult);
 
-   nsCOMPtr<nsIDocShell> container(mContainer);
+   *aResult = nullptr;
+   nsCOMPtr<nsISupports> container = do_QueryReferent(mContainer);
    container.swap(*aResult);
    return NS_OK;
 }
@@ -873,7 +873,7 @@ nsDocumentViewer::InitInternal(nsIWidget* aParentWidget,
     }
   }
 
-  nsCOMPtr<nsIInterfaceRequestor> requestor(mContainer);
+  nsCOMPtr<nsIInterfaceRequestor> requestor(do_QueryReferent(mContainer));
   if (requestor) {
     if (mPresContext) {
       nsCOMPtr<nsILinkHandler> linkHandler;
@@ -1107,7 +1107,7 @@ nsDocumentViewer::PermitUnload(bool aCallerClosesWindow, bool *aPermitUnload)
     }
   }
 
-  nsCOMPtr<nsIDocShellTreeNode> docShellNode(mContainer);
+  nsCOMPtr<nsIDocShellTreeNode> docShellNode(do_QueryReferent(mContainer));
   nsAutoString text;
   beforeUnload->GetReturnValue(text);
   if (event->GetInternalNSEvent()->mFlags.mDefaultPrevented ||
@@ -1198,7 +1198,7 @@ nsDocumentViewer::ResetCloseWindow()
 {
   mCallerIsClosingWindow = false;
 
-  nsCOMPtr<nsIDocShellTreeNode> docShellNode(mContainer);
+  nsCOMPtr<nsIDocShellTreeNode> docShellNode(do_QueryReferent(mContainer));
   if (docShellNode) {
     int32_t childCount;
     docShellNode->GetChildCount(&childCount);
@@ -1286,7 +1286,7 @@ AttachContainerRecurse(nsIDocShell* aShell)
   if (viewer) {
     nsIDocument* doc = viewer->GetDocument();
     if (doc) {
-      doc->SetContainer(static_cast<nsDocShell*>(aShell));
+      doc->SetContainer(aShell);
     }
     nsRefPtr<nsPresContext> pc;
     viewer->GetPresContext(getter_AddRefs(pc));
@@ -1317,7 +1317,7 @@ nsDocumentViewer::Open(nsISupports *aState, nsISHEntry *aSHEntry)
   NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_INITIALIZED);
 
   if (mDocument)
-    mDocument->SetContainer(mContainer);
+    mDocument->SetContainer(nsCOMPtr<nsISupports>(do_QueryReferent(mContainer)));
 
   nsresult rv = InitInternal(mParentWidget, aState, mBounds, false);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1561,11 +1561,8 @@ nsDocumentViewer::Destroy()
       mPresContext->SetLinkHandler(nullptr);
       mPresContext->SetContainer(nullptr);
     }
-    if (mPresShell) {
-      nsWeakPtr container =
-        do_GetWeakReference(static_cast<nsIDocShell*>(mContainer));
-      mPresShell->SetForwardingContainer(container);
-    }
+    if (mPresShell)
+      mPresShell->SetForwardingContainer(mContainer);
 
     // Do the same for our children.  Note that we need to get the child
     // docshells from the SHEntry now; the docshell will have cleared them.
@@ -1623,7 +1620,7 @@ nsDocumentViewer::Destroy()
 
   mWindow = nullptr;
   mViewManager = nullptr;
-  mContainer = WeakPtr<nsDocShell>();
+  mContainer = nullptr;
 
   return NS_OK;
 }
@@ -1694,7 +1691,8 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
   MOZ_ASSERT(aDocument);
 
   // Set new container
-  aDocument->SetContainer(mContainer);
+  nsCOMPtr<nsISupports> container = do_QueryReferent(mContainer);
+  aDocument->SetContainer(container);
 
   if (mDocument != aDocument) {
     if (mDocument->IsStaticDocument()) {
@@ -1706,8 +1704,7 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
     mDocument = aDocument;
 
     // Set the script global object on the new document
-    nsCOMPtr<nsPIDOMWindow> window =
-      do_GetInterface(static_cast<nsIDocShell*>(mContainer.get()));
+    nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(container);
     if (window) {
       window->SetNewDocument(aDocument, nullptr, aForceReuseInnerWindow);
     }
@@ -1715,7 +1712,7 @@ nsDocumentViewer::SetDocumentInternal(nsIDocument* aDocument,
     // Clear the list of old child docshells. Child docshells for the new
     // document will be constructed as frames are created.
     if (!aDocument->IsStaticDocument()) {
-      nsCOMPtr<nsIDocShellTreeNode> node(mContainer);
+      nsCOMPtr<nsIDocShellTreeNode> node = do_QueryInterface(container);
       if (node) {
         int32_t count;
         node->GetChildCount(&count);
@@ -1891,7 +1888,7 @@ nsDocumentViewer::Show(void)
     prevViewer->Destroy();
 
     // Make sure we don't have too many cached ContentViewers
-    nsCOMPtr<nsIDocShellTreeItem> treeItem(mContainer);
+    nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryReferent(mContainer);
     if (treeItem) {
       // We need to find the root DocShell since only that object has an
       // SHistory and we need the SHistory to evict content viewers
@@ -1927,7 +1924,7 @@ nsDocumentViewer::Show(void)
   if (mDocument && !mPresShell) {
     NS_ASSERTION(!mWindow, "Window already created but no presshell?");
 
-    nsCOMPtr<nsIBaseWindow> base_win(mContainer);
+    nsCOMPtr<nsIBaseWindow> base_win(do_QueryReferent(mContainer));
     if (base_win) {
       base_win->GetParentWidget(&mParentWidget);
       if (mParentWidget) {
@@ -2017,7 +2014,7 @@ nsDocumentViewer::Hide(void)
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDocShell> docShell(mContainer);
+  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
   if (docShell) {
     nsCOMPtr<nsILayoutHistoryState> layoutState;
     mPresShell->CaptureHistoryState(getter_AddRefs(layoutState));
@@ -2032,7 +2029,7 @@ nsDocumentViewer::Hide(void)
   mDeviceContext = nullptr;
   mParentWidget  = nullptr;
 
-  nsCOMPtr<nsIBaseWindow> base_win(mContainer);
+  nsCOMPtr<nsIBaseWindow> base_win(do_QueryReferent(mContainer));
 
   if (base_win && !mAttachedToParent) {
     base_win->SetParentWidget(nullptr);
@@ -2117,7 +2114,7 @@ nsDocumentViewer::CreateStyleSet(nsIDocument* aDocument,
   bool shouldOverride = false;
   // We don't want a docshell here for external resource docs, so just
   // look at mContainer.
-  nsCOMPtr<nsIDocShell> ds(mContainer);
+  nsCOMPtr<nsIDocShell> ds(do_QueryReferent(mContainer));
   nsCOMPtr<nsIDOMEventTarget> chromeHandler;
   nsCOMPtr<nsIURI> uri;
   nsRefPtr<nsCSSStyleSheet> csssheet;
@@ -2306,7 +2303,7 @@ nsDocumentViewer::FindContainerView()
   nsView* containerView = nullptr;
 
   if (mContainer) {
-    nsCOMPtr<nsIDocShellTreeItem> docShellItem(mContainer);
+    nsCOMPtr<nsIDocShellTreeItem> docShellItem = do_QueryReferent(mContainer);
     nsCOMPtr<nsPIDOMWindow> pwin(do_GetInterface(docShellItem));
     if (pwin) {
       nsCOMPtr<nsIContent> containerElement = do_QueryInterface(pwin->GetFrameElementInternal());
@@ -2503,7 +2500,7 @@ NS_IMETHODIMP nsDocumentViewer::CopyImage(int32_t aCopyFlags)
   // make noise if we're not in an image
   NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsILoadContext> loadContext(mContainer);
+  nsCOMPtr<nsILoadContext> loadContext(do_QueryReferent(mContainer));
   return nsCopySupport::ImageCopy(node, loadContext, aCopyFlags);
 }
 
@@ -2635,7 +2632,7 @@ NS_IMETHODIMP nsDocumentViewer::ScrollToNode(nsIDOMNode* aNode)
 void
 nsDocumentViewer::CallChildren(CallChildFunc aFunc, void* aClosure)
 {
-  nsCOMPtr<nsIDocShellTreeNode> docShellNode(mContainer);
+  nsCOMPtr<nsIDocShellTreeNode> docShellNode(do_QueryReferent(mContainer));
   if (docShellNode)
   {
     int32_t i;
@@ -3229,7 +3226,7 @@ nsDocumentViewer::GetContentSize(int32_t* aWidth, int32_t* aHeight)
    NS_ENSURE_TRUE(mDocument, NS_ERROR_NOT_AVAILABLE);
 
    // Skip doing this on docshell-less documents for now
-   nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(mContainer);
+   nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryReferent(mContainer));
    NS_ENSURE_TRUE(docShellAsItem, NS_ERROR_NOT_AVAILABLE);
    
    nsCOMPtr<nsIDocShellTreeItem> docShellParent;
@@ -3557,7 +3554,7 @@ nsDocumentViewer::Print(nsIPrintSettings*       aPrintSettings,
     return NS_ERROR_FAILURE;
   }
 
-  nsCOMPtr<nsIDocShell> docShell(mContainer);
+  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
   NS_ENSURE_STATE(docShell);
 
   // Check to see if this document is still busy
@@ -3667,7 +3664,7 @@ nsDocumentViewer::PrintPreview(nsIPrintSettings* aPrintSettings,
   }
 #endif
 
-  nsCOMPtr<nsIDocShell> docShell(mContainer);
+  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
   if (!docShell || !mDeviceContext) {
     PR_PL(("Can't Print Preview without device context and docshell"));
     return NS_ERROR_FAILURE;
@@ -4033,7 +4030,7 @@ nsDocumentViewer::ShouldAttachToTopLevel()
   if (!mParentWidget)
     return false;
 
-  nsCOMPtr<nsIDocShellTreeItem> containerItem(mContainer);
+  nsCOMPtr<nsIDocShellTreeItem> containerItem = do_QueryReferent(mContainer);
   if (!containerItem)
     return false;
 
@@ -4101,7 +4098,7 @@ nsDocumentViewer::SetIsPrinting(bool aIsPrinting)
 #ifdef NS_PRINTING
   // Set all the docShells in the docshell tree to be printing.
   // that way if anyone of them tries to "navigate" it can't
-  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(mContainer);
+  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(do_QueryReferent(mContainer));
   if (docShellTreeNode || !aIsPrinting) {
     SetIsPrintingInDocShellTree(docShellTreeNode, aIsPrinting, true);
   } else {
@@ -4137,7 +4134,7 @@ nsDocumentViewer::SetIsPrintPreview(bool aIsPrintPreview)
 #ifdef NS_PRINTING
   // Set all the docShells in the docshell tree to be printing.
   // that way if anyone of them tries to "navigate" it can't
-  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(mContainer);
+  nsCOMPtr<nsIDocShellTreeNode> docShellTreeNode(do_QueryReferent(mContainer));
   if (docShellTreeNode || !aIsPrintPreview) {
     SetIsPrintingInDocShellTree(docShellTreeNode, aIsPrintPreview, true);
   }
@@ -4211,7 +4208,7 @@ nsDocumentViewer::ReturnToGalleyPresentation()
   mPrintEngine->Destroy();
   mPrintEngine = nullptr;
 
-  nsCOMPtr<nsIDocShell> docShell(mContainer);
+  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
   ResetFocusState(docShell);
 
   SetTextZoom(mTextZoom);
@@ -4250,8 +4247,8 @@ nsDocumentViewer::OnDonePrinting()
     // We are done printing, now cleanup 
     if (mDeferredWindowClose) {
       mDeferredWindowClose = false;
-      nsCOMPtr<nsIDOMWindow> win =
-        do_GetInterface(static_cast<nsIDocShell*>(mContainer));
+      nsCOMPtr<nsISupports> container = do_QueryReferent(mContainer);
+      nsCOMPtr<nsIDOMWindow> win = do_GetInterface(container);
       if (win)
         win->Close();
     } else if (mClosingWhilePrinting) {
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 4b9ce74c275..2b54fe89ffd 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -958,7 +958,9 @@ nsPresContext::Init(nsDeviceContext* aDeviceContext)
                    "How did we get a presshell?");
 
       // We don't have our container set yet at this point
-      nsCOMPtr<nsIDocShellTreeItem> ourItem = mDocument->GetDocShell();
+      nsCOMPtr<nsISupports> ourContainer = mDocument->GetContainer();
+
+      nsCOMPtr<nsIDocShellTreeItem> ourItem = do_QueryInterface(ourContainer);
       if (ourItem) {
         nsCOMPtr<nsIDocShellTreeItem> parentItem;
         ourItem->GetSameTypeParent(getter_AddRefs(parentItem));
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 89deba84c76..b0ba967db33 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -29,7 +29,4 @@ LIBRARY_NAME = 'gklayout'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-LOCAL_INCLUDES += [
-    '/docshell/base',
-]
 FINAL_LIBRARY = 'xul'
diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp
index 02c866ce8ef..b2e58c46e10 100644
--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "nsCOMPtr.h"
 #include "nsContentDLF.h"
-#include "nsDocShell.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsIComponentManager.h"
@@ -136,7 +135,7 @@ nsContentDLF::CreateInstance(const char* aCommand,
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
                              const char* aContentType, 
-                             nsIDocShell* aContainer,
+                             nsISupports* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aDocViewer)
@@ -371,7 +370,7 @@ nsresult
 nsContentDLF::CreateDocument(const char* aCommand,
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
-                             nsIDocShell* aContainer,
+                             nsISupports* aContainer,
                              const nsCID& aDocumentCID,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aContentViewer)
@@ -400,7 +399,7 @@ nsContentDLF::CreateDocument(const char* aCommand,
   rv = NS_NewContentViewer(getter_AddRefs(contentViewer));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  doc->SetContainer(static_cast<nsDocShell*>(aContainer));
+  doc->SetContainer(aContainer);
 
   // Initialize the document to begin loading the data.  An
   // nsIStreamListener connected to the parser is returned in
@@ -419,7 +418,7 @@ nsContentDLF::CreateXULDocument(const char* aCommand,
                                 nsIChannel* aChannel,
                                 nsILoadGroup* aLoadGroup,
                                 const char* aContentType,
-                                nsIDocShell* aContainer,
+                                nsISupports* aContainer,
                                 nsISupports* aExtraInfo,
                                 nsIStreamListener** aDocListener,
                                 nsIContentViewer** aContentViewer)
@@ -443,7 +442,7 @@ nsContentDLF::CreateXULDocument(const char* aCommand,
    * aDocListener.
    */
 
-  doc->SetContainer(static_cast<nsDocShell*>(aContainer));
+  doc->SetContainer(aContainer);
 
   rv = doc->StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer, aDocListener, true);
   if (NS_FAILED(rv)) return rv;
diff --git a/layout/build/nsContentDLF.h b/layout/build/nsContentDLF.h
index e44d6b948d5..327915cc7c3 100644
--- a/layout/build/nsContentDLF.h
+++ b/layout/build/nsContentDLF.h
@@ -33,7 +33,7 @@ public:
   nsresult CreateDocument(const char* aCommand,
                           nsIChannel* aChannel,
                           nsILoadGroup* aLoadGroup,
-                          nsIDocShell* aContainer,
+                          nsISupports* aContainer,
                           const nsCID& aDocumentCID,
                           nsIStreamListener** aDocListener,
                           nsIContentViewer** aContentViewer);
@@ -42,7 +42,7 @@ public:
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
                              const char* aContentType,
-                             nsIDocShell* aContainer,
+                             nsISupports* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aContentViewer);
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 3dfa4c59e59..d75992b0a1a 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -981,7 +981,8 @@ EndSwapDocShellsForDocument(nsIDocument* aDocument, void*)
   // Our docshell and view trees have been updated for the new hierarchy.
   // Now also update all nsDeviceContext::mWidget to that of the
   // container view in the new hierarchy.
-  nsCOMPtr<nsIDocShell> ds = aDocument->GetDocShell();
+  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
+  nsCOMPtr<nsIDocShell> ds = do_QueryInterface(container);
   if (ds) {
     nsCOMPtr<nsIContentViewer> cv;
     ds->GetContentViewer(getter_AddRefs(cv));
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 31445e87fac..f789c0f3878 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -293,7 +293,7 @@ void nsPrintEngine::DestroyPrintingData()
 
 //--------------------------------------------------------
 nsresult nsPrintEngine::Initialize(nsIDocumentViewerPrint* aDocViewerPrint, 
-                                   nsIDocShell*            aContainer,
+                                   nsIWeakReference*       aContainer,
                                    nsIDocument*            aDocument,
                                    float                   aScreenDPI,
                                    FILE*                   aDebugFile)
@@ -303,7 +303,7 @@ nsresult nsPrintEngine::Initialize(nsIDocumentViewerPrint* aDocViewerPrint,
   NS_ENSURE_ARG_POINTER(aDocument);
 
   mDocViewerPrint = aDocViewerPrint;
-  mContainer      = do_GetWeakReference(aContainer);
+  mContainer      = aContainer;
   mDocument       = aDocument;
   mScreenDPI      = aScreenDPI;
 
@@ -1335,7 +1335,8 @@ nsPrintEngine::MapContentForPO(nsPrintObject*   aPO,
   nsIDocument* subDoc = doc->GetSubDocumentFor(aContent);
 
   if (subDoc) {
-    nsCOMPtr<nsIDocShell> docShell(subDoc->GetDocShell());
+    nsCOMPtr<nsISupports> container = subDoc->GetContainer();
+    nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
 
     if (docShell) {
       nsPrintObject * po = nullptr;
diff --git a/layout/printing/nsPrintEngine.h b/layout/printing/nsPrintEngine.h
index ec1b5c5daec..14e1680477e 100644
--- a/layout/printing/nsPrintEngine.h
+++ b/layout/printing/nsPrintEngine.h
@@ -82,7 +82,7 @@ public:
   void DestroyPrintingData();
 
   nsresult Initialize(nsIDocumentViewerPrint* aDocViewerPrint, 
-                      nsIDocShell*            aContainer,
+                      nsIWeakReference*       aContainer,
                       nsIDocument*            aDocument,
                       float                   aScreenDPI,
                       FILE*                   aDebugFile);
diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp
index bbd7ddbdf80..a5a043c09ac 100644
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -876,13 +876,15 @@ nsUserFontSet::CheckFontLoad(const gfxFontFaceSrc* aFontFaceSrc,
   }
 
   *aBypassCache = false;
-
-  nsCOMPtr<nsIDocShell> docShell = ps->GetDocument()->GetDocShell();
-  if (docShell) {
-    uint32_t loadType;
-    if (NS_SUCCEEDED(docShell->GetLoadType(&loadType))) {
-      if ((loadType >> 16) & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
-        *aBypassCache = true;
+  nsCOMPtr<nsISupports> container = ps->GetDocument()->GetContainer();
+  if (container) {
+    nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+    if (docShell) {
+      uint32_t loadType;
+      if (NS_SUCCEEDED(docShell->GetLoadType(&loadType))) {
+        if ((loadType >> 16) & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE) {
+          *aBypassCache = true;
+        }
       }
     }
   }
@@ -980,6 +982,11 @@ nsUserFontSet::GetPrivateBrowsing()
     return false;
   }
 
-  nsCOMPtr<nsILoadContext> loadContext = ps->GetDocument()->GetLoadContext();
+  nsCOMPtr<nsISupports> container = ps->GetDocument()->GetContainer();
+  if (!container) {
+    return false;
+  }
+
+  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(container);
   return loadContext && loadContext->UsePrivateBrowsing();
 }
diff --git a/layout/xul/base/src/nsContainerBoxObject.cpp b/layout/xul/base/src/nsContainerBoxObject.cpp
index 9bcac0236ff..2e5e1aa4387 100644
--- a/layout/xul/base/src/nsContainerBoxObject.cpp
+++ b/layout/xul/base/src/nsContainerBoxObject.cpp
@@ -80,8 +80,13 @@ NS_IMETHODIMP nsContainerBoxObject::GetDocShell(nsIDocShell** aResult)
     return NS_OK;
   }
 
-  NS_IF_ADDREF(*aResult = sub_doc->GetDocShell());
-  return NS_OK;
+  nsCOMPtr<nsISupports> container = sub_doc->GetContainer();
+
+  if (!container) {
+    return NS_OK;
+  }
+
+  return CallQueryInterface(container, aResult);
 }
 
 nsresult
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index e666547c46d..919e7711c53 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -1061,7 +1061,8 @@ nsXULPopupManager::HidePopupsInList(const nsTArray<nsMenuPopupFrame *> &aFrames,
 bool
 nsXULPopupManager::IsChildOfDocShell(nsIDocument* aDoc, nsIDocShellTreeItem* aExpected)
 {
-  nsCOMPtr<nsIDocShellTreeItem> docShellItem(aDoc->GetDocShell());
+  nsCOMPtr<nsISupports> doc = aDoc->GetContainer();
+  nsCOMPtr<nsIDocShellTreeItem> docShellItem(do_QueryInterface(doc));
   while(docShellItem) {
     if (docShellItem == aExpected)
       return true;
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp
index 2317ffef342..4499fd14f7b 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -584,8 +584,9 @@ nsFormFillController::GetInPrivateContext(bool *aInPrivateContext)
   nsCOMPtr<nsIDOMElement> element = do_QueryInterface(mFocusedInput);
   element->GetOwnerDocument(getter_AddRefs(inputDoc));
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(inputDoc);
-  nsCOMPtr<nsIDocShell> docShell = doc->GetDocShell();
-  nsCOMPtr<nsILoadContext> loadContext = doc->GetLoadContext();
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
+  nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
   *aInPrivateContext = loadContext && loadContext->UsePrivateBrowsing();
   return NS_OK;
 }
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
index 1ab166ac42e..d3acc291c96 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
@@ -23,7 +23,6 @@
 #include "nsICacheSession.h"
 #include "nsICachingChannel.h"
 #include "nsIContent.h"
-#include "nsIDocShell.h"
 #include "nsIDocumentLoader.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMWindow.h"
@@ -379,7 +378,8 @@ nsOfflineCacheUpdateService::ScheduleOnDocumentStop(nsIURI *aManifestURI,
          this, aManifestURI, aDocumentURI, aDocument));
 
     nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDocument);
-    nsCOMPtr<nsIWebProgress> progress = do_QueryInterface(doc->GetContainer());
+    nsCOMPtr<nsISupports> container = doc->GetContainer();
+    nsCOMPtr<nsIWebProgress> progress = do_QueryInterface(container);
     NS_ENSURE_TRUE(progress, NS_ERROR_INVALID_ARG);
 
     // Proceed with cache update
diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp
index 98c84dba4c6..e0d8f991abf 100644
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -17,7 +17,6 @@
 
 #include "nsDirectoryViewer.h"
 #include "nsIDirIndex.h"
-#include "nsIDocShell.h"
 #include "jsapi.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
@@ -1266,7 +1265,7 @@ nsDirectoryViewerFactory::CreateInstance(const char *aCommand,
                                          nsIChannel* aChannel,
                                          nsILoadGroup* aLoadGroup,
                                          const char* aContentType, 
-                                         nsIDocShell* aContainer,
+                                         nsISupports* aContainer,
                                          nsISupports* aExtraInfo,
                                          nsIStreamListener** aDocListenerResult,
                                          nsIContentViewer** aDocViewerResult)

From 481a86bf54099faf8b1ca72ce9b4a380cc3cf345 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nthomas@mozilla.com>
Date: Tue, 19 Nov 2013 10:35:19 -0500
Subject: [PATCH 08/92] Bug 937458, bump the required clang version in mach
 bootstrap, r=gps DONTBUILD

--HG--
extra : rebase_source : 423de887a8ee17846ad3f4b3a716d86b64ce6654
---
 python/mozboot/mozboot/osx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
index 94182750a03..9e53baf9e1f 100644
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -31,7 +31,7 @@ MACPORTS_CLANG_PACKAGE = 'clang-3.3'
 
 RE_CLANG_VERSION = re.compile('Apple (?:clang|LLVM) version (\d+\.\d+)')
 
-APPLE_CLANG_MINIMUM_VERSION = StrictVersion('4.0')
+APPLE_CLANG_MINIMUM_VERSION = StrictVersion('4.2')
 
 XCODE_REQUIRED = '''
 Xcode is required to build Firefox. Please complete the install of Xcode

From c23af4269836197c467db282ba7fff11c5b63413 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Tue, 19 Nov 2013 08:37:52 -0700
Subject: [PATCH 09/92] Bug 938950 - Don't provide full access to
 compartment/zone/runtime during Ion compilation, r=jandem. CLOBBER

---
 js/src/gc/Zone.h                           |   2 +-
 js/src/jit/AsmJS.cpp                       |   2 +-
 js/src/jit/BaselineIC.cpp                  |   2 +-
 js/src/jit/BaselineJIT.cpp                 |   4 +-
 js/src/jit/CodeGenerator.cpp               |  39 ++--
 js/src/jit/CompileWrappers.cpp             | 230 +++++++++++++++++++++
 js/src/jit/CompileWrappers.h               | 119 +++++++++++
 js/src/jit/CompilerRoot.h                  |   2 +-
 js/src/jit/Ion.cpp                         |  44 ++--
 js/src/jit/Ion.h                           |  17 +-
 js/src/jit/IonAnalysis.cpp                 |   2 +-
 js/src/jit/IonBuilder.cpp                  |  14 +-
 js/src/jit/IonBuilder.h                    |   4 +-
 js/src/jit/IonMacroAssembler.cpp           |  18 +-
 js/src/jit/IonMacroAssembler.h             |  10 +-
 js/src/jit/IonSpewer.cpp                   |   8 +-
 js/src/jit/JitCompartment.h                |   6 +-
 js/src/jit/Lowering.cpp                    |   2 +-
 js/src/jit/MCallOptimize.cpp               |   6 +-
 js/src/jit/MIR.cpp                         |   3 +-
 js/src/jit/MIR.h                           |   8 +-
 js/src/jit/MIRGenerator.h                  |  11 +-
 js/src/jit/MIRGraph.cpp                    |   2 +-
 js/src/jit/arm/CodeGenerator-arm.cpp       |   2 +-
 js/src/jit/arm/MacroAssembler-arm.cpp      |   2 +-
 js/src/jit/shared/Assembler-shared.h       |   8 +-
 js/src/jit/shared/CodeGenerator-shared.cpp |   4 +-
 js/src/jit/x64/CodeGenerator-x64.cpp       |   2 +-
 js/src/jit/x64/MacroAssembler-x64.h        |   2 +-
 js/src/jit/x86/CodeGenerator-x86.cpp       |   2 +-
 js/src/jit/x86/MacroAssembler-x86.h        |   2 +-
 js/src/jsapi.cpp                           |   4 +-
 js/src/jsatominlines.h                     |   4 +-
 js/src/jscntxt.cpp                         |  11 +-
 js/src/jscntxt.h                           |   2 +-
 js/src/jsfun.cpp                           |  10 +-
 js/src/jsfun.h                             |   4 +-
 js/src/jsworkers.cpp                       |   6 +-
 js/src/moz.build                           |   1 +
 js/src/vm/ForkJoin.cpp                     |   4 +-
 js/src/vm/Interpreter-inl.h                |   4 +-
 js/src/vm/Runtime.h                        |  11 +-
 42 files changed, 498 insertions(+), 142 deletions(-)
 create mode 100644 js/src/jit/CompileWrappers.cpp
 create mode 100644 js/src/jit/CompileWrappers.h

diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index 9f6c86e2874..557ec971076 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -128,7 +128,7 @@ struct Zone : public JS::shadow::Zone,
 
     void setNeedsBarrier(bool needs, ShouldUpdateIon updateIon);
 
-    const bool *AddressOfNeedsBarrier() const {
+    const bool *addressOfNeedsBarrier() const {
         return &needsBarrier_;
     }
 
diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp
index df1b761d053..30ff4877238 100644
--- a/js/src/jit/AsmJS.cpp
+++ b/js/src/jit/AsmJS.cpp
@@ -1934,7 +1934,7 @@ class FunctionCompiler
 
         graph_  = lifo_.new_<MIRGraph>(alloc_);
         info_   = lifo_.new_<CompileInfo>(locals_.count(), SequentialExecution);
-        mirGen_ = lifo_.new_<MIRGenerator>(cx()->compartment(), alloc_, graph_, info_);
+        mirGen_ = lifo_.new_<MIRGenerator>(CompileCompartment::get(cx()->compartment()), alloc_, graph_, info_);
 
         if (!newBlock(/* pred = */ nullptr, &curBlock_, fn_))
             return false;
diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index f9d7c54ed9a..26dd349d1fd 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -9214,7 +9214,7 @@ DoTypeOfFallback(JSContext *cx, BaselineFrame *frame, ICTypeOf_Fallback *stub, H
 {
     FallbackICSpew(cx, stub, "TypeOf");
     JSType type = js::TypeOfValue(val);
-    RootedString string(cx, TypeName(type, cx->runtime()));
+    RootedString string(cx, TypeName(type, cx->runtime()->atomState));
 
     res.setString(string);
 
diff --git a/js/src/jit/BaselineJIT.cpp b/js/src/jit/BaselineJIT.cpp
index f4f830a4711..2a1b6956924 100644
--- a/js/src/jit/BaselineJIT.cpp
+++ b/js/src/jit/BaselineJIT.cpp
@@ -749,7 +749,9 @@ BaselineScript::toggleDebugTraps(JSScript *script, jsbytecode *pc)
     SrcNoteLineScanner scanner(script->notes(), script->lineno);
 
     JSRuntime *rt = script->runtimeFromMainThread();
-    IonContext ictx(rt, script->compartment(), nullptr);
+    IonContext ictx(CompileRuntime::get(rt),
+                    CompileCompartment::get(script->compartment()),
+                    nullptr);
     AutoFlushCache afc("DebugTraps", rt->jitRuntime());
 
     for (uint32_t i = 0; i < numPCMappingIndexEntries(); i++) {
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index c6c4a574624..4d7c0ef37f6 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -712,7 +712,7 @@ CodeGenerator::visitIntToString(LIntToString *lir)
     masm.branch32(Assembler::AboveOrEqual, input, Imm32(StaticStrings::INT_STATIC_LIMIT),
                   ool->entry());
 
-    masm.movePtr(ImmPtr(&GetIonContext()->runtime->staticStrings.intStaticTable), output);
+    masm.movePtr(ImmPtr(&GetIonContext()->runtime->staticStrings().intStaticTable), output);
     masm.loadPtr(BaseIndex(output, input, ScalePointer), output);
 
     masm.bind(ool->rejoin());
@@ -741,7 +741,7 @@ CodeGenerator::visitDoubleToString(LDoubleToString *lir)
     masm.branch32(Assembler::AboveOrEqual, temp, Imm32(StaticStrings::INT_STATIC_LIMIT),
                   ool->entry());
 
-    masm.movePtr(ImmPtr(&GetIonContext()->runtime->staticStrings.intStaticTable), output);
+    masm.movePtr(ImmPtr(&GetIonContext()->runtime->staticStrings().intStaticTable), output);
     masm.loadPtr(BaseIndex(output, temp, ScalePointer), output);
 
     masm.bind(ool->rejoin());
@@ -798,7 +798,6 @@ CodeGenerator::visitLambda(LLambda *lir)
     if (!ool)
         return false;
 
-    JS_ASSERT(gen->compartment == info.fun->compartment());
     JS_ASSERT(!info.singletonType);
 
     masm.newGCThing(output, info.fun, ool->entry());
@@ -1584,7 +1583,7 @@ CodeGenerator::visitPostWriteBarrierO(LPostWriteBarrierO *lir)
     if (!addOutOfLineCode(ool))
         return false;
 
-    Nursery &nursery = GetIonContext()->runtime->gcNursery;
+    const Nursery &nursery = GetIonContext()->runtime->gcNursery();
 
     if (lir->object()->isConstant()) {
         JS_ASSERT(!nursery.isInside(&lir->object()->toConstant()->toObject()));
@@ -1616,7 +1615,7 @@ CodeGenerator::visitPostWriteBarrierV(LPostWriteBarrierV *lir)
     ValueOperand value = ToValue(lir, LPostWriteBarrierV::Input);
     masm.branchTestObject(Assembler::NotEqual, value, ool->rejoin());
 
-    Nursery &nursery = GetIonContext()->runtime->gcNursery;
+    const Nursery &nursery = GetIonContext()->runtime->gcNursery();
 
     if (lir->object()->isConstant()) {
         JS_ASSERT(!nursery.isInside(&lir->object()->toConstant()->toObject()));
@@ -1645,7 +1644,7 @@ CodeGenerator::visitPostWriteBarrierAllSlots(LPostWriteBarrierAllSlots *lir)
     if (!addOutOfLineCode(ool))
         return false;
 
-    Nursery &nursery = GetIonContext()->runtime->gcNursery;
+    const Nursery &nursery = GetIonContext()->runtime->gcNursery();
 
     if (lir->object()->isConstant()) {
         JS_ASSERT(!nursery.isInside(&lir->object()->toConstant()->toObject()));
@@ -2499,11 +2498,9 @@ CodeGenerator::visitCheckOverRecursed(LCheckOverRecursed *lir)
     // Ion may legally place frames very close to the limit. Calling additional
     // C functions may then violate the limit without any checking.
 
-    JSRuntime *rt = GetIonContext()->runtime;
-
     // Since Ion frames exist on the C stack, the stack limit may be
     // dynamically set by JS_SetThreadStackLimit() and JS_SetNativeStackQuota().
-    uintptr_t *limitAddr = &rt->mainThread.ionStackLimit;
+    const void *limitAddr = GetIonContext()->runtime->addressOfIonStackLimit();
 
     CheckOverRecursedFailure *ool = new CheckOverRecursedFailure(lir);
     if (!addOutOfLineCode(ool))
@@ -3866,7 +3863,7 @@ CodeGenerator::visitMathFunctionD(LMathFunctionD *ins)
     FloatRegister input = ToFloatRegister(ins->input());
     JS_ASSERT(ToFloatRegister(ins->output()) == ReturnFloatReg);
 
-    MathCache *mathCache = ins->mir()->cache();
+    const MathCache *mathCache = ins->mir()->cache();
 
     masm.setupUnalignedABICall(mathCache ? 2 : 1, temp);
     if (mathCache) {
@@ -4420,7 +4417,7 @@ CodeGenerator::emitConcat(LInstruction *lir, Register lhs, Register rhs, Registe
         return false;
 
     ExecutionMode mode = gen->info().executionMode();
-    IonCode *stringConcatStub = gen->jitCompartment()->stringConcatStub(mode);
+    IonCode *stringConcatStub = gen->compartment->jitCompartment()->stringConcatStub(mode);
     masm.call(stringConcatStub);
     masm.branchTestPtr(Assembler::Zero, output, output, ool->entry());
 
@@ -4690,7 +4687,7 @@ CodeGenerator::visitFromCharCode(LFromCharCode *lir)
     masm.branch32(Assembler::AboveOrEqual, code, Imm32(StaticStrings::UNIT_STATIC_LIMIT),
                   ool->entry());
 
-    masm.movePtr(ImmPtr(&GetIonContext()->runtime->staticStrings.unitStaticTable), output);
+    masm.movePtr(ImmPtr(&GetIonContext()->runtime->staticStrings().unitStaticTable), output);
     masm.loadPtr(BaseIndex(output, code, ScalePointer), output);
 
     masm.bind(ool->rejoin());
@@ -5345,7 +5342,7 @@ CodeGenerator::visitIteratorStart(LIteratorStart *lir)
     JS_ASSERT(flags == JSITER_ENUMERATE);
 
     // Fetch the most recent iterator and ensure it's not nullptr.
-    masm.loadPtr(AbsoluteAddress(&GetIonContext()->runtime->nativeIterCache.last), output);
+    masm.loadPtr(AbsoluteAddress(GetIonContext()->runtime->addressOfLastCachedNativeIterator()), output);
     masm.branchTestPtr(Assembler::Zero, output, output, ool->entry());
 
     // Load NativeIterator.
@@ -5406,7 +5403,7 @@ CodeGenerator::visitIteratorStart(LIteratorStart *lir)
     masm.or32(Imm32(JSITER_ACTIVE), Address(niTemp, offsetof(NativeIterator, flags)));
 
     // Chain onto the active iterator stack.
-    masm.loadPtr(AbsoluteAddress(&gen->compartment->enumerators), temp1);
+    masm.loadPtr(AbsoluteAddress(gen->compartment->addressOfEnumerators()), temp1);
 
     // ni->next = list
     masm.storePtr(temp1, Address(niTemp, NativeIterator::offsetOfNext()));
@@ -6733,7 +6730,7 @@ CodeGenerator::visitTypeOfV(LTypeOfV *lir)
     Register output = ToRegister(lir->output());
     Register tag = masm.splitTagForTest(value);
 
-    JSRuntime *rt = GetIonContext()->runtime;
+    const JSAtomState &names = GetIonContext()->runtime->names();
     Label done;
 
     OutOfLineTypeOfV *ool = nullptr;
@@ -6750,36 +6747,36 @@ CodeGenerator::visitTypeOfV(LTypeOfV *lir)
         // it's an object the result is always "object".
         Label notObject;
         masm.branchTestObject(Assembler::NotEqual, tag, &notObject);
-        masm.movePtr(ImmGCPtr(rt->atomState.object), output);
+        masm.movePtr(ImmGCPtr(names.object), output);
         masm.jump(&done);
         masm.bind(&notObject);
     }
 
     Label notNumber;
     masm.branchTestNumber(Assembler::NotEqual, tag, &notNumber);
-    masm.movePtr(ImmGCPtr(rt->atomState.number), output);
+    masm.movePtr(ImmGCPtr(names.number), output);
     masm.jump(&done);
     masm.bind(&notNumber);
 
     Label notUndefined;
     masm.branchTestUndefined(Assembler::NotEqual, tag, &notUndefined);
-    masm.movePtr(ImmGCPtr(rt->atomState.undefined), output);
+    masm.movePtr(ImmGCPtr(names.undefined), output);
     masm.jump(&done);
     masm.bind(&notUndefined);
 
     Label notNull;
     masm.branchTestNull(Assembler::NotEqual, tag, &notNull);
-    masm.movePtr(ImmGCPtr(rt->atomState.object), output);
+    masm.movePtr(ImmGCPtr(names.object), output);
     masm.jump(&done);
     masm.bind(&notNull);
 
     Label notBoolean;
     masm.branchTestBoolean(Assembler::NotEqual, tag, &notBoolean);
-    masm.movePtr(ImmGCPtr(rt->atomState.boolean), output);
+    masm.movePtr(ImmGCPtr(names.boolean), output);
     masm.jump(&done);
     masm.bind(&notBoolean);
 
-    masm.movePtr(ImmGCPtr(rt->atomState.string), output);
+    masm.movePtr(ImmGCPtr(names.string), output);
 
     masm.bind(&done);
     if (ool)
diff --git a/js/src/jit/CompileWrappers.cpp b/js/src/jit/CompileWrappers.cpp
new file mode 100644
index 00000000000..58aaacf4a93
--- /dev/null
+++ b/js/src/jit/CompileWrappers.cpp
@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "jit/Ion.h"
+
+using namespace js;
+using namespace js::jit;
+
+JSRuntime *
+CompileRuntime::runtime()
+{
+    return reinterpret_cast<JSRuntime *>(this);
+}
+
+/* static */ CompileRuntime *
+CompileRuntime::get(JSRuntime *rt)
+{
+    return reinterpret_cast<CompileRuntime *>(rt);
+}
+
+bool
+CompileRuntime::onMainThread()
+{
+    return js::CurrentThreadCanAccessRuntime(runtime());
+}
+
+const void *
+CompileRuntime::addressOfIonTop()
+{
+    return &runtime()->mainThread.ionTop;
+}
+
+const void *
+CompileRuntime::addressOfIonStackLimit()
+{
+    return &runtime()->mainThread.ionStackLimit;
+}
+
+const void *
+CompileRuntime::addressOfJSContext()
+{
+    return &runtime()->mainThread.ionJSContext;
+}
+
+const void *
+CompileRuntime::addressOfActivation()
+{
+    return runtime()->mainThread.addressOfActivation();
+}
+
+const void *
+CompileRuntime::addressOfLastCachedNativeIterator()
+{
+    return &runtime()->nativeIterCache.last;
+}
+
+#ifdef JS_GC_ZEAL
+const void *
+CompileRuntime::addressOfGCZeal()
+{
+    return &runtime()->gcZeal_;
+}
+#endif
+
+const void *
+CompileRuntime::addressOfInterrupt()
+{
+    return &runtime()->interrupt;
+}
+
+const JitRuntime *
+CompileRuntime::jitRuntime()
+{
+    return runtime()->jitRuntime();
+}
+
+SPSProfiler &
+CompileRuntime::spsProfiler()
+{
+    return runtime()->spsProfiler;
+}
+
+bool
+CompileRuntime::signalHandlersInstalled()
+{
+    return runtime()->signalHandlersInstalled();
+}
+
+bool
+CompileRuntime::jitSupportsFloatingPoint()
+{
+    return runtime()->jitSupportsFloatingPoint;
+}
+
+bool
+CompileRuntime::hadOutOfMemory()
+{
+    return runtime()->hadOutOfMemory;
+}
+
+const JSAtomState &
+CompileRuntime::names()
+{
+    return runtime()->atomState;
+}
+
+const StaticStrings &
+CompileRuntime::staticStrings()
+{
+    return runtime()->staticStrings;
+}
+
+const Value &
+CompileRuntime::NaNValue()
+{
+    return runtime()->NaNValue;
+}
+
+const Value &
+CompileRuntime::positiveInfinityValue()
+{
+    return runtime()->positiveInfinityValue;
+}
+
+bool
+CompileRuntime::isInsideNursery(gc::Cell *cell)
+{
+    return UninlinedIsInsideNursery(runtime(), cell);
+}
+
+const DOMCallbacks *
+CompileRuntime::DOMcallbacks()
+{
+    return GetDOMCallbacks(runtime());
+}
+
+const MathCache *
+CompileRuntime::maybeGetMathCache()
+{
+    return runtime()->maybeGetMathCache();
+}
+
+#ifdef JSGC_GENERATIONAL
+const Nursery &
+CompileRuntime::gcNursery()
+{
+    return runtime()->gcNursery;
+}
+#endif
+
+Zone *
+CompileZone::zone()
+{
+    return reinterpret_cast<Zone *>(this);
+}
+
+/* static */ CompileZone *
+CompileZone::get(Zone *zone)
+{
+    return reinterpret_cast<CompileZone *>(zone);
+}
+
+const void *
+CompileZone::addressOfNeedsBarrier()
+{
+    return zone()->addressOfNeedsBarrier();
+}
+
+const void *
+CompileZone::addressOfFreeListFirst(gc::AllocKind allocKind)
+{
+    return &zone()->allocator.arenas.getFreeList(allocKind)->first;
+}
+
+const void *
+CompileZone::addressOfFreeListLast(gc::AllocKind allocKind)
+{
+    return &zone()->allocator.arenas.getFreeList(allocKind)->last;
+}
+
+JSCompartment *
+CompileCompartment::compartment()
+{
+    return reinterpret_cast<JSCompartment *>(this);
+}
+
+/* static */ CompileCompartment *
+CompileCompartment::get(JSCompartment *comp)
+{
+    return reinterpret_cast<CompileCompartment *>(comp);
+}
+
+CompileZone *
+CompileCompartment::zone()
+{
+    return CompileZone::get(compartment()->zone());
+}
+
+CompileRuntime *
+CompileCompartment::runtime()
+{
+    return CompileRuntime::get(compartment()->runtimeFromAnyThread());
+}
+
+const void *
+CompileCompartment::addressOfEnumerators()
+{
+    return &compartment()->enumerators;
+}
+
+const CallsiteCloneTable &
+CompileCompartment::callsiteClones()
+{
+    return compartment()->callsiteClones;
+}
+
+const JitCompartment *
+CompileCompartment::jitCompartment()
+{
+    return compartment()->jitCompartment();
+}
+
+bool
+CompileCompartment::hasObjectMetadataCallback()
+{
+    return compartment()->hasObjectMetadataCallback();
+}
diff --git a/js/src/jit/CompileWrappers.h b/js/src/jit/CompileWrappers.h
new file mode 100644
index 00000000000..487e063ea51
--- /dev/null
+++ b/js/src/jit/CompileWrappers.h
@@ -0,0 +1,119 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef jit_CompileWrappers_h
+#define jit_CompileWrappers_h
+
+#ifdef JS_ION
+
+#include "jscntxt.h"
+
+namespace js {
+namespace jit {
+
+class JitRuntime;
+
+// During Ion compilation we need access to various bits of the current
+// compartment, runtime and so forth. However, since compilation can run off
+// thread while the main thread is actively mutating the VM, this access needs
+// to be restricted. The classes below give the compiler an interface to access
+// all necessary information in a threadsafe fashion.
+
+class CompileRuntime
+{
+    JSRuntime *runtime();
+
+  public:
+    static CompileRuntime *get(JSRuntime *rt);
+
+    bool onMainThread();
+
+    // &mainThread.ionTop
+    const void *addressOfIonTop();
+
+    // rt->mainThread.ionStackLimit;
+    const void *addressOfIonStackLimit();
+
+    // &mainThread.ionJSContext
+    const void *addressOfJSContext();
+
+    // &mainThread.activation_
+    const void *addressOfActivation();
+
+    // &GetIonContext()->runtime->nativeIterCache.last
+    const void *addressOfLastCachedNativeIterator();
+
+#ifdef JS_GC_ZEAL
+    const void *addressOfGCZeal();
+#endif
+
+    const void *addressOfInterrupt();
+
+    const JitRuntime *jitRuntime();
+
+    // Compilation does not occur off thread when the SPS profiler is enabled.
+    SPSProfiler &spsProfiler();
+
+    bool signalHandlersInstalled();
+    bool jitSupportsFloatingPoint();
+    bool hadOutOfMemory();
+
+    const JSAtomState &names();
+    const StaticStrings &staticStrings();
+    const Value &NaNValue();
+    const Value &positiveInfinityValue();
+
+    bool isInsideNursery(gc::Cell *cell);
+
+    // DOM callbacks must be threadsafe (and will hopefully be removed soon).
+    const DOMCallbacks *DOMcallbacks();
+
+    const MathCache *maybeGetMathCache();
+
+#ifdef JSGC_GENERATIONAL
+    const Nursery &gcNursery();
+#endif
+};
+
+class CompileZone
+{
+    Zone *zone();
+
+  public:
+    static CompileZone *get(Zone *zone);
+
+    const void *addressOfNeedsBarrier();
+
+    // allocator.arenas.getFreeList(allocKind)
+    const void *addressOfFreeListFirst(gc::AllocKind allocKind);
+    const void *addressOfFreeListLast(gc::AllocKind allocKind);
+};
+
+class CompileCompartment
+{
+    JSCompartment *compartment();
+
+  public:
+    static CompileCompartment *get(JSCompartment *comp);
+
+    CompileZone *zone();
+    CompileRuntime *runtime();
+
+    const void *addressOfEnumerators();
+
+    const CallsiteCloneTable &callsiteClones();
+
+    const JitCompartment *jitCompartment();
+
+    bool hasObjectMetadataCallback();
+};
+
+} // namespace jit
+} // namespace js
+
+#endif // JS_ION
+
+#endif // jit_CompileWrappers_h
diff --git a/js/src/jit/CompilerRoot.h b/js/src/jit/CompilerRoot.h
index ed511bdc736..4b3f2e34b72 100644
--- a/js/src/jit/CompilerRoot.h
+++ b/js/src/jit/CompilerRoot.h
@@ -29,7 +29,7 @@ class CompilerRoot : public CompilerRootNode
       : CompilerRootNode(nullptr)
     {
         if (ptr) {
-            JS_ASSERT(!UninlinedIsInsideNursery(GetIonContext()->runtime, ptr));
+            JS_ASSERT(!GetIonContext()->runtime->isInsideNursery(ptr));
             setRoot(ptr);
         }
     }
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index e5fec94edb5..bf048c745b0 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -103,10 +103,10 @@ jit::MaybeGetIonContext()
 }
 
 IonContext::IonContext(JSContext *cx, TempAllocator *temp)
-  : runtime(cx->runtime()),
-    cx(cx),
-    compartment(cx->compartment()),
+  : cx(cx),
     temp(temp),
+    runtime(CompileRuntime::get(cx->runtime())),
+    compartment(CompileCompartment::get(cx->compartment())),
     prev_(CurrentIonContext()),
     assemblerCount_(0)
 {
@@ -114,32 +114,32 @@ IonContext::IonContext(JSContext *cx, TempAllocator *temp)
 }
 
 IonContext::IonContext(ExclusiveContext *cx, TempAllocator *temp)
-  : runtime(cx->runtime_),
-    cx(nullptr),
-    compartment(nullptr),
+  : cx(nullptr),
     temp(temp),
+    runtime(CompileRuntime::get(cx->runtime_)),
+    compartment(nullptr),
     prev_(CurrentIonContext()),
     assemblerCount_(0)
 {
     SetIonContext(this);
 }
 
-IonContext::IonContext(JSRuntime *rt, JSCompartment *comp, TempAllocator *temp)
-  : runtime(rt),
-    cx(nullptr),
+IonContext::IonContext(CompileRuntime *rt, CompileCompartment *comp, TempAllocator *temp)
+  : cx(nullptr),
+    temp(temp),
+    runtime(rt),
     compartment(comp),
-    temp(temp),
     prev_(CurrentIonContext()),
     assemblerCount_(0)
 {
     SetIonContext(this);
 }
 
-IonContext::IonContext(JSRuntime *rt)
-  : runtime(rt),
-    cx(nullptr),
-    compartment(nullptr),
+IonContext::IonContext(CompileRuntime *rt)
+  : cx(nullptr),
     temp(nullptr),
+    runtime(rt),
+    compartment(nullptr),
     prev_(CurrentIonContext()),
     assemblerCount_(0)
 {
@@ -589,14 +589,14 @@ JitCompartment::sweep(FreeOp *fop)
 }
 
 IonCode *
-JitRuntime::getBailoutTable(const FrameSizeClass &frameClass)
+JitRuntime::getBailoutTable(const FrameSizeClass &frameClass) const
 {
     JS_ASSERT(frameClass != FrameSizeClass::None());
     return bailoutTables_[frameClass.classId()];
 }
 
 IonCode *
-JitRuntime::getVMWrapper(const VMFunction &f)
+JitRuntime::getVMWrapper(const VMFunction &f) const
 {
     JS_ASSERT(functionWrappers_);
     JS_ASSERT(functionWrappers_->initialized());
@@ -1077,7 +1077,7 @@ IonScript::purgeCaches(Zone *zone)
         return;
 
     JSRuntime *rt = zone->runtimeFromMainThread();
-    IonContext ictx(rt);
+    IonContext ictx(CompileRuntime::get(rt));
     AutoFlushCache afc("purgeCaches", rt->jitRuntime());
     for (size_t i = 0; i < numCaches(); i++)
         getCacheFromIndex(i).reset();
@@ -1134,7 +1134,7 @@ jit::ToggleBarriers(JS::Zone *zone, bool needs)
     if (!rt->hasJitRuntime())
         return;
 
-    IonContext ictx(rt);
+    IonContext ictx(CompileRuntime::get(rt));
     AutoFlushCache afc("ToggleBarriers", rt->jitRuntime());
     for (gc::CellIterUnderGC i(zone, gc::FINALIZE_SCRIPT); !i.done(); i.next()) {
         JSScript *script = i.get<JSScript>();
@@ -1644,7 +1644,9 @@ IonCompile(JSContext *cx, JSScript *script,
     if (!constraints)
         return AbortReason_Alloc;
 
-    IonBuilder *builder = alloc->new_<IonBuilder>((JSContext *) nullptr, cx->compartment(), temp, graph, constraints,
+    IonBuilder *builder = alloc->new_<IonBuilder>((JSContext *) nullptr,
+                                                  CompileCompartment::get(cx->compartment()),
+                                                  temp, graph, constraints,
                                                   &inspector, info, baselineFrame);
     if (!builder)
         return AbortReason_Alloc;
@@ -2366,7 +2368,7 @@ jit::InvalidateAll(FreeOp *fop, Zone *zone)
 
     for (JitActivationIterator iter(fop->runtime()); !iter.done(); ++iter) {
         if (iter.activation()->compartment()->zone() == zone) {
-            IonContext ictx(fop->runtime());
+            IonContext ictx(CompileRuntime::get(fop->runtime()));
             AutoFlushCache afc("InvalidateAll", fop->runtime()->jitRuntime());
             IonSpew(IonSpew_Invalidate, "Invalidating all frames for GC");
             InvalidateActivation(fop, iter.jitTop(), true);
@@ -2612,7 +2614,7 @@ void
 AutoFlushCache::updateTop(uintptr_t p, size_t len)
 {
     IonContext *ictx = MaybeGetIonContext();
-    JitRuntime *jrt = (ictx != nullptr) ? ictx->runtime->jitRuntime() : nullptr;
+    JitRuntime *jrt = (ictx != nullptr) ? const_cast<JitRuntime *>(ictx->runtime->jitRuntime()) : nullptr;
     if (!jrt || !jrt->flusher())
         JSC::ExecutableAllocator::cacheFlush((void*)p, len);
     else
diff --git a/js/src/jit/Ion.h b/js/src/jit/Ion.h
index 60f3d5c9673..3ccb0a856ec 100644
--- a/js/src/jit/Ion.h
+++ b/js/src/jit/Ion.h
@@ -15,6 +15,7 @@
 #include "jscompartment.h"
 
 #include "jit/CompileInfo.h"
+#include "jit/CompileWrappers.h"
 
 namespace js {
 namespace jit {
@@ -276,14 +277,22 @@ class IonContext
   public:
     IonContext(JSContext *cx, TempAllocator *temp);
     IonContext(ExclusiveContext *cx, TempAllocator *temp);
-    IonContext(JSRuntime *rt, JSCompartment *comp, TempAllocator *temp);
-    IonContext(JSRuntime *rt);
+    IonContext(CompileRuntime *rt, CompileCompartment *comp, TempAllocator *temp);
+    IonContext(CompileRuntime *rt);
     ~IonContext();
 
-    JSRuntime *runtime;
+    // Running context when executing on the main thread. Not available during
+    // compilation.
     JSContext *cx;
-    JSCompartment *compartment;
+
+    // Allocator for temporary memory during compilation.
     TempAllocator *temp;
+
+    // Wrappers with information about the current runtime/compartment for use
+    // during compilation.
+    CompileRuntime *runtime;
+    CompileCompartment *compartment;
+
     int getNextAssemblerId() {
         return assemblerCount_++;
     }
diff --git a/js/src/jit/IonAnalysis.cpp b/js/src/jit/IonAnalysis.cpp
index 3e1aea6f869..42c1e5a3f91 100644
--- a/js/src/jit/IonAnalysis.cpp
+++ b/js/src/jit/IonAnalysis.cpp
@@ -2109,7 +2109,7 @@ jit::AnalyzeNewScriptProperties(JSContext *cx, HandleFunction fun,
 
     types::CompilerConstraintList *constraints = types::NewCompilerConstraintList(temp);
     BaselineInspector inspector(script);
-    IonBuilder builder(cx, cx->compartment(), &temp, &graph, constraints,
+    IonBuilder builder(cx, CompileCompartment::get(cx->compartment()), &temp, &graph, constraints,
                        &inspector, &info, /* baselineFrame = */ nullptr);
 
     if (!builder.build()) {
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index 39dcea445ca..374a73fa0ee 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -37,7 +37,7 @@ using namespace js::jit;
 using mozilla::DebugOnly;
 using mozilla::Maybe;
 
-IonBuilder::IonBuilder(JSContext *analysisContext, JSCompartment *comp, TempAllocator *temp, MIRGraph *graph,
+IonBuilder::IonBuilder(JSContext *analysisContext, CompileCompartment *comp, TempAllocator *temp, MIRGraph *graph,
                        types::CompilerConstraintList *constraints,
                        BaselineInspector *inspector, CompileInfo *info, BaselineFrame *baselineFrame,
                        size_t inliningDepth, uint32_t loopDepth)
@@ -4967,7 +4967,7 @@ IonBuilder::jsop_call(uint32_t argc, bool constructing)
     for (uint32_t i = 0; i < originals.length(); i++) {
         JSFunction *fun = &originals[i]->as<JSFunction>();
         if (fun->hasScript() && fun->nonLazyScript()->shouldCloneAtCallsite) {
-            if (JSFunction *clone = ExistingCloneFunctionAtCallsite(compartment, fun, script(), pc)) {
+            if (JSFunction *clone = ExistingCloneFunctionAtCallsite(compartment->callsiteClones(), fun, script(), pc)) {
                 fun = clone;
                 hasClones = true;
             }
@@ -5028,7 +5028,7 @@ IonBuilder::testShouldDOMCall(types::TypeSet *inTypes,
     // property, we can bake in a call to the bottom half of the DOM
     // accessor
     DOMInstanceClassMatchesProto instanceChecker =
-        GetDOMCallbacks(compartment->runtimeFromAnyThread())->instanceClassMatchesProto;
+        compartment->runtime()->DOMcallbacks()->instanceClassMatchesProto;
 
     const JSJitInfo *jinfo = func->jitInfo();
     if (jinfo->type != opType)
@@ -5940,7 +5940,7 @@ ClassHasEffectlessLookup(const Class *clasp)
 }
 
 static bool
-ClassHasResolveHook(JSCompartment *comp, const Class *clasp, PropertyName *name)
+ClassHasResolveHook(CompileCompartment *comp, const Class *clasp, PropertyName *name)
 {
     if (clasp->resolve == JS_ResolveStub)
         return false;
@@ -5951,7 +5951,7 @@ ClassHasResolveHook(JSCompartment *comp, const Class *clasp, PropertyName *name)
     }
 
     if (clasp->resolve == (JSResolveOp)fun_resolve)
-        return FunctionHasResolveHook(comp->runtimeFromAnyThread(), name);
+        return FunctionHasResolveHook(comp->runtime()->names(), name);
 
     return true;
 }
@@ -6200,9 +6200,9 @@ IonBuilder::getStaticName(JSObject *staticObject, PropertyName *name, bool *psuc
         if (name == names().undefined)
             return pushConstant(UndefinedValue());
         if (name == names().NaN)
-            return pushConstant(compartment->runtimeFromAnyThread()->NaNValue);
+            return pushConstant(compartment->runtime()->NaNValue());
         if (name == names().Infinity)
-            return pushConstant(compartment->runtimeFromAnyThread()->positiveInfinityValue);
+            return pushConstant(compartment->runtime()->positiveInfinityValue());
     }
 
     types::TypeObjectKey *staticType = types::TypeObjectKey::get(staticObject);
diff --git a/js/src/jit/IonBuilder.h b/js/src/jit/IonBuilder.h
index eef334c5e73..df6a2c1e50f 100644
--- a/js/src/jit/IonBuilder.h
+++ b/js/src/jit/IonBuilder.h
@@ -205,7 +205,7 @@ class IonBuilder : public MIRGenerator
     static int CmpSuccessors(const void *a, const void *b);
 
   public:
-    IonBuilder(JSContext *analysisContext, JSCompartment *comp, TempAllocator *temp, MIRGraph *graph,
+    IonBuilder(JSContext *analysisContext, CompileCompartment *comp, TempAllocator *temp, MIRGraph *graph,
                types::CompilerConstraintList *constraints,
                BaselineInspector *inspector, CompileInfo *info, BaselineFrame *baselineFrame,
                size_t inliningDepth = 0, uint32_t loopDepth = 0);
@@ -734,7 +734,7 @@ class IonBuilder : public MIRGenerator
         return callerBuilder_ != nullptr;
     }
 
-    JSAtomState &names() { return compartment->runtimeFromAnyThread()->atomState; }
+    const JSAtomState &names() { return compartment->runtime()->names(); }
 
   private:
     bool init();
diff --git a/js/src/jit/IonMacroAssembler.cpp b/js/src/jit/IonMacroAssembler.cpp
index d299ffe4446..8f298590589 100644
--- a/js/src/jit/IonMacroAssembler.cpp
+++ b/js/src/jit/IonMacroAssembler.cpp
@@ -636,12 +636,10 @@ MacroAssembler::newGCThing(const Register &result, gc::AllocKind allocKind, Labe
 
     int thingSize = int(gc::Arena::thingSize(allocKind));
 
-    Zone *zone = GetIonContext()->compartment->zone();
-
 #ifdef JS_GC_ZEAL
     // Don't execute the inline path if gcZeal is active.
     branch32(Assembler::NotEqual,
-             AbsoluteAddress(&GetIonContext()->runtime->gcZeal_), Imm32(0),
+             AbsoluteAddress(GetIonContext()->runtime->addressOfGCZeal()), Imm32(0),
              fail);
 #endif
 
@@ -651,7 +649,7 @@ MacroAssembler::newGCThing(const Register &result, gc::AllocKind allocKind, Labe
         jump(fail);
 
 #ifdef JSGC_GENERATIONAL
-    Nursery &nursery = GetIonContext()->runtime->gcNursery;
+    const Nursery &nursery = GetIonContext()->runtime->gcNursery();
     if (nursery.isEnabled() &&
         allocKind <= gc::FINALIZE_OBJECT_LAST &&
         initialHeap != gc::TenuredHeap)
@@ -668,17 +666,17 @@ MacroAssembler::newGCThing(const Register &result, gc::AllocKind allocKind, Labe
     }
 #endif // JSGC_GENERATIONAL
 
+    CompileZone *zone = GetIonContext()->compartment->zone();
+
     // Inline FreeSpan::allocate.
     // There is always exactly one FreeSpan per allocKind per JSCompartment.
     // If a FreeSpan is replaced, its members are updated in the freeLists table,
     // which the code below always re-reads.
-    gc::FreeSpan *list = const_cast<gc::FreeSpan *>
-                         (zone->allocator.arenas.getFreeList(allocKind));
-    loadPtr(AbsoluteAddress(&list->first), result);
-    branchPtr(Assembler::BelowOrEqual, AbsoluteAddress(&list->last), result, fail);
+    loadPtr(AbsoluteAddress(zone->addressOfFreeListFirst(allocKind)), result);
+    branchPtr(Assembler::BelowOrEqual, AbsoluteAddress(zone->addressOfFreeListLast(allocKind)), result, fail);
 
     addPtr(Imm32(thingSize), result);
-    storePtr(result, AbsoluteAddress(&list->first));
+    storePtr(result, AbsoluteAddress(zone->addressOfFreeListFirst(allocKind)));
     subPtr(Imm32(thingSize), result);
 }
 
@@ -870,7 +868,7 @@ void
 MacroAssembler::checkInterruptFlagsPar(const Register &tempReg,
                                             Label *fail)
 {
-    movePtr(ImmPtr(&GetIonContext()->runtime->interrupt), tempReg);
+    movePtr(ImmPtr(GetIonContext()->runtime->addressOfInterrupt()), tempReg);
     load32(Address(tempReg, 0), tempReg);
     branchTest32(Assembler::NonZero, tempReg, tempReg, fail);
 }
diff --git a/js/src/jit/IonMacroAssembler.h b/js/src/jit/IonMacroAssembler.h
index 8e2768b1fb1..db4b852b670 100644
--- a/js/src/jit/IonMacroAssembler.h
+++ b/js/src/jit/IonMacroAssembler.h
@@ -373,10 +373,10 @@ class MacroAssembler : public MacroAssemblerSpecific
     }
 
     void loadJSContext(const Register &dest) {
-        loadPtr(AbsoluteAddress(&GetIonContext()->runtime->mainThread.ionJSContext), dest);
+        loadPtr(AbsoluteAddress(GetIonContext()->runtime->addressOfJSContext()), dest);
     }
     void loadJitActivation(const Register &dest) {
-        loadPtr(AbsoluteAddress(GetIonContext()->runtime->mainThread.addressOfActivation()), dest);
+        loadPtr(AbsoluteAddress(GetIonContext()->runtime->addressOfActivation()), dest);
     }
 
     template<typename T>
@@ -627,8 +627,8 @@ class MacroAssembler : public MacroAssemblerSpecific
 
     void branchTestNeedsBarrier(Condition cond, const Register &scratch, Label *label) {
         JS_ASSERT(cond == Zero || cond == NonZero);
-        JS::Zone *zone = GetIonContext()->compartment->zone();
-        movePtr(ImmPtr(zone->AddressOfNeedsBarrier()), scratch);
+        CompileZone *zone = GetIonContext()->compartment->zone();
+        movePtr(ImmPtr(zone->addressOfNeedsBarrier()), scratch);
         Address needsBarrierAddr(scratch, 0);
         branchTest32(cond, needsBarrierAddr, Imm32(0x1), label);
     }
@@ -647,7 +647,7 @@ class MacroAssembler : public MacroAssemblerSpecific
         Push(PreBarrierReg);
         computeEffectiveAddress(address, PreBarrierReg);
 
-        JitRuntime *rt = GetIonContext()->runtime->jitRuntime();
+        const JitRuntime *rt = GetIonContext()->runtime->jitRuntime();
         IonCode *preBarrier = (type == MIRType_Shape)
                               ? rt->shapePreBarrier()
                               : rt->valuePreBarrier();
diff --git a/js/src/jit/IonSpewer.cpp b/js/src/jit/IonSpewer.cpp
index ae20c478a0e..75cd5d7fc43 100644
--- a/js/src/jit/IonSpewer.cpp
+++ b/js/src/jit/IonSpewer.cpp
@@ -81,7 +81,7 @@ jit::EnableIonDebugLogging()
 void
 jit::IonSpewNewFunction(MIRGraph *graph, HandleScript func)
 {
-    if (!OffThreadIonCompilationEnabled(GetIonContext()->runtime)) {
+    if (GetIonContext()->runtime->onMainThread()) {
         ionspewer.beginFunction(graph, func);
         return;
     }
@@ -102,21 +102,21 @@ jit::IonSpewNewFunction(MIRGraph *graph, HandleScript func)
 void
 jit::IonSpewPass(const char *pass)
 {
-    if (!OffThreadIonCompilationEnabled(GetIonContext()->runtime))
+    if (GetIonContext()->runtime->onMainThread())
         ionspewer.spewPass(pass);
 }
 
 void
 jit::IonSpewPass(const char *pass, LinearScanAllocator *ra)
 {
-    if (!OffThreadIonCompilationEnabled(GetIonContext()->runtime))
+    if (GetIonContext()->runtime->onMainThread())
         ionspewer.spewPass(pass, ra);
 }
 
 void
 jit::IonSpewEndFunction()
 {
-    if (!OffThreadIonCompilationEnabled(GetIonContext()->runtime))
+    if (GetIonContext()->runtime->onMainThread())
         ionspewer.endFunction();
 }
 
diff --git a/js/src/jit/JitCompartment.h b/js/src/jit/JitCompartment.h
index d88c044866c..1640ffeb40e 100644
--- a/js/src/jit/JitCompartment.h
+++ b/js/src/jit/JitCompartment.h
@@ -275,7 +275,7 @@ class JitRuntime
 
     bool handleAccessViolation(JSRuntime *rt, void *faultingAddress);
 
-    IonCode *getVMWrapper(const VMFunction &f);
+    IonCode *getVMWrapper(const VMFunction &f) const;
     IonCode *debugTrapHandler(JSContext *cx);
 
     IonCode *getGenericBailoutHandler() const {
@@ -290,7 +290,7 @@ class JitRuntime
         return bailoutTail_;
     }
 
-    IonCode *getBailoutTable(const FrameSizeClass &frameClass);
+    IonCode *getBailoutTable(const FrameSizeClass &frameClass) const;
 
     IonCode *getArgumentsRectifier(ExecutionMode mode) const {
         switch (mode) {
@@ -424,7 +424,7 @@ class JitCompartment
         return rt->execAlloc_;
     }
 
-    IonCode *stringConcatStub(ExecutionMode mode) {
+    IonCode *stringConcatStub(ExecutionMode mode) const {
         switch (mode) {
           case SequentialExecution: return stringConcatStub_;
           case ParallelExecution:   return parallelStringConcatStub_;
diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
index 33ebbdb3389..c8f531e24e7 100644
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -3209,7 +3209,7 @@ LIRGenerator::visitFunctionBoundary(MFunctionBoundary *ins)
         return false;
     // If slow assertions are enabled, then this node will result in a callVM
     // out to a C++ function for the assertions, so we will need a safepoint.
-    return !GetIonContext()->runtime->spsProfiler.slowAssertionsEnabled() ||
+    return !GetIonContext()->runtime->spsProfiler().slowAssertionsEnabled() ||
            assignSafepoint(lir, ins);
 }
 
diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp
index 52fc1df1c3c..8e304d9b571 100644
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -188,7 +188,7 @@ IonBuilder::inlineMathFunction(CallInfo &callInfo, MMathFunction::Function funct
     if (!IsNumberType(callInfo.getArg(0)->type()))
         return InliningStatus_NotInlined;
 
-    MathCache *cache = compartment->runtimeFromAnyThread()->maybeGetMathCache();
+    const MathCache *cache = compartment->runtime()->maybeGetMathCache();
     if (!cache)
         return InliningStatus_NotInlined;
 
@@ -1266,7 +1266,7 @@ IonBuilder::inlineNewParallelArray(CallInfo &callInfo)
     if (targetObj && targetObj->is<JSFunction>())
         target = &targetObj->as<JSFunction>();
     if (target && target->isInterpreted() && target->nonLazyScript()->shouldCloneAtCallsite) {
-        if (JSFunction *clone = ExistingCloneFunctionAtCallsite(compartment, target, script(), pc))
+        if (JSFunction *clone = ExistingCloneFunctionAtCallsite(compartment->callsiteClones(), target, script(), pc))
             target = clone;
     }
     MDefinition *ctor = makeCallsiteClone(
@@ -1291,7 +1291,7 @@ IonBuilder::inlineParallelArray(CallInfo &callInfo)
         return InliningStatus_NotInlined;
 
     JS_ASSERT(target->nonLazyScript()->shouldCloneAtCallsite);
-    if (JSFunction *clone = ExistingCloneFunctionAtCallsite(compartment, target, script(), pc))
+    if (JSFunction *clone = ExistingCloneFunctionAtCallsite(compartment->callsiteClones(), target, script(), pc))
         target = clone;
 
     MConstant *ctor = MConstant::New(alloc(), ObjectValue(*target));
diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp
index 6a43ca66a3b..5b34080061f 100644
--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -1966,8 +1966,7 @@ MTypeOf::foldsTo(TempAllocator &alloc, bool useValueNumbers)
         return this;
     }
 
-    JSRuntime *rt = GetIonContext()->runtime;
-    return MConstant::New(alloc, StringValue(TypeName(type, rt)));
+    return MConstant::New(alloc, StringValue(TypeName(type, GetIonContext()->runtime->names())));
 }
 
 void
diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index af9842e9e38..849a6571620 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -3801,9 +3801,9 @@ class MMathFunction
 
   private:
     Function function_;
-    MathCache *cache_;
+    const MathCache *cache_;
 
-    MMathFunction(MDefinition *input, Function function, MathCache *cache)
+    MMathFunction(MDefinition *input, Function function, const MathCache *cache)
       : MUnaryInstruction(input), function_(function), cache_(cache)
     {
         setResultType(MIRType_Double);
@@ -3816,14 +3816,14 @@ class MMathFunction
 
     // A nullptr cache means this function will neither access nor update the cache.
     static MMathFunction *New(TempAllocator &alloc, MDefinition *input, Function function,
-                              MathCache *cache)
+                              const MathCache *cache)
     {
         return new(alloc) MMathFunction(input, function, cache);
     }
     Function function() const {
         return function_;
     }
-    MathCache *cache() const {
+    const MathCache *cache() const {
         return cache_;
     }
     TypePolicy *typePolicy() {
diff --git a/js/src/jit/MIRGenerator.h b/js/src/jit/MIRGenerator.h
index 349bdf675a5..93fe32a795c 100644
--- a/js/src/jit/MIRGenerator.h
+++ b/js/src/jit/MIRGenerator.h
@@ -33,7 +33,7 @@ class MStart;
 class MIRGenerator
 {
   public:
-    MIRGenerator(JSCompartment *compartment, TempAllocator *alloc, MIRGraph *graph, CompileInfo *info);
+    MIRGenerator(CompileCompartment *compartment, TempAllocator *alloc, MIRGraph *graph, CompileInfo *info);
 
     TempAllocator &alloc() {
         return *alloc_;
@@ -44,10 +44,7 @@ class MIRGenerator
     bool ensureBallast() {
         return alloc().ensureBallast();
     }
-    JitCompartment *jitCompartment() const {
-        return compartment->jitCompartment();
-    }
-    JitRuntime *jitRuntime() const {
+    const JitRuntime *jitRuntime() const {
         return GetIonContext()->runtime->jitRuntime();
     }
     CompileInfo &info() {
@@ -69,7 +66,7 @@ class MIRGenerator
     }
 
     bool instrumentedProfiling() {
-        return GetIonContext()->runtime->spsProfiler.enabled();
+        return GetIonContext()->runtime->spsProfiler().enabled();
     }
 
     // Whether the main thread is trying to cancel this build.
@@ -126,7 +123,7 @@ class MIRGenerator
     }
 
   public:
-    JSCompartment *compartment;
+    CompileCompartment *compartment;
 
   protected:
     CompileInfo *info_;
diff --git a/js/src/jit/MIRGraph.cpp b/js/src/jit/MIRGraph.cpp
index 43811f74cd7..194e11adbb1 100644
--- a/js/src/jit/MIRGraph.cpp
+++ b/js/src/jit/MIRGraph.cpp
@@ -16,7 +16,7 @@
 using namespace js;
 using namespace js::jit;
 
-MIRGenerator::MIRGenerator(JSCompartment *compartment,
+MIRGenerator::MIRGenerator(CompileCompartment *compartment,
                            TempAllocator *alloc, MIRGraph *graph, CompileInfo *info)
   : compartment(compartment),
     info_(info),
diff --git a/js/src/jit/arm/CodeGenerator-arm.cpp b/js/src/jit/arm/CodeGenerator-arm.cpp
index b418fca156c..5543a94d2ac 100644
--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -1872,7 +1872,7 @@ CodeGeneratorARM::visitInterruptCheck(LInterruptCheck *lir)
     if (!ool)
         return false;
 
-    void *interrupt = (void*)&GetIonContext()->runtime->interrupt;
+    void *interrupt = (void*)GetIonContext()->runtime->addressOfInterrupt();
     masm.load32(AbsoluteAddress(interrupt), lr);
     masm.ma_cmp(lr, Imm32(0));
     masm.ma_b(ool->entry(), Assembler::NonZero);
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp
index 0cbab9b30cc..cd2bd3fda83 100644
--- a/js/src/jit/arm/MacroAssembler-arm.cpp
+++ b/js/src/jit/arm/MacroAssembler-arm.cpp
@@ -3367,7 +3367,7 @@ MacroAssemblerARMCompat::storeTypeTag(ImmTag tag, Register base, Register index,
 
 void
 MacroAssemblerARMCompat::linkExitFrame() {
-    uint8_t *dest = (uint8_t*)&GetIonContext()->runtime->mainThread.ionTop;
+    uint8_t *dest = (uint8_t*)GetIonContext()->runtime->addressOfIonTop();
     movePtr(ImmPtr(dest), ScratchRegister);
     ma_str(StackPointer, Operand(ScratchRegister, 0));
 }
diff --git a/js/src/jit/shared/Assembler-shared.h b/js/src/jit/shared/Assembler-shared.h
index bcb2ca97c32..b358b6d2667 100644
--- a/js/src/jit/shared/Assembler-shared.h
+++ b/js/src/jit/shared/Assembler-shared.h
@@ -356,12 +356,8 @@ class Label : public LabelBase
     { }
     ~Label()
     {
-#ifdef DEBUG
-        // Note: the condition is a hack to silence this assert when OOM testing,
-        // see bug 756614.
-        if (MaybeGetIonContext() && !OffThreadIonCompilationEnabled(GetIonContext()->runtime))
-            JS_ASSERT_IF(!GetIonContext()->runtime->hadOutOfMemory, !used());
-#endif
+        if (MaybeGetIonContext())
+            JS_ASSERT_IF(!GetIonContext()->runtime->hadOutOfMemory(), !used());
     }
 };
 
diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp
index bec245fffd2..19bcca9ab12 100644
--- a/js/src/jit/shared/CodeGenerator-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-shared.cpp
@@ -46,7 +46,7 @@ CodeGeneratorShared::CodeGeneratorShared(MIRGenerator *gen, LIRGraph *graph, Mac
     pushedArgs_(0),
 #endif
     lastOsiPointOffset_(0),
-    sps_(&GetIonContext()->runtime->spsProfiler, &lastPC_),
+    sps_(&GetIonContext()->runtime->spsProfiler(), &lastPC_),
     osrEntryOffset_(0),
     skipArgCheckEntryOffset_(0),
     frameDepth_(graph->localSlotCount() * sizeof(STACK_SLOT_SIZE) +
@@ -623,7 +623,7 @@ CodeGeneratorShared::callVM(const VMFunction &fun, LInstruction *ins, const Regi
 
     // If we're calling a function with an out parameter type of double, make
     // sure we have an FPU.
-    JS_ASSERT_IF(fun.outParam == Type_Double, GetIonContext()->runtime->jitSupportsFloatingPoint);
+    JS_ASSERT_IF(fun.outParam == Type_Double, GetIonContext()->runtime->jitSupportsFloatingPoint());
 
 #ifdef DEBUG
     if (ins->mirRaw()) {
diff --git a/js/src/jit/x64/CodeGenerator-x64.cpp b/js/src/jit/x64/CodeGenerator-x64.cpp
index 621397bb222..d44ac4c6c0b 100644
--- a/js/src/jit/x64/CodeGenerator-x64.cpp
+++ b/js/src/jit/x64/CodeGenerator-x64.cpp
@@ -281,7 +281,7 @@ CodeGeneratorX64::visitInterruptCheck(LInterruptCheck *lir)
         return false;
 
     masm.branch32(Assembler::NotEqual,
-                  AbsoluteAddress(&GetIonContext()->runtime->interrupt), Imm32(0),
+                  AbsoluteAddress(GetIonContext()->runtime->addressOfInterrupt()), Imm32(0),
                   ool->entry());
     masm.bind(ool->rejoin());
     return true;
diff --git a/js/src/jit/x64/MacroAssembler-x64.h b/js/src/jit/x64/MacroAssembler-x64.h
index 53ccd2ac0a6..fc68f4ad960 100644
--- a/js/src/jit/x64/MacroAssembler-x64.h
+++ b/js/src/jit/x64/MacroAssembler-x64.h
@@ -1228,7 +1228,7 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
     // ThreadData::ionTop of the main thread.
     void linkExitFrame() {
         storePtr(StackPointer,
-                 AbsoluteAddress(&GetIonContext()->runtime->mainThread.ionTop));
+                 AbsoluteAddress(GetIonContext()->runtime->addressOfIonTop()));
     }
 
     void callWithExitFrame(IonCode *target, Register dynStack) {
diff --git a/js/src/jit/x86/CodeGenerator-x86.cpp b/js/src/jit/x86/CodeGenerator-x86.cpp
index 399d9542add..4517790cd4b 100644
--- a/js/src/jit/x86/CodeGenerator-x86.cpp
+++ b/js/src/jit/x86/CodeGenerator-x86.cpp
@@ -271,7 +271,7 @@ CodeGeneratorX86::visitInterruptCheck(LInterruptCheck *lir)
     if (!ool)
         return false;
 
-    masm.cmpl(Operand(AbsoluteAddress(&GetIonContext()->runtime->interrupt)), Imm32(0));
+    masm.cmpl(Operand(AbsoluteAddress(GetIonContext()->runtime->addressOfInterrupt())), Imm32(0));
     masm.j(Assembler::NonZero, ool->entry());
     masm.bind(ool->rejoin());
     return true;
diff --git a/js/src/jit/x86/MacroAssembler-x86.h b/js/src/jit/x86/MacroAssembler-x86.h
index ce5f4a219af..0d1395a0830 100644
--- a/js/src/jit/x86/MacroAssembler-x86.h
+++ b/js/src/jit/x86/MacroAssembler-x86.h
@@ -1072,7 +1072,7 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
     // Save an exit frame (which must be aligned to the stack pointer) to
     // ThreadData::ionTop of the main thread.
     void linkExitFrame() {
-        movl(StackPointer, Operand(AbsoluteAddress(&GetIonContext()->runtime->mainThread.ionTop)));
+        movl(StackPointer, Operand(AbsoluteAddress(GetIonContext()->runtime->addressOfIonTop())));
     }
 
     void callWithExitFrame(IonCode *target, Register dynStack) {
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 97b1463cb1e..ae3364209d9 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1174,7 +1174,7 @@ typedef struct JSStdName {
 static Handle<PropertyName*>
 StdNameToPropertyName(JSContext *cx, const JSStdName *stdn)
 {
-    return OFFSET_TO_NAME(cx->runtime(), stdn->atomOffset);
+    return AtomStateOffsetToName(cx->runtime()->atomState, stdn->atomOffset);
 }
 
 /*
@@ -1334,7 +1334,7 @@ JS_ResolveStandardClass(JSContext *cx, HandleObject obj, HandleId id, bool *reso
     stdnm = nullptr;
     for (i = 0; standard_class_atoms[i].init; i++) {
         JS_ASSERT(standard_class_atoms[i].clasp);
-        atom = OFFSET_TO_NAME(rt, standard_class_atoms[i].atomOffset);
+        atom = AtomStateOffsetToName(rt->atomState, standard_class_atoms[i].atomOffset);
         if (idstr == atom) {
             stdnm = &standard_class_atoms[i];
             break;
diff --git a/js/src/jsatominlines.h b/js/src/jsatominlines.h
index c895ac5b3ee..f6ed26e39bd 100644
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.h
@@ -163,14 +163,14 @@ AtomHasher::match(const AtomStateEntry &entry, const Lookup &lookup)
 }
 
 inline Handle<PropertyName*>
-TypeName(JSType type, JSRuntime *rt)
+TypeName(JSType type, const JSAtomState &names)
 {
     JS_ASSERT(type < JSTYPE_LIMIT);
     JS_STATIC_ASSERT(offsetof(JSAtomState, undefined) +
                      JSTYPE_LIMIT * sizeof(FixedHeapPtr<PropertyName>) <=
                      sizeof(JSAtomState));
     JS_STATIC_ASSERT(JSTYPE_VOID == 0);
-    return (&rt->atomState.undefined)[type];
+    return (&names.undefined)[type];
 }
 
 inline Handle<PropertyName*>
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 551bd538b59..b91c69f8115 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -110,10 +110,9 @@ JSCompartment::sweepCallsiteClones()
 }
 
 JSFunction *
-js::ExistingCloneFunctionAtCallsite(JSCompartment *comp, JSFunction *fun,
+js::ExistingCloneFunctionAtCallsite(const CallsiteCloneTable &table, JSFunction *fun,
                                     JSScript *script, jsbytecode *pc)
 {
-    JS_ASSERT(comp->zone()->types.inferenceEnabled);
     JS_ASSERT(fun->nonLazyScript()->shouldCloneAtCallsite);
     JS_ASSERT(!fun->nonLazyScript()->enclosingStaticScope());
     JS_ASSERT(types::UseNewTypeForClone(fun));
@@ -124,14 +123,10 @@ js::ExistingCloneFunctionAtCallsite(JSCompartment *comp, JSFunction *fun,
      */
     JS_ASSERT(fun->isTenured());
 
-    typedef CallsiteCloneKey Key;
-    typedef CallsiteCloneTable Table;
-
-    Table &table = comp->callsiteClones;
     if (!table.initialized())
         return nullptr;
 
-    Table::Ptr p = table.lookup(Key(fun, script, pc - script->code));
+    CallsiteCloneTable::Ptr p = table.lookup(CallsiteCloneKey(fun, script, pc - script->code));
     if (p)
         return p->value;
 
@@ -141,7 +136,7 @@ js::ExistingCloneFunctionAtCallsite(JSCompartment *comp, JSFunction *fun,
 JSFunction *
 js::CloneFunctionAtCallsite(JSContext *cx, HandleFunction fun, HandleScript script, jsbytecode *pc)
 {
-    if (JSFunction *clone = ExistingCloneFunctionAtCallsite(cx->compartment(), fun, script, pc))
+    if (JSFunction *clone = ExistingCloneFunctionAtCallsite(cx->compartment()->callsiteClones, fun, script, pc))
         return clone;
 
     RootedObject parent(cx, fun->environment());
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 03d2f2945b2..3c9d060cf5a 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -65,7 +65,7 @@ typedef HashMap<CallsiteCloneKey,
                 SystemAllocPolicy> CallsiteCloneTable;
 
 JSFunction *
-ExistingCloneFunctionAtCallsite(JSCompartment *comp, JSFunction *fun,
+ExistingCloneFunctionAtCallsite(const CallsiteCloneTable &table, JSFunction *fun,
                                 JSScript *script, jsbytecode *pc);
 
 JSFunction *CloneFunctionAtCallsite(JSContext *cx, HandleFunction fun,
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 9dc4aae5d12..65eeb42153e 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -180,7 +180,7 @@ fun_enumerate(JSContext *cx, HandleObject obj)
 
     for (unsigned i = 0; i < ArrayLength(poisonPillProps); i++) {
         const uint16_t offset = poisonPillProps[i];
-        id = NameToId(OFFSET_TO_NAME(cx->runtime(), offset));
+        id = NameToId(AtomStateOffsetToName(cx->runtime()->atomState, offset));
         if (!JSObject::hasProperty(cx, obj, id, &found, 0))
             return false;
     }
@@ -248,15 +248,15 @@ ResolveInterpretedFunctionPrototype(JSContext *cx, HandleObject obj)
 }
 
 bool
-js::FunctionHasResolveHook(JSRuntime *rt, PropertyName *name)
+js::FunctionHasResolveHook(const JSAtomState &atomState, PropertyName *name)
 {
-    if (name == rt->atomState.prototype || name == rt->atomState.length || name == rt->atomState.name)
+    if (name == atomState.prototype || name == atomState.length || name == atomState.name)
         return true;
 
     for (unsigned i = 0; i < ArrayLength(poisonPillProps); i++) {
         const uint16_t offset = poisonPillProps[i];
 
-        if (name == OFFSET_TO_NAME(rt, offset))
+        if (name == AtomStateOffsetToName(atomState, offset))
             return true;
     }
 
@@ -319,7 +319,7 @@ js::fun_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
     for (unsigned i = 0; i < ArrayLength(poisonPillProps); i++) {
         const uint16_t offset = poisonPillProps[i];
 
-        if (JSID_IS_ATOM(id, OFFSET_TO_NAME(cx->runtime(), offset))) {
+        if (JSID_IS_ATOM(id, AtomStateOffsetToName(cx->runtime()->atomState, offset))) {
             JS_ASSERT(!IsInternalFunctionObject(fun));
 
             PropertyOp getter;
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index ff1d0bc0f1b..4b2f0b6d659 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -23,6 +23,8 @@ typedef JSParallelNative   ParallelNative;
 typedef JSThreadSafeNative ThreadSafeNative;
 }
 
+struct JSAtomState;
+
 class JSFunction : public JSObject
 {
   public:
@@ -490,7 +492,7 @@ DefineFunction(JSContext *cx, HandleObject obj, HandleId id, JSNative native,
                NewObjectKind newKind = GenericObject);
 
 bool
-FunctionHasResolveHook(JSRuntime *rt, PropertyName *name);
+FunctionHasResolveHook(const JSAtomState &atomState, PropertyName *name);
 
 extern bool
 fun_resolve(JSContext *cx, HandleObject obj, HandleId id,
diff --git a/js/src/jsworkers.cpp b/js/src/jsworkers.cpp
index 027f0eb6e0a..3b66741070e 100644
--- a/js/src/jsworkers.cpp
+++ b/js/src/jsworkers.cpp
@@ -636,7 +636,7 @@ WorkerThread::handleAsmJSWorkload(WorkerThreadState &state)
 
     state.unlock();
     do {
-        jit::IonContext icx(runtime, asmData->mir->compartment, &asmData->mir->alloc());
+        jit::IonContext icx(jit::CompileRuntime::get(runtime), asmData->mir->compartment, &asmData->mir->alloc());
 
         int64_t before = PRMJ_Now();
 
@@ -691,7 +691,9 @@ WorkerThread::handleIonWorkload(WorkerThreadState &state)
 
     state.unlock();
     {
-        jit::IonContext ictx(runtime, ionBuilder->script()->compartment(), &ionBuilder->alloc());
+        jit::IonContext ictx(jit::CompileRuntime::get(runtime),
+                             jit::CompileCompartment::get(ionBuilder->script()->compartment()),
+                             &ionBuilder->alloc());
         ionBuilder->setBackgroundCodegen(jit::CompileBackEnd(ionBuilder));
     }
     state.lock();
diff --git a/js/src/moz.build b/js/src/moz.build
index 3394aefd0bc..ab5ee30d951 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -229,6 +229,7 @@ if CONFIG['ENABLE_ION']:
         'jit/BytecodeAnalysis.cpp',
         'jit/C1Spewer.cpp',
         'jit/CodeGenerator.cpp',
+        'jit/CompileWrappers.cpp',
         'jit/EdgeCaseAnalysis.cpp',
         'jit/EffectiveAddressAnalysis.cpp',
         'jit/Ion.cpp',
diff --git a/js/src/vm/ForkJoin.cpp b/js/src/vm/ForkJoin.cpp
index 9fc47fecc08..e6cfc4a8d00 100644
--- a/js/src/vm/ForkJoin.cpp
+++ b/js/src/vm/ForkJoin.cpp
@@ -1482,7 +1482,9 @@ ForkJoinShared::executePortion(PerThreadData *perThread,
 
     // Make a new IonContext for the slice, which is needed if we need to
     // re-enter the VM.
-    IonContext icx(cx_->runtime(), cx_->compartment(), nullptr);
+    IonContext icx(CompileRuntime::get(cx_->runtime()),
+                   CompileCompartment::get(cx_->compartment()),
+                   nullptr);
 
     JS_ASSERT(slice.bailoutRecord->topScript == nullptr);
 
diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h
index f5ca8a3b986..dbd274d1788 100644
--- a/js/src/vm/Interpreter-inl.h
+++ b/js/src/vm/Interpreter-inl.h
@@ -459,14 +459,14 @@ static JS_ALWAYS_INLINE JSString *
 TypeOfOperation(const Value &v, JSRuntime *rt)
 {
     JSType type = js::TypeOfValue(v);
-    return TypeName(type, rt);
+    return TypeName(type, rt->atomState);
 }
 
 static inline JSString *
 TypeOfObjectOperation(JSObject *obj, JSRuntime *rt)
 {
     JSType type = js::TypeOfObject(obj);
-    return TypeName(type, rt);
+    return TypeName(type, rt->atomState);
 }
 
 static JS_ALWAYS_INLINE bool
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 77e7cb06623..0fa95dbc270 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -466,11 +466,16 @@ struct JSAtomState
 #undef PROPERTYNAME_FIELD
 };
 
-#define NAME_OFFSET(name)       offsetof(JSAtomState, name)
-#define OFFSET_TO_NAME(rt,off)  (*(js::FixedHeapPtr<js::PropertyName>*)((char*)&(rt)->atomState + (off)))
-
 namespace js {
 
+#define NAME_OFFSET(name)       offsetof(JSAtomState, name)
+
+inline HandlePropertyName
+AtomStateOffsetToName(const JSAtomState &atomState, size_t offset)
+{
+    return *(js::FixedHeapPtr<js::PropertyName>*)((char*)&atomState + offset);
+}
+
 /*
  * Encapsulates portions of the runtime/context that are tied to a
  * single active thread.  Normally, as most JS is single-threaded,

From ebc838d6ec922eeb09f70cce5ae4434e3923ffcb Mon Sep 17 00:00:00 2001
From: Michael Shuen <mz_mhs-ctb@outlook.com>
Date: Tue, 19 Nov 2013 10:37:58 -0500
Subject: [PATCH 10/92] Bug 940153 - Build dom/encoding in unified mode.
 r=bzbarsky

---
 dom/encoding/moz.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build
index 35a8fd6f534..9968e87a159 100644
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -16,6 +16,9 @@ EXPORTS.mozilla.dom += [
 SOURCES += [
     'EncodingUtils.cpp',
     'FallbackEncoding.cpp',
+]
+
+UNIFIED_SOURCES += {
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]

From 96f3834d749aa1713547013382bcad2c51c78fce Mon Sep 17 00:00:00 2001
From: Michael Shuen <mz_mhs-ctb@outlook.com>
Date: Tue, 19 Nov 2013 10:37:58 -0500
Subject: [PATCH 11/92] Bug 940185 - Build dom/audiochannel in unified mode.
 r=bzbarsky

---
 dom/audiochannel/moz.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build
index 03b0072ed2e..187688e8b3b 100644
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -19,7 +19,7 @@ EXPORTS += [
     'AudioChannelServiceChild.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',
     'AudioChannelServiceChild.cpp',

From ec535567f8a29bb9c4c34adce3e06f4edd3d3560 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 19 Nov 2013 10:40:59 -0500
Subject: [PATCH 12/92] Bug 938950 - Touch CLOBBER.

---
 CLOBBER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index cc2cb7ee4f2..7c97389909f 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,4 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Australis landing.
+Bug 938950 needs a clobber.

From 84360c4d9b8a004cafdcebcdd89caa44d5c83b31 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Wed, 13 Nov 2013 16:43:25 -0500
Subject: [PATCH 13/92] Bug 922094 - part 1 - report proto/iface cache size to
 about:memory; r=njn

---
 dom/base/nsWindowMemoryReporter.cpp | 8 ++++++++
 dom/base/nsWindowMemoryReporter.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp
index daa97ed1847..614e2255fda 100644
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@@ -310,6 +310,11 @@ CollectWindowReports(nsGlobalWindow *aWindow,
               "other 'dom/' numbers.");
   aWindowTotalSizes->mDOMOtherSize += windowSizes.mDOMOtherSize;
 
+  REPORT_SIZE("/proto-iface-cache", windowSizes.mProtoIfaceCacheSize,
+              "Memory used for prototype and interface binding caches "
+              "with a window.");
+  aWindowTotalSizes->mProtoIfaceCacheSize += windowSizes.mProtoIfaceCacheSize;
+
   REPORT_SIZE("/property-tables",
               windowSizes.mPropertyTablesSize,
               "Memory used for the property tables within a window.");
@@ -531,6 +536,9 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
   REPORT("window-objects/dom/other", windowTotalSizes.mDOMOtherSize,
          "This is the sum of all windows' 'dom/other' numbers.");
 
+  REPORT("window-objects/proto-iface-cache", windowTotalSizes.mProtoIfaceCacheSize,
+         "This is the sum of all windows' 'proto-iface-cache' numbers.");
+
   REPORT("window-objects/property-tables",
          windowTotalSizes.mPropertyTablesSize,
          "This is the sum of all windows' 'property-tables' numbers.");
diff --git a/dom/base/nsWindowMemoryReporter.h b/dom/base/nsWindowMemoryReporter.h
index 1691a21402b..5a7e1ab1164 100644
--- a/dom/base/nsWindowMemoryReporter.h
+++ b/dom/base/nsWindowMemoryReporter.h
@@ -40,6 +40,7 @@ class nsWindowSizes {
   macro(Other, mLayoutTextRunsSize) \
   macro(Other, mLayoutPresContextSize) \
   macro(Other, mPropertyTablesSize) \
+  macro(Other, mProtoIfaceCacheSize) \
 
 public:
   nsWindowSizes(mozilla::MallocSizeOf aMallocSizeOf)

From 480ca243ab6d4c2143b9ce065fe5af3481fddd02 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Wed, 13 Nov 2013 16:43:47 -0500
Subject: [PATCH 14/92] Bug 922094 - part 2 - make nsGlobalWindow report its
 proto/iface cache size, if appropriate; r=bz

---
 dom/base/nsGlobalWindow.cpp | 7 +++++++
 dom/base/nsGlobalWindow.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 588dd0472f0..86ba1ffa1be 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -210,6 +210,7 @@
 #include "mozilla/dom/WindowBinding.h"
 #include "nsITabChild.h"
 #include "nsIDOMMediaQueryList.h"
+#include "mozilla/dom/DOMJSClass.h"
 
 #ifdef MOZ_WEBSPEECH
 #include "mozilla/dom/SpeechSynthesis.h"
@@ -12658,6 +12659,12 @@ nsGlobalWindow::AddSizeOfIncludingThis(nsWindowSizes* aWindowSizes) const
     const_cast<nsTHashtable<nsPtrHashKey<nsDOMEventTargetHelper> >*>
       (&mEventTargetObjects)->EnumerateEntries(CollectSizeAndListenerCount,
                                                aWindowSizes);
+
+  JSObject* global = FastGetGlobalJSObject();
+  if (IsInnerWindow() && global) {
+    JS::Heap<JSObject*>* cache = GetProtoAndIfaceArray(global);
+    aWindowSizes->mProtoIfaceCacheSize += aWindowSizes->mMallocSizeOf(cache);
+  }
 }
 
 
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 39923deaec4..2924c80f586 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -342,7 +342,7 @@ public:
 
   // nsIScriptGlobalObject
   virtual nsIScriptContext *GetContext();
-  JSObject *FastGetGlobalJSObject()
+  JSObject *FastGetGlobalJSObject() const
   {
     return mJSObject;
   }

From 4c70cf2f1cdd020af8e73e5b506cecd0435dfca4 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 15 Nov 2013 10:15:53 -0500
Subject: [PATCH 15/92] Bug 939109 - remove stray debugging statement; r=ehsan

---
 ipc/ipdl/ipdl/parser.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ipc/ipdl/ipdl/parser.py b/ipc/ipdl/ipdl/parser.py
index 6004bb5ec7c..50230100e1c 100644
--- a/ipc/ipdl/ipdl/parser.py
+++ b/ipc/ipdl/ipdl/parser.py
@@ -219,7 +219,6 @@ def p_TranslationUnit(p):
         tu.namespaces = tu.protocol.namespaces
         tu.name = tu.protocol.name
     else:
-        print tu.filetype
         assert tu.filetype == 'header'
         # There's not really a canonical "thing" in headers.  So
         # somewhat arbitrarily use the namespace of the last

From 5aa221f4664f401cf8b8ac7b5398f3ddf09c6bef Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 19 Nov 2013 11:02:03 -0500
Subject: [PATCH 16/92] Bug 940153 - Fix python syntax error.
 r=BlameTheShiftKey

---
 dom/encoding/moz.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build
index 9968e87a159..8001bb33dbd 100644
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -18,7 +18,7 @@ SOURCES += [
     'FallbackEncoding.cpp',
 ]
 
-UNIFIED_SOURCES += {
+UNIFIED_SOURCES += [
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]

From e1591a1d394befb0fe0f3f9f8b066e3f4cd1002d Mon Sep 17 00:00:00 2001
From: "Nicholas D. Matsakis" <nmatsakis@mozilla.com>
Date: Tue, 19 Nov 2013 11:03:26 -0500
Subject: [PATCH 17/92] Bug 930974 - Check IsObject() and not just
 ObjectIsHandle() r=till

---
 js/src/builtin/TypedObject.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/src/builtin/TypedObject.js b/js/src/builtin/TypedObject.js
index b67a77ae2fd..b1297e1df53 100644
--- a/js/src/builtin/TypedObject.js
+++ b/js/src/builtin/TypedObject.js
@@ -493,7 +493,7 @@ function TypedArrayRedimension(newArrayType) {
 //
 // FIXME bug 929656 -- label algorithms with steps from the spec
 function HandleCreate(obj, ...path) {
-  if (!ObjectIsTypeObject(this))
+  if (!IsObject(this) || !ObjectIsTypeObject(this))
     ThrowError(JSMSG_INCOMPATIBLE_PROTO, "Type", "handle", "value");
 
   var handle = NewTypedHandle(this);
@@ -507,14 +507,14 @@ function HandleCreate(obj, ...path) {
 // Handle.move: user exposed!
 // FIXME bug 929656 -- label algorithms with steps from the spec
 function HandleMove(handle, obj, ...path) {
-  if (!ObjectIsTypedHandle(handle))
+  if (!IsObject(handle) || !ObjectIsTypedHandle(handle))
     ThrowError(JSMSG_INCOMPATIBLE_PROTO, "Handle", "set", typeof value);
 
   HandleMoveInternal(handle, obj, path);
 }
 
 function HandleMoveInternal(handle, obj, path) {
-  assert(ObjectIsTypedHandle(handle),
+  assert(IsObject(handle) && ObjectIsTypedHandle(handle),
          "HandleMoveInternal: not typed handle");
 
   if (!IsObject(obj) || !ObjectIsTypedDatum(obj))
@@ -567,10 +567,12 @@ function HandleTest(obj) {
 // Miscellaneous
 
 function ObjectIsTypedDatum(obj) {
+  assert(IsObject(obj), "ObjectIsTypedDatum invoked with non-object")
   return ObjectIsTypedObject(obj) || ObjectIsTypedHandle(obj);
 }
 
 function ObjectIsAttached(obj) {
+  assert(IsObject(obj), "ObjectIsAttached invoked with non-object")
   assert(ObjectIsTypedDatum(obj),
          "ObjectIsAttached() invoked on invalid obj");
   return DATUM_OWNER(obj) != null;

From 34c7d6502365d87f9a12d067a42dc00df5453eef Mon Sep 17 00:00:00 2001
From: "Nicholas D. Matsakis" <nmatsakis@mozilla.com>
Date: Fri, 1 Nov 2013 11:07:37 -0400
Subject: [PATCH 18/92] Bug 926401 - Zero-length arrays r=waldo

---
 js/src/builtin/TypedObject.js                   | 14 ++++++++------
 js/src/tests/ecma_6/TypedObject/arrayzerolen.js | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 js/src/tests/ecma_6/TypedObject/arrayzerolen.js

diff --git a/js/src/builtin/TypedObject.js b/js/src/builtin/TypedObject.js
index b1297e1df53..ca5704a3f05 100644
--- a/js/src/builtin/TypedObject.js
+++ b/js/src/builtin/TypedObject.js
@@ -136,7 +136,7 @@ TypedObjectPointer.prototype.moveToElem = function(index) {
   assert(TO_INT32(index) === index,
          "moveToElem invoked with non-integer index");
   assert(index >= 0 && index < REPR_LENGTH(this.typeRepr),
-         "moveToElem invoked with out-of-bounds index");
+         "moveToElem invoked with out-of-bounds index: " + index);
 
   var elementTypeObj = this.typeObj.elementType;
   var elementTypeRepr = TYPE_TYPE_REPR(elementTypeObj);
@@ -268,11 +268,13 @@ TypedObjectPointer.prototype.set = function(fromValue) {
       break;
 
     // Adapt each element.
-    var tempPtr = this.copy().moveToElem(0);
-    var size = REPR_SIZE(tempPtr.typeRepr);
-    for (var i = 0; i < length; i++) {
-      tempPtr.set(fromValue[i]);
-      tempPtr.offset += size;
+    if (length > 0) {
+      var tempPtr = this.copy().moveToElem(0);
+      var size = REPR_SIZE(tempPtr.typeRepr);
+      for (var i = 0; i < length; i++) {
+        tempPtr.set(fromValue[i]);
+        tempPtr.offset += size;
+      }
     }
     return;
 
diff --git a/js/src/tests/ecma_6/TypedObject/arrayzerolen.js b/js/src/tests/ecma_6/TypedObject/arrayzerolen.js
new file mode 100644
index 00000000000..d455e2ad6fb
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedObject/arrayzerolen.js
@@ -0,0 +1,17 @@
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject"))
+var BUGNUMBER = 926401;
+var summary = 'TypedObjects ArrayType implementation';
+
+// Test creation of zero-length array
+
+function runTest() {
+  var T = TypedObject;
+  var Color = new T.StructType({'r': T.uint8, 'g': T.uint8, 'b': T.uint8});
+  var Rainbow = new T.ArrayType(Color, 0);
+  var theOneISawWasJustBlack = new Rainbow([]);
+  if (typeof reportCompare === "function")
+    reportCompare(true, true);
+  print("Tests complete");
+}
+
+runTest();

From 56a3543abbf1cc3e8c51e0b65f1486a01f4b4edf Mon Sep 17 00:00:00 2001
From: "Nicholas D. Matsakis" <nmatsakis@mozilla.com>
Date: Sun, 22 Sep 2013 20:18:31 -0400
Subject: [PATCH 19/92] Bug 898359 - Implement reference types in typed objects
 r=sfink

---
 js/src/builtin/TestingFunctions.cpp           |  68 +-
 js/src/builtin/TypeRepresentation.cpp         | 268 +++++-
 js/src/builtin/TypeRepresentation.h           |  77 +-
 js/src/builtin/TypedObject.cpp                | 792 +++++++++++-------
 js/src/builtin/TypedObject.h                  | 107 ++-
 js/src/builtin/TypedObject.js                 |  42 +-
 js/src/builtin/TypedObjectConstants.h         |  30 +-
 js/src/jit/IonBuilder.cpp                     |   7 +
 .../ecma_6/TypedObject/handle_get_set.js      |  19 +
 .../tests/ecma_6/TypedObject/numerictypes.js  |   4 +-
 .../TypedObject/referencetypealiasing.js      |  33 +
 .../TypedObject/referencetypecoercions.js     |  70 ++
 .../TypedObject/referencetypemultiple.js      |  22 +
 .../ecma_6/TypedObject/referencetypetrace.js  |  88 ++
 .../ecma_6/TypedObject/referencetypeuninit.js |  30 +
 .../tests/ecma_6/TypedObject/simpleequiv.js   |  27 +-
 js/src/vm/CommonPropertyNames.h               |   1 +
 js/src/vm/SelfHosting.cpp                     |  13 +-
 18 files changed, 1306 insertions(+), 392 deletions(-)
 create mode 100644 js/src/tests/ecma_6/TypedObject/referencetypealiasing.js
 create mode 100644 js/src/tests/ecma_6/TypedObject/referencetypecoercions.js
 create mode 100644 js/src/tests/ecma_6/TypedObject/referencetypemultiple.js
 create mode 100644 js/src/tests/ecma_6/TypedObject/referencetypetrace.js
 create mode 100644 js/src/tests/ecma_6/TypedObject/referencetypeuninit.js

diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index 720e623ae57..149392002de 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -687,16 +687,9 @@ CountHeap(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    jsval v;
-    int32_t traceKind;
-    JSString *str;
-    JSCountHeapTracer countTracer;
-    JSCountHeapNode *node;
-    size_t counter;
-
     RootedValue startValue(cx, UndefinedValue());
     if (args.length() > 0) {
-        v = args[0];
+        jsval v = args[0];
         if (JSVAL_IS_TRACEABLE(v)) {
             startValue = v;
         } else if (!JSVAL_IS_NULL(v)) {
@@ -707,28 +700,45 @@ CountHeap(JSContext *cx, unsigned argc, jsval *vp)
         }
     }
 
-    traceKind = -1;
+    RootedValue traceValue(cx);
+    int32_t traceKind = -1;
+    void *traceThing = NULL;
     if (args.length() > 1) {
-        str = ToString(cx, args[0]);
+        JSString *str = ToString(cx, args[1]);
         if (!str)
             return false;
         JSFlatString *flatStr = JS_FlattenString(cx, str);
         if (!flatStr)
             return false;
-        for (size_t i = 0; ;) {
-            if (JS_FlatStringEqualsAscii(flatStr, traceKindNames[i].name)) {
-                traceKind = traceKindNames[i].kind;
-                break;
-            }
-            if (++i == ArrayLength(traceKindNames)) {
-                JSAutoByteString bytes(cx, str);
-                if (!!bytes)
-                    JS_ReportError(cx, "trace kind name '%s' is unknown", bytes.ptr());
+        if (JS_FlatStringEqualsAscii(flatStr, "specific")) {
+            if (args.length() < 3) {
+                JS_ReportError(cx, "tracing of specific value requested "
+                               "but no value provided");
                 return false;
             }
+            traceValue = args[2];
+            if (!JSVAL_IS_TRACEABLE(traceValue)){
+                JS_ReportError(cx, "cannot trace this kind of value");
+                return false;
+            }
+            traceThing = JSVAL_TO_TRACEABLE(traceValue);
+        } else {
+            for (size_t i = 0; ;) {
+                if (JS_FlatStringEqualsAscii(flatStr, traceKindNames[i].name)) {
+                    traceKind = traceKindNames[i].kind;
+                    break;
+                }
+                if (++i == ArrayLength(traceKindNames)) {
+                    JSAutoByteString bytes(cx, str);
+                    if (!!bytes)
+                        JS_ReportError(cx, "trace kind name '%s' is unknown", bytes.ptr());
+                    return false;
+                }
+            }
         }
     }
 
+    JSCountHeapTracer countTracer;
     JS_TracerInit(&countTracer.base, JS_GetRuntime(cx), CountHeapNotify);
     if (!countTracer.visited.init()) {
         JS_ReportOutOfMemory(cx);
@@ -744,10 +754,18 @@ CountHeap(JSContext *cx, unsigned argc, jsval *vp)
         JS_CallValueTracer(&countTracer.base, startValue.address(), "root");
     }
 
-    counter = 0;
+    JSCountHeapNode *node;
+    size_t counter = 0;
     while ((node = countTracer.traceList) != nullptr) {
-        if (traceKind == -1 || node->kind == traceKind)
-            counter++;
+        if (traceThing == nullptr) {
+            // We are looking for all nodes with a specific kind
+            if (traceKind == -1 || node->kind == traceKind)
+                counter++;
+        } else {
+            // We are looking for some specific thing
+            if (node->thing == traceThing)
+                counter++;
+        }
         countTracer.traceList = node->next;
         node->next = countTracer.recycleList;
         countTracer.recycleList = node;
@@ -1359,11 +1377,13 @@ static const JSFunctionSpecWithHelp TestingFunctions[] = {
 "  was built with."),
 
     JS_FN_HELP("countHeap", CountHeap, 0, 0,
-"countHeap([start[, kind]])",
+"countHeap([start[, kind[, thing]]])",
 "  Count the number of live GC things in the heap or things reachable from\n"
 "  start when it is given and is not null. kind is either 'all' (default) to\n"
 "  count all things or one of 'object', 'double', 'string', 'function'\n"
-"  to count only things of that kind."),
+"  to count only things of that kind. If kind is the string 'specific',\n"
+"  then you can provide an extra argument with some specific traceable\n"
+"  thing to count.\n"),
 
 #ifdef DEBUG
     JS_FN_HELP("oomAfterAllocations", OOMAfterAllocations, 1, 0,
diff --git a/js/src/builtin/TypeRepresentation.cpp b/js/src/builtin/TypeRepresentation.cpp
index cfac977b8b9..26db68d5910 100644
--- a/js/src/builtin/TypeRepresentation.cpp
+++ b/js/src/builtin/TypeRepresentation.cpp
@@ -59,6 +59,9 @@ TypeRepresentationHasher::match(TypeRepresentation *key1,
       case TypeRepresentation::Scalar:
         return matchScalars(key1->asScalar(), key2->asScalar());
 
+      case TypeRepresentation::Reference:
+        return matchReferences(key1->asReference(), key2->asReference());
+
       case TypeRepresentation::Struct:
         return matchStructs(key1->asStruct(), key2->asStruct());
 
@@ -76,6 +79,13 @@ TypeRepresentationHasher::matchScalars(ScalarTypeRepresentation *key1,
     return key1->type() == key2->type();
 }
 
+bool
+TypeRepresentationHasher::matchReferences(ReferenceTypeRepresentation *key1,
+                                          ReferenceTypeRepresentation *key2)
+{
+    return key1->type() == key2->type();
+}
+
 bool
 TypeRepresentationHasher::matchStructs(StructTypeRepresentation *key1,
                                        StructTypeRepresentation *key2)
@@ -109,6 +119,9 @@ TypeRepresentationHasher::hash(TypeRepresentation *key) {
       case TypeRepresentation::Scalar:
         return hashScalar(key->asScalar());
 
+      case TypeRepresentation::Reference:
+        return hashReference(key->asReference());
+
       case TypeRepresentation::Struct:
         return hashStruct(key->asStruct());
 
@@ -125,6 +138,12 @@ TypeRepresentationHasher::hashScalar(ScalarTypeRepresentation *key)
     return HashGeneric(key->kind(), key->type());
 }
 
+HashNumber
+TypeRepresentationHasher::hashReference(ReferenceTypeRepresentation *key)
+{
+    return HashGeneric(key->kind(), key->type());
+}
+
 HashNumber
 TypeRepresentationHasher::hashStruct(StructTypeRepresentation *key)
 {
@@ -145,14 +164,16 @@ TypeRepresentationHasher::hashArray(ArrayTypeRepresentation *key)
 ///////////////////////////////////////////////////////////////////////////
 // Constructors
 
-TypeRepresentation::TypeRepresentation(Kind kind, size_t size, size_t align)
+TypeRepresentation::TypeRepresentation(Kind kind, size_t size,
+                                       size_t align, bool opaque)
   : size_(size),
     alignment_(align),
-    kind_(kind)
+    kind_(kind),
+    opaque_(opaque)
 {}
 
 ScalarTypeRepresentation::ScalarTypeRepresentation(Type type)
-  : TypeRepresentation(Scalar, 0, 1),
+  : TypeRepresentation(Scalar, 0, 1, false),
     type_(type)
 {
     switch (type) {
@@ -179,9 +200,28 @@ ScalarTypeRepresentation::ScalarTypeRepresentation(Type type)
     }
 }
 
+ReferenceTypeRepresentation::ReferenceTypeRepresentation(Type type)
+  : TypeRepresentation(Reference, 0, 1, true),
+    type_(type)
+{
+    switch (type) {
+      case TYPE_ANY:
+        size_ = sizeof(js::HeapValue);
+        alignment_ = MOZ_ALIGNOF(js::HeapValue);
+        break;
+
+      case TYPE_OBJECT:
+      case TYPE_STRING:
+        size_ = sizeof(js::HeapPtrObject);
+        alignment_ = MOZ_ALIGNOF(js::HeapPtrObject);
+        break;
+    }
+}
+
 ArrayTypeRepresentation::ArrayTypeRepresentation(TypeRepresentation *element,
                                                  size_t length)
-  : TypeRepresentation(Array, element->size() * length, element->alignment()),
+  : TypeRepresentation(Array, element->size() * length,
+                       element->alignment(), element->opaque()),
     element_(element),
     length_(length)
 {
@@ -203,9 +243,10 @@ StructField::StructField(size_t index,
 {}
 
 StructTypeRepresentation::StructTypeRepresentation()
-  : TypeRepresentation(Struct, 0, 1),
+  : TypeRepresentation(Struct, 0, 1, false),
     fieldCount_(0) // see ::init() below!
 {
+    // note: size_, alignment_, and opaque_ are computed in ::init() below
 }
 
 bool
@@ -222,9 +263,16 @@ StructTypeRepresentation::init(JSContext *cx,
     // consistency across build environments.
     uint32_t totalSize = 0;
 
+    // These will be adjusted in the loop below:
+    alignment_ = 1;
+    opaque_ = false;
+
     for (size_t i = 0; i < ids.length(); i++) {
         TypeRepresentation *fieldTypeRepr = fromOwnerObject(*typeReprOwners[i]);
 
+        if (fieldTypeRepr->opaque())
+            opaque_ = true;
+
         uint32_t alignedSize = alignTo(totalSize, fieldTypeRepr->alignment());
         if (alignedSize < totalSize) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
@@ -305,6 +353,11 @@ TypeRepresentation::addToTableOrFree(JSContext *cx,
                                       Int32Value(asScalar()->type()));
         break;
 
+      case Reference:
+        ownerObject->initReservedSlot(JS_TYPEREPR_SLOT_TYPE,
+                                      Int32Value(asReference()->type()));
+        break;
+
       case Struct:
         break;
     }
@@ -336,6 +389,29 @@ ScalarTypeRepresentation::Create(JSContext *cx,
     return ptr->addToTableOrFree(cx, p);
 }
 
+/*static*/
+JSObject *
+ReferenceTypeRepresentation::Create(JSContext *cx,
+                                    ReferenceTypeRepresentation::Type type)
+{
+    JSCompartment *comp = cx->compartment();
+
+    ReferenceTypeRepresentation sample(type);
+    TypeRepresentationHash::AddPtr p = comp->typeReprs.lookupForAdd(&sample);
+    if (p)
+        return (*p)->ownerObject();
+
+    // Note: cannot use cx->new_ because constructor is private.
+    ReferenceTypeRepresentation *ptr =
+        (ReferenceTypeRepresentation *) cx->malloc_(
+            sizeof(ReferenceTypeRepresentation));
+    if (!ptr)
+        return nullptr;
+    new(ptr) ReferenceTypeRepresentation(type);
+
+    return ptr->addToTableOrFree(cx, p);
+}
+
 /*static*/
 JSObject *
 ArrayTypeRepresentation::Create(JSContext *cx,
@@ -422,6 +498,7 @@ TypeRepresentation::traceFields(JSTracer *trace)
 
     switch (kind()) {
       case Scalar:
+      case Reference:
         break;
 
       case Struct:
@@ -472,6 +549,9 @@ TypeRepresentation::appendString(JSContext *cx, StringBuffer &contents)
       case Scalar:
         return asScalar()->appendStringScalar(cx, contents);
 
+      case Reference:
+        return asReference()->appendStringReference(cx, contents);
+
       case Array:
         return asArray()->appendStringArray(cx, contents);
 
@@ -505,6 +585,28 @@ ScalarTypeRepresentation::appendStringScalar(JSContext *cx, StringBuffer &conten
     MOZ_ASSUME_UNREACHABLE("Invalid type");
 }
 
+/*static*/ const char *
+ReferenceTypeRepresentation::typeName(Type type)
+{
+    switch (type) {
+#define NUMERIC_TYPE_TO_STRING(constant_, type_, name_) \
+        case constant_: return #name_;
+        JS_FOR_EACH_REFERENCE_TYPE_REPR(NUMERIC_TYPE_TO_STRING)
+    }
+    MOZ_ASSUME_UNREACHABLE("Invalid type");
+}
+
+bool
+ReferenceTypeRepresentation::appendStringReference(JSContext *cx, StringBuffer &contents)
+{
+    switch (type()) {
+#define NUMERIC_TYPE_APPEND_STRING(constant_, type_, name_)                   \
+        case constant_: return contents.append(#name_);
+        JS_FOR_EACH_REFERENCE_TYPE_REPR(NUMERIC_TYPE_APPEND_STRING)
+    }
+    MOZ_ASSUME_UNREACHABLE("Invalid type");
+}
+
 bool
 ArrayTypeRepresentation::appendStringArray(JSContext *cx, StringBuffer &contents)
 {
@@ -558,6 +660,162 @@ StructTypeRepresentation::appendStringStruct(JSContext *cx, StringBuffer &conten
     return true;
 }
 
+///////////////////////////////////////////////////////////////////////////
+// Walking memory
+
+template<typename V>
+static void
+visitReferences(TypeRepresentation *repr, uint8_t *mem, V& visitor)
+{
+    if (repr->transparent())
+        return;
+
+    switch (repr->kind()) {
+      case TypeRepresentation::Scalar:
+        return;
+
+      case TypeRepresentation::Reference:
+        visitor.visitReference(repr->asReference(), mem);
+        return;
+
+      case TypeRepresentation::Array:
+      {
+        ArrayTypeRepresentation *arrayRepr = repr->asArray();
+        TypeRepresentation *elementRepr = arrayRepr->element();
+        for (size_t i = 0; i < arrayRepr->length(); i++) {
+            visitReferences(elementRepr, mem, visitor);
+            mem += elementRepr->size();
+        }
+        return;
+      }
+
+      case TypeRepresentation::Struct:
+      {
+        StructTypeRepresentation *structRepr = repr->asStruct();
+        for (size_t i = 0; i < structRepr->fieldCount(); i++) {
+            const StructField &f = structRepr->field(i);
+            visitReferences(f.typeRepr, mem + f.offset, visitor);
+        }
+        return;
+      }
+    }
+
+    MOZ_ASSUME_UNREACHABLE("Invalid type repr kind");
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Initializing instances
+
+namespace js {
+class MemoryInitVisitor {
+    const JSRuntime *rt_;
+
+  public:
+    MemoryInitVisitor(const JSRuntime *rt)
+      : rt_(rt)
+    {}
+
+    void visitReference(ReferenceTypeRepresentation *repr, uint8_t *mem);
+};
+} // namespace js
+
+void
+js::MemoryInitVisitor::visitReference(ReferenceTypeRepresentation *repr, uint8_t *mem)
+{
+    switch (repr->type()) {
+      case ReferenceTypeRepresentation::TYPE_ANY:
+      {
+        js::HeapValue *heapValue = reinterpret_cast<js::HeapValue *>(mem);
+        heapValue->init(UndefinedValue());
+        return;
+      }
+
+      case ReferenceTypeRepresentation::TYPE_OBJECT:
+      {
+        js::HeapPtrObject *objectPtr =
+            reinterpret_cast<js::HeapPtrObject *>(mem);
+        objectPtr->init(nullptr);
+        return;
+      }
+
+      case ReferenceTypeRepresentation::TYPE_STRING:
+      {
+        js::HeapPtrString *stringPtr =
+            reinterpret_cast<js::HeapPtrString *>(mem);
+        stringPtr->init(rt_->emptyString);
+        return;
+      }
+    }
+
+    MOZ_ASSUME_UNREACHABLE("Invalid kind");
+}
+
+void
+TypeRepresentation::initInstance(const JSRuntime *rt, uint8_t *mem)
+{
+    MemoryInitVisitor visitor(rt);
+    memset(mem, 0, size());
+    if (opaque())
+        visitReferences(this, mem, visitor);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Tracing instances
+
+namespace js {
+class MemoryTracingVisitor {
+    JSTracer *trace_;
+
+  public:
+
+    MemoryTracingVisitor(JSTracer *trace)
+      : trace_(trace)
+    {}
+
+    void visitReference(ReferenceTypeRepresentation *repr, uint8_t *mem);
+};
+} // namespace js
+
+void
+js::MemoryTracingVisitor::visitReference(ReferenceTypeRepresentation *repr, uint8_t *mem)
+{
+    switch (repr->type()) {
+      case ReferenceTypeRepresentation::TYPE_ANY:
+      {
+        js::HeapValue *heapValue = reinterpret_cast<js::HeapValue *>(mem);
+        gc::MarkValue(trace_, heapValue, "reference-val");
+        return;
+      }
+
+      case ReferenceTypeRepresentation::TYPE_OBJECT:
+      {
+        js::HeapPtrObject *objectPtr =
+            reinterpret_cast<js::HeapPtrObject *>(mem);
+        if (*objectPtr)
+            gc::MarkObject(trace_, objectPtr, "reference-obj");
+        return;
+      }
+
+      case ReferenceTypeRepresentation::TYPE_STRING:
+      {
+        js::HeapPtrString *stringPtr =
+            reinterpret_cast<js::HeapPtrString *>(mem);
+        if (*stringPtr)
+            gc::MarkString(trace_, stringPtr, "reference-str");
+        return;
+      }
+    }
+
+    MOZ_ASSUME_UNREACHABLE("Invalid kind");
+}
+
+void
+TypeRepresentation::traceInstance(JSTracer *trace, uint8_t *mem)
+{
+    MemoryTracingVisitor visitor(trace);
+    visitReferences(this, mem, visitor);
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // Misc
 
diff --git a/js/src/builtin/TypeRepresentation.h b/js/src/builtin/TypeRepresentation.h
index 865591b1586..4dce2f90265 100644
--- a/js/src/builtin/TypeRepresentation.h
+++ b/js/src/builtin/TypeRepresentation.h
@@ -39,6 +39,14 @@
   object, and the finalizer of the owner object removes the pointer
   from the table and then frees the pointer.
 
+  # Opacity
+
+  A type representation is considered "opaque" if it contains
+  references (strings, objects, any). In those cases we have to be
+  more limited with respect to aliasing etc to preserve portability
+  across engines (for example, we don't want to expose sizeof(Any))
+  and memory safety.
+
   # Future plans:
 
   The owner object will eventually be exposed to self-hosted script
@@ -59,6 +67,7 @@ namespace js {
 
 class TypeRepresentation;
 class ScalarTypeRepresentation;
+class ReferenceTypeRepresentation;
 class ArrayTypeRepresentation;
 class StructTypeRepresentation;
 
@@ -73,11 +82,14 @@ struct TypeRepresentationHasher
 
   private:
     static HashNumber hashScalar(ScalarTypeRepresentation *key);
+    static HashNumber hashReference(ReferenceTypeRepresentation *key);
     static HashNumber hashStruct(StructTypeRepresentation *key);
     static HashNumber hashArray(ArrayTypeRepresentation *key);
 
     static bool matchScalars(ScalarTypeRepresentation *key1,
                              ScalarTypeRepresentation *key2);
+    static bool matchReferences(ReferenceTypeRepresentation *key1,
+                                ReferenceTypeRepresentation *key2);
     static bool matchStructs(StructTypeRepresentation *key1,
                              StructTypeRepresentation *key2);
     static bool matchArrays(ArrayTypeRepresentation *key1,
@@ -92,16 +104,18 @@ class TypeRepresentation {
   public:
     enum Kind {
         Scalar = JS_TYPEREPR_SCALAR_KIND,
+        Reference = JS_TYPEREPR_REFERENCE_KIND,
         Struct = JS_TYPEREPR_STRUCT_KIND,
         Array = JS_TYPEREPR_ARRAY_KIND
     };
 
   protected:
-    TypeRepresentation(Kind kind, size_t size, size_t align);
+    TypeRepresentation(Kind kind, size_t size, size_t align, bool opaque);
 
     size_t size_;
     size_t alignment_;
     Kind kind_;
+    bool opaque_;
 
     JSObject *addToTableOrFree(JSContext *cx, TypeRepresentationHash::AddPtr &p);
 
@@ -117,12 +131,21 @@ class TypeRepresentation {
     size_t size() const { return size_; }
     size_t alignment() const { return alignment_; }
     Kind kind() const { return kind_; }
+    bool opaque() const { return opaque_; }
+    bool transparent() const { return !opaque_; }
     JSObject *ownerObject() const { return ownerObject_.get(); }
 
     // Appends a stringified form of this type representation onto
     // buffer, for use in error messages and the like.
     bool appendString(JSContext *cx, StringBuffer &buffer);
 
+    // Initializes memory that contains an instance of this type
+    // with appropriate default values (typically 0).
+    void initInstance(const JSRuntime *rt, uint8_t *mem);
+
+    // Traces memory that contains an instance of this type.
+    void traceInstance(JSTracer *trace, uint8_t *mem);
+
     static bool isOwnerObject(JSObject &obj);
     static TypeRepresentation *fromOwnerObject(JSObject &obj);
 
@@ -135,6 +158,15 @@ class TypeRepresentation {
         return (ScalarTypeRepresentation*) this;
     }
 
+    bool isReference() const {
+        return kind() == Reference;
+    }
+
+    ReferenceTypeRepresentation *asReference() {
+        JS_ASSERT(isReference());
+        return (ReferenceTypeRepresentation*) this;
+    }
+
     bool isArray() const {
         return kind() == Array;
     }
@@ -193,7 +225,9 @@ class ScalarTypeRepresentation : public TypeRepresentation {
         return type_;
     }
 
-    bool convertValue(JSContext *cx, HandleValue value, MutableHandleValue vp);
+    const char *typeName() const {
+        return typeName(type());
+    }
 
     static const char *typeName(Type type);
     static JSObject *Create(JSContext *cx, Type type);
@@ -217,6 +251,45 @@ class ScalarTypeRepresentation : public TypeRepresentation {
     JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(macro_)                           \
     macro_(ScalarTypeRepresentation::TYPE_UINT8_CLAMPED, uint8_t, uint8Clamped)
 
+class ReferenceTypeRepresentation : public TypeRepresentation {
+  public:
+    // Must match order of JS_FOR_EACH_REFERENCE_TYPE_REPR below
+    enum Type {
+        TYPE_ANY = JS_REFERENCETYPEREPR_ANY,
+        TYPE_OBJECT = JS_REFERENCETYPEREPR_OBJECT,
+        TYPE_STRING = JS_REFERENCETYPEREPR_STRING,
+    };
+    static const int32_t TYPE_MAX = TYPE_STRING + 1;
+
+  private:
+    // so TypeRepresentation can call appendStringScalar() etc
+    friend class TypeRepresentation;
+
+    Type type_;
+
+    explicit ReferenceTypeRepresentation(Type type);
+
+    // See TypeRepresentation::appendString()
+    bool appendStringReference(JSContext *cx, StringBuffer &buffer);
+
+  public:
+    Type type() const {
+        return type_;
+    }
+
+    const char *typeName() const {
+        return typeName(type());
+    }
+
+    static const char *typeName(Type type);
+    static JSObject *Create(JSContext *cx, Type type);
+};
+
+#define JS_FOR_EACH_REFERENCE_TYPE_REPR(macro_)                             \
+    macro_(ReferenceTypeRepresentation::TYPE_ANY,    HeapValue, Any)        \
+    macro_(ReferenceTypeRepresentation::TYPE_OBJECT, HeapPtrObject, Object) \
+    macro_(ReferenceTypeRepresentation::TYPE_STRING, HeapPtrString, string)
+
 class ArrayTypeRepresentation : public TypeRepresentation {
   private:
     // so TypeRepresentation can call appendStringArray() etc
diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp
index 8667f682751..63b6aecf7d6 100644
--- a/js/src/builtin/TypedObject.cpp
+++ b/js/src/builtin/TypedObject.cpp
@@ -100,10 +100,21 @@ ToObjectIfObject(HandleValue value)
 }
 
 static inline bool
-IsNumericTypeObject(JSObject &type)
+IsScalarTypeObject(JSObject &type)
 {
-    return &NumericTypeClasses[0] <= type.getClass() &&
-           type.getClass() < &NumericTypeClasses[ScalarTypeRepresentation::TYPE_MAX];
+    return type.hasClass(&ScalarType::class_);
+}
+
+static inline bool
+IsReferenceTypeObject(JSObject &type)
+{
+    return type.hasClass(&ReferenceType::class_);
+}
+
+static inline bool
+IsSimpleTypeObject(JSObject &type)
+{
+    return IsScalarTypeObject(type) || IsReferenceTypeObject(type);
 }
 
 static inline bool
@@ -118,16 +129,11 @@ IsStructTypeObject(JSObject &type)
     return type.hasClass(&StructType::class_);
 }
 
-static inline bool
-IsComplexTypeObject(JSObject &type)
-{
-    return IsArrayTypeObject(type) || IsStructTypeObject(type);
-}
-
 static inline bool
 IsTypeObject(JSObject &type)
 {
-    return IsNumericTypeObject(type) || IsComplexTypeObject(type);
+    return IsScalarTypeObject(type) || IsArrayTypeObject(type) ||
+           IsStructTypeObject(type) || IsReferenceTypeObject(type);
 }
 
 static inline bool
@@ -173,6 +179,31 @@ GetType(JSObject &datum)
     return &datum.getReservedSlot(JS_DATUM_SLOT_TYPE_OBJ).toObject();
 }
 
+static bool
+TypeObjectToSource(JSContext *cx, unsigned int argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    RootedObject thisObj(cx, ToObjectIfObject(args.thisv()));
+    if (!thisObj || !IsTypeObject(*thisObj)) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage,
+                             nullptr, JSMSG_TYPEDOBJECT_HANDLE_BAD_ARGS,
+                             "this", "type object");
+        return false;
+    }
+
+    StringBuffer contents(cx);
+    if (!typeRepresentation(*thisObj)->appendString(cx, contents))
+        return false;
+
+    RootedString result(cx, contents.finishString());
+    if (!result)
+        return false;
+
+    args.rval().setString(result);
+    return true;
+}
+
 /*
  * Overwrites the contents of `datum` at offset `offset` with `val`
  * converted to the type `typeObj`. This is done by delegating to
@@ -291,35 +322,40 @@ IsTypedDatumOfKind(JSObject &obj, TypeRepresentation::Kind kind)
     return repr->kind() == kind;
 }
 
-#define BINARYDATA_NUMERIC_CLASSES(constant_, type_, name_)                   \
-{                                                                             \
-    #name_,                                                                   \
-    JSCLASS_HAS_RESERVED_SLOTS(JS_TYPEOBJ_SCALAR_SLOTS),                      \
-    JS_PropertyStub,       /* addProperty */                                  \
-    JS_DeletePropertyStub, /* delProperty */                                  \
-    JS_PropertyStub,       /* getProperty */                                  \
-    JS_StrictPropertyStub, /* setProperty */                                  \
-    JS_EnumerateStub,                                                         \
-    JS_ResolveStub,                                                           \
-    JS_ConvertStub,                                                           \
-    nullptr,                                                                  \
-    nullptr,                                                                  \
-    NumericType<constant_, type_>::call,                                      \
-    nullptr,                                                                  \
-    nullptr,                                                                  \
-    nullptr                                                                   \
-},
+/***************************************************************************
+ * Scalar type objects
+ *
+ * Scalar type objects like `uint8`, `uint16`, are all instances of
+ * the ScalarType class. Like all type objects, they have a reserved
+ * slot pointing to a TypeRepresentation object, which is used to
+ * distinguish which scalar type object this actually is.
+ */
 
-static const JSFunctionSpec NumericTypeObjectMethods[] = {
+const Class js::ScalarType::class_ = {
+    "Scalar",
+    JSCLASS_HAS_RESERVED_SLOTS(JS_TYPEOBJ_SCALAR_SLOTS),
+    JS_PropertyStub,       /* addProperty */
+    JS_DeletePropertyStub, /* delProperty */
+    JS_PropertyStub,       /* getProperty */
+    JS_StrictPropertyStub, /* setProperty */
+    JS_EnumerateStub,
+    JS_ResolveStub,
+    JS_ConvertStub,
+    nullptr,
+    nullptr,
+    ScalarType::call,
+    nullptr,
+    nullptr,
+    nullptr
+};
+
+const JSFunctionSpec js::ScalarType::typeObjectMethods[] = {
+    JS_FN("toSource", TypeObjectToSource, 0, 0),
     {"handle", {nullptr, nullptr}, 2, 0, "HandleCreate"},
     {"equivalent", {nullptr, nullptr}, 1, 0, "TypeObjectEquivalent"},
     JS_FS_END
 };
 
-const Class js::NumericTypeClasses[ScalarTypeRepresentation::TYPE_MAX] = {
-    JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_NUMERIC_CLASSES)
-};
-
 template <typename T>
 static T ConvertScalar(double d)
 {
@@ -334,22 +370,8 @@ static T ConvertScalar(double d)
     }
 }
 
-template<ScalarTypeRepresentation::Type N>
-static bool
-NumericTypeToString(JSContext *cx, unsigned int argc, Value *vp)
-{
-    static_assert(N < ScalarTypeRepresentation::TYPE_MAX, "bad numeric type");
-    CallArgs args = CallArgsFromVp(argc, vp);
-    JSString *s = JS_NewStringCopyZ(cx, ScalarTypeRepresentation::typeName(N));
-    if (!s)
-        return false;
-    args.rval().setString(s);
-    return true;
-}
-
-template <ScalarTypeRepresentation::Type type, typename T>
 bool
-NumericType<type, T>::call(JSContext *cx, unsigned argc, Value *vp)
+ScalarType::call(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() < 1) {
@@ -358,6 +380,9 @@ NumericType<type, T>::call(JSContext *cx, unsigned argc, Value *vp)
         return false;
     }
 
+    ScalarTypeRepresentation *typeRepr = typeRepresentation(args.callee())->asScalar();
+    ScalarTypeRepresentation::Type type = typeRepr->type();
+
     double number;
     if (!ToNumber(cx, args[0], &number))
         return false;
@@ -365,11 +390,103 @@ NumericType<type, T>::call(JSContext *cx, unsigned argc, Value *vp)
     if (type == ScalarTypeRepresentation::TYPE_UINT8_CLAMPED)
         number = ClampDoubleToUint8(number);
 
-    T converted = ConvertScalar<T>(number);
-    args.rval().setNumber((double) converted);
+    switch (type) {
+#define SCALARTYPE_CALL(constant_, type_, name_)                             \
+      case constant_: {                                                       \
+          type_ converted = ConvertScalar<type_>(number);                     \
+          args.rval().setNumber((double) converted);                          \
+          return true;                                                        \
+      }
+
+        JS_FOR_EACH_SCALAR_TYPE_REPR(SCALARTYPE_CALL)
+#undef SCALARTYPE_CALL
+
+    }
     return true;
 }
 
+/***************************************************************************
+ * Reference type objects
+ *
+ * Reference type objects like `Any` or `Object` basically work the
+ * same way that the scalar type objects do. There is one class with
+ * many instances, and each instance has a reserved slot with a
+ * TypeRepresentation object, which is used to distinguish which
+ * reference type object this actually is.
+ */
+
+const Class js::ReferenceType::class_ = {
+    "Reference",
+    JSCLASS_HAS_RESERVED_SLOTS(JS_TYPEOBJ_REFERENCE_SLOTS),
+    JS_PropertyStub,       /* addProperty */
+    JS_DeletePropertyStub, /* delProperty */
+    JS_PropertyStub,       /* getProperty */
+    JS_StrictPropertyStub, /* setProperty */
+    JS_EnumerateStub,
+    JS_ResolveStub,
+    JS_ConvertStub,
+    nullptr,
+    nullptr,
+    ReferenceType::call,
+    nullptr,
+    nullptr,
+    nullptr
+};
+
+const JSFunctionSpec js::ReferenceType::typeObjectMethods[] = {
+    JS_FN("toSource", TypeObjectToSource, 0, 0),
+    {"handle", {nullptr, nullptr}, 2, 0, "HandleCreate"},
+    {"equivalent", {nullptr, nullptr}, 1, 0, "TypeObjectEquivalent"},
+    JS_FS_END
+};
+
+bool
+js::ReferenceType::call(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    JS_ASSERT(IsReferenceTypeObject(args.callee()));
+    ReferenceTypeRepresentation *typeRepr =
+        typeRepresentation(args.callee())->asReference();
+
+    if (args.length() < 1) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                             JSMSG_MORE_ARGS_NEEDED,
+                             typeRepr->typeName(), "0", "s");
+        return false;
+    }
+
+    switch (typeRepr->type()) {
+      case ReferenceTypeRepresentation::TYPE_ANY:
+        args.rval().set(args[0]);
+        return true;
+
+      case ReferenceTypeRepresentation::TYPE_OBJECT:
+      {
+        RootedObject obj(cx, ToObject(cx, args[0]));
+        if (!obj)
+            return false;
+        args.rval().setObject(*obj);
+        return true;
+      }
+
+      case ReferenceTypeRepresentation::TYPE_STRING:
+      {
+        RootedString obj(cx, ToString<CanGC>(cx, args[0]));
+        if (!obj)
+            return false;
+        args.rval().setString(&*obj);
+        return true;
+      }
+    }
+
+    MOZ_ASSUME_UNREACHABLE("Unhandled Reference type");
+}
+
+/***************************************************************************
+ * ArrayType class
+ */
+
 /*
  * For code like:
  *
@@ -433,65 +550,6 @@ CreateComplexTypeInstancePrototype(JSContext *cx,
                                    &typeObjectCtor->global());
 }
 
-template<typename T>
-static JSObject *
-CreateMetaTypeObject(JSContext *cx,
-                     Handle<GlobalObject*> global)
-{
-    RootedAtom className(cx, Atomize(cx, T::class_.name,
-                                     strlen(T::class_.name)));
-    if (!className)
-        return nullptr;
-
-    RootedObject funcProto(cx, global->getOrCreateFunctionPrototype(cx));
-    if (!funcProto)
-        return nullptr;
-
-    // Create ctor.prototype, which inherits from Function.prototype
-
-    RootedObject proto(
-        cx, NewObjectWithGivenProto(cx, &JSObject::class_, funcProto,
-                                    global, SingletonObject));
-    if (!proto)
-        return nullptr;
-
-    // Create ctor.prototype.prototype, which inherits from Object.__proto__
-
-    RootedObject objProto(cx, global->getOrCreateObjectPrototype(cx));
-    if (!objProto)
-        return nullptr;
-    RootedObject protoProto(
-        cx, NewObjectWithGivenProto(cx, &JSObject::class_, objProto,
-                                    global, SingletonObject));
-    if (!proto)
-        return nullptr;
-
-    RootedValue protoProtoValue(cx, ObjectValue(*protoProto));
-    if (!JSObject::defineProperty(cx, proto, cx->names().prototype,
-                                  protoProtoValue,
-                                  nullptr, nullptr,
-                                  JSPROP_READONLY | JSPROP_PERMANENT))
-        return nullptr;
-
-    // Create ctor itself
-
-    RootedFunction ctor(
-        cx, global->createConstructor(cx, T::construct, className, 2));
-    if (!ctor ||
-        !LinkConstructorAndPrototype(cx, ctor, proto) ||
-        !DefinePropertiesAndBrand(cx, proto,
-                                  T::typeObjectProperties,
-                                  T::typeObjectMethods) ||
-        !DefinePropertiesAndBrand(cx, protoProto,
-                                  T::typedObjectProperties,
-                                  T::typedObjectMethods))
-    {
-        return nullptr;
-    }
-
-    return ctor;
-}
-
 const Class ArrayType::class_ = {
     "ArrayType",
     JSCLASS_HAS_RESERVED_SLOTS(JS_TYPEOBJ_ARRAY_SLOTS),
@@ -517,7 +575,7 @@ const JSPropertySpec ArrayType::typeObjectProperties[] = {
 const JSFunctionSpec ArrayType::typeObjectMethods[] = {
     {"handle", {nullptr, nullptr}, 2, 0, "HandleCreate"},
     JS_FN("repeat", ArrayType::repeat, 1, 0),
-    JS_FN("toSource", ArrayType::toSource, 0, 0),
+    JS_FN("toSource", TypeObjectToSource, 0, 0),
     {"equivalent", {nullptr, nullptr}, 1, 0, "TypeObjectEquivalent"},
     JS_FS_END
 };
@@ -593,32 +651,6 @@ ArrayType::repeat(JSContext *cx, unsigned int argc, Value *vp)
     return true;
 }
 
-bool
-ArrayType::toSource(JSContext *cx, unsigned int argc, Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    RootedObject thisObj(cx, ToObjectIfObject(args.thisv()));
-    if (!thisObj || !IsArrayTypeObject(*thisObj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage,
-                             nullptr, JSMSG_INCOMPATIBLE_PROTO,
-                             "ArrayType", "toSource",
-                             InformalValueTypeName(args.thisv()));
-        return false;
-    }
-
-    StringBuffer contents(cx);
-    if (!typeRepresentation(*thisObj)->appendString(cx, contents))
-        return false;
-
-    RootedString result(cx, contents.finishString());
-    if (!result)
-        return false;
-
-    args.rval().setString(result);
-    return true;
-}
-
 /**
  * The subarray function first creates an ArrayType instance
  * which will act as the elementType for the subarray.
@@ -761,24 +793,26 @@ InitializeCommonTypeDescriptorProperties(JSContext *cx,
     TypeRepresentation *typeRepr =
         TypeRepresentation::fromOwnerObject(*typeReprOwnerObj);
 
-    // byteLength
-    RootedValue typeByteLength(cx, NumberValue(typeRepr->size()));
-    if (!JSObject::defineProperty(cx, obj, cx->names().byteLength,
-                                  typeByteLength,
-                                  nullptr, nullptr,
-                                  JSPROP_READONLY | JSPROP_PERMANENT))
-    {
-        return false;
-    }
+    if (typeRepr->transparent()) {
+        // byteLength
+        RootedValue typeByteLength(cx, NumberValue(typeRepr->size()));
+        if (!JSObject::defineProperty(cx, obj, cx->names().byteLength,
+                                      typeByteLength,
+                                      nullptr, nullptr,
+                                      JSPROP_READONLY | JSPROP_PERMANENT))
+        {
+            return false;
+        }
 
-    // byteAlignment
-    RootedValue typeByteAlignment(cx, NumberValue(typeRepr->alignment()));
-    if (!JSObject::defineProperty(cx, obj, cx->names().byteAlignment,
-                                  typeByteAlignment,
-                                  nullptr, nullptr,
-                                  JSPROP_READONLY | JSPROP_PERMANENT))
-    {
-        return false;
+        // byteAlignment
+        RootedValue typeByteAlignment(cx, NumberValue(typeRepr->alignment()));
+        if (!JSObject::defineProperty(cx, obj, cx->names().byteAlignment,
+                                      typeByteAlignment,
+                                      nullptr, nullptr,
+                                      JSPROP_READONLY | JSPROP_PERMANENT))
+        {
+            return false;
+        }
     }
 
     // variable -- always false since we do not yet support variable-size types
@@ -823,8 +857,7 @@ ArrayType::create(JSContext *cx,
                                     &prototypeVal.toObject(), cx->global()));
     if (!obj)
         return nullptr;
-    obj->initReservedSlot(JS_TYPEOBJ_SLOT_TYPE_REPR,
-                          ObjectValue(*typeReprObj));
+    obj->initReservedSlot(JS_TYPEOBJ_SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
 
     RootedValue elementTypeVal(cx, ObjectValue(*elementType));
     if (!JSObject::defineProperty(cx, obj, cx->names().elementType,
@@ -832,8 +865,7 @@ ArrayType::create(JSContext *cx,
                                   JSPROP_READONLY | JSPROP_PERMANENT))
         return nullptr;
 
-    obj->initReservedSlot(JS_TYPEOBJ_SLOT_ARRAY_ELEM_TYPE,
-                          elementTypeVal);
+    obj->initReservedSlot(JS_TYPEOBJ_SLOT_ARRAY_ELEM_TYPE, elementTypeVal);
 
     RootedValue lengthVal(cx, Int32Value(length));
     if (!JSObject::defineProperty(cx, obj, cx->names().length,
@@ -915,8 +947,8 @@ ArrayType::construct(JSContext *cx, unsigned argc, Value *vp)
 }
 
 /*********************************
- * Structs
- *********************************/
+ * StructType class
+ */
 
 const Class StructType::class_ = {
     "StructType",
@@ -943,7 +975,7 @@ const JSPropertySpec StructType::typeObjectProperties[] = {
 
 const JSFunctionSpec StructType::typeObjectMethods[] = {
     {"handle", {nullptr, nullptr}, 2, 0, "HandleCreate"},
-    JS_FN("toSource", StructType::toSource, 0, 0),
+    JS_FN("toSource", TypeObjectToSource, 0, 0),
     {"equivalent", {nullptr, nullptr}, 1, 0, "TypeObjectEquivalent"},
     JS_FS_END
 };
@@ -1147,88 +1179,152 @@ StructType::construct(JSContext *cx, unsigned int argc, Value *vp)
     return false;
 }
 
-bool
-StructType::toSource(JSContext *cx, unsigned int argc, Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
+/******************************************************************************
+ * Creating the TypedObject "module"
+ *
+ * We create one global, `TypedObject`, which contains the following
+ * members:
+ *
+ * 1. uint8, uint16, etc
+ * 2. ArrayType
+ * 3. StructType
+ *
+ * Each of these is a function and hence their prototype is
+ * `Function.__proto__` (in terms of the JS Engine, they are not
+ * JSFunctions but rather instances of their own respective JSClasses
+ * which override the call and construct operations).
+ *
+ * Each type object also has its own `prototype` field. Therefore,
+ * using `StructType` as an example, the basic setup is:
+ *
+ *   StructType --__proto__--> Function.__proto__
+ *        |
+ *    prototype -- prototype --> { }
+ *        |
+ *        v
+ *       { } -----__proto__--> Function.__proto__
+ *
+ * When a new type object (e.g., an instance of StructType) is created,
+ * it will look as follows:
+ *
+ *   MyStruct -__proto__-> StructType.prototype -__proto__-> Function.__proto__
+ *        |                          |
+ *        |                     prototype
+ *        |                          |
+ *        |                          v
+ *    prototype -----__proto__----> { }
+ *        |
+ *        v
+ *       { } --__proto__-> Object.prototype
+ *
+ * Finally, when an instance of `MyStruct` is created, its
+ * structure is as follows:
+ *
+ *    object -__proto__->
+ *      MyStruct.prototype -__proto__->
+ *        StructType.prototype.prototype -__proto__->
+ *          Objcet.prototype
+ */
 
-    RootedObject thisObj(cx, ToObjectIfObject(args.thisv()));
-    if (!thisObj || !IsStructTypeObject(*thisObj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
-                             "StructType", "toSource",
-                             InformalValueTypeName(args.thisv()));
+// Here `T` is either `ScalarType` or `ReferenceType`
+template<typename T>
+static bool
+DefineSimpleTypeObject(JSContext *cx,
+                       HandleObject global,
+                       HandleObject module,
+                       typename T::TypeRepr::Type type,
+                       HandlePropertyName className)
+{
+    RootedObject funcProto(cx, JS_GetFunctionPrototype(cx, global));
+    JS_ASSERT(funcProto);
+
+    RootedObject numFun(cx, NewObjectWithClassProto(cx, &T::class_, funcProto, global));
+    if (!numFun)
+        return false;
+
+    RootedObject typeReprObj(cx, T::TypeRepr::Create(cx, type));
+    if (!typeReprObj)
+        return false;
+
+    numFun->initReservedSlot(JS_TYPEOBJ_SLOT_TYPE_REPR,
+                             ObjectValue(*typeReprObj));
+
+    if (!InitializeCommonTypeDescriptorProperties(cx, numFun, typeReprObj))
+        return false;
+
+    if (!JS_DefineFunctions(cx, numFun, T::typeObjectMethods))
+        return false;
+
+    RootedValue numFunValue(cx, ObjectValue(*numFun));
+    if (!JSObject::defineProperty(cx, module, className,
+                                  numFunValue, nullptr, nullptr, 0))
+    {
         return false;
     }
 
-    StringBuffer contents(cx);
-    if (!typeRepresentation(*thisObj)->appendString(cx, contents))
-        return false;
-
-    RootedString result(cx, contents.finishString());
-    if (!result)
-        return false;
-
-    args.rval().setString(result);
     return true;
 }
 
-///////////////////////////////////////////////////////////////////////////
+template<typename T>
+static JSObject *
+DefineMetaTypeObject(JSContext *cx,
+                     Handle<GlobalObject*> global)
+{
+    RootedAtom className(cx, Atomize(cx, T::class_.name,
+                                     strlen(T::class_.name)));
+    if (!className)
+        return nullptr;
 
-///////////////////////////////////////////////////////////////////////////
-// Creating the TypedObject "module"
-//
-// We create one global, `TypedObject`, which contains the following
-// members:
-//
-// 1. uint8, uint16, etc
-// 2. ArrayType
-// 3. StructType
-//
-// These are all callable/constructable objects whose [[Prototype]]s
-// are Function.prototype, but they are not functions in the JSAPI
-// sense (as in having the class JSFunction::class_).
-//
-// Each type object also has its own `prototype` field. Therefore,
-// using `StructType` as an example, the basic setup is as shown here
-// (each edge is labeled with a property name, and [[P]] is short for
-// [[Prototype]]):
-//
-//   StructType --[[P]]--> Function.[[P]]
-//        |
-//    prototype
-//        |
-//        v
-//       { } -----[[P]]--> Function.[[P]]
-//        |
-//    prototype
-//        |
-//        v
-//       { } -----[[P]]--> Object.[[P]]
-//
-// When a new type object (e.g., an instance of StructType) is created,
-// it will look as follows:
-//
-//   MyStruct -[[P]]-> StructType.prototype -[[P]]-> Function.[[P]]
-//        |
-//    prototype
-//        |
-//        v
-//       { } --[[P]]-> StructType.prototype.prototype
-//
-// Finally, when an instance of `MyStruct` is created, its
-// structure is as follows:
-//
-//    object -[[P]]--> MyStruct.prototype
-//
-// This structure permits users to install methods for all struct
-// types (by modifying StructType.prototype); for all struct instances
-// (by modifying StructType.prototype.prototype); or for all instances
-// of `MyStruct` specifically (MyStruct.prototype).
+    RootedObject funcProto(cx, global->getOrCreateFunctionPrototype(cx));
+    if (!funcProto)
+        return nullptr;
 
-template<ScalarTypeRepresentation::Type type>
-static bool
-DefineNumericClass(JSContext *cx, Handle<GlobalObject*> global,
-                   HandleObject module, HandlePropertyName className);
+    // Create ctor.prototype, which inherits from Function.__proto__
+
+    RootedObject proto(
+        cx, NewObjectWithGivenProto(cx, &JSObject::class_, funcProto,
+                                    global, SingletonObject));
+    if (!proto)
+        return nullptr;
+
+    // Create ctor.prototype.prototype, which inherits from Object.__proto__
+
+    RootedObject objProto(cx, global->getOrCreateObjectPrototype(cx));
+    if (!objProto)
+        return nullptr;
+    RootedObject protoProto(
+        cx, NewObjectWithGivenProto(cx, &JSObject::class_, objProto,
+                                    global, SingletonObject));
+    if (!proto)
+        return nullptr;
+
+    RootedValue protoProtoValue(cx, ObjectValue(*protoProto));
+    if (!JSObject::defineProperty(cx, proto, cx->names().prototype,
+                                  protoProtoValue,
+                                  nullptr, nullptr,
+                                  JSPROP_READONLY | JSPROP_PERMANENT))
+        return nullptr;
+
+    // Create ctor itself
+
+    const int constructorLength = 2;
+    RootedFunction ctor(cx,
+                        global->createConstructor(cx, T::construct,
+                                                  className, constructorLength));
+    if (!ctor ||
+        !LinkConstructorAndPrototype(cx, ctor, proto) ||
+        !DefinePropertiesAndBrand(cx, proto,
+                                  T::typeObjectProperties,
+                                  T::typeObjectMethods) ||
+        !DefinePropertiesAndBrand(cx, protoProto,
+                                  T::typedObjectProperties,
+                                  T::typedObjectMethods))
+    {
+        return nullptr;
+    }
+
+    return ctor;
+}
 
 JSObject *
 js_InitTypedObjectClass(JSContext *cx, HandleObject obj)
@@ -1257,17 +1353,25 @@ js_InitTypedObjectClass(JSContext *cx, HandleObject obj)
 
     RootedValue moduleValue(cx, ObjectValue(*module));
 
-    // uint8, uint16, etc
+    // uint8, uint16, any, etc
 
-#define BINARYDATA_NUMERIC_DEFINE(constant_, type_, name_)                      \
-    if (!DefineNumericClass<constant_>(cx, global, module, cx->names().name_))  \
+#define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_)                       \
+    if (!DefineSimpleTypeObject<ScalarType>(cx, global, module, constant_,      \
+                                            cx->names().name_))                 \
         return nullptr;
-    JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_NUMERIC_DEFINE)
-#undef BINARYDATA_NUMERIC_DEFINE
+    JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE)
+#undef BINARYDATA_SCALAR_DEFINE
+
+#define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_)                    \
+    if (!DefineSimpleTypeObject<ReferenceType>(cx, global, module, constant_,   \
+                                               cx->names().name_))              \
+        return nullptr;
+    JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE)
+#undef BINARYDATA_REFERENCE_DEFINE
 
     // ArrayType.
 
-    RootedObject arrayType(cx, CreateMetaTypeObject<ArrayType>(cx, global));
+    RootedObject arrayType(cx, DefineMetaTypeObject<ArrayType>(cx, global));
     if (!arrayType)
         return nullptr;
 
@@ -1280,7 +1384,7 @@ js_InitTypedObjectClass(JSContext *cx, HandleObject obj)
 
     // StructType.
 
-    RootedObject structType(cx, CreateMetaTypeObject<StructType>(cx, global));
+    RootedObject structType(cx, DefineMetaTypeObject<StructType>(cx, global));
     if (!structType)
         return nullptr;
 
@@ -1333,55 +1437,12 @@ js_InitTypedObjectDummy(JSContext *cx, HandleObject obj)
     MOZ_ASSUME_UNREACHABLE("shouldn't be initializing TypedObject via the JSProtoKey initializer mechanism");
 }
 
-template<ScalarTypeRepresentation::Type type>
-static bool
-DefineNumericClass(JSContext *cx,
-                   Handle<GlobalObject*> global,
-                   HandleObject module,
-                   HandlePropertyName className)
-{
-    RootedObject funcProto(cx, global->getOrCreateFunctionPrototype(cx));
-    if (!funcProto)
-        return false;
-
-    RootedObject numFun(cx, NewObjectWithClassProto(cx, &NumericTypeClasses[type],
-                                                    funcProto, global));
-    if (!numFun)
-        return false;
-
-    RootedObject typeReprObj(cx, ScalarTypeRepresentation::Create(cx, type));
-    if (!typeReprObj)
-        return false;
-
-    numFun->initReservedSlot(JS_TYPEOBJ_SLOT_TYPE_REPR,
-                             ObjectValue(*typeReprObj));
-
-    if (!InitializeCommonTypeDescriptorProperties(cx, numFun, typeReprObj))
-        return false;
-
-    if (!JS_DefineFunctions(cx, numFun, NumericTypeObjectMethods))
-        return false;
-
-    if (!JS_DefineFunction(cx, numFun, "toString",
-                           NumericTypeToString<type>, 0, 0))
-        return false;
-
-    if (!JS_DefineFunction(cx, numFun, "toSource",
-                           NumericTypeToString<type>, 0, 0))
-    {
-        return false;
-    }
-
-    RootedValue numFunValue(cx, ObjectValue(*numFun));
-    if (!JSObject::defineProperty(cx, module, className,
-                                  numFunValue, nullptr, nullptr, 0))
-        return false;
-
-    return true;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Typed datums
+/******************************************************************************
+ * Typed datums
+ *
+ * Datums represent either typed objects or handles. See comment in
+ * TypedObject.h.
+ */
 
 template<class T>
 /*static*/ T *
@@ -1409,7 +1470,7 @@ TypedDatum::createUnattachedWithClass(JSContext *cx,
     JS_ASSERT(clasp->hasPrivate());
 
     RootedObject proto(cx);
-    if (IsNumericTypeObject(*type)) {
+    if (IsSimpleTypeObject(*type)) {
         // FIXME Bug 929651 -- What prototype to use?
         proto = type->global().getOrCreateObjectPrototype(cx);
     } else {
@@ -1433,7 +1494,7 @@ TypedDatum::createUnattachedWithClass(JSContext *cx,
 
     // Tag the type object for this instance with the type
     // representation, if that has not been done already.
-    if (cx->typeInferenceEnabled() && !IsNumericTypeObject(*type)) {
+    if (cx->typeInferenceEnabled() && !IsSimpleTypeObject(*type)) {
         // FIXME Bug 929651           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
         RootedTypeObject typeObj(cx, obj->getType(cx));
         if (typeObj) {
@@ -1446,8 +1507,8 @@ TypedDatum::createUnattachedWithClass(JSContext *cx,
     return static_cast<TypedDatum*>(&*obj);
 }
 
-/* static */ void
-TypedDatum::attach(void *memory)
+/*static*/ void
+TypedDatum::attach(uint8_t *memory)
 {
     setPrivate(memory);
     setReservedSlot(JS_DATUM_SLOT_OWNER, ObjectValue(*this));
@@ -1522,6 +1583,11 @@ TypedDatum::obj_trace(JSTracer *trace, JSObject *object)
 
     for (size_t i = 0; i < JS_DATUM_SLOTS; i++)
         gc::MarkSlot(trace, &object->getReservedSlotRef(i), "TypedObjectSlot");
+
+    uint8_t *mem = TypedMem(*object);
+    TypeRepresentation *repr = typeRepresentation(*GetType(*object));
+    if (repr->opaque())
+        repr->traceInstance(trace, mem);
 }
 
 /*static*/ void
@@ -1552,9 +1618,11 @@ TypedDatum::obj_lookupGeneric(JSContext *cx, HandleObject obj, HandleId id,
 
     switch (typeRepr->kind()) {
       case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
         break;
 
-      case TypeRepresentation::Array: {
+      case TypeRepresentation::Array:
+      {
         uint32_t index;
         if (js_IdIsIndex(id, &index))
             return obj_lookupElement(cx, obj, index, objp, propp);
@@ -1567,7 +1635,8 @@ TypedDatum::obj_lookupGeneric(JSContext *cx, HandleObject obj, HandleId id,
         break;
       }
 
-      case TypeRepresentation::Struct: {
+      case TypeRepresentation::Struct:
+      {
         RootedObject type(cx, GetType(*obj));
         JS_ASSERT(IsStructTypeObject(*type));
         StructTypeRepresentation *typeRepr =
@@ -1725,6 +1794,7 @@ TypedDatum::obj_getGeneric(JSContext *cx, HandleObject obj, HandleObject receive
     TypeRepresentation *typeRepr = typeRepresentation(*type);
     switch (typeRepr->kind()) {
       case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
         break;
 
       case TypeRepresentation::Array:
@@ -1783,6 +1853,7 @@ TypedDatum::obj_getElementIfPresent(JSContext *cx, HandleObject obj,
 
     switch (typeRepr->kind()) {
       case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
       case TypeRepresentation::Struct:
         break;
 
@@ -1833,6 +1904,7 @@ TypedDatum::obj_setGeneric(JSContext *cx, HandleObject obj, HandleId id,
 
     switch (typeRepr->kind()) {
       case ScalarTypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
         break;
 
       case ScalarTypeRepresentation::Array:
@@ -1876,11 +1948,12 @@ TypedDatum::obj_setElement(JSContext *cx, HandleObject obj, uint32_t index,
     TypeRepresentation *typeRepr = typeRepresentation(*type);
 
     switch (typeRepr->kind()) {
-      case ScalarTypeRepresentation::Scalar:
-      case ScalarTypeRepresentation::Struct:
+      case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
+      case TypeRepresentation::Struct:
         break;
 
-      case ScalarTypeRepresentation::Array: {
+      case TypeRepresentation::Array: {
         ArrayTypeRepresentation *arrayTypeRepr = typeRepr->asArray();
 
         if (index >= arrayTypeRepr->length()) {
@@ -1917,6 +1990,7 @@ TypedDatum::obj_getGenericAttributes(JSContext *cx, HandleObject obj,
 
     switch (typeRepr->kind()) {
       case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
         break;
 
       case TypeRepresentation::Array:
@@ -1956,6 +2030,7 @@ IsOwnId(JSContext *cx, HandleObject obj, HandleId id)
 
     switch (typeRepr->kind()) {
       case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
         return false;
 
       case TypeRepresentation::Array:
@@ -2047,6 +2122,7 @@ TypedDatum::obj_enumerate(JSContext *cx, HandleObject obj, JSIterateOp enum_op,
 
     switch (typeRepr->kind()) {
       case TypeRepresentation::Scalar:
+      case TypeRepresentation::Reference:
         switch (enum_op) {
           case JSENUMERATE_INIT_ALL:
           case JSENUMERATE_INIT:
@@ -2123,8 +2199,9 @@ TypedDatum::dataOffset()
     return JSObject::getPrivateDataOffset(JS_DATUM_SLOTS + 1);
 }
 
-///////////////////////////////////////////////////////////////////////////
-// Typed Objects
+/******************************************************************************
+ * Typed Objects
+ */
 
 const Class TypedObject::class_ = {
     "TypedObject",
@@ -2184,10 +2261,10 @@ TypedObject::createZeroed(JSContext *cx, HandleObject type)
 
     TypeRepresentation *typeRepr = typeRepresentation(*type);
     size_t memsize = typeRepr->size();
-    void *memory = JS_malloc(cx, memsize);
+    uint8_t *memory = (uint8_t*) cx->malloc_(memsize);
     if (!memory)
         return nullptr;
-    memset(memory, 0, memsize);
+    typeRepr->initInstance(cx->runtime(), memory);
     obj->attach(memory);
     return obj;
 }
@@ -2214,8 +2291,9 @@ TypedObject::construct(JSContext *cx, unsigned int argc, Value *vp)
     return true;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// Handles
+/******************************************************************************
+ * Handles
+ */
 
 const Class TypedHandle::class_ = {
     "Handle",
@@ -2274,8 +2352,9 @@ const JSFunctionSpec TypedHandle::handleStaticMethods[] = {
     JS_FS_END
 };
 
-///////////////////////////////////////////////////////////////////////////
-// Intrinsics
+/******************************************************************************
+ * Intrinsics
+ */
 
 bool
 js::NewTypedHandle(JSContext *cx, unsigned argc, Value *vp)
@@ -2466,6 +2545,32 @@ js::StoreScalar##T::JitInfo =                                                 \
     JS_JITINFO_NATIVE_PARALLEL(                                               \
         JSParallelNativeThreadSafeWrapper<Func>);
 
+#define JS_STORE_REFERENCE_CLASS_IMPL(_constant, T, _name)                      \
+bool                                                                            \
+js::StoreReference##T::Func(ThreadSafeContext *, unsigned argc, Value *vp)      \
+{                                                                               \
+    CallArgs args = CallArgsFromVp(argc, vp);                                   \
+    JS_ASSERT(args.length() == 3);                                              \
+    JS_ASSERT(args[0].isObject() && IsTypedDatum(args[0].toObject()));          \
+    JS_ASSERT(args[1].isInt32());                                               \
+                                                                                \
+    int32_t offset = args[1].toInt32();                                         \
+                                                                                \
+    /* Should be guaranteed by the typed objects API: */                        \
+    JS_ASSERT(offset % MOZ_ALIGNOF(T) == 0);                                    \
+                                                                                \
+    uint8_t *mem = TypedMem(args[0].toObject()) + offset;                       \
+    T *heap = reinterpret_cast<T*>(mem);                                        \
+    store(heap, args[2]);                                                       \
+    args.rval().setUndefined();                                                 \
+    return true;                                                                \
+}                                                                               \
+                                                                                \
+const JSJitInfo                                                                 \
+js::StoreReference##T::JitInfo =                                                \
+    JS_JITINFO_NATIVE_PARALLEL(                                                 \
+        JSParallelNativeThreadSafeWrapper<Func>);
+
 #define JS_LOAD_SCALAR_CLASS_IMPL(_constant, T, _name)                        \
 bool                                                                          \
 js::LoadScalar##T::Func(ThreadSafeContext *, unsigned argc, Value *vp)        \
@@ -2490,7 +2595,82 @@ js::LoadScalar##T::JitInfo =                                                  \
     JS_JITINFO_NATIVE_PARALLEL(                                               \
         JSParallelNativeThreadSafeWrapper<Func>);
 
+#define JS_LOAD_REFERENCE_CLASS_IMPL(_constant, T, _name)                     \
+bool                                                                          \
+js::LoadReference##T::Func(ThreadSafeContext *, unsigned argc, Value *vp)     \
+{                                                                             \
+    CallArgs args = CallArgsFromVp(argc, vp);                                 \
+    JS_ASSERT(args.length() == 2);                                            \
+    JS_ASSERT(args[0].isObject() && IsTypedDatum(args[0].toObject()));        \
+    JS_ASSERT(args[1].isInt32());                                             \
+                                                                              \
+    int32_t offset = args[1].toInt32();                                       \
+                                                                              \
+    /* Should be guaranteed by the typed objects API: */                      \
+    JS_ASSERT(offset % MOZ_ALIGNOF(T) == 0);                                  \
+                                                                              \
+    uint8_t *mem = TypedMem(args[0].toObject()) + offset;                     \
+    T *heap = reinterpret_cast<T*>(mem);                                      \
+    load(heap, args.rval());                                                  \
+    return true;                                                              \
+}                                                                             \
+                                                                              \
+const JSJitInfo                                                               \
+js::LoadReference##T::JitInfo =                                               \
+    JS_JITINFO_NATIVE_PARALLEL(                                               \
+        JSParallelNativeThreadSafeWrapper<Func>);
+
+// Because the precise syntax for storing values/objects/strings
+// differs, we abstract it away using specialized variants of the
+// private methods `store()` and `load()`.
+
+void
+StoreReferenceHeapValue::store(HeapValue *heap, const Value &v)
+{
+    *heap = v;
+}
+
+void
+StoreReferenceHeapPtrObject::store(HeapPtrObject *heap, const Value &v)
+{
+    JS_ASSERT(v.isObjectOrNull()); // or else Store_object is being misused
+    *heap = v.toObjectOrNull();
+}
+
+void
+StoreReferenceHeapPtrString::store(HeapPtrString *heap, const Value &v)
+{
+    JS_ASSERT(v.isString()); // or else Store_string is being misused
+    *heap = v.toString();
+}
+
+void
+LoadReferenceHeapValue::load(HeapValue *heap,
+                             MutableHandleValue v)
+{
+    v.set(*heap);
+}
+
+void
+LoadReferenceHeapPtrObject::load(HeapPtrObject *heap,
+                                 MutableHandleValue v)
+{
+    if (*heap)
+        v.setObject(**heap);
+    else
+        v.setNull();
+}
+
+void
+LoadReferenceHeapPtrString::load(HeapPtrString *heap,
+                                 MutableHandleValue v)
+{
+    v.setString(*heap);
+}
+
 // I was using templates for this stuff instead of macros, but ran
 // into problems with the Unagi compiler.
 JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(JS_STORE_SCALAR_CLASS_IMPL)
 JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(JS_LOAD_SCALAR_CLASS_IMPL)
+JS_FOR_EACH_REFERENCE_TYPE_REPR(JS_STORE_REFERENCE_CLASS_IMPL)
+JS_FOR_EACH_REFERENCE_TYPE_REPR(JS_LOAD_REFERENCE_CLASS_IMPL)
diff --git a/js/src/builtin/TypedObject.h b/js/src/builtin/TypedObject.h
index d9a99a259dd..a8391055ac7 100644
--- a/js/src/builtin/TypedObject.h
+++ b/js/src/builtin/TypedObject.h
@@ -103,22 +103,32 @@ namespace js {
  */
 extern const Class TypedObjectClass;
 
-template <ScalarTypeRepresentation::Type type, typename T>
-class NumericType
+// Type for scalar type constructors like `uint8`. All such type
+// constructors share a common js::Class and JSFunctionSpec. Scalar
+// types are non-opaque (their storage is visible unless combined with
+// an opaque reference type.)
+class ScalarType
 {
-  private:
-    static const Class * typeToClass();
   public:
-    static bool reify(JSContext *cx, void *mem, MutableHandleValue vp);
+    static const Class class_;
+    static const JSFunctionSpec typeObjectMethods[];
+    typedef ScalarTypeRepresentation TypeRepr;
+
     static bool call(JSContext *cx, unsigned argc, Value *vp);
 };
 
-/*
- * These are the classes of the scalar type descriptors, like `uint8`,
- * `uint16` etc. Each of these classes has exactly one instance that
- * is pre-created.
- */
-extern const Class NumericTypeClasses[ScalarTypeRepresentation::TYPE_MAX];
+// Type for reference type constructors like `Any`, `String`, and
+// `Object`. All such type constructors share a common js::Class and
+// JSFunctionSpec. All these types are opaque.
+class ReferenceType
+{
+  public:
+    static const Class class_;
+    static const JSFunctionSpec typeObjectMethods[];
+    typedef ReferenceTypeRepresentation TypeRepr;
+
+    static bool call(JSContext *cx, unsigned argc, Value *vp);
+};
 
 /*
  * Type descriptor created by `new ArrayType(...)`
@@ -148,8 +158,6 @@ class ArrayType : public JSObject
     static bool repeat(JSContext *cx, unsigned argc, Value *vp);
     static bool subarray(JSContext *cx, unsigned argc, Value *vp);
 
-    static bool toSource(JSContext *cx, unsigned argc, Value *vp);
-
     static JSObject *elementType(JSContext *cx, HandleObject obj);
 };
 
@@ -186,8 +194,6 @@ class StructType : public JSObject
     // does `new StructType(...)`. It produces a struct type object.
     static bool construct(JSContext *cx, unsigned argc, Value *vp);
 
-    static bool toSource(JSContext *cx, unsigned argc, Value *vp);
-
     static bool convertAndCopyTo(JSContext *cx,
                                  StructTypeRepresentation *typeRepr,
                                  HandleValue from, uint8_t *mem);
@@ -278,8 +284,12 @@ class TypedDatum : public JSObject
                               MutableHandleValue statep, MutableHandleId idp);
 
   public:
-    // Returns the offset in bytes within the object where the `void*`
-    // pointer can be found.
+    // Each typed object contains a void* pointer pointing at the
+    // binary data that it represents. (That data may be owned by this
+    // object or this object may alias data owned by someone else.)
+    // This function returns the offset in bytes within the object
+    // where the `void*` pointer can be found. It is intended for use
+    // by the JIT.
     static size_t dataOffset();
 
     static TypedDatum *createUnattachedWithClass(JSContext *cx,
@@ -305,7 +315,7 @@ class TypedDatum : public JSObject
                                      size_t offset);
 
     // If `this` is the owner of the memory, use this.
-    void attach(void *mem);
+    void attach(uint8_t *mem);
 
     // Otherwise, use this to attach to memory referenced by another datum.
     void attach(JSObject &datum, uint32_t offset);
@@ -417,12 +427,20 @@ bool Memcpy(ThreadSafeContext *cx, unsigned argc, Value *vp);
 extern const JSJitInfo MemcpyJitInfo;
 
 /*
- * Usage: StoreScalar(targetDatum, targetOffset, value)
+ * Usage: Store_int8(targetDatum, targetOffset, value)
+ *        ...
+ *        Store_uint8(targetDatum, targetOffset, value)
+ *        ...
+ *        Store_float32(targetDatum, targetOffset, value)
+ *        Store_float64(targetDatum, targetOffset, value)
  *
- * Intrinsic function. Stores value (which must be an int32 or uint32)
- * by `scalarTypeRepr` (which must be a type repr obj) and stores the
- * value at the memory for `targetDatum` at offset `targetOffset`.
- * `targetDatum` must be attached.
+ * Intrinsic function. Stores `value` into the memory referenced by
+ * `targetDatum` at the offset `targetOffset`.
+ *
+ * Assumes (and asserts) that:
+ * - `targetDatum` is attached
+ * - `targetOffset` is a valid offset within the bounds of `targetDatum`
+ * - `value` is a number
  */
 #define JS_STORE_SCALAR_CLASS_DEFN(_constant, T, _name)                       \
 class StoreScalar##T {                                                        \
@@ -431,6 +449,29 @@ class StoreScalar##T {                                                        \
     static const JSJitInfo JitInfo;                                           \
 };
 
+/*
+ * Usage: Store_Any(targetDatum, targetOffset, value)
+ *        Store_Object(targetDatum, targetOffset, value)
+ *        Store_string(targetDatum, targetOffset, value)
+ *
+ * Intrinsic function. Stores `value` into the memory referenced by
+ * `targetDatum` at the offset `targetOffset`.
+ *
+ * Assumes (and asserts) that:
+ * - `targetDatum` is attached
+ * - `targetOffset` is a valid offset within the bounds of `targetDatum`
+ * - `value` is an object (`Store_Object`) or string (`Store_string`).
+ */
+#define JS_STORE_REFERENCE_CLASS_DEFN(_constant, T, _name)                    \
+class StoreReference##T {                                                     \
+  private:                                                                    \
+    static void store(T* heap, const Value &v);                               \
+                                                                              \
+  public:                                                                     \
+    static bool Func(ThreadSafeContext *cx, unsigned argc, Value *vp);        \
+    static const JSJitInfo JitInfo;                                           \
+};
+
 /*
  * Usage: LoadScalar(targetDatum, targetOffset, value)
  *
@@ -446,10 +487,30 @@ class LoadScalar##T {                                                         \
     static const JSJitInfo JitInfo;                                           \
 };
 
+/*
+ * Usage: LoadReference(targetDatum, targetOffset, value)
+ *
+ * Intrinsic function. Stores value (which must be an int32 or uint32)
+ * by `scalarTypeRepr` (which must be a type repr obj) and stores the
+ * value at the memory for `targetDatum` at offset `targetOffset`.
+ * `targetDatum` must be attached.
+ */
+#define JS_LOAD_REFERENCE_CLASS_DEFN(_constant, T, _name)                     \
+class LoadReference##T {                                                      \
+  private:                                                                    \
+    static void load(T* heap, MutableHandleValue v);                          \
+                                                                              \
+  public:                                                                     \
+    static bool Func(ThreadSafeContext *cx, unsigned argc, Value *vp);        \
+    static const JSJitInfo JitInfo;                                           \
+};
+
 // I was using templates for this stuff instead of macros, but ran
 // into problems with the Unagi compiler.
 JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(JS_STORE_SCALAR_CLASS_DEFN)
 JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(JS_LOAD_SCALAR_CLASS_DEFN)
+JS_FOR_EACH_REFERENCE_TYPE_REPR(JS_STORE_REFERENCE_CLASS_DEFN)
+JS_FOR_EACH_REFERENCE_TYPE_REPR(JS_LOAD_REFERENCE_CLASS_DEFN)
 
 } // namespace js
 
diff --git a/js/src/builtin/TypedObject.js b/js/src/builtin/TypedObject.js
index ca5704a3f05..3ebd50b6500 100644
--- a/js/src/builtin/TypedObject.js
+++ b/js/src/builtin/TypedObject.js
@@ -106,6 +106,7 @@ TypedObjectPointer.prototype.kind = function() {
 TypedObjectPointer.prototype.moveTo = function(propName) {
   switch (this.kind()) {
   case JS_TYPEREPR_SCALAR_KIND:
+  case JS_TYPEREPR_REFERENCE_KIND:
     break;
 
   case JS_TYPEREPR_ARRAY_KIND:
@@ -179,7 +180,6 @@ TypedObjectPointer.prototype.moveToField = function(propName) {
 // by `this` and produce JS values. This process is called *reification*
 // in the spec.
 
-
 // Reifies the value referenced by the pointer, meaning that it
 // returns a new object pointing at the value. If the value is
 // a scalar, it will return a JS number, but otherwise the reified
@@ -191,6 +191,9 @@ TypedObjectPointer.prototype.get = function() {
   if (REPR_KIND(this.typeRepr) == JS_TYPEREPR_SCALAR_KIND)
     return this.getScalar();
 
+  if (REPR_KIND(this.typeRepr) == JS_TYPEREPR_REFERENCE_KIND)
+    return this.getReference();
+
   return NewDerivedTypedDatum(this.typeObj, this.datum, this.offset);
 }
 
@@ -226,6 +229,22 @@ TypedObjectPointer.prototype.getScalar = function() {
   assert(false, "Unhandled scalar type: " + type);
 }
 
+TypedObjectPointer.prototype.getReference = function() {
+  var type = REPR_TYPE(this.typeRepr);
+  switch (type) {
+  case JS_REFERENCETYPEREPR_ANY:
+    return Load_Any(this.datum, this.offset);
+
+  case JS_REFERENCETYPEREPR_OBJECT:
+    return Load_Object(this.datum, this.offset);
+
+  case JS_REFERENCETYPEREPR_STRING:
+    return Load_string(this.datum, this.offset);
+  }
+
+  assert(false, "Unhandled scalar type: " + type);
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // Setting values
 //
@@ -258,6 +277,10 @@ TypedObjectPointer.prototype.set = function(fromValue) {
     this.setScalar(fromValue);
     return;
 
+  case JS_TYPEREPR_REFERENCE_KIND:
+    this.setReference(fromValue);
+    return;
+
   case JS_TYPEREPR_ARRAY_KIND:
     if (!IsObject(fromValue))
       break;
@@ -342,6 +365,23 @@ TypedObjectPointer.prototype.setScalar = function(fromValue) {
   assert(false, "Unhandled scalar type: " + type);
 }
 
+TypedObjectPointer.prototype.setReference = function(fromValue) {
+  var type = REPR_TYPE(this.typeRepr);
+  switch (type) {
+  case JS_REFERENCETYPEREPR_ANY:
+    return Store_Any(this.datum, this.offset, fromValue);
+
+  case JS_REFERENCETYPEREPR_OBJECT:
+    var value = (fromValue === null ? fromValue : ToObject(fromValue));
+    return Store_Object(this.datum, this.offset, value);
+
+  case JS_REFERENCETYPEREPR_STRING:
+    return Store_string(this.datum, this.offset, ToString(fromValue));
+  }
+
+  assert(false, "Unhandled scalar type: " + type);
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // C++ Wrappers
 //
diff --git a/js/src/builtin/TypedObjectConstants.h b/js/src/builtin/TypedObjectConstants.h
index 8371d8d7d8f..0da7bee5533 100644
--- a/js/src/builtin/TypedObjectConstants.h
+++ b/js/src/builtin/TypedObjectConstants.h
@@ -13,7 +13,7 @@
 // Slots for type objects
 //
 // Some slots apply to all type objects and some are specific to
-// particular kinds of type objects.  Because all type objects, at
+// particular kinds of type objects. Because all type objects, at
 // least for now, have a distinct class, we can assign them distinct
 // numbers of slots depending on their kind.
 
@@ -23,6 +23,9 @@
 // Slots on scalars
 #define JS_TYPEOBJ_SCALAR_SLOTS            1  // Maximum number
 
+// Slots on references
+#define JS_TYPEOBJ_REFERENCE_SLOTS         1  // Maximum number
+
 // Slots on arrays
 #define JS_TYPEOBJ_SLOT_ARRAY_ELEM_TYPE    1
 #define JS_TYPEOBJ_ARRAY_SLOTS             2  // Maximum number
@@ -36,7 +39,7 @@
 // Slots for type representation objects
 //
 // Some slots apply to all type representations and some are specific
-// to particular kinds of type representations.  Because all type
+// to particular kinds of type representations. Because all type
 // representations share the same class, however, they always have the
 // same number of slots, though not all of them will be initialized or
 // used in the same way.
@@ -49,21 +52,22 @@
 // Slots on arrays:
 #define JS_TYPEREPR_SLOT_LENGTH    3 // Length of the array
 
-// Slots on scalars:
+// Slots on scalars and references:
 #define JS_TYPEREPR_SLOT_TYPE      3 // One of the constants below
 
 // Maximum number of slots for any type representation
 #define JS_TYPEREPR_SLOTS          4
 
-// These constants are for use exclusively in JS code.  In C++ code,
-// prefer TypeRepresentation::Scalar etc, since that allows you to
+// These constants are for use exclusively in JS code. In C++ code,
+// prefer TypeRepresentation::Scalar etc, which allows you to
 // write a switch which will receive a warning if you omit a case.
 #define JS_TYPEREPR_SCALAR_KIND 0
-#define JS_TYPEREPR_STRUCT_KIND 1
-#define JS_TYPEREPR_ARRAY_KIND  2
+#define JS_TYPEREPR_REFERENCE_KIND 1
+#define JS_TYPEREPR_STRUCT_KIND 2
+#define JS_TYPEREPR_ARRAY_KIND  3
 
-// These constants are for use exclusively in JS code.  In C++ code,
-// prefer ScalarTypeRepresentation::TYPE_INT8 etc, since that allows
+// These constants are for use exclusively in JS code. In C++ code,
+// prefer ScalarTypeRepresentation::TYPE_INT8 etc, which allows
 // you to write a switch which will receive a warning if you omit a
 // case.
 #define JS_SCALARTYPEREPR_INT8          0
@@ -76,6 +80,14 @@
 #define JS_SCALARTYPEREPR_FLOAT64       7
 #define JS_SCALARTYPEREPR_UINT8_CLAMPED 8
 
+// These constants are for use exclusively in JS code. In C++ code,
+// prefer ReferenceTypeRepresentation::TYPE_ANY etc, which allows
+// you to write a switch which will receive a warning if you omit a
+// case.
+#define JS_REFERENCETYPEREPR_ANY        0
+#define JS_REFERENCETYPEREPR_OBJECT     1
+#define JS_REFERENCETYPEREPR_STRING     2
+
 ///////////////////////////////////////////////////////////////////////////
 // Slots for typed objects (actually, any TypedContents objects)
 
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index 374a73fa0ee..b09571f0b15 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -6521,6 +6521,9 @@ IonBuilder::getElemTryTypedObject(bool *emitted, MDefinition *obj, MDefinition *
                                                  objTypeReprs,
                                                  elemTypeReprs,
                                                  elemSize);
+
+      case TypeRepresentation::Reference:
+        return true;
     }
 
     MOZ_ASSUME_UNREACHABLE("Bad kind");
@@ -8174,6 +8177,9 @@ IonBuilder::getPropTryTypedObject(bool *emitted, PropertyName *name,
         return true;
 
     switch (fieldTypeReprs.kind()) {
+      case TypeRepresentation::Reference:
+        return true;
+
       case TypeRepresentation::Struct:
       case TypeRepresentation::Array:
         return getPropTryComplexPropOfTypedObject(emitted,
@@ -8712,6 +8718,7 @@ IonBuilder::setPropTryTypedObject(bool *emitted, MDefinition *obj,
         return true;
 
     switch (fieldTypeReprs.kind()) {
+      case TypeRepresentation::Reference:
       case TypeRepresentation::Struct:
       case TypeRepresentation::Array:
         // For now, only optimize storing scalars.
diff --git a/js/src/tests/ecma_6/TypedObject/handle_get_set.js b/js/src/tests/ecma_6/TypedObject/handle_get_set.js
index 63d71f63c87..0cc743e37aa 100644
--- a/js/src/tests/ecma_6/TypedObject/handle_get_set.js
+++ b/js/src/tests/ecma_6/TypedObject/handle_get_set.js
@@ -14,6 +14,8 @@ var Point = new T.ArrayType(T.float32, 3);
 var Line = new T.StructType({from: Point, to: Point});
 var Lines = new T.ArrayType(Line, 3);
 
+var Objects = new T.ArrayType(T.Object, 3);
+
 function runTests() {
   function testHandleGetSetWithScalarType() {
     var lines = new Lines([
@@ -30,6 +32,23 @@ function runTests() {
   }
   testHandleGetSetWithScalarType();
 
+  function testHandleGetSetWithObjectType() {
+    var one = {x: 1};
+    var two = {x: 2};
+    var three = {x: 3};
+    var objects = new Objects([one, two, three]);
+
+    var handle = T.Object.handle(objects, 0);
+    assertEq(T.Handle.get(handle), one);
+    T.Handle.set(handle, three);
+    assertEq(T.Handle.get(handle), three);
+    assertEq(objects[0], three);
+
+    T.Handle.move(handle, objects, 1);
+    assertEq(T.Handle.get(handle), two);
+  }
+  testHandleGetSetWithScalarType();
+
   function testHandleGetSetWithComplexType() {
     var lines = new Lines([
       {from: [1, 2, 3], to: [4, 5, 6]},
diff --git a/js/src/tests/ecma_6/TypedObject/numerictypes.js b/js/src/tests/ecma_6/TypedObject/numerictypes.js
index 6b5299e4d75..3146eef6758 100644
--- a/js/src/tests/ecma_6/TypedObject/numerictypes.js
+++ b/js/src/tests/ecma_6/TypedObject/numerictypes.js
@@ -89,7 +89,7 @@ function runTests()
         check(function() type(+Infinity) === 0);
         check(function() type(-Infinity) === 0);
         check(function() type(NaN) === 0);
-        check(function() type.toString() === strings[i]);
+        check(function() type.toSource() === strings[i]);
         check(function() type(null) == 0);
         check(function() type(undefined) == 0);
         check(function() type([]) == 0);
@@ -110,7 +110,7 @@ function runTests()
         check(function() type(+Infinity) === Infinity);
         check(function() type(-Infinity) === -Infinity);
         check(function() Number.isNaN(type(NaN)));
-        check(function() type.toString() === floatStrings[i]);
+        check(function() type.toSource() === floatStrings[i]);
         check(function() type(null) == 0);
         check(function() Number.isNaN(type(undefined)));
         check(function() type([]) == 0);
diff --git a/js/src/tests/ecma_6/TypedObject/referencetypealiasing.js b/js/src/tests/ecma_6/TypedObject/referencetypealiasing.js
new file mode 100644
index 00000000000..66e6e16a853
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedObject/referencetypealiasing.js
@@ -0,0 +1,33 @@
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject"))
+var BUGNUMBER = 898359;
+var summary = 'TypedObjects reference type aliasing';
+var actual = '';
+var expect = '';
+
+var ArrayType = TypedObject.ArrayType;
+var StructType = TypedObject.StructType;
+var Any = TypedObject.Any;
+var Object = TypedObject.Object;
+var string = TypedObject.string;
+
+function runTests()
+{
+  printBugNumber(BUGNUMBER);
+  printStatus(summary);
+
+  var MyType = new StructType({f: Object});
+
+  // Test aliasing
+  var myInstance = new MyType({f: {a: 22}});
+  var anotherInstance = new MyType({f: myInstance.f});
+  assertEq(myInstance.f.a, 22);
+  assertEq(myInstance.f.a, anotherInstance.f.a);
+
+  myInstance.f.a += 1;
+  assertEq(myInstance.f.a, 23);
+  assertEq(myInstance.f.a, anotherInstance.f.a);
+
+  reportCompare(true, true, "TypedObjects reference type aliasing tests");
+}
+
+runTests();
diff --git a/js/src/tests/ecma_6/TypedObject/referencetypecoercions.js b/js/src/tests/ecma_6/TypedObject/referencetypecoercions.js
new file mode 100644
index 00000000000..0a62b07fde7
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedObject/referencetypecoercions.js
@@ -0,0 +1,70 @@
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject"))
+var BUGNUMBER = 898359;
+var summary = 'TypedObjects reference type coercions';
+var actual = '';
+var expect = '';
+
+var ArrayType = TypedObject.ArrayType;
+var StructType = TypedObject.StructType;
+var Any = TypedObject.Any;
+var Object = TypedObject.Object;
+var string = TypedObject.string;
+
+function TestValues(type, values) {
+  for (var i = 0; i < values.length; i++) {
+    compare(type(values[i].input), values[i]);
+  }
+
+  var Struct = new StructType({f: type});
+  for (var i = 0; i < values.length; i++) {
+    var struct = new Struct({f: values[i].input});
+    compare(struct.f, values[i]);
+  }
+
+  for (var i = 0; i < values.length; i++) {
+    var struct = new Struct();
+    struct.f = values[i].input;
+    compare(struct.f, values[i]);
+  }
+
+  var Array = new ArrayType(type, 1);
+  for (var i = 0; i < values.length; i++) {
+    var array = new Array();
+    array[0] = values[i].input;
+    compare(array[0], values[i]);
+  }
+
+  function compare(v, spec) {
+    if (spec.source)
+      v = v.toSource();
+    assertEq(v, spec.output);
+  }
+}
+
+function runTests()
+{
+  printBugNumber(BUGNUMBER);
+  printStatus(summary);
+
+  var x = {};
+
+  TestValues(Any, [{input: undefined, output: undefined},
+                   {input: x, output: x},
+                   {input: 22.22, output: 22.22},
+                   {input: true, output: true}]);
+
+  TestValues(string, [{input: undefined, output: "undefined"},
+                      {input: x, output: x.toString()},
+                      {input: 22.22, output: "22.22"},
+                      {input: true, output: "true"}]);
+
+  assertThrows(() => Object(undefined));
+
+  TestValues(Object, [{input: x, output: x},
+                      {input: 22.22, source: true, output: "(new Number(22.22))"},
+                      {input: true, source: true, output: "(new Boolean(true))"}]);
+
+  reportCompare(true, true, "TypedObjects reference type tests");
+}
+
+runTests();
diff --git a/js/src/tests/ecma_6/TypedObject/referencetypemultiple.js b/js/src/tests/ecma_6/TypedObject/referencetypemultiple.js
new file mode 100644
index 00000000000..f5fc54891ed
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedObject/referencetypemultiple.js
@@ -0,0 +1,22 @@
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject"))
+var BUGNUMBER = 898359;
+var summary = 'TypedObjects reference type coercions';
+var actual = '';
+var expect = '';
+
+var ArrayType = TypedObject.ArrayType;
+var StructType = TypedObject.StructType;
+var Any = TypedObject.Any;
+var Object = TypedObject.Object;
+var string = TypedObject.string;
+
+
+function runTests()
+{
+  var S = new StructType({f: Any, g: Any});
+  var s = new S({f: "Hello", g: "Hello"});
+  assertEq(s.f, s.g);
+  reportCompare(true, true, "TypedObjects trace tests");
+}
+
+runTests();
diff --git a/js/src/tests/ecma_6/TypedObject/referencetypetrace.js b/js/src/tests/ecma_6/TypedObject/referencetypetrace.js
new file mode 100644
index 00000000000..e1b90399d8c
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedObject/referencetypetrace.js
@@ -0,0 +1,88 @@
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject")||!this.hasOwnProperty("countHeap"))
+var BUGNUMBER = 898359;
+var summary = 'TypedObjects reference type trace';
+var actual = '';
+var expect = '';
+
+var ArrayType = TypedObject.ArrayType;
+var StructType = TypedObject.StructType;
+var Any = TypedObject.Any;
+var Object = TypedObject.Object;
+var string = TypedObject.string;
+
+function assertCanReach(from, target, times) {
+  times = times || 1;
+  var count1 = countHeap(from, "specific", target);
+  print("canReach:", count1, times, from.toSource(), target.toSource());
+  assertEq(count1, times);
+}
+
+function assertCannotReach(from, target) {
+  var count1 = countHeap(from, "specific", target);
+  print("cannotReach:", count1, from.toSource(), target.toSource());
+  assertEq(count1, 0);
+}
+
+function TestStructFields(RefType) {
+  var rabbit = {};
+  var S1 = new StructType({f: RefType});
+  var s1 = new S1({f: rabbit});
+  assertCanReach(s1, rabbit);
+  s1.f = null;
+  assertCannotReach(s1, rabbit);
+}
+
+function TestArrayElements(RefType) {
+  var rabbit = {};
+  var S1 = new ArrayType(RefType, 1);
+  var s1 = new S1([rabbit]);
+  assertCanReach(s1, rabbit);
+  s1[0] = null;
+  assertCannotReach(s1, rabbit);
+}
+
+function TestStructInArray(RefType) {
+  var rabbit = {};
+  var S2 = new StructType({f: RefType, g: RefType});
+  var S1 = new ArrayType(S2, 1);
+  var s1 = new S1([{f: rabbit, g: {}}]);
+  assertCanReach(s1, rabbit);
+  s1[0].f = null;
+  assertCannotReach(s1, rabbit);
+}
+
+function TestStringInStruct() {
+  // Rather subtle hair-pullingly maddening testing phenomena: If you
+  // just use a constant string here, it's always reachable via the
+  // atoms table. Same is true of "Hello" + "1" (an earlier
+  // attempt) due to parser constant folding. So we have to make a
+  // rabbit that's not constant foldable. But don't just use
+  // Math.random(), since small integers are atoms already.
+  var rabbit = "Hello" + Math.random();
+  var S1 = new StructType({f: string});
+  var s1 = new S1({f: rabbit});
+  assertCanReach(s1, rabbit);
+  s1.f = "World";
+  assertCannotReach(s1, rabbit);
+}
+
+function runTests()
+{
+  printBugNumber(BUGNUMBER);
+  printStatus(summary);
+
+  TestStructFields(Object);
+  TestStructFields(Any);
+
+  TestArrayElements(Object);
+  TestArrayElements(Any);
+
+  TestStructInArray(Object);
+  TestStructInArray(Any);
+
+  TestStringInStruct();
+
+  reportCompare(true, true, "TypedObjects trace tests");
+}
+
+runTests();
diff --git a/js/src/tests/ecma_6/TypedObject/referencetypeuninit.js b/js/src/tests/ecma_6/TypedObject/referencetypeuninit.js
new file mode 100644
index 00000000000..86e8d7a6d6e
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedObject/referencetypeuninit.js
@@ -0,0 +1,30 @@
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject"))
+var BUGNUMBER = 898359;
+var summary = 'TypedObjects reference type default values';
+var actual = '';
+var expect = '';
+
+var ArrayType = TypedObject.ArrayType;
+var StructType = TypedObject.StructType;
+var Any = TypedObject.Any;
+var Object = TypedObject.Object;
+var string = TypedObject.string;
+
+function runTests()
+{
+  printBugNumber(BUGNUMBER);
+  printStatus(summary);
+
+  var S = new StructType({any: Any,
+                          object: Object,
+                          string: string});
+  var s = new S();
+
+  assertEq(s.any, undefined);
+  assertEq(s.object, null);
+  assertEq(s.string, "");
+
+  reportCompare(true, true, "TypedObjects ref type uninit");
+}
+
+runTests();
diff --git a/js/src/tests/ecma_6/TypedObject/simpleequiv.js b/js/src/tests/ecma_6/TypedObject/simpleequiv.js
index d8fb3c2f119..14431526216 100644
--- a/js/src/tests/ecma_6/TypedObject/simpleequiv.js
+++ b/js/src/tests/ecma_6/TypedObject/simpleequiv.js
@@ -2,30 +2,21 @@
 var BUGNUMBER = 922216;
 var summary = 'TypedObjects Equivalent Numeric Types';
 
-var ArrayType = TypedObject.ArrayType;
-var StructType = TypedObject.StructType;
-var uint8 = TypedObject.uint8;
-var uint16 = TypedObject.uint16;
-var uint32 = TypedObject.uint32;
-var uint8Clamped = TypedObject.uint8Clamped;
-var int8 = TypedObject.int8;
-var int16 = TypedObject.int16;
-var int32 = TypedObject.int32;
-var float32 = TypedObject.float32;
-var float64 = TypedObject.float64;
+var T = TypedObject;
 
 function runTests() {
   print(BUGNUMBER + ": " + summary);
 
-  var scalarTypes = [
-    int8, int16, int32,
-    uint8, uint16, uint32,
-    float32, float64
+  var simpleTypes = [
+    T.int8, T.int16, T.int32,
+    T.uint8, T.uint16, T.uint32,
+    T.float32, T.float64,
+    T.Object, T.Any, T.string
   ];
 
-  for (var i = 0; i < scalarTypes.length; i++)
-    for (var j = 0; j < scalarTypes.length; j++)
-      assertEq(i == j, scalarTypes[i].equivalent(scalarTypes[j]));
+  for (var i = 0; i < simpleTypes.length; i++)
+    for (var j = 0; j < simpleTypes.length; j++)
+      assertEq(i == j, simpleTypes[i].equivalent(simpleTypes[j]));
 
   reportCompare(true, true);
   print("Tests complete");
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 6406291bfa6..2bf8c7c0e94 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -13,6 +13,7 @@
 
 #define FOR_EACH_COMMON_PROPERTYNAME(macro) \
     macro(anonymous, anonymous, "anonymous") \
+    macro(Any, Any, "Any") \
     macro(apply, apply, "apply") \
     macro(arguments, arguments, "arguments") \
     macro(as, as, "as") \
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 56eb8bfb641..d5122bb506c 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -659,14 +659,23 @@ static const JSFunctionSpec intrinsic_functions[] = {
               JSNativeThreadSafeWrapper<js::Memcpy>,
               &js::MemcpyJitInfo, 5, 0),
 
-#define LOAD_AND_STORE_FN_DECLS(_constant, _type, _name)                      \
+#define LOAD_AND_STORE_SCALAR_FN_DECLS(_constant, _type, _name)               \
     JS_FNINFO("Store_" #_name,                                                \
               JSNativeThreadSafeWrapper<js::StoreScalar##_type::Func>,        \
               &js::StoreScalar##_type::JitInfo, 3, 0),                        \
     JS_FNINFO("Load_" #_name,                                                 \
               JSNativeThreadSafeWrapper<js::LoadScalar##_type::Func>,         \
               &js::LoadScalar##_type::JitInfo, 3, 0),
-    JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(LOAD_AND_STORE_FN_DECLS)
+    JS_FOR_EACH_UNIQUE_SCALAR_TYPE_REPR_CTYPE(LOAD_AND_STORE_SCALAR_FN_DECLS)
+
+#define LOAD_AND_STORE_REFERENCE_FN_DECLS(_constant, _type, _name)              \
+    JS_FNINFO("Store_" #_name,                                                  \
+              JSNativeThreadSafeWrapper<js::StoreReference##_type::Func>,       \
+              &js::StoreReference##_type::JitInfo, 3, 0),                       \
+    JS_FNINFO("Load_" #_name,                                                   \
+              JSNativeThreadSafeWrapper<js::LoadReference##_type::Func>,        \
+              &js::LoadReference##_type::JitInfo, 3, 0),
+    JS_FOR_EACH_REFERENCE_TYPE_REPR(LOAD_AND_STORE_REFERENCE_FN_DECLS)
 
     // See builtin/Intl.h for descriptions of the intl_* functions.
     JS_FN("intl_availableCalendars", intl_availableCalendars, 1,0),

From 00b30fed02f24f63c7cf1e46c9ed966d9cf7069e Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Mon, 18 Nov 2013 13:51:01 -0800
Subject: [PATCH 20/92] Bug 939587 - js/src should regenerate build backend
 when necessary; r=glandium

--HG--
extra : rebase_source : 5cbb0f49f0ee6c09f7e48b7888cbae9ca622e9e5
---
 js/src/Makefile.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 209ce57215b..2268b20f885 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -148,6 +148,17 @@ endif
 MOZILLA_DTRACE_SRC = $(srcdir)/devtools/javascript-trace.d
 endif
 
+backend.RecursiveMakeBackend:
+	@echo "Build configuration changed. Regenerating backend."
+	$(PYTHON) config.status
+
+Makefile: backend.RecursiveMakeBackend
+	@$(TOUCH) $@
+
+include backend.RecursiveMakeBackend.pp
+
+default:: backend.RecursiveMakeBackend
+
 default::
 	$(call py_action,process_install_manifest,--no-remove $(DIST)/include _build_manifests/install/dist_include)
 

From 3687a05ea24def1e1310f7558022a780f3da70f6 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 19 Nov 2013 12:55:01 -0500
Subject: [PATCH 21/92] Backed out changesets 7e5acb32bd11 and 427cd48f6c6d
 (bug 922094) for Windows debug mochitest-4 crashes. CLOSED TREE

---
 dom/base/nsGlobalWindow.cpp         | 7 -------
 dom/base/nsGlobalWindow.h           | 2 +-
 dom/base/nsWindowMemoryReporter.cpp | 8 --------
 dom/base/nsWindowMemoryReporter.h   | 1 -
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 86ba1ffa1be..588dd0472f0 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -210,7 +210,6 @@
 #include "mozilla/dom/WindowBinding.h"
 #include "nsITabChild.h"
 #include "nsIDOMMediaQueryList.h"
-#include "mozilla/dom/DOMJSClass.h"
 
 #ifdef MOZ_WEBSPEECH
 #include "mozilla/dom/SpeechSynthesis.h"
@@ -12659,12 +12658,6 @@ nsGlobalWindow::AddSizeOfIncludingThis(nsWindowSizes* aWindowSizes) const
     const_cast<nsTHashtable<nsPtrHashKey<nsDOMEventTargetHelper> >*>
       (&mEventTargetObjects)->EnumerateEntries(CollectSizeAndListenerCount,
                                                aWindowSizes);
-
-  JSObject* global = FastGetGlobalJSObject();
-  if (IsInnerWindow() && global) {
-    JS::Heap<JSObject*>* cache = GetProtoAndIfaceArray(global);
-    aWindowSizes->mProtoIfaceCacheSize += aWindowSizes->mMallocSizeOf(cache);
-  }
 }
 
 
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 2924c80f586..39923deaec4 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -342,7 +342,7 @@ public:
 
   // nsIScriptGlobalObject
   virtual nsIScriptContext *GetContext();
-  JSObject *FastGetGlobalJSObject() const
+  JSObject *FastGetGlobalJSObject()
   {
     return mJSObject;
   }
diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp
index 614e2255fda..daa97ed1847 100644
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@@ -310,11 +310,6 @@ CollectWindowReports(nsGlobalWindow *aWindow,
               "other 'dom/' numbers.");
   aWindowTotalSizes->mDOMOtherSize += windowSizes.mDOMOtherSize;
 
-  REPORT_SIZE("/proto-iface-cache", windowSizes.mProtoIfaceCacheSize,
-              "Memory used for prototype and interface binding caches "
-              "with a window.");
-  aWindowTotalSizes->mProtoIfaceCacheSize += windowSizes.mProtoIfaceCacheSize;
-
   REPORT_SIZE("/property-tables",
               windowSizes.mPropertyTablesSize,
               "Memory used for the property tables within a window.");
@@ -536,9 +531,6 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
   REPORT("window-objects/dom/other", windowTotalSizes.mDOMOtherSize,
          "This is the sum of all windows' 'dom/other' numbers.");
 
-  REPORT("window-objects/proto-iface-cache", windowTotalSizes.mProtoIfaceCacheSize,
-         "This is the sum of all windows' 'proto-iface-cache' numbers.");
-
   REPORT("window-objects/property-tables",
          windowTotalSizes.mPropertyTablesSize,
          "This is the sum of all windows' 'property-tables' numbers.");
diff --git a/dom/base/nsWindowMemoryReporter.h b/dom/base/nsWindowMemoryReporter.h
index 5a7e1ab1164..1691a21402b 100644
--- a/dom/base/nsWindowMemoryReporter.h
+++ b/dom/base/nsWindowMemoryReporter.h
@@ -40,7 +40,6 @@ class nsWindowSizes {
   macro(Other, mLayoutTextRunsSize) \
   macro(Other, mLayoutPresContextSize) \
   macro(Other, mPropertyTablesSize) \
-  macro(Other, mProtoIfaceCacheSize) \
 
 public:
   nsWindowSizes(mozilla::MallocSizeOf aMallocSizeOf)

From 23f093f4e34399862fd0f31bf02bb5f6d3d1306b Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Mon, 18 Nov 2013 11:17:41 -0800
Subject: [PATCH 22/92] Bug 939925 - Catch exceptions when recording resource
 usage; r=mshal

--HG--
extra : rebase_source : a9d1c353ae82376cac561c01c94698bf49a9777f
---
 python/mozbuild/mozbuild/controller/building.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
index d9407758400..5f9b6b7b3b1 100644
--- a/python/mozbuild/mozbuild/controller/building.py
+++ b/python/mozbuild/mozbuild/controller/building.py
@@ -384,12 +384,17 @@ class BuildMonitor(MozbuildObject):
         if not record_usage:
             return
 
-        usage = self.record_resource_usage()
-        if not usage:
-            return
+        try:
+            usage = self.record_resource_usage()
+            if not usage:
+                return
 
-        with open(self._get_state_filename('build_resources.json'), 'w') as fh:
-            json.dump(usage, fh, indent=2)
+            with open(self._get_state_filename('build_resources.json'), 'w') as fh:
+                json.dump(usage, fh, indent=2)
+        except Exception as e:
+            self.log(logging.WARNING, 'build_resources_error',
+                {'msg': str(e)},
+                'Exception when writing resource usage file: {msg}')
 
     def _get_finder_cpu_usage(self):
         """Obtain the CPU usage of the Finder app on OS X.

From 943b78f5c39dcfb8049f36b65fe1331f53ab6e07 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 12 Nov 2013 12:30:34 -0800
Subject: [PATCH 23/92] Bug 937803 - os.path.exists should work with
 MockedOpen; r=glandium

--HG--
extra : rebase_source : 567b70b6a75f3c918da2c99ceb490ac569919ed0
---
 config/mozunit.py            | 13 +++++++++++++
 config/tests/unit-mozunit.py | 12 ++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/config/mozunit.py b/config/mozunit.py
index da0083dfc8e..964927e10f5 100644
--- a/config/mozunit.py
+++ b/config/mozunit.py
@@ -129,11 +129,24 @@ class MockedOpen(object):
     def __enter__(self):
         import __builtin__
         self.open = __builtin__.open
+        self._orig_path_exists = os.path.exists
         __builtin__.open = self
+        os.path.exists = self._wrapped_exists
 
     def __exit__(self, type, value, traceback):
         import __builtin__
         __builtin__.open = self.open
+        os.path.exists = self._orig_path_exists
+
+    def _wrapped_exists(self, p):
+        if p in self.files:
+            return True
+
+        abspath = os.path.abspath(p)
+        if abspath in self.files:
+            return True
+
+        return self._orig_path_exists(p)
 
 def main(*args):
     unittest.main(testRunner=MozTestRunner(),*args)
diff --git a/config/tests/unit-mozunit.py b/config/tests/unit-mozunit.py
index 4e03c19366b..69798f4bacd 100644
--- a/config/tests/unit-mozunit.py
+++ b/config/tests/unit-mozunit.py
@@ -15,8 +15,15 @@ class TestMozUnit(unittest.TestCase):
         with os.fdopen(fd, 'w') as file:
             file.write('foobar');
 
+        self.assertFalse(os.path.exists('file1'))
+        self.assertFalse(os.path.exists('file2'))
+
         with MockedOpen({'file1': 'content1',
                          'file2': 'content2'}):
+            self.assertTrue(os.path.exists('file1'))
+            self.assertTrue(os.path.exists('file2'))
+            self.assertFalse(os.path.exists('foo/file1'))
+
             # Check the contents of the files given at MockedOpen creation.
             self.assertEqual(open('file1', 'r').read(), 'content1')
             self.assertEqual(open('file2', 'r').read(), 'content2')
@@ -24,6 +31,7 @@ class TestMozUnit(unittest.TestCase):
             # Check that overwriting these files alters their content.
             with open('file1', 'w') as file:
                 file.write('foo')
+            self.assertTrue(os.path.exists('file1'))
             self.assertEqual(open('file1', 'r').read(), 'foo')
 
             # ... but not until the file is closed.
@@ -38,13 +46,17 @@ class TestMozUnit(unittest.TestCase):
                 file.write('bar')
             self.assertEqual(open('file1', 'r').read(), 'foobar')
 
+            self.assertFalse(os.path.exists('file3'))
+
             # Opening a non-existing file ought to fail.
             self.assertRaises(IOError, open, 'file3', 'r')
+            self.assertFalse(os.path.exists('file3'))
 
             # Check that writing a new file does create the file.
             with open('file3', 'w') as file:
                 file.write('baz')
             self.assertEqual(open('file3', 'r').read(), 'baz')
+            self.assertTrue(os.path.exists('file3'))
 
             # Check the content of the file created outside MockedOpen.
             self.assertEqual(open(path, 'r').read(), 'foobar')

From 577455026d50ff8c505988941ebdf213397e8e8f Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Thu, 14 Nov 2013 14:31:58 -0800
Subject: [PATCH 24/92] Bug 928195 - Part 1: Remove trailing whitespace from
 Codegen.py; r=bz

--HG--
extra : rebase_source : 09a7ed7933ef3c6efac617d3300b709ac2b3f26e
---
 dom/bindings/Codegen.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 5e0fad48abe..b4d90639d45 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -1889,7 +1889,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
                                   post="\n}")
         else:
             prefCache = None
-            
+
         if UseHolderForUnforgeable(self.descriptor):
             createUnforgeableHolder = CGGeneric("""JS::Rooted<JSObject*> unforgeableHolder(aCx,
   JS_NewObjectWithGivenProto(aCx, nullptr, nullptr, nullptr));
@@ -2017,7 +2017,7 @@ class CGGetPerInterfaceObject(CGAbstractMethod):
     CreateInterfaceObjects(aCx, aGlobal, protoAndIfaceArray, aDefineOnGlobal);
   }
 
-  /* 
+  /*
    * The object might _still_ be null, but that's OK.
    *
    * Calling fromMarkedLocation() is safe because protoAndIfaceArray is
@@ -3541,7 +3541,7 @@ for (uint32_t i = 0; i < length; ++i) {
                 "  if (index < 0) {\n"
                 "    return true;\n"
                 "  }\n")
-            
+
         template = (
             "{\n"
             "  bool ok;\n"
@@ -4108,7 +4108,7 @@ def getWrapTemplateForType(type, descriptorProvider, result, successCode,
     def wrapAndSetPtr(wrapCall, failureCode=None):
         """
         Returns the code to set the jsval by calling "wrapCall". "failureCode"
-        is the code to run if calling "wrapCall" fails 
+        is the code to run if calling "wrapCall" fails
         """
         if failureCode is None:
             failureCode = exceptionCode
@@ -5036,7 +5036,7 @@ class CGSwitch(CGList):
                         )
                     )
                 )
-                        
+
         self.append(CGGeneric("}"))
 
 class CGCase(CGList):
@@ -5085,7 +5085,7 @@ class CGMethodCall(CGThing):
                                       method,
                                       argConversionStartsAt=argConversionStartsAt,
                                       isConstructor=isConstructor)
-            
+
 
         signatures = method.signatures()
         if len(signatures) == 1:
@@ -6788,10 +6788,10 @@ class ClassUsingDeclaration(ClassItem):
 class ClassConstructor(ClassItem):
     """
     Used for adding a constructor to a CGClass.
-    
+
     args is a list of Argument objects that are the arguments taken by the
     constructor.
-    
+
     inline should be True if the constructor should be marked inline.
 
     bodyInHeader should be True if the body should be placed in the class
@@ -6835,7 +6835,7 @@ class ClassConstructor(ClassItem):
                 initialize = m.body
                 if initialize:
                     items.append(m.name + "(" + initialize + ")")
-            
+
         if len(items) > 0:
             return '\n  : ' + ',\n    '.join(items)
         return ''
@@ -7846,7 +7846,7 @@ class CGDOMJSProxyHandler_hasOwn(ClassMethod):
         self.descriptor = descriptor
     def getBody(self):
         if self.descriptor.supportsIndexedProperties():
-            indexed = ("int32_t index = GetArrayIndexFromId(cx, id);\n" + 
+            indexed = ("int32_t index = GetArrayIndexFromId(cx, id);\n" +
                        "if (IsArrayIndex(index)) {\n" +
                        CGIndenter(CGProxyIndexedPresenceChecker(self.descriptor)).define() + "\n" +
                        "  *bp = found;\n" +
@@ -8742,7 +8742,7 @@ if (""",
                 "}")
             conversionReplacements["convert"] = CGIndenter(
                 CGGeneric(conversionReplacements["convert"])).define()
-        
+
         return CGGeneric(
             string.Template(conversion).substitute(conversionReplacements)
             )
@@ -11349,4 +11349,3 @@ class CGEventRoot(CGThing):
 
     def define(self):
         return self.root.define()
-

From 1dc2a7a39b95828e10284c934c8a998d7089b8a0 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Thu, 14 Nov 2013 14:34:50 -0800
Subject: [PATCH 25/92] Bug 928195 - Part 2: Provide a mach command to run
 WebIDL parser tests; r=bz

--HG--
extra : rebase_source : ff200d7a77532dae9e022d03cccc624ea1f77c63
---
 build/mach_bootstrap.py       |  3 +++
 dom/bindings/mach_commands.py | 30 ++++++++++++++++++++++++++++++
 dom/bindings/test/Makefile.in |  4 ----
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 dom/bindings/mach_commands.py

diff --git a/build/mach_bootstrap.py b/build/mach_bootstrap.py
index 79b3562a38f..0f0e8367474 100644
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -35,6 +35,8 @@ SEARCH_PATHS = [
     'python/which',
     'build/pymake',
     'config',
+    'dom/bindings',
+    'dom/bindings/parser',
     'other-licenses/ply',
     'xpcom/idl-parser',
     'testing',
@@ -60,6 +62,7 @@ SEARCH_PATHS = [
 # Individual files providing mach commands.
 MACH_MODULES = [
     'addon-sdk/mach_commands.py',
+    'dom/bindings/mach_commands.py',
     'layout/tools/reftest/mach_commands.py',
     'python/mach_commands.py',
     'python/mach/mach/commands/commandinfo.py',
diff --git a/dom/bindings/mach_commands.py b/dom/bindings/mach_commands.py
new file mode 100644
index 00000000000..e176d91cd4e
--- /dev/null
+++ b/dom/bindings/mach_commands.py
@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, # You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from __future__ import unicode_literals
+
+import os
+import sys
+
+from mach.decorators import (
+    CommandArgument,
+    CommandProvider,
+    Command,
+)
+
+from mozbuild.base import MachCommandBase
+
+
+@CommandProvider
+class WebIDLProvider(MachCommandBase):
+    @Command('webidl-parser-test', category='testing',
+        description='Run WebIDL tests.')
+    @CommandArgument('--verbose', '-v', action='store_true',
+        help='Run tests in verbose mode.')
+    def webidl_test(self, verbose=False):
+        sys.path.insert(0, os.path.join(self.topsrcdir, 'other-licenses',
+            'ply'))
+
+        from runtests import run_tests
+        return run_tests(None, verbose=verbose)
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index b3e8e53253c..78756bf35a0 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -65,10 +65,6 @@ check::
 	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) $(srcdir)/../parser/runtests.py
 
-check-interactive:
-	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
-	  $(PLY_INCLUDE) $(srcdir)/../parser/runtests.py -q
-
 # Since we define MOCHITEST_FILES, config/makefiles/mochitest.mk goes ahead and
 # sets up a rule with libs:: in itm which makes our .DEFAULT_TARGET be "libs".
 # Then ruls.mk does |.DEFAULT_TARGET ?= default| which leaves it as "libs".  So

From b89193cb6758187c95369b78490183f05b27fcfd Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Mon, 18 Nov 2013 13:02:11 -0800
Subject: [PATCH 26/92] Bug 928195 - Part 3: Consolidate all WebIDL Python
 logic into mozwebidl module; r=bz, froydnj

--HG--
extra : rebase_source : 0d8f664ecda7a92b6fba768a0dd0fd867c7d0ed3
---
 build/virtualenv_packages.txt                 |   2 +
 dom/bindings/Makefile.in                      |   2 +
 dom/bindings/mozwebidl/__init__.py            | 563 ++++++++++++++++++
 dom/bindings/mozwebidl/test/Child.webidl      |   3 +
 .../mozwebidl/test/DummyBinding.webidl        |   2 +
 .../mozwebidl/test/ExampleBinding.webidl      |   3 +
 dom/bindings/mozwebidl/test/Parent.webidl     |   3 +
 dom/bindings/mozwebidl/test/TestEvent.webidl  |  13 +
 dom/bindings/mozwebidl/test/test_mozwebidl.py | 276 +++++++++
 9 files changed, 867 insertions(+)
 create mode 100644 dom/bindings/mozwebidl/__init__.py
 create mode 100644 dom/bindings/mozwebidl/test/Child.webidl
 create mode 100644 dom/bindings/mozwebidl/test/DummyBinding.webidl
 create mode 100644 dom/bindings/mozwebidl/test/ExampleBinding.webidl
 create mode 100644 dom/bindings/mozwebidl/test/Parent.webidl
 create mode 100644 dom/bindings/mozwebidl/test/TestEvent.webidl
 create mode 100644 dom/bindings/mozwebidl/test/test_mozwebidl.py

diff --git a/build/virtualenv_packages.txt b/build/virtualenv_packages.txt
index 98003ce2bff..7d2ddd02698 100644
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -13,6 +13,8 @@ mock.pth:python/mock-1.0.0
 mozilla.pth:build
 mozilla.pth:config
 mozilla.pth:xpcom/typelib/xpt/tools
+mozilla.pth:dom/bindings
+mozilla.pth:dom/bindings/parser
 copy:build/buildconfig.py
 packages.txt:testing/mozbase/packages.txt
 objdir:build
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index be1bbe9dfa6..35bc43cb4db 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -90,6 +90,8 @@ globalgen_headers_DEST = $(ABS_DIST)/include/mozilla/dom
 globalgen_headers_TARGET := export
 INSTALL_TARGETS += globalgen_headers
 
+PYTHON_UNIT_TESTS += $(srcdir)/mozwebidl/test/test_mozwebidl.py
+
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
diff --git a/dom/bindings/mozwebidl/__init__.py b/dom/bindings/mozwebidl/__init__.py
new file mode 100644
index 00000000000..65f6af156d9
--- /dev/null
+++ b/dom/bindings/mozwebidl/__init__.py
@@ -0,0 +1,563 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This module contains code for managing WebIDL files and bindings for
+# the build system.
+
+from __future__ import unicode_literals
+
+import errno
+import hashlib
+import json
+import logging
+import os
+
+from copy import deepcopy
+
+from mach.mixin.logging import LoggingMixin
+
+from mozbuild.base import MozbuildObject
+from mozbuild.makeutil import Makefile
+from mozbuild.pythonutil import iter_modules_in_path
+from mozbuild.util import FileAvoidWrite
+
+import WebIDL
+from Codegen import (
+    CGBindingRoot,
+    CGEventRoot,
+    CGExampleRoot,
+    GlobalGenRoots,
+)
+from Configuration import Configuration
+
+
+class BuildResult(object):
+    """Represents the result of building WebIDL files.
+
+    This holds a summary of output file generation during a build.
+    """
+
+    def __init__(self):
+        # The .webidl files that had their outputs regenerated.
+        self.inputs = set()
+
+        # The output files that were created.
+        self.created = set()
+
+        # The output files that changed.
+        self.updated = set()
+
+        # The output files that didn't change.
+        self.unchanged = set()
+
+
+class WebIDLCodegenManagerState(dict):
+    """Holds state for the WebIDL code generation manager.
+
+    State is currently just an extended dict. The internal implementation of
+    state should be considered a black box to everyone except
+    WebIDLCodegenManager. But we'll still document it.
+
+    Fields:
+
+    version
+       The integer version of the format. This is to detect incompatible
+       changes between state. It should be bumped whenever the format
+       changes or semantics change.
+
+    webidls
+       A dictionary holding information about every known WebIDL input.
+       Keys are the basenames of input WebIDL files. Values are dicts of
+       metadata. Keys in those dicts are:
+
+       * filename - The full path to the input filename.
+       * inputs - A set of full paths to other webidl files this webidl
+         depends on.
+       * outputs - Set of full output paths that are created/derived from
+         this file.
+       * sha1 - The hexidecimal SHA-1 of the input filename from the last
+         processing time.
+
+    global_inputs
+       A dictionary defining files that influence all processing. Keys
+       are full filenames. Values are hexidecimal SHA-1 from the last
+       processing time.
+    """
+
+    VERSION = 1
+
+    def __init__(self, fh=None):
+        self['version'] = self.VERSION
+        self['webidls'] = {}
+        self['global_depends'] = {}
+
+        if not fh:
+            return
+
+        state = json.load(fh)
+        if state['version'] != self.VERSION:
+            raise Exception('Unknown state version: %s' % state['version'])
+
+        self['version'] = state['version']
+        self['global_depends'] = state['global_depends']
+
+        for k, v in state['webidls'].items():
+            self['webidls'][k] = v
+
+            # Sets are converted to lists for serialization because JSON
+            # doesn't support sets.
+            self['webidls'][k]['inputs'] = set(v['inputs'])
+            self['webidls'][k]['outputs'] = set(v['outputs'])
+
+    def dump(self, fh):
+        """Dump serialized state to a file handle."""
+        normalized = deepcopy(self)
+
+        for k, v in self['webidls'].items():
+            # Convert sets to lists because JSON doesn't support sets.
+            normalized['webidls'][k]['outputs'] = sorted(v['outputs'])
+            normalized['webidls'][k]['inputs'] = sorted(v['inputs'])
+
+        json.dump(normalized, fh, sort_keys=True)
+
+
+class WebIDLCodegenManager(LoggingMixin):
+    """Manages all things WebIDL.
+
+    This object is meant to be generic and reusable. Paths, etc should be
+    parameters and not hardcoded.
+    """
+
+    # Global parser derived declaration files.
+    GLOBAL_DECLARE_FILES = {
+        'GeneratedAtomList.h',
+        'PrototypeList.h',
+        'RegisterBindings.h',
+        'UnionConversions.h',
+        'UnionTypes.h',
+    }
+
+    # Global parser derived definition files.
+    GLOBAL_DEFINE_FILES = {
+        'RegisterBindings.cpp',
+        'UnionTypes.cpp',
+    }
+
+    # Example interfaces to build along with the tree. Other example
+    # interfaces will need to be generated manually.
+    BUILD_EXAMPLE_INTERFACES = {
+        'TestExampleInterface',
+        'TestExampleProxyInterface',
+    }
+
+    def __init__(self, config_path, inputs, exported_header_dir,
+        codegen_dir, state_path, cache_dir=None, make_deps_path=None,
+        make_deps_target=None):
+        """Create an instance that manages WebIDLs in the build system.
+
+        config_path refers to a WebIDL config file (e.g. Bindings.conf).
+        inputs is a 3-tuple describing the input .webidl files and how to
+        process them. Members are:
+            (set(.webidl files), set(basenames of exported files),
+                set(basenames of generated events files))
+
+        exported_header_dir and codegen_dir are directories where generated
+        files will be written to.
+        state_path is the path to a file that will receive JSON state from our
+        actions.
+        make_deps_path is the path to a make dependency file that we can
+        optionally write.
+        make_deps_target is the target that receives the make dependencies. It
+        must be defined if using make_deps_path.
+        """
+        self.populate_logger()
+
+        input_paths, exported_stems, generated_events_stems = inputs
+
+        self._config_path = config_path
+        self._input_paths = set(input_paths)
+        self._exported_stems = set(exported_stems)
+        self._generated_events_stems = set(generated_events_stems)
+        self._exported_header_dir = exported_header_dir
+        self._codegen_dir = codegen_dir
+        self._state_path = state_path
+        self._cache_dir = cache_dir
+        self._make_deps_path = make_deps_path
+        self._make_deps_target = make_deps_target
+
+        if (make_deps_path and not make_deps_target) or (not make_deps_path and
+            make_deps_target):
+            raise Exception('Must define both make_deps_path and make_deps_target '
+                'if one is defined.')
+
+        self._parser_results = None
+        self._config = None
+        self._state = WebIDLCodegenManagerState()
+
+        if os.path.exists(state_path):
+            with open(state_path, 'rb') as fh:
+                try:
+                    self._state = WebIDLCodegenManagerState(fh=fh)
+                except Exception as e:
+                    self.log(logging.WARN, 'webidl_bad_state', {'msg': str(e)},
+                        'Bad WebIDL state: {msg}')
+
+    @property
+    def config(self):
+        if not self._config:
+            self._parse_webidl()
+
+        return self._config
+
+    def generate_build_files(self):
+        """Generate files required for the build.
+
+        This function is in charge of generating all the .h/.cpp files derived
+        from input .webidl files. Please note that there are build actions
+        required to produce .webidl files and these build actions are
+        explicitly not captured here: this function assumes all .webidl files
+        are present and up to date.
+
+        This routine is called as part of the build to ensure files that need
+        to exist are present and up to date. This routine may not be called if
+        the build dependencies (generated as a result of calling this the first
+        time) say everything is up to date.
+
+        Because reprocessing outputs for every .webidl on every invocation
+        is expensive, we only regenerate the minimal set of files on every
+        invocation. The rules for deciding what needs done are roughly as
+        follows:
+
+        1. If any .webidl changes, reparse all .webidl files and regenerate
+           the global derived files. Only regenerate output files (.h/.cpp)
+           impacted by the modified .webidl files.
+        2. If an non-.webidl dependency (Python files, config file) changes,
+           assume everything is out of date and regenerate the world. This
+           is because changes in those could globally impact every output
+           file.
+        3. If an output file is missing, ensure it is present by performing
+           necessary regeneration.
+        """
+        # Despite #1 above, we assume the build system is smart enough to not
+        # invoke us if nothing has changed. Therefore, any invocation means
+        # something has changed. And, if anything has changed, we need to
+        # parse the WebIDL.
+        self._parse_webidl()
+
+        result = BuildResult()
+
+        # If we parse, we always update globals - they are cheap and it is
+        # easier that way.
+        created, updated, unchanged = self._write_global_derived()
+        result.created |= created
+        result.updated |= updated
+        result.unchanged |= unchanged
+
+        # If any of the extra dependencies changed, regenerate the world.
+        global_changed, global_hashes = self._global_dependencies_changed()
+        if global_changed:
+            # Make a copy because we may modify.
+            changed_inputs = set(self._input_paths)
+        else:
+            changed_inputs = self._compute_changed_inputs()
+
+        self._state['global_depends'] = global_hashes
+
+        # Generate bindings from .webidl files.
+        for filename in sorted(changed_inputs):
+            basename = os.path.basename(filename)
+            result.inputs.add(filename)
+            written, deps = self._generate_build_files_for_webidl(filename)
+            result.created |= written[0]
+            result.updated |= written[1]
+            result.unchanged |= written[2]
+
+            self._state['webidls'][basename] = dict(
+                filename=filename,
+                outputs=written[0] | written[1] | written[2],
+                inputs=set(deps),
+                sha1=self._input_hashes[filename],
+            )
+
+        # Process some special interfaces required for testing.
+        for interface in self.BUILD_EXAMPLE_INTERFACES:
+            written = self.generate_example_files(interface)
+            result.created |= written[0]
+            result.updated |= written[1]
+            result.unchanged |= written[2]
+
+        # Generate a make dependency file.
+        if self._make_deps_path:
+            mk = Makefile()
+            codegen_rule = mk.create_rule([self._make_deps_target])
+            codegen_rule.add_dependencies(global_hashes.keys())
+            codegen_rule.add_dependencies(self._input_paths)
+
+            with FileAvoidWrite(self._make_deps_path) as fh:
+                mk.dump(fh)
+
+        self._save_state()
+
+        return result
+
+    def generate_example_files(self, interface):
+        """Generates example files for a given interface."""
+        root = CGExampleRoot(self.config, interface)
+
+        return self._maybe_write_codegen(root, *self._example_paths(interface))
+
+    def _parse_webidl(self):
+        self.log(logging.INFO, 'webidl_parse',
+            {'count': len(self._input_paths)},
+            'Parsing {count} WebIDL files.')
+
+        hashes = {}
+        parser = WebIDL.Parser(self._cache_dir)
+
+        for path in sorted(self._input_paths):
+            with open(path, 'rb') as fh:
+                data = fh.read()
+                hashes[path] = hashlib.sha1(data).hexdigest()
+                parser.parse(data, path)
+
+        self._parser_results = parser.finish()
+        self._config = Configuration(self._config_path, self._parser_results)
+        self._input_hashes = hashes
+
+    def _write_global_derived(self):
+        things = [('declare', f) for f in self.GLOBAL_DECLARE_FILES]
+        things.extend(('define', f) for f in self.GLOBAL_DEFINE_FILES)
+
+        result = (set(), set(), set())
+
+        for what, filename in things:
+            stem = os.path.splitext(filename)[0]
+            root = getattr(GlobalGenRoots, stem)(self._config)
+
+            if what == 'declare':
+                code = root.declare()
+                output_root = self._exported_header_dir
+            elif what == 'define':
+                code = root.define()
+                output_root = self._codegen_dir
+            else:
+                raise Exception('Unknown global gen type: %s' % what)
+
+            output_path = os.path.join(output_root, filename)
+            self._maybe_write_file(output_path, code, result)
+
+        return result
+
+    def _compute_changed_inputs(self):
+        """Compute the set of input files that need regenerated."""
+        changed_inputs = set()
+        expected_outputs = self.expected_build_output_files()
+
+        # Look for missing output files.
+        if any(not os.path.exists(f) for f in expected_outputs):
+            # FUTURE Bug 940469 Only regenerate minimum set.
+            changed_inputs |= self._input_paths
+
+        # That's it for examining output files. We /could/ examine SHA-1's of
+        # output files from a previous run to detect modifications. But that's
+        # a lot of extra work and most build systems don't do that anyway.
+
+        # Now we move on to the input files.
+        old_hashes = {v['filename']: v['sha1']
+            for v in self._state['webidls'].values()}
+
+        old_filenames = set(old_hashes.keys())
+        new_filenames = self._input_paths
+
+        # If an old file has disappeared or a new file has arrived, mark
+        # it.
+        changed_inputs |= old_filenames ^ new_filenames
+
+        # For the files in common between runs, compare content. If the file
+        # has changed, mark it. We don't need to perform mtime comparisons
+        # because content is a stronger validator.
+        for filename in old_filenames & new_filenames:
+            if old_hashes[filename] != self._input_hashes[filename]:
+                changed_inputs.add(filename)
+
+        # We've now populated the base set of inputs that have changed.
+
+        # Inherit dependencies from previous run. The full set of dependencies
+        # is associated with each record, so we don't need to perform any fancy
+        # graph traversal.
+        for v in self._state['webidls'].values():
+            if any(dep for dep in v['inputs'] if dep in changed_inputs):
+                changed_inputs.add(v['filename'])
+
+        # Ensure all changed inputs actually exist (some changed inputs could
+        # have been from deleted files).
+        return set(f for f in changed_inputs if os.path.exists(f))
+
+    def _binding_info(self, p):
+        """Compute binding metadata for an input path.
+
+        Returns a tuple of:
+
+          (stem, binding_stem, is_event, output_files)
+
+        output_files is itself a tuple. The first two items are the binding
+        header and C++ paths, respectively. The 2nd pair are the event header
+        and C++ paths or None if this isn't an event binding.
+        """
+        basename = os.path.basename(p)
+        stem = os.path.splitext(basename)[0]
+        binding_stem = '%sBinding' % stem
+
+        if stem in self._exported_stems:
+            header_dir = self._exported_header_dir
+        else:
+            header_dir = self._codegen_dir
+
+        is_event = stem in self._generated_events_stems
+
+        files = (
+            os.path.join(header_dir, '%s.h' % binding_stem),
+            os.path.join(self._codegen_dir, '%s.cpp' % binding_stem),
+            os.path.join(header_dir, '%s.h' % stem) if is_event else None,
+            os.path.join(self._codegen_dir, '%s.cpp' % stem) if is_event else None,
+        )
+
+        return stem, binding_stem, is_event, header_dir, files
+
+    def _example_paths(self, interface):
+        return (
+            os.path.join(self._codegen_dir, '%s-example.h' % interface),
+            os.path.join(self._codegen_dir, '%s-example.cpp' % interface))
+
+    def expected_build_output_files(self):
+        """Obtain the set of files generate_build_files() should write."""
+        paths = set()
+
+        # Account for global generation.
+        for p in self.GLOBAL_DECLARE_FILES:
+            paths.add(os.path.join(self._exported_header_dir, p))
+        for p in self.GLOBAL_DEFINE_FILES:
+            paths.add(os.path.join(self._codegen_dir, p))
+
+        for p in self._input_paths:
+            stem, binding_stem, is_event, header_dir, files = self._binding_info(p)
+            paths |= {f for f in files if f}
+
+        for interface in self.BUILD_EXAMPLE_INTERFACES:
+            for p in self._example_paths(interface):
+                paths.add(p)
+
+        return paths
+
+    def _generate_build_files_for_webidl(self, filename):
+        self.log(logging.INFO, 'webidl_generate_build_for_input',
+            {'filename': filename},
+            'Generating WebIDL files derived from {filename}')
+
+        stem, binding_stem, is_event, header_dir, files = self._binding_info(filename)
+        root = CGBindingRoot(self._config, binding_stem, filename)
+
+        result = self._maybe_write_codegen(root, files[0], files[1])
+
+        if is_event:
+            generated_event = CGEventRoot(self._config, stem)
+            result = self._maybe_write_codegen(generated_event, files[2],
+                files[3], result)
+
+        return result, root.deps()
+
+    def _global_dependencies_changed(self):
+        """Determine whether the global dependencies have changed."""
+        current_files = set(iter_modules_in_path(os.path.dirname(__file__)))
+
+        # We need to catch other .py files from /dom/bindings. We assume these
+        # are in the same directory as the config file.
+        current_files |= set(iter_modules_in_path(os.path.dirname(self._config_path)))
+
+        current_files.add(self._config_path)
+
+        current_hashes = {}
+        for f in current_files:
+            # This will fail if the file doesn't exist. If a current global
+            # dependency doesn't exist, something else is wrong.
+            with open(f, 'rb') as fh:
+                current_hashes[f] = hashlib.sha1(fh.read()).hexdigest()
+
+        # The set of files has changed.
+        if current_files ^ set(self._state['global_depends'].keys()):
+            return True, current_hashes
+
+        # Compare hashes.
+        for f, sha1 in current_hashes.items():
+            if sha1 != self._state['global_depends'][f]:
+                return True, current_hashes
+
+        return False, current_hashes
+
+    def _save_state(self):
+        with open(self._state_path, 'wb') as fh:
+            self._state.dump(fh)
+
+    def _maybe_write_codegen(self, obj, declare_path, define_path, result=None):
+        assert declare_path and define_path
+        if not result:
+            result = (set(), set(), set())
+
+        self._maybe_write_file(declare_path, obj.declare(), result)
+        self._maybe_write_file(define_path, obj.define(), result)
+
+        return result
+
+    def _maybe_write_file(self, path, content, result):
+        fh = FileAvoidWrite(path)
+        fh.write(content)
+        existed, updated = fh.close()
+
+        if not existed:
+            result[0].add(path)
+        elif updated:
+            result[1].add(path)
+        else:
+            result[2].add(path)
+
+
+def create_build_system_manager(topsrcdir, topobjdir, dist_dir):
+    """Create a WebIDLManager for use by the build system."""
+    src_dir = os.path.join(topsrcdir, 'dom', 'bindings')
+    obj_dir = os.path.join(topobjdir, 'dom', 'bindings')
+
+    with open(os.path.join(obj_dir, 'file-lists.json'), 'rb') as fh:
+        files = json.load(fh)
+
+    inputs = (files['webidls'], files['exported_stems'],
+        files['generated_events_stems'])
+
+    cache_dir = os.path.join(obj_dir, '_cache')
+    try:
+        os.makedirs(cache_dir)
+    except OSError as e:
+        if e.errno != errno.EEXIST:
+            raise
+
+    return WebIDLCodegenManager(
+        os.path.join(src_dir, 'Bindings.conf'),
+        inputs,
+        os.path.join(dist_dir, 'include', 'mozilla', 'dom'),
+        obj_dir,
+        os.path.join(obj_dir, 'codegen.json'),
+        cache_dir=cache_dir,
+        # The make rules include a codegen.pp file containing dependencies.
+        make_deps_path=os.path.join(obj_dir, 'codegen.pp'),
+        make_deps_target='codegen.pp',
+    )
+
+
+class BuildSystemWebIDL(MozbuildObject):
+    @property
+    def manager(self):
+        if not hasattr(self, '_webidl_manager'):
+            self._webidl_manager = create_build_system_manager(
+                self.topsrcdir, self.topobjdir, self.distdir)
+
+        return self._webidl_manager
diff --git a/dom/bindings/mozwebidl/test/Child.webidl b/dom/bindings/mozwebidl/test/Child.webidl
new file mode 100644
index 00000000000..f7d0a76c9d3
--- /dev/null
+++ b/dom/bindings/mozwebidl/test/Child.webidl
@@ -0,0 +1,3 @@
+interface Child : Parent {
+  void ChildBaz();
+};
diff --git a/dom/bindings/mozwebidl/test/DummyBinding.webidl b/dom/bindings/mozwebidl/test/DummyBinding.webidl
new file mode 100644
index 00000000000..e2ccc4b6974
--- /dev/null
+++ b/dom/bindings/mozwebidl/test/DummyBinding.webidl
@@ -0,0 +1,2 @@
+interface DummyInterface {};
+interface DummyInterfaceWorkers {};
diff --git a/dom/bindings/mozwebidl/test/ExampleBinding.webidl b/dom/bindings/mozwebidl/test/ExampleBinding.webidl
new file mode 100644
index 00000000000..34794993fe4
--- /dev/null
+++ b/dom/bindings/mozwebidl/test/ExampleBinding.webidl
@@ -0,0 +1,3 @@
+/* These interfaces are hard-coded and need to be defined. */
+interface TestExampleInterface {};
+interface TestExampleProxyInterface {};
diff --git a/dom/bindings/mozwebidl/test/Parent.webidl b/dom/bindings/mozwebidl/test/Parent.webidl
new file mode 100644
index 00000000000..423f364aea2
--- /dev/null
+++ b/dom/bindings/mozwebidl/test/Parent.webidl
@@ -0,0 +1,3 @@
+interface Parent {
+  void MethodFoo();
+};
diff --git a/dom/bindings/mozwebidl/test/TestEvent.webidl b/dom/bindings/mozwebidl/test/TestEvent.webidl
new file mode 100644
index 00000000000..db085629186
--- /dev/null
+++ b/dom/bindings/mozwebidl/test/TestEvent.webidl
@@ -0,0 +1,13 @@
+interface EventTarget {
+  void addEventListener();
+};
+
+interface Event {};
+
+callback EventHandlerNonNull = any (Event event);
+typedef EventHandlerNonNull? EventHandler;
+
+[NoInterfaceObject]
+interface TestEvent : EventTarget {
+  attribute EventHandler onfoo;
+};
diff --git a/dom/bindings/mozwebidl/test/test_mozwebidl.py b/dom/bindings/mozwebidl/test/test_mozwebidl.py
new file mode 100644
index 00000000000..de9a665c2a9
--- /dev/null
+++ b/dom/bindings/mozwebidl/test/test_mozwebidl.py
@@ -0,0 +1,276 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from __future__ import unicode_literals
+
+import imp
+import json
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+from mozwebidl import (
+    WebIDLCodegenManager,
+    WebIDLCodegenManagerState,
+)
+
+from mozfile import NamedTemporaryFile
+
+from mozunit import (
+    MockedOpen,
+    main,
+)
+
+
+OUR_DIR = os.path.abspath(os.path.dirname(__file__))
+TOPSRCDIR = os.path.normpath(os.path.join(OUR_DIR, '..', '..', '..', '..'))
+
+
+class TestWebIDLCodegenManager(unittest.TestCase):
+    TEST_STEMS = {
+        'Child',
+        'Parent',
+        'ExampleBinding',
+        'TestEvent',
+    }
+
+    @property
+    def _static_input_paths(self):
+        s = {os.path.join(OUR_DIR, p) for p in os.listdir(OUR_DIR)
+            if p.endswith('.webidl')}
+
+        return s
+
+    @property
+    def _config_path(self):
+        config = os.path.join(TOPSRCDIR, 'dom', 'bindings', 'Bindings.conf')
+        self.assertTrue(os.path.exists(config))
+
+        return config
+
+    def _get_manager_args(self):
+        tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, tmp)
+
+        cache_dir = os.path.join(tmp, 'cache')
+        os.mkdir(cache_dir)
+
+        ip = self._static_input_paths
+
+        inputs = (
+            ip,
+            {os.path.splitext(os.path.basename(p))[0] for p in ip},
+            set()
+        )
+
+        return dict(
+            config_path=self._config_path,
+            inputs=inputs,
+            exported_header_dir=os.path.join(tmp, 'exports'),
+            codegen_dir=os.path.join(tmp, 'codegen'),
+            state_path=os.path.join(tmp, 'state.json'),
+            make_deps_path=os.path.join(tmp, 'codegen.pp'),
+            make_deps_target='codegen.pp',
+            cache_dir=cache_dir,
+        )
+
+    def _get_manager(self):
+        return WebIDLCodegenManager(**self._get_manager_args())
+
+    def test_unknown_state_version(self):
+        """Loading a state file with a too new version resets state."""
+        args = self._get_manager_args()
+
+        p = args['state_path']
+
+        with open(p, 'wb') as fh:
+            json.dump({
+                'version': WebIDLCodegenManagerState.VERSION + 1,
+                'foobar': '1',
+            }, fh)
+
+        manager = WebIDLCodegenManager(**args)
+
+        self.assertEqual(manager._state['version'],
+            WebIDLCodegenManagerState.VERSION)
+        self.assertNotIn('foobar', manager._state)
+
+    def test_generate_build_files(self):
+        """generate_build_files() does the right thing from empty."""
+        manager = self._get_manager()
+        result = manager.generate_build_files()
+        self.assertEqual(len(result.inputs), 5)
+
+        output = manager.expected_build_output_files()
+        self.assertEqual(result.created, output)
+        self.assertEqual(len(result.updated), 0)
+        self.assertEqual(len(result.unchanged), 0)
+
+        for f in output:
+            self.assertTrue(os.path.isfile(f))
+
+        for f in manager.GLOBAL_DECLARE_FILES:
+            self.assertIn(os.path.join(manager._exported_header_dir, f), output)
+
+        for f in manager.GLOBAL_DEFINE_FILES:
+            self.assertIn(os.path.join(manager._codegen_dir, f), output)
+
+        for s in self.TEST_STEMS:
+            self.assertTrue(os.path.isfile(os.path.join(
+                manager._exported_header_dir, '%sBinding.h' % s)))
+            self.assertTrue(os.path.isfile(os.path.join(
+                manager._codegen_dir, '%sBinding.cpp' % s)))
+
+        self.assertTrue(os.path.isfile(manager._state_path))
+
+        with open(manager._state_path, 'rb') as fh:
+            state = json.load(fh)
+            self.assertEqual(state['version'], 1)
+            self.assertIn('webidls', state)
+
+            child = state['webidls']['Child.webidl']
+            self.assertEqual(len(child['inputs']), 2)
+            self.assertEqual(len(child['outputs']), 2)
+            self.assertEqual(child['sha1'], 'c41527cad3bc161fa6e7909e48fa11f9eca0468b')
+
+    def test_generate_build_files_load_state(self):
+        """State should be equivalent when instantiating a new instance."""
+        args = self._get_manager_args()
+        m1 = WebIDLCodegenManager(**args)
+        self.assertEqual(len(m1._state['webidls']), 0)
+        m1.generate_build_files()
+
+        m2 = WebIDLCodegenManager(**args)
+        self.assertGreater(len(m2._state['webidls']), 2)
+        self.assertEqual(m1._state, m2._state)
+
+    def test_no_change_no_writes(self):
+        """If nothing changes, no files should be updated."""
+        args = self._get_manager_args()
+        m1 = WebIDLCodegenManager(**args)
+        m1.generate_build_files()
+
+        m2 = WebIDLCodegenManager(**args)
+        result = m2.generate_build_files()
+
+        self.assertEqual(len(result.inputs), 0)
+        self.assertEqual(len(result.created), 0)
+        self.assertEqual(len(result.updated), 0)
+
+    def test_output_file_regenerated(self):
+        """If an output file disappears, it is regenerated."""
+        args = self._get_manager_args()
+        m1 = WebIDLCodegenManager(**args)
+        m1.generate_build_files()
+
+        rm_count = 0
+        for p in m1._state['webidls']['Child.webidl']['outputs']:
+            rm_count += 1
+            os.unlink(p)
+
+        for p in m1.GLOBAL_DECLARE_FILES:
+            rm_count += 1
+            os.unlink(os.path.join(m1._exported_header_dir, p))
+
+        m2 = WebIDLCodegenManager(**args)
+        result = m2.generate_build_files()
+        self.assertEqual(len(result.created), rm_count)
+
+    def test_only_rebuild_self(self):
+        """If an input file changes, only rebuild that one file."""
+        args = self._get_manager_args()
+        m1 = WebIDLCodegenManager(**args)
+        m1.generate_build_files()
+
+        child_path = None
+        for p in m1._input_paths:
+            if p.endswith('Child.webidl'):
+                child_path = p
+                break
+
+        self.assertIsNotNone(child_path)
+        child_content = open(child_path, 'rb').read()
+
+        with MockedOpen({child_path: child_content + '\n/* */'}):
+            m2 = WebIDLCodegenManager(**args)
+            result = m2.generate_build_files()
+            self.assertEqual(result.inputs, set([child_path]))
+            self.assertEqual(len(result.updated), 0)
+            self.assertEqual(len(result.created), 0)
+
+    def test_rebuild_dependencies(self):
+        """Ensure an input file used by others results in others rebuilding."""
+        args = self._get_manager_args()
+        m1 = WebIDLCodegenManager(**args)
+        m1.generate_build_files()
+
+        parent_path = None
+        child_path = None
+        for p in m1._input_paths:
+            if p.endswith('Parent.webidl'):
+                parent_path = p
+            elif p.endswith('Child.webidl'):
+                child_path = p
+
+        self.assertIsNotNone(parent_path)
+        parent_content = open(parent_path, 'rb').read()
+
+        with MockedOpen({parent_path: parent_content + '\n/* */'}):
+            m2 = WebIDLCodegenManager(**args)
+            result = m2.generate_build_files()
+            self.assertEqual(result.inputs, {child_path, parent_path})
+            self.assertEqual(len(result.updated), 0)
+            self.assertEqual(len(result.created), 0)
+
+    def test_python_change_regenerate_everything(self):
+        """If a Python file changes, we should attempt to rebuild everything."""
+
+        # We don't want to mutate files in the source directory because we want
+        # to be able to build from a read-only filesystem. So, we install a
+        # dummy module and rewrite the metadata to say it comes from the source
+        # directory.
+        #
+        # Hacking imp to accept a MockedFile doesn't appear possible. So for
+        # the first iteration we read from a temp file. The second iteration
+        # doesn't need to import, so we are fine with a mocked file.
+        fake_path = os.path.join(OUR_DIR, 'fakemodule.py')
+        with NamedTemporaryFile('wt') as fh:
+            fh.write('# Original content')
+            fh.flush()
+            mod = imp.load_source('mozwebidl.fakemodule', fh.name)
+            mod.__file__ = fake_path
+
+            args = self._get_manager_args()
+            m1 = WebIDLCodegenManager(**args)
+            with MockedOpen({fake_path: '# Original content'}):
+                old_exists = os.path.exists
+                try:
+                    def exists(p):
+                        if p == fake_path:
+                            return True
+                        return old_exists(p)
+
+                    os.path.exists = exists
+
+                    result = m1.generate_build_files()
+                    l = len(result.inputs)
+
+                    with open(fake_path, 'wt') as fh:
+                        fh.write('# Modified content')
+
+                    m2 = WebIDLCodegenManager(**args)
+                    result = m2.generate_build_files()
+                    self.assertEqual(len(result.inputs), l)
+
+                    result = m2.generate_build_files()
+                    self.assertEqual(len(result.inputs), 0)
+                finally:
+                    os.path.exists = old_exists
+                    del sys.modules['mozwebidl.fakemodule']
+
+
+if __name__ == '__main__':
+    main()

From 21661b7f55b65a3a0ca6d01d2073d66deddd6772 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Thu, 14 Nov 2013 10:34:55 -0800
Subject: [PATCH 27/92] Bug 928195 - Part 4: mach command for generating WebIDL
 example files; r=froydnj

--HG--
extra : rebase_source : c2c2667cae91eae9e444f9d7cbd2750a5207af5d
---
 dom/bindings/mach_commands.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dom/bindings/mach_commands.py b/dom/bindings/mach_commands.py
index e176d91cd4e..35f9ef70b5f 100644
--- a/dom/bindings/mach_commands.py
+++ b/dom/bindings/mach_commands.py
@@ -18,6 +18,17 @@ from mozbuild.base import MachCommandBase
 
 @CommandProvider
 class WebIDLProvider(MachCommandBase):
+    @Command('webidl-example', category='misc',
+        description='Generate example files for a WebIDL interface.')
+    @CommandArgument('interface', nargs='+',
+        help='Interface(s) whose examples to generate.')
+    def webidl_example(self, interface):
+        from mozwebidl import BuildSystemWebIDL
+
+        manager = self._spawn(BuildSystemWebIDL).manager
+        for i in interface:
+            manager.generate_example_files(i)
+
     @Command('webidl-parser-test', category='testing',
         description='Run WebIDL tests.')
     @CommandArgument('--verbose', '-v', action='store_true',

From 75c527d3b5b215e203eb84d35a9adfbec4c452e4 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 13 Nov 2013 15:41:22 -0800
Subject: [PATCH 28/92] Bug 928195 - Part 5: Add docs for WebIDL and the build
 system

DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 24ea7ebca4ae151073502267b5123d2160b28d8e
---
 build/docs/index.rst  |   1 +
 build/docs/webidl.rst | 137 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 build/docs/webidl.rst

diff --git a/build/docs/index.rst b/build/docs/index.rst
index 0dd663db96a..47a84c8117a 100644
--- a/build/docs/index.rst
+++ b/build/docs/index.rst
@@ -28,6 +28,7 @@ Important Concepts
    mozinfo
    preprocessor
    jar-manifests
+   webidl
 
 mozbuild
 ========
diff --git a/build/docs/webidl.rst b/build/docs/webidl.rst
new file mode 100644
index 00000000000..de8686ed921
--- /dev/null
+++ b/build/docs/webidl.rst
@@ -0,0 +1,137 @@
+.. _webidl:
+
+======
+WebIDL
+======
+
+WebIDL describes interfaces web browsers are supposed to implement.
+
+The interaction between WebIDL and the build system is somewhat complex.
+This document will attempt to explain how it all works.
+
+Overview
+========
+
+``.webidl`` files throughout the tree define interfaces the browser
+implements. Since Gecko/Firefox is implemented in C++, there is a
+mechanism to convert these interfaces and associated metadata to
+C++ code. That's where the build system comes into play.
+
+All the code for interacting with ``.webidl`` files lives under
+``dom/bindings``. There is code in the build system to deal with
+WebIDLs explicitly.
+
+WebIDL source file flavors
+==========================
+
+Not all ``.webidl`` files are created equal! There are several flavors,
+each represented by a separate symbol from :ref:`mozbuild_symbols`.
+
+WEBIDL_FILES
+   Refers to regular/static ``.webidl`` files. Most WebIDL interfaces
+   are defined this way.
+
+GENERATED_EVENTS_WEBIDL_FILES
+   In addition to generating a binding, these ``.webidl`` files also
+   generate an event source file.
+
+PREPROCESSED_WEBIDL_FILES
+   The ``.webidl`` files are generated by preprocessing an input file.
+   They otherwise behave like **WEBIDL_FILES**.
+
+TEST_WEBIDL_FILES
+   Like **WEBIDL_FILES** but the interfaces are for testing only and
+   aren't shipped with the browser.
+
+PREPROCESSED_TEST_WEBIDL_FILES
+   Like **TEST_WEBIDL_FILES** except the ``.webidl`` is obtained via
+   preprocessing, much like **PREPROCESSED_WEBIDL_FILES**.
+
+GENERATED_WEBIDL_FILES
+   The ``.webidl`` for these is obtained through an *external*
+   mechanism. Typically there are custom build rules for producing these
+   files.
+
+Producing C++ code
+==================
+
+The most complicated part about WebIDLs is the process by which
+``.webidl`` files are converted into C++.
+
+The process begins by staging every ``.webidl`` file to a common
+location. For static files, this involves symlinking. However,
+preprocessed and externally-generated ``.webidl`` have special actions.
+
+Producing C++ code from ``.webidl`` consists of 3 logical steps:
+parsing, global generation, and bindings generation.
+
+Parsing
+-------
+
+*Every* ``.webidl`` is fed into a single parser instance. When a single
+``.webidl`` file changes, *every* ``.webidl`` needs to be reparsed.
+
+Global Generation
+-----------------
+
+Global generation takes the parser output and produces some
+well-defined output files. These output files essentially depend on
+every input ``.webidl``.
+
+Binding Generation
+------------------
+
+Binding generation refers to the process of generating output files
+corresponding to a particular ``.webidl`` file. For all ``.webidl`` files,
+we generate a ``*Binding.h`` and ``*Binding.cpp`` file. For generated
+events ``.webidl`` files, we also generate ``*.h`` and ``*.cpp`` files.
+
+Requirements
+============
+
+This section aims to document the build and developer workflow requirements
+for WebIDL.
+
+Parser unit tests
+   There are parser tests provided by ``dom/bindings/parser/runtests.py``
+   that should run as part of ``make check``. There must be a mechanism
+   to run the tests in *human* mode so they output friendly error
+   messages.
+
+Mochitests
+   There are various mochitests under ``dom/bindings/test``. They should
+   be runnable through the standard mechanisms.
+
+Test interfaces are generated as part of the build
+   ``TestExampleGenBinding.cpp`` calls into methods from the
+   ``TestExampleInterface`` and ``TestExampleProxyInterface`` interfaces.
+   These interfaces need to be generated as part of the build.
+
+Running tests automatically rebuilds
+   When a developer runs the WebIDL tests, she expects any necessary rebuilds
+   to occur.
+
+   This is faciliated through ``mach webidl-test``.
+
+Minimal rebuilds
+   Reprocessing every output for every change is expensive. So we don't
+   inconvenience people changing ``.webidl`` files, the build system
+   should only perform a minimal rebuild when sources change.
+
+Explicit method for performing codegen
+   There needs to be an explicit method for incurring code generation.
+   It needs to cover regular and test files.
+
+   This is implemented via ``make export`` in ``dom/bindings``.
+
+No-op binding generation should be fast
+   So developers touching ``.webidl`` files are not inconvenienced,
+   no-op binding generation should be fast. Watch out for the build system
+   processing large dependency files it doesn't need in order to perform
+   code generation.
+
+Ability to generate example files
+   *Any* interface can have example ``.h``/``.cpp`` files generated.
+   There must be a mechanism to facilitate this.
+
+   This is currently facilitated through ``mach webidl-example``.

From cd28c58eaa3a4cd8428ae0b1431b65b079c6f742 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Thu, 14 Nov 2013 09:52:49 -0800
Subject: [PATCH 29/92] Bug 928195 - Part 6: Rewrite WebIDL build system
 integration

WebIDL build system integration has been rewritten from the ground up.
Changes:

* GlobalGen.py, BindingGen.py, and ExampleGen.py have been removed in
  favor of mozwebidl.py.

* Static .webidl files are now processed directly in their original location
  and aren't copied to the object directory.

* Generated events <stem>.cpp files are now compiled into the unified
  sources. Previously, only the <stem>Binding.cpp files were compiled
  into unified sources.

* Exported .h files are now generated directly into their final location.
  Previously, they were generated into the local directory then
  installed in their final location.

* The list of globalgen-generated files now lives in Python and isn't
  duplicated in 3 places.

* The make dependencies are much simpler as a result of using a single
  command to perform all code generation. The auto-generated .pp file from
  code generation sets up all dependencies necessary to reinvoke code
  generation and Python takes care of dependency management.

--HG--
extra : rebase_source : bde37d7aab3bd224ca8611f3ba4aaf6311e2faab
---
 CLOBBER                                       |   3 +-
 dom/bindings/BindingGen.py                    |  98 ------
 dom/bindings/Codegen.py                       |  20 --
 dom/bindings/ExampleGen.py                    |  46 ---
 dom/bindings/GlobalGen.py                     |  81 -----
 dom/bindings/Makefile.in                      | 285 ++++--------------
 dom/bindings/moz.build                        |  11 +
 dom/bindings/test/Makefile.in                 |  79 +----
 dom/bindings/test/moz.build                   |  13 +-
 dom/moz.build                                 |   3 -
 dom/webidl/moz.build                          |  12 -
 python/mozbuild/mozbuild/action/webidl.py     |  17 ++
 python/mozbuild/mozbuild/backend/common.py    | 114 ++++++-
 .../mozbuild/backend/recursivemake.py         | 171 ++++++-----
 python/mozbuild/mozbuild/base.py              |   4 +
 15 files changed, 308 insertions(+), 649 deletions(-)
 delete mode 100644 dom/bindings/BindingGen.py
 delete mode 100644 dom/bindings/ExampleGen.py
 delete mode 100644 dom/bindings/GlobalGen.py
 create mode 100644 python/mozbuild/mozbuild/action/webidl.py

diff --git a/CLOBBER b/CLOBBER
index 7c97389909f..10494054cab 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,4 +18,5 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 938950 needs a clobber.
+Bug 928195 rewrote WebIDL building from the ground up, hopefully eliminating
+needs for future clobbers
diff --git a/dom/bindings/BindingGen.py b/dom/bindings/BindingGen.py
deleted file mode 100644
index e064270513f..00000000000
--- a/dom/bindings/BindingGen.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os
-import cPickle
-from Configuration import Configuration
-from Codegen import CGBindingRoot, replaceFileIfChanged, CGEventRoot
-from mozbuild.makeutil import Makefile
-from mozbuild.pythonutil import iter_modules_in_path
-from buildconfig import topsrcdir
-
-
-def generate_binding_files(config, outputprefix, srcprefix, webidlfile,
-                           generatedEventsWebIDLFiles):
-    """
-    |config| Is the configuration object.
-    |outputprefix| is a prefix to use for the header guards and filename.
-    """
-
-    depsname = ".deps/" + outputprefix + ".pp"
-    root = CGBindingRoot(config, outputprefix, webidlfile)
-    replaceFileIfChanged(outputprefix + ".h", root.declare())
-    replaceFileIfChanged(outputprefix + ".cpp", root.define())
-
-    if webidlfile in generatedEventsWebIDLFiles:
-        eventName = webidlfile[:-len(".webidl")]
-        generatedEvent = CGEventRoot(config, eventName)
-        replaceFileIfChanged(eventName + ".h", generatedEvent.declare())
-        replaceFileIfChanged(eventName + ".cpp", generatedEvent.define())
-
-    mk = Makefile()
-    # NOTE: it's VERY important that we output dependencies for the FooBinding
-    # file here, not for the header or generated cpp file.  These dependencies
-    # are used later to properly determine changedDeps and prevent rebuilding
-    # too much.  See the comment explaining $(binding_dependency_trackers) in
-    # Makefile.in.
-    rule = mk.create_rule([outputprefix])
-    rule.add_dependencies(os.path.join(srcprefix, x) for x in sorted(root.deps()))
-    rule.add_dependencies(iter_modules_in_path(topsrcdir))
-    with open(depsname, 'w') as f:
-        mk.dump(f)
-
-def main():
-    # Parse arguments.
-    from optparse import OptionParser
-    usagestring = "usage: %prog [header|cpp] configFile outputPrefix srcPrefix webIDLFile"
-    o = OptionParser(usage=usagestring)
-    o.add_option("--verbose-errors", action='store_true', default=False,
-                 help="When an error happens, display the Python traceback.")
-    (options, args) = o.parse_args()
-
-    configFile = os.path.normpath(args[0])
-    srcPrefix = os.path.normpath(args[1])
-
-    # Load the configuration
-    f = open('ParserResults.pkl', 'rb')
-    config = cPickle.load(f)
-    f.close()
-
-    def readFile(f):
-        file = open(f, 'rb')
-        try:
-            contents = file.read()
-        finally:
-            file.close()
-        return contents
-    allWebIDLFiles = readFile(args[2]).split()
-    generatedEventsWebIDLFiles = readFile(args[3]).split()
-    changedDeps = readFile(args[4]).split()
-
-    if all(f.endswith("Binding") or f == "ParserResults.pkl" for f in changedDeps):
-        toRegenerate = filter(lambda f: f.endswith("Binding"), changedDeps)
-        if len(toRegenerate) == 0 and len(changedDeps) == 1:
-            # Work around build system bug 874923: if we get here that means
-            # that changedDeps contained only one entry and it was
-            # "ParserResults.pkl".  That should never happen: if the
-            # ParserResults.pkl changes then either one of the globalgen files
-            # changed (in which case we wouldn't be in this "only
-            # ParserResults.pkl and *Binding changed" code) or some .webidl
-            # files changed (and then the corresponding *Binding files should
-            # show up in changedDeps).  Since clearly the build system is
-            # confused, just regenerate everything to be safe.
-            toRegenerate = allWebIDLFiles
-        else:
-            toRegenerate = map(lambda f: f[:-len("Binding")] + ".webidl",
-                               toRegenerate)
-    else:
-        toRegenerate = allWebIDLFiles
-
-    for webIDLFile in toRegenerate:
-        assert webIDLFile.endswith(".webidl")
-        outputPrefix = webIDLFile[:-len(".webidl")] + "Binding"
-        generate_binding_files(config, outputPrefix, srcPrefix, webIDLFile,
-                               generatedEventsWebIDLFiles);
-
-if __name__ == '__main__':
-    main()
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index b4d90639d45..b7aaf0481b0 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -26,26 +26,6 @@ NEWRESOLVE_HOOK_NAME = '_newResolve'
 ENUMERATE_HOOK_NAME= '_enumerate'
 ENUM_ENTRY_VARIABLE_NAME = 'strings'
 
-def replaceFileIfChanged(filename, newContents):
-    """
-    Read a copy of the old file, so that we don't touch it if it hasn't changed.
-    Returns True if the file was updated, false otherwise.
-    """
-    oldFileContents = ""
-    try:
-        oldFile = open(filename, 'rb')
-        oldFileContents = ''.join(oldFile.readlines())
-        oldFile.close()
-    except:
-        pass
-
-    if newContents == oldFileContents:
-        return False
-
-    f = open(filename, 'wb')
-    f.write(newContents)
-    f.close()
-    return True
 
 def toStringBool(arg):
     return str(not not arg).lower()
diff --git a/dom/bindings/ExampleGen.py b/dom/bindings/ExampleGen.py
deleted file mode 100644
index 60eebe221a3..00000000000
--- a/dom/bindings/ExampleGen.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os
-import cPickle
-from Configuration import Configuration
-from Codegen import CGExampleRoot, replaceFileIfChanged
-
-def generate_interface_example(config, interfaceName):
-    """
-    |config| Is the configuration object.
-    |interfaceName| is the name of the interface we're generating an example for.
-    """
-
-    root = CGExampleRoot(config, interfaceName)
-    exampleHeader = interfaceName + "-example.h"
-    exampleImpl = interfaceName + "-example.cpp"
-    replaceFileIfChanged(exampleHeader, root.declare())
-    replaceFileIfChanged(exampleImpl, root.define())
-
-def main():
-
-    # Parse arguments.
-    from optparse import OptionParser
-    usagestring = "usage: %prog configFile interfaceName"
-    o = OptionParser(usage=usagestring)
-    o.add_option("--verbose-errors", action='store_true', default=False,
-                 help="When an error happens, display the Python traceback.")
-    (options, args) = o.parse_args()
-
-    if len(args) != 2:
-        o.error(usagestring)
-    configFile = os.path.normpath(args[0])
-    interfaceName = args[1]
-
-    # Load the configuration
-    f = open('ParserResults.pkl', 'rb')
-    config = cPickle.load(f)
-    f.close()
-
-    # Generate the example class.
-    generate_interface_example(config, interfaceName)
-
-if __name__ == '__main__':
-    main()
diff --git a/dom/bindings/GlobalGen.py b/dom/bindings/GlobalGen.py
deleted file mode 100644
index f3f02a4d1e4..00000000000
--- a/dom/bindings/GlobalGen.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# We do one global pass over all the WebIDL to generate our prototype enum
-# and generate information for subsequent phases.
-
-import os
-import WebIDL
-import cPickle
-from Configuration import Configuration
-from Codegen import GlobalGenRoots, replaceFileIfChanged
-
-def generate_file(config, name, action):
-
-    root = getattr(GlobalGenRoots, name)(config)
-    if action is 'declare':
-        filename = name + '.h'
-        code = root.declare()
-    else:
-        assert action is 'define'
-        filename = name + '.cpp'
-        code = root.define()
-
-    if replaceFileIfChanged(filename, code):
-        print "Generating %s" % (filename)
-    else:
-        print "%s hasn't changed - not touching it" % (filename)
-
-def main():
-    # Parse arguments.
-    from optparse import OptionParser
-    usageString = "usage: %prog [options] webidldir [files]"
-    o = OptionParser(usage=usageString)
-    o.add_option("--cachedir", dest='cachedir', default=None,
-                 help="Directory in which to cache lex/parse tables.")
-    o.add_option("--verbose-errors", action='store_true', default=False,
-                 help="When an error happens, display the Python traceback.")
-    (options, args) = o.parse_args()
-
-    if len(args) < 2:
-        o.error(usageString)
-
-    configFile = args[0]
-    baseDir = args[1]
-    fileList = args[2:]
-
-    # Parse the WebIDL.
-    parser = WebIDL.Parser(options.cachedir)
-    for filename in fileList:
-        fullPath = os.path.normpath(os.path.join(baseDir, filename))
-        f = open(fullPath, 'rb')
-        lines = f.readlines()
-        f.close()
-        parser.parse(''.join(lines), fullPath)
-    parserResults = parser.finish()
-
-    # Load the configuration.
-    config = Configuration(configFile, parserResults)
-
-    # Write the configuration out to a pickle.
-    resultsFile = open('ParserResults.pkl', 'wb')
-    cPickle.dump(config, resultsFile, -1)
-    resultsFile.close()
-
-    # Generate the atom list.
-    generate_file(config, 'GeneratedAtomList', 'declare')
-
-    # Generate the prototype list.
-    generate_file(config, 'PrototypeList', 'declare')
-
-    # Generate the common code.
-    generate_file(config, 'RegisterBindings', 'declare')
-    generate_file(config, 'RegisterBindings', 'define')
-
-    generate_file(config, 'UnionTypes', 'declare')
-    generate_file(config, 'UnionTypes', 'define')
-    generate_file(config, 'UnionConversions', 'declare')
-
-if __name__ == '__main__':
-    main()
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index 35bc43cb4db..acc72d8d483 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -1,251 +1,78 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+abs_dist := $(abspath $(DIST))
+webidl_base := $(topsrcdir)/dom/webidl
 
-webidl_base = $(topsrcdir)/dom/webidl
 # Generated by moz.build
 include webidlsrcs.mk
 
-binding_include_path := mozilla/dom
-webidl_files += $(generated_events_webidl_files)
-all_webidl_files = $(webidl_files) $(generated_webidl_files) $(preprocessed_webidl_files)
-
-# Set exported_binding_headers before adding the test IDL to the mix
-exported_binding_headers := $(subst .webidl,Binding.h,$(all_webidl_files))
-exported_generated_events_headers := $(subst .webidl,.h,$(generated_events_webidl_files))
-
-# Set linked_binding_cpp_files before adding the test IDL to the mix
-linked_binding_cpp_files := $(subst .webidl,Binding.cpp,$(all_webidl_files))
-linked_generated_events_cpp_files := $(subst .webidl,.cpp,$(generated_events_webidl_files))
-
-all_webidl_files += $(test_webidl_files) $(preprocessed_test_webidl_files)
-
-generated_header_files := $(subst .webidl,Binding.h,$(all_webidl_files)) $(exported_generated_events_headers)
-generated_cpp_files := $(subst .webidl,Binding.cpp,$(all_webidl_files)) $(linked_generated_events_cpp_files)
-
-# We want to be able to only regenerate the .cpp and .h files that really need
-# to change when a .webidl file changes.  We do this by making the
-# binding_dependency_trackers targets have dependencies on the right .webidl
-# files via generated .pp files, having a .BindingGen target that depends on the
-# binding_dependency_trackers and which has all the generated binding .h/.cpp
-# depending on it, and then in the make commands for that target being able to
-# check which exact binding_dependency_trackers changed.
-binding_dependency_trackers := $(subst .webidl,Binding,$(all_webidl_files))
-
-globalgen_targets := \
-  GeneratedAtomList.h \
-  PrototypeList.h \
-  RegisterBindings.h \
-  RegisterBindings.cpp \
-  UnionTypes.h \
-  UnionTypes.cpp \
-  UnionConversions.h \
-  $(NULL)
-
-# Nasty hack: when the test/Makefile.in invokes us to do codegen, it
-# uses a target of
-# "export TestExampleInterface-example TestExampleProxyInterface-example".
-# We don't actually need to load our .o.pp files in that case, so just
-# pretend like we have no CPPSRCS if that's the target.  It makes the
-# test cycle much faster, which is why we're doing it.
-#
-# XXXbz We could try to cheat even more and only include our CPPSRCS
-# when $(MAKECMDGOALS) contains libs, so that we can skip loading all
-# those .o.pp when trying to make a single .cpp file too, but that
-# would break |make FooBinding.o(bj)|.  Ah, well.
-ifneq (export TestExampleInterface-example TestExampleProxyInterface-example,$(MAKECMDGOALS))
-CPPSRCS = \
-  $(unified_binding_cpp_files) \
-  $(linked_generated_events_cpp_files) \
-  $(filter %.cpp, $(globalgen_targets)) \
-  BindingUtils.cpp \
-  CallbackInterface.cpp \
-  CallbackObject.cpp \
-  DOMJSProxyHandler.cpp \
-  Date.cpp \
-  Exceptions.cpp \
-  $(NULL)
-endif
-
-ABS_DIST := $(abspath $(DIST))
-
-EXTRA_EXPORT_MDDEPEND_FILES := $(addsuffix .pp,$(binding_dependency_trackers))
-
-EXPORTS_GENERATED_FILES := $(exported_binding_headers) $(exported_generated_events_headers)
-EXPORTS_GENERATED_DEST := $(ABS_DIST)/include/$(binding_include_path)
-EXPORTS_GENERATED_TARGET := export
-INSTALL_TARGETS += EXPORTS_GENERATED
-
-# Install auto-generated GlobalGen files. The rules for the install must
-# be in the same target/subtier as GlobalGen.py, otherwise the files will not
-# get installed into the appropriate location as they are generated.
-globalgen_headers_FILES := \
-  GeneratedAtomList.h \
-  PrototypeList.h \
-  RegisterBindings.h \
-  UnionConversions.h \
-  UnionTypes.h \
-  $(NULL)
-globalgen_headers_DEST = $(ABS_DIST)/include/mozilla/dom
-globalgen_headers_TARGET := export
-INSTALL_TARGETS += globalgen_headers
-
-PYTHON_UNIT_TESTS += $(srcdir)/mozwebidl/test/test_mozwebidl.py
-
-include $(topsrcdir)/config/rules.mk
-
 ifdef GNU_CC
 CXXFLAGS += -Wno-uninitialized
 endif
 
-# If you change bindinggen_dependencies here, change it in
-# dom/bindings/test/Makefile.in too.
-bindinggen_dependencies := \
-  BindingGen.py \
-  Bindings.conf \
-  Configuration.py \
-  Codegen.py \
-  ParserResults.pkl \
-  parser/WebIDL.py \
+# These come from webidlsrcs.mk.
+CPPSRCS += $(globalgen_sources) $(unified_binding_cpp_files)
+
+# Generated bindings reference *Binding.h, not mozilla/dom/*Binding.h. And,
+# since we generate exported bindings directly to $(DIST)/include, we need
+# to add that path to the search list. We need to ensure the $(DIST) path
+# occurs before '.' because old builds generated .h files into '.'
+# before copying them to $(DIST). Those old .h files won't get updated
+# any more and thus using them could result in build failures due to
+# mismatches. This consideration shouldn't be relevant after CLOBBER
+# is touched.
+#
+# Ideally, binding generation uses the prefixed header file names.
+# Bug 932092 tracks.
+LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom
+
+PYTHON_UNIT_TESTS += $(srcdir)/mozwebidl/test/test_mozwebidl.py
+
+include $(topsrcdir)/config/rules.mk
+
+
+css2properties_dependencies = \
+  $(topsrcdir)/layout/style/nsCSSPropList.h \
+  $(topsrcdir)/layout/style/nsCSSPropAliasList.h \
+  $(webidl_base)/CSS2Properties.webidl.in \
+  $(webidl_base)/CSS2PropertiesProps.h \
+  $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
   $(GLOBAL_DEPS) \
   $(NULL)
 
-CSS2Properties.webidl: $(topsrcdir)/layout/style/nsCSSPropList.h \
-                       $(topsrcdir)/layout/style/nsCSSPropAliasList.h \
-                       $(webidl_base)/CSS2Properties.webidl.in \
-                       $(webidl_base)/CSS2PropertiesProps.h \
-                       $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
-                       $(GLOBAL_DEPS)
-	$(CPP) $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/layout/style $(webidl_base)/CSS2PropertiesProps.h | \
-	  PYTHONDONTWRITEBYTECODE=1 $(PYTHON) \
-	  $(srcdir)/GenerateCSS2PropertiesWebIDL.py $(webidl_base)/CSS2Properties.webidl.in > CSS2Properties.webidl
+CSS2Properties.webidl: $(css2properties_dependencies)
+	$(CPP) $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/layout/style \
+	  $(webidl_base)/CSS2PropertiesProps.h | \
+	    PYTHONDONTWRITEBYTECODE=1 $(PYTHON) \
+	      $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
+	      $(webidl_base)/CSS2Properties.webidl.in > $@
 
-$(webidl_files): %: $(webidl_base)/%
-	$(INSTALL) $(IFLAGS1) $(webidl_base)/$* .
-
-$(test_webidl_files): %: $(srcdir)/test/%
-	$(INSTALL) $(IFLAGS1) $(srcdir)/test/$* .
-
-# We can't easily use PP_TARGETS here because it insists on outputting targets
-# that look like "$(CURDIR)/foo" whereas we want our target to just be "foo".
-# Make sure to include $(GLOBAL_DEPS) so we pick up changes to what symbols are
-# defined.  Also make sure to remove $@ before writing to it, because otherwise
-# if a file goes from non-preprocessed to preprocessed we can end up writing to
-# a symlink, which will clobber files in the srcdir, which is bad.
-$(preprocessed_webidl_files): %: $(webidl_base)/% $(GLOBAL_DEPS)
-	$(RM) $@
-	$(call py_action,preprocessor, \
-          $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(webidl_base)/$* -o $@)
-
-# See the comment about PP_TARGETS for $(preprocessed_webidl_files)
-$(preprocessed_test_webidl_files): %: $(srcdir)/test/% $(GLOBAL_DEPS)
-	$(RM) $@
-	$(call py_action,preprocessor, \
-          $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(srcdir)/test/$* -o $@)
-
-# Make is dumb and can get confused between "foo" and "$(CURDIR)/foo".  Make
-# sure that the latter depends on the former, since the latter gets used in .pp
-# files.
-all_webidl_files_absolute = $(addprefix $(CURDIR)/,$(all_webidl_files))
-$(all_webidl_files_absolute): $(CURDIR)/%: %
-
-$(generated_header_files): .BindingGen
-
-$(generated_cpp_files): .BindingGen
-
-# $(binding_dependency_trackers) pick up additional dependencies via .pp files
-# The rule: just brings the tracker up to date, if it's out of date, so that
-# we'll know that we have to redo binding generation and flag this prerequisite
-# there as being newer than the bindinggen target.
-$(binding_dependency_trackers):
-	@$(TOUCH) $@
-
-$(globalgen_targets): ParserResults.pkl
-
-%-example: .BindingGen
-	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
-	  $(PLY_INCLUDE) -I$(srcdir)/parser \
-	  $(srcdir)/ExampleGen.py \
-	  $(srcdir)/Bindings.conf $*
-
-CACHE_DIR = _cache
-
-globalgen_dependencies := \
-  GlobalGen.py \
-  Bindings.conf \
-  Configuration.py \
-  Codegen.py \
-  parser/WebIDL.py \
-  webidlsrcs.mk \
-  $(all_webidl_files) \
-  $(CACHE_DIR)/.done \
+# Most of the logic for dependencies lives inside Python so it can be
+# used by multiple build backends. We simply have rules to generate
+# and include the .pp file. This will pull in additional dependencies
+# on codegen.pp which will cause any .webidl or .py file change to
+# result in regeneration.
+codegen_dependencies := \
+  $(nonstatic_webidl_files) \
   $(GLOBAL_DEPS) \
   $(NULL)
 
-$(CACHE_DIR)/.done:
-	$(MKDIR) -p $(CACHE_DIR)
+include codegen.pp
+
+codegen.pp: $(codegen_dependencies)
+	$(call py_action,webidl,$(srcdir))
 	@$(TOUCH) $@
 
-# Running GlobalGen.py updates ParserResults.pkl as a side-effect
-ParserResults.pkl: $(globalgen_dependencies)
-	$(info Generating global WebIDL files)
-	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
-	  $(PLY_INCLUDE) -I$(srcdir)/parser \
-	  $(srcdir)/GlobalGen.py $(srcdir)/Bindings.conf . \
-	  --cachedir=$(CACHE_DIR) \
-	  $(all_webidl_files)
-
-$(globalgen_headers_FILES): ParserResults.pkl
-
-# Make sure .deps actually exists, since we'll try to write to it from
-# BindingGen.py but we're typically running in the export phase, which is
-# before anyone has bothered creating .deps.
-# Then, pass our long lists through files to try to avoid blowing out the
-# command line.
-# Next, BindingGen.py will examine the changed dependency list to figure out
-# what it really needs to regenerate.
-# Finally, touch the .BindingGen file so that we don't have to keep redoing
-# all that until something else actually changes.
-.BindingGen: $(bindinggen_dependencies) $(binding_dependency_trackers)
-	$(info Generating WebIDL bindings)
-	$(MKDIR) -p .deps
-	echo $(all_webidl_files) > .all-webidl-file-list
-	echo $(generated_events_webidl_files) > .generated-events-webidl-files
-	echo $? > .changed-dependency-list
-	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
-	  $(PLY_INCLUDE) -I$(srcdir)/parser \
-	  $(srcdir)/BindingGen.py \
-	  $(srcdir)/Bindings.conf \
-	  $(CURDIR) \
-	  .all-webidl-file-list \
-	  .generated-events-webidl-files \
-	  .changed-dependency-list
-	@$(TOUCH) $@
+export:: codegen.pp
 
 GARBAGE += \
-  webidlyacc.py \
+  codegen.pp \
+  codegen.json \
   parser.out \
-  $(wildcard *-example.h) \
-  $(wildcard *-example.cpp) \
-  .BindingGen \
-  .all-webidl-file-list \
-  .generated-events-webidl-files \
-  .changed-dependency-list \
-  $(binding_dependency_trackers) \
+  WebIDLGrammar.pkl \
+  $(wildcard *.h) \
+  $(wildcard *.cpp) \
+  $(wildcard *.webidl) \
   $(NULL)
-
-# Make sure all binding header files are created during the export stage, so we
-# don't have issues with .cpp files being compiled before we've generated the
-# headers they depend on.  This is really only needed for the test files, since
-# the non-test headers are all exported above anyway.  Note that this means that
-# we do all of our codegen during export.
-export:: $(generated_header_files)
-
-distclean::
-	-$(RM) \
-        $(generated_header_files) \
-        $(generated_cpp_files) \
-        $(all_webidl_files) \
-        $(globalgen_targets) \
-        ParserResults.pkl \
-        $(NULL)
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 207517e9eff..9a94e9aa376 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -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/.
 
+TEST_DIRS += ['test']
+
 EXPORTS.mozilla += [
     'ErrorResult.h',
 ]
@@ -68,6 +70,15 @@ LOCAL_INCLUDES += [
     '/media/webrtc/signaling/src/peerconnection',
 ]
 
+SOURCES += [
+    'BindingUtils.cpp',
+    'CallbackInterface.cpp',
+    'CallbackObject.cpp',
+    'Date.cpp',
+    'DOMJSProxyHandler.cpp',
+    'Exceptions.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index 78756bf35a0..b6dec519193 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -2,89 +2,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Do NOT export this library.  We don't actually want our test code
-# being added to libxul or anything.
-
-# pymake can't handle descending into dom/bindings several times simultaneously
-ifdef .PYMAKE
-.NOTPARALLEL:
-endif
-
-# Need this for $(test_webidl_files)
 include ../webidlsrcs.mk
 
-# But the webidl actually lives in our parent dir
-test_webidl_files := $(addprefix ../,$(test_webidl_files))
-# Store the actual locations of our source preprocessed files, so we
-# can depend on them sanely.
-source_preprocessed_test_webidl_files := $(addprefix $(srcdir)/,$(preprocessed_test_webidl_files))
-preprocessed_test_webidl_files := $(addprefix ../,$(preprocessed_test_webidl_files))
+# $(test_stems) comes from webidlsrcs.mk.
+CPPSRCS += $(addprefix ../,$(test_stems))
 
-CPPSRCS += \
-  $(subst .webidl,Binding.cpp,$(test_webidl_files)) \
-  $(subst .webidl,Binding.cpp,$(preprocessed_test_webidl_files)) \
-  $(NULL)
-
-# If you change bindinggen_dependencies here, change it in
-# dom/bindings/Makefile.in too.  But note that we include ../Makefile
-# here manually, since $(GLOBAL_DEPS) won't cover it.
-bindinggen_dependencies := \
-  ../BindingGen.py \
-  ../Bindings.conf \
-  ../Configuration.py \
-  ../Codegen.py \
-  ../ParserResults.pkl \
-  ../parser/WebIDL.py \
-  ../Makefile \
-  $(GLOBAL_DEPS) \
-  $(NULL)
-
-ifdef GNU_CC
-CXXFLAGS += -Wno-uninitialized
-endif
+# Bug 932082 tracks having bindings use namespaced includes.
+LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom -I..
 
 # Include rules.mk before any of our targets so our first target is coming from
 # rules.mk and running make with no target in this dir does the right thing.
 include $(topsrcdir)/config/rules.mk
 
-$(CPPSRCS): .BindingGen
-
-.BindingGen: $(bindinggen_dependencies) \
-             $(test_webidl_files) \
-             $(source_preprocessed_test_webidl_files) \
-             $(NULL)
-	# The export phase in dom/bindings is what actually looks at
-	# dependencies and regenerates things as needed, so just go ahead and
-	# make that phase here.  Also make our example interface files.  If the
-	# target used here ever changes, change the conditional around
-	# $(CPPSRCS) in dom/bindings/Makefile.in.
-	$(MAKE) -C .. export TestExampleInterface-example TestExampleProxyInterface-example
-	@$(TOUCH) $@
-
 check::
 	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) $(srcdir)/../parser/runtests.py
-
-# Since we define MOCHITEST_FILES, config/makefiles/mochitest.mk goes ahead and
-# sets up a rule with libs:: in itm which makes our .DEFAULT_TARGET be "libs".
-# Then ruls.mk does |.DEFAULT_TARGET ?= default| which leaves it as "libs".  So
-# if we make without an explicit target in this directory, we try to make
-# "libs", but with a $(MAKECMDGOALS) of empty string.  And then rules.mk
-# helpfully does not include our *.o.pp files, since it includes them only if
-# filtering some stuff out from $(MAKECMDGOALS) leaves it nonempty.  The upshot
-# is that if some headers change and we run make in this dir without an explicit
-# target things don't get rebuilt.
-#
-# On the other hand, if we set .DEFAULT_TARGET to "default" explicitly here,
-# then rules.mk will reinvoke make with "export" and "libs" but this time hey
-# will be passed as explicit targets, show up in $(MAKECMDGOALS), and things
-# will work.  Do this at the end of our Makefile so the rest of the build system
-# does not get a chance to muck with it after we set it.
-.DEFAULT_GOAL := default
-
-# Make sure to add .BindingGen to GARBAGE so we'll rebuild our example
-# files if someone goes through and deletes GARBAGE all over, which
-# will delete example files from our parent dir.
-GARBAGE += \
-  .BindingGen \
-  $(NULL)
diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build
index 82db3c691cb..5b129eee9e2 100644
--- a/dom/bindings/test/moz.build
+++ b/dom/bindings/test/moz.build
@@ -14,9 +14,20 @@ MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
+TEST_WEBIDL_FILES += [
+    'TestDictionary.webidl',
+    'TestJSImplInheritanceGen.webidl',
+    'TestTypedef.webidl',
+]
+
+PREPROCESSED_TEST_WEBIDL_FILES += [
+    'TestCodeGen.webidl',
+    'TestExampleGen.webidl',
+    'TestJSImplGen.webidl',
+]
+
 LOCAL_INCLUDES += [
     '/dom/bindings',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
 ]
-
diff --git a/dom/moz.build b/dom/moz.build
index 599efe94778..481886daf32 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -100,12 +100,9 @@ if CONFIG['MOZ_GAMEPAD']:
 if CONFIG['MOZ_NFC']:
     PARALLEL_DIRS += ['nfc']
 
-# bindings/test is here, because it needs to build after bindings/, and
-# we build subdirectories before ourselves.
 TEST_DIRS += [
     'tests',
     'imptests',
-    'bindings/test',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'cocoa', 'windows', 'android', 'qt', 'os2'):
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index e3db21266b8..628cf7aac3a 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -545,18 +545,6 @@ if CONFIG['MOZ_B2G_FM']:
         'FMRadio.webidl',
     ]
 
-if CONFIG['ENABLE_TESTS']:
-    TEST_WEBIDL_FILES += [
-        'TestDictionary.webidl',
-        'TestJSImplInheritanceGen.webidl',
-        'TestTypedef.webidl',
-    ]
-    PREPROCESSED_TEST_WEBIDL_FILES += [
-        'TestCodeGen.webidl',
-        'TestExampleGen.webidl',
-        'TestJSImplGen.webidl',
-    ]
-
 GENERATED_EVENTS_WEBIDL_FILES = [
     'BlobEvent.webidl',
     'CallGroupErrorEvent.webidl',
diff --git a/python/mozbuild/mozbuild/action/webidl.py b/python/mozbuild/mozbuild/action/webidl.py
new file mode 100644
index 00000000000..f174834282a
--- /dev/null
+++ b/python/mozbuild/mozbuild/action/webidl.py
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import sys
+
+from mozwebidl import BuildSystemWebIDL
+
+
+def main(argv):
+    """Perform WebIDL code generation required by the build system."""
+    manager = BuildSystemWebIDL.from_environment().manager
+    manager.generate_build_files()
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
index 827fbd07af3..2b8e3178484 100644
--- a/python/mozbuild/mozbuild/backend/common.py
+++ b/python/mozbuild/mozbuild/backend/common.py
@@ -12,8 +12,14 @@ import mozpack.path as mozpath
 from .base import BuildBackend
 
 from ..frontend.data import (
+    GeneratedEventWebIDLFile,
+    GeneratedWebIDLFile,
+    PreprocessedTestWebIDLFile,
+    PreprocessedWebIDLFile,
     TestManifest,
+    TestWebIDLFile,
     XPIDLFile,
+    WebIDLFile,
 )
 
 from ..util import DefaultOnReadDict
@@ -51,6 +57,80 @@ class XPIDLManager(object):
         self.modules.setdefault(entry['module'], set()).add(entry['root'])
 
 
+class WebIDLCollection(object):
+    """Collects WebIDL info referenced during the build."""
+
+    def __init__(self):
+        self.sources = set()
+        self.generated_sources = set()
+        self.generated_events_sources = set()
+        self.preprocessed_sources = set()
+        self.test_sources = set()
+        self.preprocessed_test_sources = set()
+
+    def all_regular_sources(self):
+        return self.sources | self.generated_sources | \
+            self.generated_events_sources | self.preprocessed_sources
+
+    def all_regular_basenames(self):
+        return [os.path.basename(source) for source in self.all_regular_sources()]
+
+    def all_regular_stems(self):
+        return [os.path.splitext(b)[0] for b in self.all_regular_basenames()]
+
+    def all_regular_bindinggen_stems(self):
+        for stem in self.all_regular_stems():
+            yield '%sBinding' % stem
+
+        for source in self.generated_events_sources:
+            yield os.path.splitext(os.path.basename(source))[0]
+
+    def all_regular_cpp_basenames(self):
+        for stem in self.all_regular_bindinggen_stems():
+            yield '%s.cpp' % stem
+
+    def all_test_sources(self):
+        return self.test_sources | self.preprocessed_test_sources
+
+    def all_test_basenames(self):
+        return [os.path.basename(source) for source in self.all_test_sources()]
+
+    def all_test_stems(self):
+        return [os.path.splitext(b)[0] for b in self.all_test_basenames()]
+
+    def all_test_cpp_basenames(self):
+        return ['%sBinding.cpp' % s for s in self.all_test_stems()]
+
+    def all_static_sources(self):
+        return self.sources | self.generated_events_sources | \
+            self.test_sources
+
+    def all_non_static_sources(self):
+        return self.generated_sources | self.preprocessed_sources | \
+            self.preprocessed_test_sources
+
+    def all_non_static_basenames(self):
+        return [os.path.basename(s) for s in self.all_non_static_sources()]
+
+    def all_preprocessed_sources(self):
+        return self.preprocessed_sources | self.preprocessed_test_sources
+
+    def all_sources(self):
+        return set(self.all_regular_sources()) | set(self.all_test_sources())
+
+    def all_basenames(self):
+        return [os.path.basename(source) for source in self.all_sources()]
+
+    def all_stems(self):
+        return [os.path.splitext(b)[0] for b in self.all_basenames()]
+
+    def generated_events_basenames(self):
+        return [os.path.basename(s) for s in self.generated_events_sources]
+
+    def generated_events_stems(self):
+        return [os.path.splitext(b)[0] for b in self.generated_events_basenames()]
+
+
 class TestManager(object):
     """Helps hold state related to tests."""
 
@@ -85,6 +165,7 @@ class CommonBackend(BuildBackend):
     def _init(self):
         self._idl_manager = XPIDLManager(self.environment)
         self._test_manager = TestManager(self.environment)
+        self._webidls = WebIDLCollection()
 
     def consume_object(self, obj):
         if isinstance(obj, TestManifest):
@@ -92,13 +173,44 @@ class CommonBackend(BuildBackend):
                 self._test_manager.add(test, flavor=obj.flavor,
                     topsrcdir=obj.topsrcdir)
 
-        if isinstance(obj, XPIDLFile):
+        elif isinstance(obj, XPIDLFile):
             self._idl_manager.register_idl(obj.source_path, obj.module)
 
+        elif isinstance(obj, WebIDLFile):
+            self._webidls.sources.add(mozpath.join(obj.srcdir, obj.basename))
+            obj.ack()
+
+        elif isinstance(obj, GeneratedEventWebIDLFile):
+            self._webidls.generated_events_sources.add(mozpath.join(
+                obj.srcdir, obj.basename))
+            obj.ack()
+
+        elif isinstance(obj, TestWebIDLFile):
+            self._webidls.test_sources.add(mozpath.join(obj.srcdir,
+                obj.basename))
+            obj.ack()
+
+        elif isinstance(obj, PreprocessedTestWebIDLFile):
+            self._webidls.preprocessed_test_sources.add(mozpath.join(
+                obj.srcdir, obj.basename))
+            obj.ack()
+
+        elif isinstance(obj, GeneratedWebIDLFile):
+            self._webidls.generated_sources.add(mozpath.join(obj.srcdir,
+                obj.basename))
+            obj.ack()
+
+        elif isinstance(obj, PreprocessedWebIDLFile):
+            self._webidls.preprocessed_sources.add(mozpath.join(
+                obj.srcdir, obj.basename))
+            obj.ack()
+
     def consume_finished(self):
         if len(self._idl_manager.idls):
             self._handle_idl_manager(self._idl_manager)
 
+        self._handle_webidl_collection(self._webidls)
+
         # Write out a machine-readable file describing every test.
         path = os.path.join(self.environment.topobjdir, 'all-tests.json')
         with self._write_file(path) as fh:
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 3ed3746ef74..929b9fecc88 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -5,13 +5,15 @@
 from __future__ import unicode_literals
 
 import itertools
+import json
 import logging
 import os
-import re
 import types
 
 from collections import namedtuple
 
+import mozwebidl
+
 import mozbuild.makeutil as mozmakeutil
 from mozpack.copier import FilePurger
 from mozpack.manifests import (
@@ -25,9 +27,7 @@ from ..frontend.data import (
     Defines,
     DirectoryTraversal,
     Exports,
-    GeneratedEventWebIDLFile,
     GeneratedInclude,
-    GeneratedWebIDLFile,
     HeaderFileSubstitution,
     HostProgram,
     HostSimpleProgram,
@@ -36,17 +36,13 @@ from ..frontend.data import (
     JavaJarData,
     LibraryDefinition,
     LocalInclude,
-    PreprocessedTestWebIDLFile,
-    PreprocessedWebIDLFile,
     Program,
     SandboxDerived,
     SandboxWrapped,
     SimpleProgram,
-    TestWebIDLFile,
+    TestManifest,
     VariablePassthru,
     XPIDLFile,
-    TestManifest,
-    WebIDLFile,
 )
 from ..util import (
     ensureParentDir,
@@ -268,12 +264,6 @@ class RecursiveMakeBackend(CommonBackend):
 
         self._backend_files = {}
         self._ipdl_sources = set()
-        self._webidl_sources = set()
-        self._generated_events_webidl_sources = set()
-        self._test_webidl_sources = set()
-        self._preprocessed_test_webidl_sources = set()
-        self._preprocessed_webidl_sources = set()
-        self._generated_webidl_sources = set()
 
         def detailed(summary):
             s = '{:d} total backend files. {:d} created; {:d} updated; {:d} unchanged'.format(
@@ -388,33 +378,6 @@ class RecursiveMakeBackend(CommonBackend):
         elif isinstance(obj, IPDLFile):
             self._ipdl_sources.add(mozpath.join(obj.srcdir, obj.basename))
 
-        elif isinstance(obj, WebIDLFile):
-            self._webidl_sources.add(mozpath.join(obj.srcdir, obj.basename))
-            self._process_webidl_basename(obj.basename)
-
-        elif isinstance(obj, GeneratedEventWebIDLFile):
-            self._generated_events_webidl_sources.add(mozpath.join(obj.srcdir, obj.basename))
-
-        elif isinstance(obj, TestWebIDLFile):
-            self._test_webidl_sources.add(mozpath.join(obj.srcdir,
-                                                       obj.basename))
-            # Test WebIDL files are not exported.
-
-        elif isinstance(obj, PreprocessedTestWebIDLFile):
-            self._preprocessed_test_webidl_sources.add(mozpath.join(obj.srcdir,
-                                                                    obj.basename))
-            # Test WebIDL files are not exported.
-
-        elif isinstance(obj, GeneratedWebIDLFile):
-            self._generated_webidl_sources.add(mozpath.join(obj.srcdir,
-                                                            obj.basename))
-            self._process_webidl_basename(obj.basename)
-
-        elif isinstance(obj, PreprocessedWebIDLFile):
-            self._preprocessed_webidl_sources.add(mozpath.join(obj.srcdir,
-                                                               obj.basename))
-            self._process_webidl_basename(obj.basename)
-
         elif isinstance(obj, Program):
             self._process_program(obj.program, backend_file)
 
@@ -588,6 +551,9 @@ class RecursiveMakeBackend(CommonBackend):
                                  poison_windows_h=False):
         files_per_unified_file = 16
 
+        # In case it's a generator.
+        files = sorted(files)
+
         explanation = "\n" \
             "# We build files in 'unified' mode by including several files\n" \
             "# together into a single source file.  This cuts down on\n" \
@@ -613,7 +579,7 @@ class RecursiveMakeBackend(CommonBackend):
                 return itertools.izip_longest(fillvalue=dummy_fill_value, *args)
 
             for i, unified_group in enumerate(grouper(files_per_unified_file,
-                                                      sorted(files))):
+                                                      files)):
                 just_the_filenames = list(filter_out_dummy(unified_group))
                 yield '%s%d.%s' % (unified_prefix, i, unified_suffix), just_the_filenames
 
@@ -720,42 +686,10 @@ class RecursiveMakeBackend(CommonBackend):
         with self._write_file(os.path.join(ipdl_dir, 'ipdlsrcs.mk')) as ipdls:
             mk.dump(ipdls, removal_guard=False)
 
-        self._may_skip['compile'] -= set(['ipc/ipdl'])
-
-        # Write out master lists of WebIDL source files.
-        bindings_dir = os.path.join(self.environment.topobjdir, 'dom', 'bindings')
-
-        mk = mozmakeutil.Makefile()
-
-        def write_var(variable, sources):
-            files = [os.path.basename(f) for f in sorted(sources)]
-            mk.add_statement('%s += %s' % (variable, ' '.join(files)))
-        write_var('webidl_files', self._webidl_sources)
-        write_var('generated_events_webidl_files', self._generated_events_webidl_sources)
-        write_var('test_webidl_files', self._test_webidl_sources)
-        write_var('preprocessed_test_webidl_files', self._preprocessed_test_webidl_sources)
-        write_var('generated_webidl_files', self._generated_webidl_sources)
-        write_var('preprocessed_webidl_files', self._preprocessed_webidl_sources)
-
-        all_webidl_files = itertools.chain(iter(self._webidl_sources),
-                                           iter(self._generated_events_webidl_sources),
-                                           iter(self._generated_webidl_sources),
-                                           iter(self._preprocessed_webidl_sources))
-        all_webidl_files = [os.path.basename(x) for x in all_webidl_files]
-        all_webidl_sources = [re.sub(r'\.webidl$', 'Binding.cpp', x) for x in all_webidl_files]
-
-        self._add_unified_build_rules(mk, all_webidl_sources,
-                                      bindings_dir,
-                                      unified_prefix='UnifiedBindings',
-                                      unified_files_makefile_variable='unified_binding_cpp_files',
-                                      poison_windows_h=True)
-
-        # Assume that Somebody Else has responsibility for correctly
-        # specifying removal dependencies for |all_webidl_sources|.
-        with self._write_file(os.path.join(bindings_dir, 'webidlsrcs.mk')) as webidls:
-            mk.dump(webidls, removal_guard=False)
-
-        self._may_skip['compile'] -= set(['dom/bindings', 'dom/bindings/test'])
+        # These contain autogenerated sources that the build config doesn't
+        # yet know about.
+        self._may_skip['compile'] -= {'ipc/ipdl'}
+        self._may_skip['compile'] -= {'dom/bindings', 'dom/bindings/test'}
 
         self._fill_root_mk()
 
@@ -1008,10 +942,6 @@ class RecursiveMakeBackend(CommonBackend):
     def _process_host_simple_program(self, program, backend_file):
         backend_file.write('HOST_SIMPLE_PROGRAMS += %s\n' % program)
 
-    def _process_webidl_basename(self, basename):
-        header = 'mozilla/dom/%sBinding.h' % os.path.splitext(basename)[0]
-        self._install_manifests['dist_include'].add_optional_exists(header)
-
     def _process_test_manifest(self, obj, backend_file):
         # Much of the logic in this function could be moved to CommonBackend.
         self.backend_input_files.add(os.path.join(obj.topsrcdir,
@@ -1104,3 +1034,80 @@ class RecursiveMakeBackend(CommonBackend):
 
             for manifest in sorted(manifests):
                 master.write('[include:%s]\n' % manifest)
+
+    def _handle_webidl_collection(self, webidls):
+        if not webidls.all_stems():
+            return
+
+        bindings_dir = os.path.join(self.environment.topobjdir, 'dom',
+            'bindings')
+
+        all_inputs = set(webidls.all_static_sources())
+        for s in webidls.all_non_static_basenames():
+            all_inputs.add(os.path.join(bindings_dir, s))
+
+        generated_events_stems = webidls.generated_events_stems()
+        exported_stems = webidls.all_regular_stems()
+
+        # The WebIDL manager reads configuration from a JSON file. So, we
+        # need to write this file early.
+        o = dict(
+            webidls=sorted(all_inputs),
+            generated_events_stems=sorted(generated_events_stems),
+            exported_stems=sorted(exported_stems),
+        )
+
+        file_lists = os.path.join(bindings_dir, 'file-lists.json')
+        with self._write_file(file_lists) as fh:
+            json.dump(o, fh, sort_keys=True)
+
+        manager = mozwebidl.create_build_system_manager(
+            self.environment.topsrcdir,
+            self.environment.topobjdir,
+            os.path.join(self.environment.topobjdir, 'dist')
+        )
+
+        # The manager is the source of truth on what files are generated.
+        # Consult it for install manifests.
+        include_dir = os.path.join(self.environment.topobjdir, 'dist',
+            'include')
+        for f in manager.expected_build_output_files():
+            if f.startswith(include_dir):
+                self._install_manifests['dist_include'].add_optional_exists(
+                    f[len(include_dir)+1:])
+
+        # We pass WebIDL info to make via a completely generated make file.
+        mk = Makefile()
+        mk.add_statement('nonstatic_webidl_files := %s' % ' '.join(
+            sorted(webidls.all_non_static_basenames())))
+        mk.add_statement('globalgen_sources := %s' % ' '.join(
+            sorted(manager.GLOBAL_DEFINE_FILES)))
+        mk.add_statement('test_sources := %s' % ' '.join(
+            sorted('%sBinding.cpp' % s for s in webidls.all_test_stems())))
+
+        # Add rules to preprocess bindings.
+        for source in sorted(webidls.all_preprocessed_sources()):
+            basename = os.path.basename(source)
+            rule = mk.create_rule([basename])
+            rule.add_dependencies([source, '$(GLOBAL_DEPS)'])
+            rule.add_commands([
+                # Remove the file before writing so bindings that go from
+                # static to preprocessed don't end up writing to a symlink,
+                # which would modify content in the source directory.
+                '$(RM) $@',
+                '$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) '
+                    '$(XULPPFLAGS) $< -o $@)'
+            ])
+
+        # Bindings are compiled in unified mode to speed up compilation and
+        # to reduce linker memory size. Note that test bindings are separated
+        # from regular ones so tests bindings aren't shipped.
+        self._add_unified_build_rules(mk,
+            webidls.all_regular_cpp_basenames(),
+            bindings_dir,
+            unified_prefix='UnifiedBindings',
+            unified_files_makefile_variable='unified_binding_cpp_files')
+
+        webidls_mk = os.path.join(bindings_dir, 'webidlsrcs.mk')
+        with self._write_file(webidls_mk) as fh:
+            mk.dump(fh, removal_guard=False)
diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
index b8bdd8f4860..7dafae5b347 100644
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -275,6 +275,10 @@ class MozbuildObject(ProcessExecutionMixin):
     def bindir(self):
         return os.path.join(self.topobjdir, 'dist', 'bin')
 
+    @property
+    def includedir(self):
+        return os.path.join(self.topobjdir, 'dist', 'include')
+
     @property
     def statedir(self):
         return os.path.join(self.topobjdir, '.mozbuild')

From 5cae11189e12bfff7afea7e4b07341b717863709 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Tue, 19 Nov 2013 12:15:20 -0600
Subject: [PATCH 30/92] Bug 908100. Prefer the pointerDownTarget when resetting
 the active state because that is what we set active state on. r=vingtetun

---
 dom/browser-element/BrowserElementPanning.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/browser-element/BrowserElementPanning.js b/dom/browser-element/BrowserElementPanning.js
index 6282a97edd2..4d7bce7f988 100644
--- a/dom/browser-element/BrowserElementPanning.js
+++ b/dom/browser-element/BrowserElementPanning.js
@@ -454,7 +454,7 @@ const ContentPanning = {
   },
 
   _resetActive: function cp_resetActive() {
-    let elt = this.target || this.pointerDownTarget;
+    let elt = this.pointerDownTarget || this.target;
     let root = elt.ownerDocument || elt.document;
     this._setActive(root.documentElement);
   },

From eaf2de481bac4cdb77c0092cc36c2aa4132ba85e Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Tue, 19 Nov 2013 10:17:43 -0800
Subject: [PATCH 31/92] Bug 937369 - Use moz.build in accessibility/src/jsat.
 r=davidb

---
 accessible/src/jsat/Makefile.in | 16 ----------------
 accessible/src/jsat/moz.build   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/accessible/src/jsat/Makefile.in b/accessible/src/jsat/Makefile.in
index a26c4544f74..c580d191c1b 100644
--- a/accessible/src/jsat/Makefile.in
+++ b/accessible/src/jsat/Makefile.in
@@ -1,19 +1,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
-
-INSTALL_TARGETS += ACCESSFU
-
-ACCESSFU_FILES := \
-  AccessFu.jsm \
-  EventManager.jsm \
-  jar.mn \
-  Makefile.in \
-  OutputGenerator.jsm \
-  Presentation.jsm \
-  TouchAdapter.jsm \
-  TraversalRules.jsm \
-  Utils.jsm \
-  $(NULL)
-
-ACCESSFU_DEST = $(FINAL_TARGET)/modules/accessibility
diff --git a/accessible/src/jsat/moz.build b/accessible/src/jsat/moz.build
index c271ec3908c..cd1a6be2598 100644
--- a/accessible/src/jsat/moz.build
+++ b/accessible/src/jsat/moz.build
@@ -3,3 +3,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JS_MODULES_PATH = 'modules/accessibility'
+
+EXTRA_JS_MODULES += [
+    'AccessFu.jsm',
+    'EventManager.jsm',
+    'OutputGenerator.jsm',
+    'Presentation.jsm',
+    'TouchAdapter.jsm',
+    'TraversalRules.jsm',
+    'Utils.jsm'
+]

From 98ac3021f247262912314956be673541e3dba0a7 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Tue, 19 Nov 2013 10:17:43 -0800
Subject: [PATCH 32/92] Bug 937466 - Introduce Constants module. r=yzen

---
 accessible/src/jsat/Constants.jsm       |  39 ++++
 accessible/src/jsat/EventManager.jsm    |  57 +++---
 accessible/src/jsat/OutputGenerator.jsm |  14 +-
 accessible/src/jsat/TraversalRules.jsm  | 247 ++++++++++--------------
 accessible/src/jsat/Utils.jsm           |  24 ++-
 accessible/src/jsat/content-script.js   |  11 +-
 accessible/src/jsat/moz.build           |   1 +
 7 files changed, 190 insertions(+), 203 deletions(-)
 create mode 100644 accessible/src/jsat/Constants.jsm

diff --git a/accessible/src/jsat/Constants.jsm b/accessible/src/jsat/Constants.jsm
new file mode 100644
index 00000000000..5dcc1d4697f
--- /dev/null
+++ b/accessible/src/jsat/Constants.jsm
@@ -0,0 +1,39 @@
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+this.EXPORTED_SYMBOLS = ['Roles', 'Events', 'Relations', 'Filters'];
+
+function ConstantsMap (aObject, aPrefix) {
+  let offset = aPrefix.length;
+  for (var name in aObject) {
+    if (name.indexOf(aPrefix) === 0) {
+      this[name.slice(offset)] = aObject[name];
+    }
+  }
+}
+
+XPCOMUtils.defineLazyGetter(
+  this, 'Roles',
+  function() {
+    return new ConstantsMap(Ci.nsIAccessibleRole, 'ROLE_');
+  });
+
+XPCOMUtils.defineLazyGetter(
+  this, 'Events',
+  function() {
+    return new ConstantsMap(Ci.nsIAccessibleEvent, 'EVENT_');
+  });
+
+XPCOMUtils.defineLazyGetter(
+  this, 'Relations',
+  function() {
+    return new ConstantsMap(Ci.nsIAccessibleRelation, 'RELATION_');
+  });
+
+XPCOMUtils.defineLazyGetter(
+  this, 'Filters',
+  function() {
+    return new ConstantsMap(Ci.nsIAccessibleTraversalRule, 'FILTER_');
+  });
diff --git a/accessible/src/jsat/EventManager.jsm b/accessible/src/jsat/EventManager.jsm
index 781b647e431..21ad11a5036 100644
--- a/accessible/src/jsat/EventManager.jsm
+++ b/accessible/src/jsat/EventManager.jsm
@@ -7,21 +7,6 @@
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-const EVENT_VIRTUALCURSOR_CHANGED = Ci.nsIAccessibleEvent.EVENT_VIRTUALCURSOR_CHANGED;
-const EVENT_STATE_CHANGE = Ci.nsIAccessibleEvent.EVENT_STATE_CHANGE;
-const EVENT_SCROLLING_START = Ci.nsIAccessibleEvent.EVENT_SCROLLING_START;
-const EVENT_TEXT_CARET_MOVED = Ci.nsIAccessibleEvent.EVENT_TEXT_CARET_MOVED;
-const EVENT_TEXT_INSERTED = Ci.nsIAccessibleEvent.EVENT_TEXT_INSERTED;
-const EVENT_TEXT_REMOVED = Ci.nsIAccessibleEvent.EVENT_TEXT_REMOVED;
-const EVENT_FOCUS = Ci.nsIAccessibleEvent.EVENT_FOCUS;
-const EVENT_SHOW = Ci.nsIAccessibleEvent.EVENT_SHOW;
-const EVENT_HIDE = Ci.nsIAccessibleEvent.EVENT_HIDE;
-
-const ROLE_INTERNAL_FRAME = Ci.nsIAccessibleRole.ROLE_INTERNAL_FRAME;
-const ROLE_DOCUMENT = Ci.nsIAccessibleRole.ROLE_DOCUMENT;
-const ROLE_CHROME_WINDOW = Ci.nsIAccessibleRole.ROLE_CHROME_WINDOW;
-const ROLE_TEXT_LEAF = Ci.nsIAccessibleRole.ROLE_TEXT_LEAF;
-
 const TEXT_NODE = 3;
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
@@ -35,6 +20,10 @@ XPCOMUtils.defineLazyModuleGetter(this, 'Presentation',
   'resource://gre/modules/accessibility/Presentation.jsm');
 XPCOMUtils.defineLazyModuleGetter(this, 'TraversalRules',
   'resource://gre/modules/accessibility/TraversalRules.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Roles',
+  'resource://gre/modules/accessibility/Constants.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Events',
+  'resource://gre/modules/accessibility/Constants.jsm');
 
 this.EXPORTED_SYMBOLS = ['EventManager'];
 
@@ -144,7 +133,7 @@ this.EventManager.prototype = {
 
     // Don't bother with non-content events in firefox.
     if (Utils.MozBuildApp == 'browser' &&
-        aEvent.eventType != EVENT_VIRTUALCURSOR_CHANGED &&
+        aEvent.eventType != Events.VIRTUALCURSOR_CHANGED &&
         // XXX Bug 442005 results in DocAccessible::getDocType returning
         // NS_ERROR_FAILURE. Checking for aEvent.accessibleDocument.docType ==
         // 'window' does not currently work.
@@ -154,12 +143,12 @@ this.EventManager.prototype = {
     }
 
     switch (aEvent.eventType) {
-      case EVENT_VIRTUALCURSOR_CHANGED:
+      case Events.VIRTUALCURSOR_CHANGED:
       {
         let pivot = aEvent.accessible.
           QueryInterface(Ci.nsIAccessibleDocument).virtualCursor;
         let position = pivot.position;
-        if (position && position.role == ROLE_INTERNAL_FRAME)
+        if (position && position.role == Roles.INTERNAL_FRAME)
           break;
         let event = aEvent.
           QueryInterface(Ci.nsIAccessibleVirtualCursorChangeEvent);
@@ -174,7 +163,7 @@ this.EventManager.prototype = {
 
         break;
       }
-      case EVENT_STATE_CHANGE:
+      case Events.STATE_CHANGE:
       {
         let event = aEvent.QueryInterface(Ci.nsIAccessibleStateChangeEvent);
         if (event.state == Ci.nsIAccessibleStates.STATE_CHECKED &&
@@ -191,13 +180,13 @@ this.EventManager.prototype = {
         }
         break;
       }
-      case EVENT_SCROLLING_START:
+      case Events.SCROLLING_START:
       {
         let vc = Utils.getVirtualCursor(aEvent.accessibleDocument);
         vc.moveNext(TraversalRules.Simple, aEvent.accessible, true);
         break;
       }
-      case EVENT_TEXT_CARET_MOVED:
+      case Events.TEXT_CARET_MOVED:
       {
         let acc = aEvent.accessible;
         let characterCount = acc.
@@ -233,7 +222,7 @@ this.EventManager.prototype = {
         this.editState = editState;
         break;
       }
-      case EVENT_SHOW:
+      case Events.SHOW:
       {
         let {liveRegion, isPolite} = this._handleLiveRegion(aEvent,
           ['additions', 'all']);
@@ -242,14 +231,14 @@ this.EventManager.prototype = {
           break;
         }
         // Show for text is handled by the EVENT_TEXT_INSERTED handler.
-        if (aEvent.accessible.role === ROLE_TEXT_LEAF) {
+        if (aEvent.accessible.role === Roles.TEXT_LEAF) {
           break;
         }
-        this._dequeueLiveEvent(EVENT_HIDE, liveRegion);
+        this._dequeueLiveEvent(Events.HIDE, liveRegion);
         this.present(Presentation.liveRegion(liveRegion, isPolite, false));
         break;
       }
-      case EVENT_HIDE:
+      case Events.HIDE:
       {
         let {liveRegion, isPolite} = this._handleLiveRegion(
           aEvent.QueryInterface(Ci.nsIAccessibleHideEvent),
@@ -259,14 +248,14 @@ this.EventManager.prototype = {
           break;
         }
         // Hide for text is handled by the EVENT_TEXT_REMOVED handler.
-        if (aEvent.accessible.role === ROLE_TEXT_LEAF) {
+        if (aEvent.accessible.role === Roles.TEXT_LEAF) {
           break;
         }
-        this._queueLiveEvent(EVENT_HIDE, liveRegion, isPolite);
+        this._queueLiveEvent(Events.HIDE, liveRegion, isPolite);
         break;
       }
-      case EVENT_TEXT_INSERTED:
-      case EVENT_TEXT_REMOVED:
+      case Events.TEXT_INSERTED:
+      case Events.TEXT_REMOVED:
       {
         let {liveRegion, isPolite} = this._handleLiveRegion(aEvent,
           ['text', 'all']);
@@ -277,12 +266,12 @@ this.EventManager.prototype = {
         }
         break;
       }
-      case EVENT_FOCUS:
+      case Events.FOCUS:
       {
         // Put vc where the focus is at
         let acc = aEvent.accessible;
         let doc = aEvent.accessibleDocument;
-        if (acc.role != ROLE_DOCUMENT && doc.role != ROLE_CHROME_WINDOW) {
+        if (acc.role != Roles.DOCUMENT && doc.role != Roles.CHROME_WINDOW) {
           let vc = Utils.getVirtualCursor(doc);
           vc.moveNext(TraversalRules.Simple, acc, true);
         }
@@ -314,11 +303,11 @@ this.EventManager.prototype = {
       return;
     }
     if (aLiveRegion) {
-      if (aEvent.eventType === EVENT_TEXT_REMOVED) {
-        this._queueLiveEvent(EVENT_TEXT_REMOVED, aLiveRegion, aIsPolite,
+      if (aEvent.eventType === Events.TEXT_REMOVED) {
+        this._queueLiveEvent(Events.TEXT_REMOVED, aLiveRegion, aIsPolite,
           modifiedText);
       } else {
-        this._dequeueLiveEvent(EVENT_TEXT_REMOVED, aLiveRegion);
+        this._dequeueLiveEvent(Events.TEXT_REMOVED, aLiveRegion);
         this.present(Presentation.liveRegion(aLiveRegion, aIsPolite, false,
           modifiedText));
       }
diff --git a/accessible/src/jsat/OutputGenerator.jsm b/accessible/src/jsat/OutputGenerator.jsm
index 1605d1e400c..3cab3c00f12 100644
--- a/accessible/src/jsat/OutputGenerator.jsm
+++ b/accessible/src/jsat/OutputGenerator.jsm
@@ -18,10 +18,6 @@ const NAME_FROM_SUBTREE_RULE = 0x10;
 const OUTPUT_DESC_FIRST = 0;
 const OUTPUT_DESC_LAST = 1;
 
-const ROLE_LISTITEM = Ci.nsIAccessibleRole.ROLE_LISTITEM;
-const ROLE_STATICTEXT = Ci.nsIAccessibleRole.ROLE_STATICTEXT;
-const ROLE_LINK = Ci.nsIAccessibleRole.ROLE_LINK;
-
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 XPCOMUtils.defineLazyModuleGetter(this, 'Utils',
   'resource://gre/modules/accessibility/Utils.jsm');
@@ -31,6 +27,8 @@ XPCOMUtils.defineLazyModuleGetter(this, 'Logger',
   'resource://gre/modules/accessibility/Utils.jsm');
 XPCOMUtils.defineLazyModuleGetter(this, 'PluralForm',
   'resource://gre/modules/PluralForm.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Roles',
+  'resource://gre/modules/accessibility/Constants.jsm');
 
 var gStringBundle = Cc['@mozilla.org/intl/stringbundle;1'].
   getService(Ci.nsIStringBundleService).
@@ -697,8 +695,8 @@ this.BrailleGenerator = {
       let braille = this.objectOutputFunctions._generateBaseOutput.apply(this, arguments);
 
       if (aAccessible.indexInParent === 1 &&
-          aAccessible.parent.role == ROLE_LISTITEM &&
-          aAccessible.previousSibling.role == ROLE_STATICTEXT) {
+          aAccessible.parent.role == Roles.LISTITEM &&
+          aAccessible.previousSibling.role == Roles.STATICTEXT) {
         if (aAccessible.parent.parent && aAccessible.parent.parent.DOMNode &&
             aAccessible.parent.parent.DOMNode.nodeName == 'UL') {
           braille.unshift('*');
@@ -755,7 +753,7 @@ this.BrailleGenerator = {
     statictext: function statictext(aAccessible, aRoleStr, aStates, aFlags) {
       // Since we customize the list bullet's output, we add the static
       // text from the first node in each listitem, so skip it here.
-      if (aAccessible.parent.role == ROLE_LISTITEM) {
+      if (aAccessible.parent.role == Roles.LISTITEM) {
         return [];
       }
 
@@ -788,7 +786,7 @@ this.BrailleGenerator = {
   },
 
   _getContextStart: function _getContextStart(aContext) {
-    if (aContext.accessible.parent.role == ROLE_LINK) {
+    if (aContext.accessible.parent.role == Roles.LINK) {
       return [aContext.accessible.parent];
     }
 
diff --git a/accessible/src/jsat/TraversalRules.jsm b/accessible/src/jsat/TraversalRules.jsm
index 983ebb96f1e..e8599d416ea 100644
--- a/accessible/src/jsat/TraversalRules.jsm
+++ b/accessible/src/jsat/TraversalRules.jsm
@@ -9,61 +9,24 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
-const FILTER_IGNORE = Ci.nsIAccessibleTraversalRule.FILTER_IGNORE;
-const FILTER_MATCH = Ci.nsIAccessibleTraversalRule.FILTER_MATCH;
-const FILTER_IGNORE_SUBTREE = Ci.nsIAccessibleTraversalRule.FILTER_IGNORE_SUBTREE;
-
-const ROLE_MENUITEM = Ci.nsIAccessibleRole.ROLE_MENUITEM;
-const ROLE_LINK = Ci.nsIAccessibleRole.ROLE_LINK;
-const ROLE_PAGETAB = Ci.nsIAccessibleRole.ROLE_PAGETAB;
-const ROLE_GRAPHIC = Ci.nsIAccessibleRole.ROLE_GRAPHIC;
-const ROLE_STATICTEXT = Ci.nsIAccessibleRole.ROLE_STATICTEXT;
-const ROLE_TEXT_LEAF = Ci.nsIAccessibleRole.ROLE_TEXT_LEAF;
-const ROLE_PUSHBUTTON = Ci.nsIAccessibleRole.ROLE_PUSHBUTTON;
-const ROLE_SPINBUTTON = Ci.nsIAccessibleRole.ROLE_SPINBUTTON;
-const ROLE_CHECKBUTTON = Ci.nsIAccessibleRole.ROLE_CHECKBUTTON;
-const ROLE_RADIOBUTTON = Ci.nsIAccessibleRole.ROLE_RADIOBUTTON;
-const ROLE_COMBOBOX = Ci.nsIAccessibleRole.ROLE_COMBOBOX;
-const ROLE_PROGRESSBAR = Ci.nsIAccessibleRole.ROLE_PROGRESSBAR;
-const ROLE_BUTTONDROPDOWN = Ci.nsIAccessibleRole.ROLE_BUTTONDROPDOWN;
-const ROLE_BUTTONMENU = Ci.nsIAccessibleRole.ROLE_BUTTONMENU;
-const ROLE_CHECK_MENU_ITEM = Ci.nsIAccessibleRole.ROLE_CHECK_MENU_ITEM;
-const ROLE_PASSWORD_TEXT = Ci.nsIAccessibleRole.ROLE_PASSWORD_TEXT;
-const ROLE_RADIO_MENU_ITEM = Ci.nsIAccessibleRole.ROLE_RADIO_MENU_ITEM;
-const ROLE_TOGGLE_BUTTON = Ci.nsIAccessibleRole.ROLE_TOGGLE_BUTTON;
-const ROLE_KEY = Ci.nsIAccessibleRole.ROLE_KEY;
-const ROLE_ENTRY = Ci.nsIAccessibleRole.ROLE_ENTRY;
-const ROLE_LIST = Ci.nsIAccessibleRole.ROLE_LIST;
-const ROLE_DEFINITION_LIST = Ci.nsIAccessibleRole.ROLE_DEFINITION_LIST;
-const ROLE_LISTITEM = Ci.nsIAccessibleRole.ROLE_LISTITEM;
-const ROLE_BUTTONDROPDOWNGRID = Ci.nsIAccessibleRole.ROLE_BUTTONDROPDOWNGRID;
-const ROLE_LISTBOX = Ci.nsIAccessibleRole.ROLE_LISTBOX;
-const ROLE_OPTION = Ci.nsIAccessibleRole.ROLE_OPTION;
-const ROLE_SLIDER = Ci.nsIAccessibleRole.ROLE_SLIDER;
-const ROLE_HEADING = Ci.nsIAccessibleRole.ROLE_HEADING;
-const ROLE_HEADER = Ci.nsIAccessibleRole.ROLE_HEADER;
-const ROLE_TERM = Ci.nsIAccessibleRole.ROLE_TERM;
-const ROLE_SEPARATOR = Ci.nsIAccessibleRole.ROLE_SEPARATOR;
-const ROLE_TABLE = Ci.nsIAccessibleRole.ROLE_TABLE;
-const ROLE_INTERNAL_FRAME = Ci.nsIAccessibleRole.ROLE_INTERNAL_FRAME;
-const ROLE_PARAGRAPH = Ci.nsIAccessibleRole.ROLE_PARAGRAPH;
-const ROLE_SECTION = Ci.nsIAccessibleRole.ROLE_SECTION;
-const ROLE_LABEL = Ci.nsIAccessibleRole.ROLE_LABEL;
-
 this.EXPORTED_SYMBOLS = ['TraversalRules'];
 
 Cu.import('resource://gre/modules/accessibility/Utils.jsm');
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Roles',
+  'resource://gre/modules/accessibility/Constants.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Filters',
+  'resource://gre/modules/accessibility/Constants.jsm');
 
 let gSkipEmptyImages = new PrefCache('accessibility.accessfu.skip_empty_images');
 
 function BaseTraversalRule(aRoles, aMatchFunc) {
   this._explicitMatchRoles = new Set(aRoles);
   this._matchRoles = aRoles;
-  if (aRoles.indexOf(ROLE_LABEL) < 0) {
-    this._matchRoles.push(ROLE_LABEL);
+  if (aRoles.indexOf(Roles.LABEL) < 0) {
+    this._matchRoles.push(Roles.LABEL);
   }
-  this._matchFunc = aMatchFunc || function (acc) { return FILTER_MATCH; };
+  this._matchFunc = aMatchFunc || function (acc) { return Filters.MATCH; };
 }
 
 BaseTraversalRule.prototype = {
@@ -80,20 +43,20 @@ BaseTraversalRule.prototype = {
     match: function BaseTraversalRule_match(aAccessible)
     {
       let role = aAccessible.role;
-      if (role == ROLE_INTERNAL_FRAME) {
+      if (role == Roles.INTERNAL_FRAME) {
         return (Utils.getMessageManager(aAccessible.DOMNode)) ?
-          FILTER_MATCH  | FILTER_IGNORE_SUBTREE : FILTER_IGNORE;
+          Filters.MATCH  | Filters.IGNORE_SUBTREE : Filters.IGNORE;
       }
 
       let matchResult = this._explicitMatchRoles.has(role) ?
-          this._matchFunc(aAccessible) : FILTER_IGNORE;
+          this._matchFunc(aAccessible) : Filters.IGNORE;
 
       // If we are on a label that nests a checkbox/radio we should land on it.
       // It is a bigger touch target, and it reduces clutter.
-      if (role == ROLE_LABEL && !(matchResult & FILTER_IGNORE_SUBTREE)) {
+      if (role == Roles.LABEL && !(matchResult & Filters.IGNORE_SUBTREE)) {
         let control = Utils.getEmbeddedControl(aAccessible);
         if (control && this._explicitMatchRoles.has(control.role)) {
-          matchResult = this._matchFunc(control) | FILTER_IGNORE_SUBTREE;
+          matchResult = this._matchFunc(control) | Filters.IGNORE_SUBTREE;
         }
       }
 
@@ -104,32 +67,32 @@ BaseTraversalRule.prototype = {
 };
 
 var gSimpleTraversalRoles =
-  [ROLE_MENUITEM,
-   ROLE_LINK,
-   ROLE_PAGETAB,
-   ROLE_GRAPHIC,
-   ROLE_STATICTEXT,
-   ROLE_TEXT_LEAF,
-   ROLE_PUSHBUTTON,
-   ROLE_CHECKBUTTON,
-   ROLE_RADIOBUTTON,
-   ROLE_COMBOBOX,
-   ROLE_PROGRESSBAR,
-   ROLE_BUTTONDROPDOWN,
-   ROLE_BUTTONMENU,
-   ROLE_CHECK_MENU_ITEM,
-   ROLE_PASSWORD_TEXT,
-   ROLE_RADIO_MENU_ITEM,
-   ROLE_TOGGLE_BUTTON,
-   ROLE_ENTRY,
-   ROLE_KEY,
-   ROLE_HEADER,
-   ROLE_HEADING,
-   ROLE_SLIDER,
-   ROLE_SPINBUTTON,
-   ROLE_OPTION,
+  [Roles.MENUITEM,
+   Roles.LINK,
+   Roles.PAGETAB,
+   Roles.GRAPHIC,
+   Roles.STATICTEXT,
+   Roles.TEXT_LEAF,
+   Roles.PUSHBUTTON,
+   Roles.CHECKBUTTON,
+   Roles.RADIOBUTTON,
+   Roles.COMBOBOX,
+   Roles.PROGRESSBAR,
+   Roles.BUTTONDROPDOWN,
+   Roles.BUTTONMENU,
+   Roles.CHECK_MENU_ITEM,
+   Roles.PASSWORD_TEXT,
+   Roles.RADIO_MENU_ITEM,
+   Roles.TOGGLE_BUTTON,
+   Roles.ENTRY,
+   Roles.KEY,
+   Roles.HEADER,
+   Roles.HEADING,
+   Roles.SLIDER,
+   Roles.SPINBUTTON,
+   Roles.OPTION,
    // Used for traversing in to child OOP frames.
-   ROLE_INTERNAL_FRAME];
+   Roles.INTERNAL_FRAME];
 
 this.TraversalRules = {
   Simple: new BaseTraversalRule(
@@ -146,47 +109,47 @@ this.TraversalRules = {
       }
 
       switch (aAccessible.role) {
-      case ROLE_COMBOBOX:
+      case Roles.COMBOBOX:
         // We don't want to ignore the subtree because this is often
         // where the list box hangs out.
-        return FILTER_MATCH;
-      case ROLE_TEXT_LEAF:
+        return Filters.MATCH;
+      case Roles.TEXT_LEAF:
         {
           // Nameless text leaves are boring, skip them.
           let name = aAccessible.name;
           if (name && name.trim())
-            return FILTER_MATCH;
+            return Filters.MATCH;
           else
-            return FILTER_IGNORE;
+            return Filters.IGNORE;
         }
-      case ROLE_STATICTEXT:
+      case Roles.STATICTEXT:
         {
           let parent = aAccessible.parent;
           // Ignore prefix static text in list items. They are typically bullets or numbers.
           if (parent.childCount > 1 && aAccessible.indexInParent == 0 &&
-              parent.role == ROLE_LISTITEM)
-            return FILTER_IGNORE;
+              parent.role == Roles.LISTITEM)
+            return Filters.IGNORE;
 
-          return FILTER_MATCH;
+          return Filters.MATCH;
         }
-      case ROLE_GRAPHIC:
+      case Roles.GRAPHIC:
         return TraversalRules._shouldSkipImage(aAccessible);
-      case ROLE_LINK:
-      case ROLE_HEADER:
-      case ROLE_HEADING:
+      case Roles.LINK:
+      case Roles.HEADER:
+      case Roles.HEADING:
         return hasZeroOrSingleChildDescendants() ?
-          (FILTER_MATCH | FILTER_IGNORE_SUBTREE) : (FILTER_IGNORE);
+          (Filters.MATCH | Filters.IGNORE_SUBTREE) : (Filters.IGNORE);
       default:
         // Ignore the subtree, if there is one. So that we don't land on
         // the same content that was already presented by its parent.
-        return FILTER_MATCH |
-          FILTER_IGNORE_SUBTREE;
+        return Filters.MATCH |
+          Filters.IGNORE_SUBTREE;
       }
     }
   ),
 
   Anchor: new BaseTraversalRule(
-    [ROLE_LINK],
+    [Roles.LINK],
     function Anchor_match(aAccessible)
     {
       // We want to ignore links, only focus named anchors.
@@ -194,67 +157,67 @@ this.TraversalRules = {
       let extraState = {};
       aAccessible.getState(state, extraState);
       if (state.value & Ci.nsIAccessibleStates.STATE_LINKED) {
-        return FILTER_IGNORE;
+        return Filters.IGNORE;
       } else {
-        return FILTER_MATCH;
+        return Filters.MATCH;
       }
     }),
 
   Button: new BaseTraversalRule(
-    [ROLE_PUSHBUTTON,
-     ROLE_SPINBUTTON,
-     ROLE_TOGGLE_BUTTON,
-     ROLE_BUTTONDROPDOWN,
-     ROLE_BUTTONDROPDOWNGRID]),
+    [Roles.PUSHBUTTON,
+     Roles.SPINBUTTON,
+     Roles.TOGGLE_BUTTON,
+     Roles.BUTTONDROPDOWN,
+     Roles.BUTTONDROPDOWNGRID]),
 
   Combobox: new BaseTraversalRule(
-    [ROLE_COMBOBOX,
-     ROLE_LISTBOX]),
+    [Roles.COMBOBOX,
+     Roles.LISTBOX]),
 
   Landmark: new BaseTraversalRule(
     [],
     function Landmark_match(aAccessible) {
-      return Utils.getLandmarkName(aAccessible) ? FILTER_MATCH :
-        FILTER_IGNORE;
+      return Utils.getLandmarkName(aAccessible) ? Filters.MATCH :
+        Filters.IGNORE;
     }
   ),
 
   Entry: new BaseTraversalRule(
-    [ROLE_ENTRY,
-     ROLE_PASSWORD_TEXT]),
+    [Roles.ENTRY,
+     Roles.PASSWORD_TEXT]),
 
   FormElement: new BaseTraversalRule(
-    [ROLE_PUSHBUTTON,
-     ROLE_SPINBUTTON,
-     ROLE_TOGGLE_BUTTON,
-     ROLE_BUTTONDROPDOWN,
-     ROLE_BUTTONDROPDOWNGRID,
-     ROLE_COMBOBOX,
-     ROLE_LISTBOX,
-     ROLE_ENTRY,
-     ROLE_PASSWORD_TEXT,
-     ROLE_PAGETAB,
-     ROLE_RADIOBUTTON,
-     ROLE_RADIO_MENU_ITEM,
-     ROLE_SLIDER,
-     ROLE_CHECKBUTTON,
-     ROLE_CHECK_MENU_ITEM]),
+    [Roles.PUSHBUTTON,
+     Roles.SPINBUTTON,
+     Roles.TOGGLE_BUTTON,
+     Roles.BUTTONDROPDOWN,
+     Roles.BUTTONDROPDOWNGRID,
+     Roles.COMBOBOX,
+     Roles.LISTBOX,
+     Roles.ENTRY,
+     Roles.PASSWORD_TEXT,
+     Roles.PAGETAB,
+     Roles.RADIOBUTTON,
+     Roles.RADIO_MENU_ITEM,
+     Roles.SLIDER,
+     Roles.CHECKBUTTON,
+     Roles.CHECK_MENU_ITEM]),
 
   Graphic: new BaseTraversalRule(
-    [ROLE_GRAPHIC],
+    [Roles.GRAPHIC],
     function Graphic_match(aAccessible) {
       return TraversalRules._shouldSkipImage(aAccessible);
     }),
 
   Heading: new BaseTraversalRule(
-    [ROLE_HEADING]),
+    [Roles.HEADING]),
 
   ListItem: new BaseTraversalRule(
-    [ROLE_LISTITEM,
-     ROLE_TERM]),
+    [Roles.LISTITEM,
+     Roles.TERM]),
 
   Link: new BaseTraversalRule(
-    [ROLE_LINK],
+    [Roles.LINK],
     function Link_match(aAccessible)
     {
       // We want to ignore anchors, only focus real links.
@@ -262,50 +225,50 @@ this.TraversalRules = {
       let extraState = {};
       aAccessible.getState(state, extraState);
       if (state.value & Ci.nsIAccessibleStates.STATE_LINKED) {
-        return FILTER_MATCH;
+        return Filters.MATCH;
       } else {
-        return FILTER_IGNORE;
+        return Filters.IGNORE;
       }
     }),
 
   List: new BaseTraversalRule(
-    [ROLE_LIST,
-     ROLE_DEFINITION_LIST]),
+    [Roles.LIST,
+     Roles.DEFINITION_LIST]),
 
   PageTab: new BaseTraversalRule(
-    [ROLE_PAGETAB]),
+    [Roles.PAGETAB]),
 
   Paragraph: new BaseTraversalRule(
-    [ROLE_PARAGRAPH,
-     ROLE_SECTION],
+    [Roles.PARAGRAPH,
+     Roles.SECTION],
     function Paragraph_match(aAccessible) {
       for (let child = aAccessible.firstChild; child; child = child.nextSibling) {
-        if (child.role === ROLE_TEXT_LEAF) {
-          return FILTER_MATCH | FILTER_IGNORE_SUBTREE;
+        if (child.role === Roles.TEXT_LEAF) {
+          return Filters.MATCH | Filters.IGNORE_SUBTREE;
         }
       }
 
-      return FILTER_IGNORE;
+      return Filters.IGNORE;
     }),
 
   RadioButton: new BaseTraversalRule(
-    [ROLE_RADIOBUTTON,
-     ROLE_RADIO_MENU_ITEM]),
+    [Roles.RADIOBUTTON,
+     Roles.RADIO_MENU_ITEM]),
 
   Separator: new BaseTraversalRule(
-    [ROLE_SEPARATOR]),
+    [Roles.SEPARATOR]),
 
   Table: new BaseTraversalRule(
-    [ROLE_TABLE]),
+    [Roles.TABLE]),
 
   Checkbox: new BaseTraversalRule(
-    [ROLE_CHECKBUTTON,
-     ROLE_CHECK_MENU_ITEM]),
+    [Roles.CHECKBUTTON,
+     Roles.CHECK_MENU_ITEM]),
 
   _shouldSkipImage: function _shouldSkipImage(aAccessible) {
     if (gSkipEmptyImages.value && aAccessible.name === '') {
-      return FILTER_IGNORE;
+      return Filters.IGNORE;
     }
-    return FILTER_MATCH;
+    return Filters.MATCH;
   }
 };
diff --git a/accessible/src/jsat/Utils.jsm b/accessible/src/jsat/Utils.jsm
index 38aaf7f2d0b..48b82631b79 100644
--- a/accessible/src/jsat/Utils.jsm
+++ b/accessible/src/jsat/Utils.jsm
@@ -8,19 +8,17 @@ const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
-const EVENT_STATE_CHANGE = Ci.nsIAccessibleEvent.EVENT_STATE_CHANGE;
-
-const ROLE_CELL = Ci.nsIAccessibleRole.ROLE_CELL;
-const ROLE_COLUMNHEADER = Ci.nsIAccessibleRole.ROLE_COLUMNHEADER;
-const ROLE_ROWHEADER = Ci.nsIAccessibleRole.ROLE_ROWHEADER;
-
-const RELATION_LABEL_FOR = Ci.nsIAccessibleRelation.RELATION_LABEL_FOR;
-
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, 'Services',
   'resource://gre/modules/Services.jsm');
 XPCOMUtils.defineLazyModuleGetter(this, 'Rect',
   'resource://gre/modules/Geometry.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Roles',
+  'resource://gre/modules/accessibility/Constants.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Events',
+  'resource://gre/modules/accessibility/Constants.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Relations',
+  'resource://gre/modules/accessibility/Constants.jsm');
 
 this.EXPORTED_SYMBOLS = ['Utils', 'Logger', 'PivotContext', 'PrefCache'];
 
@@ -297,7 +295,7 @@ this.Utils = {
 
   getEmbeddedControl: function getEmbeddedControl(aLabel) {
     if (aLabel) {
-      let relation = aLabel.getRelationByType(RELATION_LABEL_FOR);
+      let relation = aLabel.getRelationByType(Relations.LABEL_FOR);
       for (let i = 0; i < relation.targetsCount; i++) {
         let target = relation.getTarget(i);
         if (target.parent === aLabel) {
@@ -399,7 +397,7 @@ this.Logger = {
 
   eventToString: function eventToString(aEvent) {
     let str = Utils.AccRetrieval.getStringEventType(aEvent.eventType);
-    if (aEvent.eventType == EVENT_STATE_CHANGE) {
+    if (aEvent.eventType == Events.STATE_CHANGE) {
       let event = aEvent.QueryInterface(Ci.nsIAccessibleStateChangeEvent);
       let stateStrings = event.isExtraState ?
         Utils.AccRetrieval.getStringStates(0, event.state) :
@@ -633,7 +631,7 @@ PivotContext.prototype = {
       if (!aAccessible) {
         return null;
       }
-      if ([ROLE_CELL, ROLE_COLUMNHEADER, ROLE_ROWHEADER].indexOf(
+      if ([Roles.CELL, Roles.COLUMNHEADER, Roles.ROWHEADER].indexOf(
         aAccessible.role) < 0) {
           return null;
       }
@@ -694,12 +692,12 @@ PivotContext.prototype = {
 
     cellInfo.columnHeaders = [];
     if (cellInfo.columnChanged && cellInfo.current.role !==
-      ROLE_COLUMNHEADER) {
+      Roles.COLUMNHEADER) {
       cellInfo.columnHeaders = [headers for (headers of getHeaders(
         cellInfo.current.columnHeaderCells))];
     }
     cellInfo.rowHeaders = [];
-    if (cellInfo.rowChanged && cellInfo.current.role === ROLE_CELL) {
+    if (cellInfo.rowChanged && cellInfo.current.role === Roles.CELL) {
       cellInfo.rowHeaders = [headers for (headers of getHeaders(
         cellInfo.current.rowHeaderCells))];
     }
diff --git a/accessible/src/jsat/content-script.js b/accessible/src/jsat/content-script.js
index 69101a78b84..cf2354a17ba 100644
--- a/accessible/src/jsat/content-script.js
+++ b/accessible/src/jsat/content-script.js
@@ -5,9 +5,6 @@
 let Ci = Components.interfaces;
 let Cu = Components.utils;
 
-const ROLE_ENTRY = Ci.nsIAccessibleRole.ROLE_ENTRY;
-const ROLE_INTERNAL_FRAME = Ci.nsIAccessibleRole.ROLE_INTERNAL_FRAME;
-
 const MOVEMENT_GRANULARITY_CHARACTER = 1;
 const MOVEMENT_GRANULARITY_WORD = 2;
 const MOVEMENT_GRANULARITY_PARAGRAPH = 8;
@@ -25,6 +22,8 @@ XPCOMUtils.defineLazyModuleGetter(this, 'EventManager',
   'resource://gre/modules/accessibility/EventManager.jsm');
 XPCOMUtils.defineLazyModuleGetter(this, 'ObjectWrapper',
   'resource://gre/modules/ObjectWrapper.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'Roles',
+  'resource://gre/modules/accessibility/Constants.jsm');
 
 Logger.debug('content-script.js');
 
@@ -137,7 +136,7 @@ function forwardToParent(aMessage) {
 function forwardToChild(aMessage, aListener, aVCPosition) {
   let acc = aVCPosition || Utils.getVirtualCursor(content.document).position;
 
-  if (!Utils.isAliveAndVisible(acc) || acc.role != ROLE_INTERNAL_FRAME) {
+  if (!Utils.isAliveAndVisible(acc) || acc.role != Roles.INTERNAL_FRAME) {
     return false;
   }
 
@@ -165,7 +164,7 @@ function activateCurrent(aMessage) {
   Logger.debug('activateCurrent');
   function activateAccessible(aAccessible) {
     if (aMessage.json.activateIfKey &&
-        aAccessible.role != Ci.nsIAccessibleRole.ROLE_KEY) {
+        aAccessible.role != Roles.KEY) {
       // Only activate keys, don't do anything on other objects.
       return;
     }
@@ -219,7 +218,7 @@ function activateCurrent(aMessage) {
   }
 
   let focusedAcc = Utils.AccRetrieval.getAccessibleFor(content.document.activeElement);
-  if (focusedAcc && focusedAcc.role === ROLE_ENTRY) {
+  if (focusedAcc && focusedAcc.role === Roles.ENTRY) {
     moveCaretTo(focusedAcc, aMessage.json.offset);
     return;
   }
diff --git a/accessible/src/jsat/moz.build b/accessible/src/jsat/moz.build
index cd1a6be2598..a7871002320 100644
--- a/accessible/src/jsat/moz.build
+++ b/accessible/src/jsat/moz.build
@@ -8,6 +8,7 @@ JS_MODULES_PATH = 'modules/accessibility'
 
 EXTRA_JS_MODULES += [
     'AccessFu.jsm',
+    'Constants.jsm',
     'EventManager.jsm',
     'OutputGenerator.jsm',
     'Presentation.jsm',

From f419ebb721304cff490172201e1b7d6ab9ad5d85 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Tue, 19 Nov 2013 10:17:43 -0800
Subject: [PATCH 33/92] Bug 937775 - Make AccessFu logging less verbose by
 default. r=yzen

---
 accessible/src/jsat/AccessFu.jsm              | 13 ++++++-------
 accessible/src/jsat/EventManager.jsm          |  4 ++--
 accessible/src/jsat/TouchAdapter.jsm          |  4 ++--
 accessible/tests/mochitest/jsat/jsatcommon.js |  2 ++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/accessible/src/jsat/AccessFu.jsm b/accessible/src/jsat/AccessFu.jsm
index 43cacb5f7fb..c82fe3e28fd 100644
--- a/accessible/src/jsat/AccessFu.jsm
+++ b/accessible/src/jsat/AccessFu.jsm
@@ -86,7 +86,7 @@ this.AccessFu = {
     Cu.import('resource://gre/modules/accessibility/TouchAdapter.jsm');
     Cu.import('resource://gre/modules/accessibility/Presentation.jsm');
 
-    Logger.info('enable');
+    Logger.info('Enabled');
 
     for each (let mm in Utils.AllMessageManagers) {
       this._addMessageListeners(mm);
@@ -145,7 +145,7 @@ this.AccessFu = {
 
     this._enabled = false;
 
-    Logger.info('disable');
+    Logger.info('Disabled');
 
     Utils.win.document.removeChild(this.stylesheet.get());
 
@@ -524,9 +524,8 @@ var Output = {
 
       for (let action of aActions) {
         let window = Utils.win;
-        Logger.info('tts.' + action.method,
-                    '"' + action.data + '"',
-                    JSON.stringify(action.options));
+        Logger.debug('tts.' + action.method, '"' + action.data + '"',
+                     JSON.stringify(action.options));
 
         if (!action.options.enqueue && this.webspeechEnabled) {
           window.speechSynthesis.cancel();
@@ -715,8 +714,8 @@ var Input = {
 
   _handleGesture: function _handleGesture(aGesture) {
     let gestureName = aGesture.type + aGesture.touches.length;
-    Logger.info('Gesture', aGesture.type,
-                '(fingers: ' + aGesture.touches.length + ')');
+    Logger.debug('Gesture', aGesture.type,
+                 '(fingers: ' + aGesture.touches.length + ')');
 
     switch (gestureName) {
       case 'dwell1':
diff --git a/accessible/src/jsat/EventManager.jsm b/accessible/src/jsat/EventManager.jsm
index 21ad11a5036..920cdca0750 100644
--- a/accessible/src/jsat/EventManager.jsm
+++ b/accessible/src/jsat/EventManager.jsm
@@ -46,7 +46,7 @@ this.EventManager.prototype = {
   start: function start() {
     try {
       if (!this._started) {
-        Logger.info('EventManager.start', Utils.MozBuildApp);
+        Logger.debug('EventManager.start');
 
         this._started = true;
 
@@ -73,7 +73,7 @@ this.EventManager.prototype = {
     if (!this._started) {
       return;
     }
-    Logger.info('EventManager.stop', Utils.MozBuildApp);
+    Logger.debug('EventManager.stop');
     AccessibilityEventObserver.removeListener(this);
     try {
       this.webProgress.removeProgressListener(this);
diff --git a/accessible/src/jsat/TouchAdapter.jsm b/accessible/src/jsat/TouchAdapter.jsm
index fa65e2aee38..87a680f8d6a 100644
--- a/accessible/src/jsat/TouchAdapter.jsm
+++ b/accessible/src/jsat/TouchAdapter.jsm
@@ -46,7 +46,7 @@ this.TouchAdapter = {
   SYNTH_ID: -1,
 
   start: function TouchAdapter_start() {
-    Logger.info('TouchAdapter.start');
+    Logger.debug('TouchAdapter.start');
 
     this._touchPoints = {};
     this._dwellTimeout = 0;
@@ -64,7 +64,7 @@ this.TouchAdapter = {
   },
 
   stop: function TouchAdapter_stop() {
-    Logger.info('TouchAdapter.stop');
+    Logger.debug('TouchAdapter.stop');
 
     let target = Utils.win;
 
diff --git a/accessible/tests/mochitest/jsat/jsatcommon.js b/accessible/tests/mochitest/jsat/jsatcommon.js
index 640989252b6..7331da10dcc 100644
--- a/accessible/tests/mochitest/jsat/jsatcommon.js
+++ b/accessible/tests/mochitest/jsat/jsatcommon.js
@@ -92,6 +92,7 @@ var AccessFuTest = {
   finish: function AccessFuTest_finish() {
     // Disable the console service logging.
     Logger.test = false;
+    Logger.logLevel = Logger.INFO;
     AccessFu.doneCallback = function doneCallback() {
       // This is being called once AccessFu has been shut down.
       // Detach AccessFu from everything it attached itself to.
@@ -136,6 +137,7 @@ var AccessFuTest = {
     AccessFu.readyCallback = function readyCallback() {
       // Enable logging to the console service.
       Logger.test = true;
+      Logger.logLevel = Logger.DEBUG;
       // This is being called once accessibility has been turned on.
 
       if (AccessFuTest._waitForExplicitFinish) {

From fa9bd3e7b12dd2f57af8d2d63fbea4277e7e480b Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 19 Nov 2013 10:16:51 -0800
Subject: [PATCH 34/92] Backed out 4 changesets (c0e8f2c0465f::608c663f691f)
 (bug 928195) for landing prematurely

--HG--
extra : rebase_source : fa42534ef50a0373738349f17b2ca57510bdd6ac
---
 CLOBBER                                       |   3 +-
 build/docs/index.rst                          |   1 -
 build/docs/webidl.rst                         | 137 -----
 build/virtualenv_packages.txt                 |   2 -
 dom/bindings/BindingGen.py                    |  98 +++
 dom/bindings/Codegen.py                       |  20 +
 dom/bindings/ExampleGen.py                    |  46 ++
 dom/bindings/GlobalGen.py                     |  81 +++
 dom/bindings/Makefile.in                      | 285 +++++++--
 dom/bindings/mach_commands.py                 |  11 -
 dom/bindings/moz.build                        |  11 -
 dom/bindings/mozwebidl/__init__.py            | 563 ------------------
 dom/bindings/mozwebidl/test/Child.webidl      |   3 -
 .../mozwebidl/test/DummyBinding.webidl        |   2 -
 .../mozwebidl/test/ExampleBinding.webidl      |   3 -
 dom/bindings/mozwebidl/test/Parent.webidl     |   3 -
 dom/bindings/mozwebidl/test/TestEvent.webidl  |  13 -
 dom/bindings/mozwebidl/test/test_mozwebidl.py | 276 ---------
 dom/bindings/test/Makefile.in                 |  79 ++-
 dom/bindings/test/moz.build                   |  13 +-
 dom/moz.build                                 |   3 +
 dom/webidl/moz.build                          |  12 +
 python/mozbuild/mozbuild/action/webidl.py     |  17 -
 python/mozbuild/mozbuild/backend/common.py    | 114 +---
 .../mozbuild/backend/recursivemake.py         | 171 +++---
 python/mozbuild/mozbuild/base.py              |   4 -
 26 files changed, 648 insertions(+), 1323 deletions(-)
 delete mode 100644 build/docs/webidl.rst
 create mode 100644 dom/bindings/BindingGen.py
 create mode 100644 dom/bindings/ExampleGen.py
 create mode 100644 dom/bindings/GlobalGen.py
 delete mode 100644 dom/bindings/mozwebidl/__init__.py
 delete mode 100644 dom/bindings/mozwebidl/test/Child.webidl
 delete mode 100644 dom/bindings/mozwebidl/test/DummyBinding.webidl
 delete mode 100644 dom/bindings/mozwebidl/test/ExampleBinding.webidl
 delete mode 100644 dom/bindings/mozwebidl/test/Parent.webidl
 delete mode 100644 dom/bindings/mozwebidl/test/TestEvent.webidl
 delete mode 100644 dom/bindings/mozwebidl/test/test_mozwebidl.py
 delete mode 100644 python/mozbuild/mozbuild/action/webidl.py

diff --git a/CLOBBER b/CLOBBER
index 10494054cab..7c97389909f 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,5 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 928195 rewrote WebIDL building from the ground up, hopefully eliminating
-needs for future clobbers
+Bug 938950 needs a clobber.
diff --git a/build/docs/index.rst b/build/docs/index.rst
index 47a84c8117a..0dd663db96a 100644
--- a/build/docs/index.rst
+++ b/build/docs/index.rst
@@ -28,7 +28,6 @@ Important Concepts
    mozinfo
    preprocessor
    jar-manifests
-   webidl
 
 mozbuild
 ========
diff --git a/build/docs/webidl.rst b/build/docs/webidl.rst
deleted file mode 100644
index de8686ed921..00000000000
--- a/build/docs/webidl.rst
+++ /dev/null
@@ -1,137 +0,0 @@
-.. _webidl:
-
-======
-WebIDL
-======
-
-WebIDL describes interfaces web browsers are supposed to implement.
-
-The interaction between WebIDL and the build system is somewhat complex.
-This document will attempt to explain how it all works.
-
-Overview
-========
-
-``.webidl`` files throughout the tree define interfaces the browser
-implements. Since Gecko/Firefox is implemented in C++, there is a
-mechanism to convert these interfaces and associated metadata to
-C++ code. That's where the build system comes into play.
-
-All the code for interacting with ``.webidl`` files lives under
-``dom/bindings``. There is code in the build system to deal with
-WebIDLs explicitly.
-
-WebIDL source file flavors
-==========================
-
-Not all ``.webidl`` files are created equal! There are several flavors,
-each represented by a separate symbol from :ref:`mozbuild_symbols`.
-
-WEBIDL_FILES
-   Refers to regular/static ``.webidl`` files. Most WebIDL interfaces
-   are defined this way.
-
-GENERATED_EVENTS_WEBIDL_FILES
-   In addition to generating a binding, these ``.webidl`` files also
-   generate an event source file.
-
-PREPROCESSED_WEBIDL_FILES
-   The ``.webidl`` files are generated by preprocessing an input file.
-   They otherwise behave like **WEBIDL_FILES**.
-
-TEST_WEBIDL_FILES
-   Like **WEBIDL_FILES** but the interfaces are for testing only and
-   aren't shipped with the browser.
-
-PREPROCESSED_TEST_WEBIDL_FILES
-   Like **TEST_WEBIDL_FILES** except the ``.webidl`` is obtained via
-   preprocessing, much like **PREPROCESSED_WEBIDL_FILES**.
-
-GENERATED_WEBIDL_FILES
-   The ``.webidl`` for these is obtained through an *external*
-   mechanism. Typically there are custom build rules for producing these
-   files.
-
-Producing C++ code
-==================
-
-The most complicated part about WebIDLs is the process by which
-``.webidl`` files are converted into C++.
-
-The process begins by staging every ``.webidl`` file to a common
-location. For static files, this involves symlinking. However,
-preprocessed and externally-generated ``.webidl`` have special actions.
-
-Producing C++ code from ``.webidl`` consists of 3 logical steps:
-parsing, global generation, and bindings generation.
-
-Parsing
--------
-
-*Every* ``.webidl`` is fed into a single parser instance. When a single
-``.webidl`` file changes, *every* ``.webidl`` needs to be reparsed.
-
-Global Generation
------------------
-
-Global generation takes the parser output and produces some
-well-defined output files. These output files essentially depend on
-every input ``.webidl``.
-
-Binding Generation
-------------------
-
-Binding generation refers to the process of generating output files
-corresponding to a particular ``.webidl`` file. For all ``.webidl`` files,
-we generate a ``*Binding.h`` and ``*Binding.cpp`` file. For generated
-events ``.webidl`` files, we also generate ``*.h`` and ``*.cpp`` files.
-
-Requirements
-============
-
-This section aims to document the build and developer workflow requirements
-for WebIDL.
-
-Parser unit tests
-   There are parser tests provided by ``dom/bindings/parser/runtests.py``
-   that should run as part of ``make check``. There must be a mechanism
-   to run the tests in *human* mode so they output friendly error
-   messages.
-
-Mochitests
-   There are various mochitests under ``dom/bindings/test``. They should
-   be runnable through the standard mechanisms.
-
-Test interfaces are generated as part of the build
-   ``TestExampleGenBinding.cpp`` calls into methods from the
-   ``TestExampleInterface`` and ``TestExampleProxyInterface`` interfaces.
-   These interfaces need to be generated as part of the build.
-
-Running tests automatically rebuilds
-   When a developer runs the WebIDL tests, she expects any necessary rebuilds
-   to occur.
-
-   This is faciliated through ``mach webidl-test``.
-
-Minimal rebuilds
-   Reprocessing every output for every change is expensive. So we don't
-   inconvenience people changing ``.webidl`` files, the build system
-   should only perform a minimal rebuild when sources change.
-
-Explicit method for performing codegen
-   There needs to be an explicit method for incurring code generation.
-   It needs to cover regular and test files.
-
-   This is implemented via ``make export`` in ``dom/bindings``.
-
-No-op binding generation should be fast
-   So developers touching ``.webidl`` files are not inconvenienced,
-   no-op binding generation should be fast. Watch out for the build system
-   processing large dependency files it doesn't need in order to perform
-   code generation.
-
-Ability to generate example files
-   *Any* interface can have example ``.h``/``.cpp`` files generated.
-   There must be a mechanism to facilitate this.
-
-   This is currently facilitated through ``mach webidl-example``.
diff --git a/build/virtualenv_packages.txt b/build/virtualenv_packages.txt
index 7d2ddd02698..98003ce2bff 100644
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -13,8 +13,6 @@ mock.pth:python/mock-1.0.0
 mozilla.pth:build
 mozilla.pth:config
 mozilla.pth:xpcom/typelib/xpt/tools
-mozilla.pth:dom/bindings
-mozilla.pth:dom/bindings/parser
 copy:build/buildconfig.py
 packages.txt:testing/mozbase/packages.txt
 objdir:build
diff --git a/dom/bindings/BindingGen.py b/dom/bindings/BindingGen.py
new file mode 100644
index 00000000000..e064270513f
--- /dev/null
+++ b/dom/bindings/BindingGen.py
@@ -0,0 +1,98 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import cPickle
+from Configuration import Configuration
+from Codegen import CGBindingRoot, replaceFileIfChanged, CGEventRoot
+from mozbuild.makeutil import Makefile
+from mozbuild.pythonutil import iter_modules_in_path
+from buildconfig import topsrcdir
+
+
+def generate_binding_files(config, outputprefix, srcprefix, webidlfile,
+                           generatedEventsWebIDLFiles):
+    """
+    |config| Is the configuration object.
+    |outputprefix| is a prefix to use for the header guards and filename.
+    """
+
+    depsname = ".deps/" + outputprefix + ".pp"
+    root = CGBindingRoot(config, outputprefix, webidlfile)
+    replaceFileIfChanged(outputprefix + ".h", root.declare())
+    replaceFileIfChanged(outputprefix + ".cpp", root.define())
+
+    if webidlfile in generatedEventsWebIDLFiles:
+        eventName = webidlfile[:-len(".webidl")]
+        generatedEvent = CGEventRoot(config, eventName)
+        replaceFileIfChanged(eventName + ".h", generatedEvent.declare())
+        replaceFileIfChanged(eventName + ".cpp", generatedEvent.define())
+
+    mk = Makefile()
+    # NOTE: it's VERY important that we output dependencies for the FooBinding
+    # file here, not for the header or generated cpp file.  These dependencies
+    # are used later to properly determine changedDeps and prevent rebuilding
+    # too much.  See the comment explaining $(binding_dependency_trackers) in
+    # Makefile.in.
+    rule = mk.create_rule([outputprefix])
+    rule.add_dependencies(os.path.join(srcprefix, x) for x in sorted(root.deps()))
+    rule.add_dependencies(iter_modules_in_path(topsrcdir))
+    with open(depsname, 'w') as f:
+        mk.dump(f)
+
+def main():
+    # Parse arguments.
+    from optparse import OptionParser
+    usagestring = "usage: %prog [header|cpp] configFile outputPrefix srcPrefix webIDLFile"
+    o = OptionParser(usage=usagestring)
+    o.add_option("--verbose-errors", action='store_true', default=False,
+                 help="When an error happens, display the Python traceback.")
+    (options, args) = o.parse_args()
+
+    configFile = os.path.normpath(args[0])
+    srcPrefix = os.path.normpath(args[1])
+
+    # Load the configuration
+    f = open('ParserResults.pkl', 'rb')
+    config = cPickle.load(f)
+    f.close()
+
+    def readFile(f):
+        file = open(f, 'rb')
+        try:
+            contents = file.read()
+        finally:
+            file.close()
+        return contents
+    allWebIDLFiles = readFile(args[2]).split()
+    generatedEventsWebIDLFiles = readFile(args[3]).split()
+    changedDeps = readFile(args[4]).split()
+
+    if all(f.endswith("Binding") or f == "ParserResults.pkl" for f in changedDeps):
+        toRegenerate = filter(lambda f: f.endswith("Binding"), changedDeps)
+        if len(toRegenerate) == 0 and len(changedDeps) == 1:
+            # Work around build system bug 874923: if we get here that means
+            # that changedDeps contained only one entry and it was
+            # "ParserResults.pkl".  That should never happen: if the
+            # ParserResults.pkl changes then either one of the globalgen files
+            # changed (in which case we wouldn't be in this "only
+            # ParserResults.pkl and *Binding changed" code) or some .webidl
+            # files changed (and then the corresponding *Binding files should
+            # show up in changedDeps).  Since clearly the build system is
+            # confused, just regenerate everything to be safe.
+            toRegenerate = allWebIDLFiles
+        else:
+            toRegenerate = map(lambda f: f[:-len("Binding")] + ".webidl",
+                               toRegenerate)
+    else:
+        toRegenerate = allWebIDLFiles
+
+    for webIDLFile in toRegenerate:
+        assert webIDLFile.endswith(".webidl")
+        outputPrefix = webIDLFile[:-len(".webidl")] + "Binding"
+        generate_binding_files(config, outputPrefix, srcPrefix, webIDLFile,
+                               generatedEventsWebIDLFiles);
+
+if __name__ == '__main__':
+    main()
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index b7aaf0481b0..b4d90639d45 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -26,6 +26,26 @@ NEWRESOLVE_HOOK_NAME = '_newResolve'
 ENUMERATE_HOOK_NAME= '_enumerate'
 ENUM_ENTRY_VARIABLE_NAME = 'strings'
 
+def replaceFileIfChanged(filename, newContents):
+    """
+    Read a copy of the old file, so that we don't touch it if it hasn't changed.
+    Returns True if the file was updated, false otherwise.
+    """
+    oldFileContents = ""
+    try:
+        oldFile = open(filename, 'rb')
+        oldFileContents = ''.join(oldFile.readlines())
+        oldFile.close()
+    except:
+        pass
+
+    if newContents == oldFileContents:
+        return False
+
+    f = open(filename, 'wb')
+    f.write(newContents)
+    f.close()
+    return True
 
 def toStringBool(arg):
     return str(not not arg).lower()
diff --git a/dom/bindings/ExampleGen.py b/dom/bindings/ExampleGen.py
new file mode 100644
index 00000000000..60eebe221a3
--- /dev/null
+++ b/dom/bindings/ExampleGen.py
@@ -0,0 +1,46 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import cPickle
+from Configuration import Configuration
+from Codegen import CGExampleRoot, replaceFileIfChanged
+
+def generate_interface_example(config, interfaceName):
+    """
+    |config| Is the configuration object.
+    |interfaceName| is the name of the interface we're generating an example for.
+    """
+
+    root = CGExampleRoot(config, interfaceName)
+    exampleHeader = interfaceName + "-example.h"
+    exampleImpl = interfaceName + "-example.cpp"
+    replaceFileIfChanged(exampleHeader, root.declare())
+    replaceFileIfChanged(exampleImpl, root.define())
+
+def main():
+
+    # Parse arguments.
+    from optparse import OptionParser
+    usagestring = "usage: %prog configFile interfaceName"
+    o = OptionParser(usage=usagestring)
+    o.add_option("--verbose-errors", action='store_true', default=False,
+                 help="When an error happens, display the Python traceback.")
+    (options, args) = o.parse_args()
+
+    if len(args) != 2:
+        o.error(usagestring)
+    configFile = os.path.normpath(args[0])
+    interfaceName = args[1]
+
+    # Load the configuration
+    f = open('ParserResults.pkl', 'rb')
+    config = cPickle.load(f)
+    f.close()
+
+    # Generate the example class.
+    generate_interface_example(config, interfaceName)
+
+if __name__ == '__main__':
+    main()
diff --git a/dom/bindings/GlobalGen.py b/dom/bindings/GlobalGen.py
new file mode 100644
index 00000000000..f3f02a4d1e4
--- /dev/null
+++ b/dom/bindings/GlobalGen.py
@@ -0,0 +1,81 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# We do one global pass over all the WebIDL to generate our prototype enum
+# and generate information for subsequent phases.
+
+import os
+import WebIDL
+import cPickle
+from Configuration import Configuration
+from Codegen import GlobalGenRoots, replaceFileIfChanged
+
+def generate_file(config, name, action):
+
+    root = getattr(GlobalGenRoots, name)(config)
+    if action is 'declare':
+        filename = name + '.h'
+        code = root.declare()
+    else:
+        assert action is 'define'
+        filename = name + '.cpp'
+        code = root.define()
+
+    if replaceFileIfChanged(filename, code):
+        print "Generating %s" % (filename)
+    else:
+        print "%s hasn't changed - not touching it" % (filename)
+
+def main():
+    # Parse arguments.
+    from optparse import OptionParser
+    usageString = "usage: %prog [options] webidldir [files]"
+    o = OptionParser(usage=usageString)
+    o.add_option("--cachedir", dest='cachedir', default=None,
+                 help="Directory in which to cache lex/parse tables.")
+    o.add_option("--verbose-errors", action='store_true', default=False,
+                 help="When an error happens, display the Python traceback.")
+    (options, args) = o.parse_args()
+
+    if len(args) < 2:
+        o.error(usageString)
+
+    configFile = args[0]
+    baseDir = args[1]
+    fileList = args[2:]
+
+    # Parse the WebIDL.
+    parser = WebIDL.Parser(options.cachedir)
+    for filename in fileList:
+        fullPath = os.path.normpath(os.path.join(baseDir, filename))
+        f = open(fullPath, 'rb')
+        lines = f.readlines()
+        f.close()
+        parser.parse(''.join(lines), fullPath)
+    parserResults = parser.finish()
+
+    # Load the configuration.
+    config = Configuration(configFile, parserResults)
+
+    # Write the configuration out to a pickle.
+    resultsFile = open('ParserResults.pkl', 'wb')
+    cPickle.dump(config, resultsFile, -1)
+    resultsFile.close()
+
+    # Generate the atom list.
+    generate_file(config, 'GeneratedAtomList', 'declare')
+
+    # Generate the prototype list.
+    generate_file(config, 'PrototypeList', 'declare')
+
+    # Generate the common code.
+    generate_file(config, 'RegisterBindings', 'declare')
+    generate_file(config, 'RegisterBindings', 'define')
+
+    generate_file(config, 'UnionTypes', 'declare')
+    generate_file(config, 'UnionTypes', 'define')
+    generate_file(config, 'UnionConversions', 'declare')
+
+if __name__ == '__main__':
+    main()
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index acc72d8d483..be1bbe9dfa6 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -1,78 +1,249 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-abs_dist := $(abspath $(DIST))
-webidl_base := $(topsrcdir)/dom/webidl
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 
+webidl_base = $(topsrcdir)/dom/webidl
 # Generated by moz.build
 include webidlsrcs.mk
 
+binding_include_path := mozilla/dom
+webidl_files += $(generated_events_webidl_files)
+all_webidl_files = $(webidl_files) $(generated_webidl_files) $(preprocessed_webidl_files)
+
+# Set exported_binding_headers before adding the test IDL to the mix
+exported_binding_headers := $(subst .webidl,Binding.h,$(all_webidl_files))
+exported_generated_events_headers := $(subst .webidl,.h,$(generated_events_webidl_files))
+
+# Set linked_binding_cpp_files before adding the test IDL to the mix
+linked_binding_cpp_files := $(subst .webidl,Binding.cpp,$(all_webidl_files))
+linked_generated_events_cpp_files := $(subst .webidl,.cpp,$(generated_events_webidl_files))
+
+all_webidl_files += $(test_webidl_files) $(preprocessed_test_webidl_files)
+
+generated_header_files := $(subst .webidl,Binding.h,$(all_webidl_files)) $(exported_generated_events_headers)
+generated_cpp_files := $(subst .webidl,Binding.cpp,$(all_webidl_files)) $(linked_generated_events_cpp_files)
+
+# We want to be able to only regenerate the .cpp and .h files that really need
+# to change when a .webidl file changes.  We do this by making the
+# binding_dependency_trackers targets have dependencies on the right .webidl
+# files via generated .pp files, having a .BindingGen target that depends on the
+# binding_dependency_trackers and which has all the generated binding .h/.cpp
+# depending on it, and then in the make commands for that target being able to
+# check which exact binding_dependency_trackers changed.
+binding_dependency_trackers := $(subst .webidl,Binding,$(all_webidl_files))
+
+globalgen_targets := \
+  GeneratedAtomList.h \
+  PrototypeList.h \
+  RegisterBindings.h \
+  RegisterBindings.cpp \
+  UnionTypes.h \
+  UnionTypes.cpp \
+  UnionConversions.h \
+  $(NULL)
+
+# Nasty hack: when the test/Makefile.in invokes us to do codegen, it
+# uses a target of
+# "export TestExampleInterface-example TestExampleProxyInterface-example".
+# We don't actually need to load our .o.pp files in that case, so just
+# pretend like we have no CPPSRCS if that's the target.  It makes the
+# test cycle much faster, which is why we're doing it.
+#
+# XXXbz We could try to cheat even more and only include our CPPSRCS
+# when $(MAKECMDGOALS) contains libs, so that we can skip loading all
+# those .o.pp when trying to make a single .cpp file too, but that
+# would break |make FooBinding.o(bj)|.  Ah, well.
+ifneq (export TestExampleInterface-example TestExampleProxyInterface-example,$(MAKECMDGOALS))
+CPPSRCS = \
+  $(unified_binding_cpp_files) \
+  $(linked_generated_events_cpp_files) \
+  $(filter %.cpp, $(globalgen_targets)) \
+  BindingUtils.cpp \
+  CallbackInterface.cpp \
+  CallbackObject.cpp \
+  DOMJSProxyHandler.cpp \
+  Date.cpp \
+  Exceptions.cpp \
+  $(NULL)
+endif
+
+ABS_DIST := $(abspath $(DIST))
+
+EXTRA_EXPORT_MDDEPEND_FILES := $(addsuffix .pp,$(binding_dependency_trackers))
+
+EXPORTS_GENERATED_FILES := $(exported_binding_headers) $(exported_generated_events_headers)
+EXPORTS_GENERATED_DEST := $(ABS_DIST)/include/$(binding_include_path)
+EXPORTS_GENERATED_TARGET := export
+INSTALL_TARGETS += EXPORTS_GENERATED
+
+# Install auto-generated GlobalGen files. The rules for the install must
+# be in the same target/subtier as GlobalGen.py, otherwise the files will not
+# get installed into the appropriate location as they are generated.
+globalgen_headers_FILES := \
+  GeneratedAtomList.h \
+  PrototypeList.h \
+  RegisterBindings.h \
+  UnionConversions.h \
+  UnionTypes.h \
+  $(NULL)
+globalgen_headers_DEST = $(ABS_DIST)/include/mozilla/dom
+globalgen_headers_TARGET := export
+INSTALL_TARGETS += globalgen_headers
+
+include $(topsrcdir)/config/rules.mk
+
 ifdef GNU_CC
 CXXFLAGS += -Wno-uninitialized
 endif
 
-# These come from webidlsrcs.mk.
-CPPSRCS += $(globalgen_sources) $(unified_binding_cpp_files)
-
-# Generated bindings reference *Binding.h, not mozilla/dom/*Binding.h. And,
-# since we generate exported bindings directly to $(DIST)/include, we need
-# to add that path to the search list. We need to ensure the $(DIST) path
-# occurs before '.' because old builds generated .h files into '.'
-# before copying them to $(DIST). Those old .h files won't get updated
-# any more and thus using them could result in build failures due to
-# mismatches. This consideration shouldn't be relevant after CLOBBER
-# is touched.
-#
-# Ideally, binding generation uses the prefixed header file names.
-# Bug 932092 tracks.
-LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom
-
-PYTHON_UNIT_TESTS += $(srcdir)/mozwebidl/test/test_mozwebidl.py
-
-include $(topsrcdir)/config/rules.mk
-
-
-css2properties_dependencies = \
-  $(topsrcdir)/layout/style/nsCSSPropList.h \
-  $(topsrcdir)/layout/style/nsCSSPropAliasList.h \
-  $(webidl_base)/CSS2Properties.webidl.in \
-  $(webidl_base)/CSS2PropertiesProps.h \
-  $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
+# If you change bindinggen_dependencies here, change it in
+# dom/bindings/test/Makefile.in too.
+bindinggen_dependencies := \
+  BindingGen.py \
+  Bindings.conf \
+  Configuration.py \
+  Codegen.py \
+  ParserResults.pkl \
+  parser/WebIDL.py \
   $(GLOBAL_DEPS) \
   $(NULL)
 
-CSS2Properties.webidl: $(css2properties_dependencies)
-	$(CPP) $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/layout/style \
-	  $(webidl_base)/CSS2PropertiesProps.h | \
-	    PYTHONDONTWRITEBYTECODE=1 $(PYTHON) \
-	      $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
-	      $(webidl_base)/CSS2Properties.webidl.in > $@
+CSS2Properties.webidl: $(topsrcdir)/layout/style/nsCSSPropList.h \
+                       $(topsrcdir)/layout/style/nsCSSPropAliasList.h \
+                       $(webidl_base)/CSS2Properties.webidl.in \
+                       $(webidl_base)/CSS2PropertiesProps.h \
+                       $(srcdir)/GenerateCSS2PropertiesWebIDL.py \
+                       $(GLOBAL_DEPS)
+	$(CPP) $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/layout/style $(webidl_base)/CSS2PropertiesProps.h | \
+	  PYTHONDONTWRITEBYTECODE=1 $(PYTHON) \
+	  $(srcdir)/GenerateCSS2PropertiesWebIDL.py $(webidl_base)/CSS2Properties.webidl.in > CSS2Properties.webidl
 
-# Most of the logic for dependencies lives inside Python so it can be
-# used by multiple build backends. We simply have rules to generate
-# and include the .pp file. This will pull in additional dependencies
-# on codegen.pp which will cause any .webidl or .py file change to
-# result in regeneration.
-codegen_dependencies := \
-  $(nonstatic_webidl_files) \
-  $(GLOBAL_DEPS) \
-  $(NULL)
+$(webidl_files): %: $(webidl_base)/%
+	$(INSTALL) $(IFLAGS1) $(webidl_base)/$* .
 
-include codegen.pp
+$(test_webidl_files): %: $(srcdir)/test/%
+	$(INSTALL) $(IFLAGS1) $(srcdir)/test/$* .
 
-codegen.pp: $(codegen_dependencies)
-	$(call py_action,webidl,$(srcdir))
+# We can't easily use PP_TARGETS here because it insists on outputting targets
+# that look like "$(CURDIR)/foo" whereas we want our target to just be "foo".
+# Make sure to include $(GLOBAL_DEPS) so we pick up changes to what symbols are
+# defined.  Also make sure to remove $@ before writing to it, because otherwise
+# if a file goes from non-preprocessed to preprocessed we can end up writing to
+# a symlink, which will clobber files in the srcdir, which is bad.
+$(preprocessed_webidl_files): %: $(webidl_base)/% $(GLOBAL_DEPS)
+	$(RM) $@
+	$(call py_action,preprocessor, \
+          $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(webidl_base)/$* -o $@)
+
+# See the comment about PP_TARGETS for $(preprocessed_webidl_files)
+$(preprocessed_test_webidl_files): %: $(srcdir)/test/% $(GLOBAL_DEPS)
+	$(RM) $@
+	$(call py_action,preprocessor, \
+          $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(srcdir)/test/$* -o $@)
+
+# Make is dumb and can get confused between "foo" and "$(CURDIR)/foo".  Make
+# sure that the latter depends on the former, since the latter gets used in .pp
+# files.
+all_webidl_files_absolute = $(addprefix $(CURDIR)/,$(all_webidl_files))
+$(all_webidl_files_absolute): $(CURDIR)/%: %
+
+$(generated_header_files): .BindingGen
+
+$(generated_cpp_files): .BindingGen
+
+# $(binding_dependency_trackers) pick up additional dependencies via .pp files
+# The rule: just brings the tracker up to date, if it's out of date, so that
+# we'll know that we have to redo binding generation and flag this prerequisite
+# there as being newer than the bindinggen target.
+$(binding_dependency_trackers):
 	@$(TOUCH) $@
 
-export:: codegen.pp
+$(globalgen_targets): ParserResults.pkl
+
+%-example: .BindingGen
+	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
+	  $(PLY_INCLUDE) -I$(srcdir)/parser \
+	  $(srcdir)/ExampleGen.py \
+	  $(srcdir)/Bindings.conf $*
+
+CACHE_DIR = _cache
+
+globalgen_dependencies := \
+  GlobalGen.py \
+  Bindings.conf \
+  Configuration.py \
+  Codegen.py \
+  parser/WebIDL.py \
+  webidlsrcs.mk \
+  $(all_webidl_files) \
+  $(CACHE_DIR)/.done \
+  $(GLOBAL_DEPS) \
+  $(NULL)
+
+$(CACHE_DIR)/.done:
+	$(MKDIR) -p $(CACHE_DIR)
+	@$(TOUCH) $@
+
+# Running GlobalGen.py updates ParserResults.pkl as a side-effect
+ParserResults.pkl: $(globalgen_dependencies)
+	$(info Generating global WebIDL files)
+	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
+	  $(PLY_INCLUDE) -I$(srcdir)/parser \
+	  $(srcdir)/GlobalGen.py $(srcdir)/Bindings.conf . \
+	  --cachedir=$(CACHE_DIR) \
+	  $(all_webidl_files)
+
+$(globalgen_headers_FILES): ParserResults.pkl
+
+# Make sure .deps actually exists, since we'll try to write to it from
+# BindingGen.py but we're typically running in the export phase, which is
+# before anyone has bothered creating .deps.
+# Then, pass our long lists through files to try to avoid blowing out the
+# command line.
+# Next, BindingGen.py will examine the changed dependency list to figure out
+# what it really needs to regenerate.
+# Finally, touch the .BindingGen file so that we don't have to keep redoing
+# all that until something else actually changes.
+.BindingGen: $(bindinggen_dependencies) $(binding_dependency_trackers)
+	$(info Generating WebIDL bindings)
+	$(MKDIR) -p .deps
+	echo $(all_webidl_files) > .all-webidl-file-list
+	echo $(generated_events_webidl_files) > .generated-events-webidl-files
+	echo $? > .changed-dependency-list
+	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
+	  $(PLY_INCLUDE) -I$(srcdir)/parser \
+	  $(srcdir)/BindingGen.py \
+	  $(srcdir)/Bindings.conf \
+	  $(CURDIR) \
+	  .all-webidl-file-list \
+	  .generated-events-webidl-files \
+	  .changed-dependency-list
+	@$(TOUCH) $@
 
 GARBAGE += \
-  codegen.pp \
-  codegen.json \
+  webidlyacc.py \
   parser.out \
-  WebIDLGrammar.pkl \
-  $(wildcard *.h) \
-  $(wildcard *.cpp) \
-  $(wildcard *.webidl) \
+  $(wildcard *-example.h) \
+  $(wildcard *-example.cpp) \
+  .BindingGen \
+  .all-webidl-file-list \
+  .generated-events-webidl-files \
+  .changed-dependency-list \
+  $(binding_dependency_trackers) \
   $(NULL)
+
+# Make sure all binding header files are created during the export stage, so we
+# don't have issues with .cpp files being compiled before we've generated the
+# headers they depend on.  This is really only needed for the test files, since
+# the non-test headers are all exported above anyway.  Note that this means that
+# we do all of our codegen during export.
+export:: $(generated_header_files)
+
+distclean::
+	-$(RM) \
+        $(generated_header_files) \
+        $(generated_cpp_files) \
+        $(all_webidl_files) \
+        $(globalgen_targets) \
+        ParserResults.pkl \
+        $(NULL)
diff --git a/dom/bindings/mach_commands.py b/dom/bindings/mach_commands.py
index 35f9ef70b5f..e176d91cd4e 100644
--- a/dom/bindings/mach_commands.py
+++ b/dom/bindings/mach_commands.py
@@ -18,17 +18,6 @@ from mozbuild.base import MachCommandBase
 
 @CommandProvider
 class WebIDLProvider(MachCommandBase):
-    @Command('webidl-example', category='misc',
-        description='Generate example files for a WebIDL interface.')
-    @CommandArgument('interface', nargs='+',
-        help='Interface(s) whose examples to generate.')
-    def webidl_example(self, interface):
-        from mozwebidl import BuildSystemWebIDL
-
-        manager = self._spawn(BuildSystemWebIDL).manager
-        for i in interface:
-            manager.generate_example_files(i)
-
     @Command('webidl-parser-test', category='testing',
         description='Run WebIDL tests.')
     @CommandArgument('--verbose', '-v', action='store_true',
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 9a94e9aa376..207517e9eff 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla += [
     'ErrorResult.h',
 ]
@@ -70,15 +68,6 @@ LOCAL_INCLUDES += [
     '/media/webrtc/signaling/src/peerconnection',
 ]
 
-SOURCES += [
-    'BindingUtils.cpp',
-    'CallbackInterface.cpp',
-    'CallbackObject.cpp',
-    'Date.cpp',
-    'DOMJSProxyHandler.cpp',
-    'Exceptions.cpp',
-]
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
diff --git a/dom/bindings/mozwebidl/__init__.py b/dom/bindings/mozwebidl/__init__.py
deleted file mode 100644
index 65f6af156d9..00000000000
--- a/dom/bindings/mozwebidl/__init__.py
+++ /dev/null
@@ -1,563 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# This module contains code for managing WebIDL files and bindings for
-# the build system.
-
-from __future__ import unicode_literals
-
-import errno
-import hashlib
-import json
-import logging
-import os
-
-from copy import deepcopy
-
-from mach.mixin.logging import LoggingMixin
-
-from mozbuild.base import MozbuildObject
-from mozbuild.makeutil import Makefile
-from mozbuild.pythonutil import iter_modules_in_path
-from mozbuild.util import FileAvoidWrite
-
-import WebIDL
-from Codegen import (
-    CGBindingRoot,
-    CGEventRoot,
-    CGExampleRoot,
-    GlobalGenRoots,
-)
-from Configuration import Configuration
-
-
-class BuildResult(object):
-    """Represents the result of building WebIDL files.
-
-    This holds a summary of output file generation during a build.
-    """
-
-    def __init__(self):
-        # The .webidl files that had their outputs regenerated.
-        self.inputs = set()
-
-        # The output files that were created.
-        self.created = set()
-
-        # The output files that changed.
-        self.updated = set()
-
-        # The output files that didn't change.
-        self.unchanged = set()
-
-
-class WebIDLCodegenManagerState(dict):
-    """Holds state for the WebIDL code generation manager.
-
-    State is currently just an extended dict. The internal implementation of
-    state should be considered a black box to everyone except
-    WebIDLCodegenManager. But we'll still document it.
-
-    Fields:
-
-    version
-       The integer version of the format. This is to detect incompatible
-       changes between state. It should be bumped whenever the format
-       changes or semantics change.
-
-    webidls
-       A dictionary holding information about every known WebIDL input.
-       Keys are the basenames of input WebIDL files. Values are dicts of
-       metadata. Keys in those dicts are:
-
-       * filename - The full path to the input filename.
-       * inputs - A set of full paths to other webidl files this webidl
-         depends on.
-       * outputs - Set of full output paths that are created/derived from
-         this file.
-       * sha1 - The hexidecimal SHA-1 of the input filename from the last
-         processing time.
-
-    global_inputs
-       A dictionary defining files that influence all processing. Keys
-       are full filenames. Values are hexidecimal SHA-1 from the last
-       processing time.
-    """
-
-    VERSION = 1
-
-    def __init__(self, fh=None):
-        self['version'] = self.VERSION
-        self['webidls'] = {}
-        self['global_depends'] = {}
-
-        if not fh:
-            return
-
-        state = json.load(fh)
-        if state['version'] != self.VERSION:
-            raise Exception('Unknown state version: %s' % state['version'])
-
-        self['version'] = state['version']
-        self['global_depends'] = state['global_depends']
-
-        for k, v in state['webidls'].items():
-            self['webidls'][k] = v
-
-            # Sets are converted to lists for serialization because JSON
-            # doesn't support sets.
-            self['webidls'][k]['inputs'] = set(v['inputs'])
-            self['webidls'][k]['outputs'] = set(v['outputs'])
-
-    def dump(self, fh):
-        """Dump serialized state to a file handle."""
-        normalized = deepcopy(self)
-
-        for k, v in self['webidls'].items():
-            # Convert sets to lists because JSON doesn't support sets.
-            normalized['webidls'][k]['outputs'] = sorted(v['outputs'])
-            normalized['webidls'][k]['inputs'] = sorted(v['inputs'])
-
-        json.dump(normalized, fh, sort_keys=True)
-
-
-class WebIDLCodegenManager(LoggingMixin):
-    """Manages all things WebIDL.
-
-    This object is meant to be generic and reusable. Paths, etc should be
-    parameters and not hardcoded.
-    """
-
-    # Global parser derived declaration files.
-    GLOBAL_DECLARE_FILES = {
-        'GeneratedAtomList.h',
-        'PrototypeList.h',
-        'RegisterBindings.h',
-        'UnionConversions.h',
-        'UnionTypes.h',
-    }
-
-    # Global parser derived definition files.
-    GLOBAL_DEFINE_FILES = {
-        'RegisterBindings.cpp',
-        'UnionTypes.cpp',
-    }
-
-    # Example interfaces to build along with the tree. Other example
-    # interfaces will need to be generated manually.
-    BUILD_EXAMPLE_INTERFACES = {
-        'TestExampleInterface',
-        'TestExampleProxyInterface',
-    }
-
-    def __init__(self, config_path, inputs, exported_header_dir,
-        codegen_dir, state_path, cache_dir=None, make_deps_path=None,
-        make_deps_target=None):
-        """Create an instance that manages WebIDLs in the build system.
-
-        config_path refers to a WebIDL config file (e.g. Bindings.conf).
-        inputs is a 3-tuple describing the input .webidl files and how to
-        process them. Members are:
-            (set(.webidl files), set(basenames of exported files),
-                set(basenames of generated events files))
-
-        exported_header_dir and codegen_dir are directories where generated
-        files will be written to.
-        state_path is the path to a file that will receive JSON state from our
-        actions.
-        make_deps_path is the path to a make dependency file that we can
-        optionally write.
-        make_deps_target is the target that receives the make dependencies. It
-        must be defined if using make_deps_path.
-        """
-        self.populate_logger()
-
-        input_paths, exported_stems, generated_events_stems = inputs
-
-        self._config_path = config_path
-        self._input_paths = set(input_paths)
-        self._exported_stems = set(exported_stems)
-        self._generated_events_stems = set(generated_events_stems)
-        self._exported_header_dir = exported_header_dir
-        self._codegen_dir = codegen_dir
-        self._state_path = state_path
-        self._cache_dir = cache_dir
-        self._make_deps_path = make_deps_path
-        self._make_deps_target = make_deps_target
-
-        if (make_deps_path and not make_deps_target) or (not make_deps_path and
-            make_deps_target):
-            raise Exception('Must define both make_deps_path and make_deps_target '
-                'if one is defined.')
-
-        self._parser_results = None
-        self._config = None
-        self._state = WebIDLCodegenManagerState()
-
-        if os.path.exists(state_path):
-            with open(state_path, 'rb') as fh:
-                try:
-                    self._state = WebIDLCodegenManagerState(fh=fh)
-                except Exception as e:
-                    self.log(logging.WARN, 'webidl_bad_state', {'msg': str(e)},
-                        'Bad WebIDL state: {msg}')
-
-    @property
-    def config(self):
-        if not self._config:
-            self._parse_webidl()
-
-        return self._config
-
-    def generate_build_files(self):
-        """Generate files required for the build.
-
-        This function is in charge of generating all the .h/.cpp files derived
-        from input .webidl files. Please note that there are build actions
-        required to produce .webidl files and these build actions are
-        explicitly not captured here: this function assumes all .webidl files
-        are present and up to date.
-
-        This routine is called as part of the build to ensure files that need
-        to exist are present and up to date. This routine may not be called if
-        the build dependencies (generated as a result of calling this the first
-        time) say everything is up to date.
-
-        Because reprocessing outputs for every .webidl on every invocation
-        is expensive, we only regenerate the minimal set of files on every
-        invocation. The rules for deciding what needs done are roughly as
-        follows:
-
-        1. If any .webidl changes, reparse all .webidl files and regenerate
-           the global derived files. Only regenerate output files (.h/.cpp)
-           impacted by the modified .webidl files.
-        2. If an non-.webidl dependency (Python files, config file) changes,
-           assume everything is out of date and regenerate the world. This
-           is because changes in those could globally impact every output
-           file.
-        3. If an output file is missing, ensure it is present by performing
-           necessary regeneration.
-        """
-        # Despite #1 above, we assume the build system is smart enough to not
-        # invoke us if nothing has changed. Therefore, any invocation means
-        # something has changed. And, if anything has changed, we need to
-        # parse the WebIDL.
-        self._parse_webidl()
-
-        result = BuildResult()
-
-        # If we parse, we always update globals - they are cheap and it is
-        # easier that way.
-        created, updated, unchanged = self._write_global_derived()
-        result.created |= created
-        result.updated |= updated
-        result.unchanged |= unchanged
-
-        # If any of the extra dependencies changed, regenerate the world.
-        global_changed, global_hashes = self._global_dependencies_changed()
-        if global_changed:
-            # Make a copy because we may modify.
-            changed_inputs = set(self._input_paths)
-        else:
-            changed_inputs = self._compute_changed_inputs()
-
-        self._state['global_depends'] = global_hashes
-
-        # Generate bindings from .webidl files.
-        for filename in sorted(changed_inputs):
-            basename = os.path.basename(filename)
-            result.inputs.add(filename)
-            written, deps = self._generate_build_files_for_webidl(filename)
-            result.created |= written[0]
-            result.updated |= written[1]
-            result.unchanged |= written[2]
-
-            self._state['webidls'][basename] = dict(
-                filename=filename,
-                outputs=written[0] | written[1] | written[2],
-                inputs=set(deps),
-                sha1=self._input_hashes[filename],
-            )
-
-        # Process some special interfaces required for testing.
-        for interface in self.BUILD_EXAMPLE_INTERFACES:
-            written = self.generate_example_files(interface)
-            result.created |= written[0]
-            result.updated |= written[1]
-            result.unchanged |= written[2]
-
-        # Generate a make dependency file.
-        if self._make_deps_path:
-            mk = Makefile()
-            codegen_rule = mk.create_rule([self._make_deps_target])
-            codegen_rule.add_dependencies(global_hashes.keys())
-            codegen_rule.add_dependencies(self._input_paths)
-
-            with FileAvoidWrite(self._make_deps_path) as fh:
-                mk.dump(fh)
-
-        self._save_state()
-
-        return result
-
-    def generate_example_files(self, interface):
-        """Generates example files for a given interface."""
-        root = CGExampleRoot(self.config, interface)
-
-        return self._maybe_write_codegen(root, *self._example_paths(interface))
-
-    def _parse_webidl(self):
-        self.log(logging.INFO, 'webidl_parse',
-            {'count': len(self._input_paths)},
-            'Parsing {count} WebIDL files.')
-
-        hashes = {}
-        parser = WebIDL.Parser(self._cache_dir)
-
-        for path in sorted(self._input_paths):
-            with open(path, 'rb') as fh:
-                data = fh.read()
-                hashes[path] = hashlib.sha1(data).hexdigest()
-                parser.parse(data, path)
-
-        self._parser_results = parser.finish()
-        self._config = Configuration(self._config_path, self._parser_results)
-        self._input_hashes = hashes
-
-    def _write_global_derived(self):
-        things = [('declare', f) for f in self.GLOBAL_DECLARE_FILES]
-        things.extend(('define', f) for f in self.GLOBAL_DEFINE_FILES)
-
-        result = (set(), set(), set())
-
-        for what, filename in things:
-            stem = os.path.splitext(filename)[0]
-            root = getattr(GlobalGenRoots, stem)(self._config)
-
-            if what == 'declare':
-                code = root.declare()
-                output_root = self._exported_header_dir
-            elif what == 'define':
-                code = root.define()
-                output_root = self._codegen_dir
-            else:
-                raise Exception('Unknown global gen type: %s' % what)
-
-            output_path = os.path.join(output_root, filename)
-            self._maybe_write_file(output_path, code, result)
-
-        return result
-
-    def _compute_changed_inputs(self):
-        """Compute the set of input files that need regenerated."""
-        changed_inputs = set()
-        expected_outputs = self.expected_build_output_files()
-
-        # Look for missing output files.
-        if any(not os.path.exists(f) for f in expected_outputs):
-            # FUTURE Bug 940469 Only regenerate minimum set.
-            changed_inputs |= self._input_paths
-
-        # That's it for examining output files. We /could/ examine SHA-1's of
-        # output files from a previous run to detect modifications. But that's
-        # a lot of extra work and most build systems don't do that anyway.
-
-        # Now we move on to the input files.
-        old_hashes = {v['filename']: v['sha1']
-            for v in self._state['webidls'].values()}
-
-        old_filenames = set(old_hashes.keys())
-        new_filenames = self._input_paths
-
-        # If an old file has disappeared or a new file has arrived, mark
-        # it.
-        changed_inputs |= old_filenames ^ new_filenames
-
-        # For the files in common between runs, compare content. If the file
-        # has changed, mark it. We don't need to perform mtime comparisons
-        # because content is a stronger validator.
-        for filename in old_filenames & new_filenames:
-            if old_hashes[filename] != self._input_hashes[filename]:
-                changed_inputs.add(filename)
-
-        # We've now populated the base set of inputs that have changed.
-
-        # Inherit dependencies from previous run. The full set of dependencies
-        # is associated with each record, so we don't need to perform any fancy
-        # graph traversal.
-        for v in self._state['webidls'].values():
-            if any(dep for dep in v['inputs'] if dep in changed_inputs):
-                changed_inputs.add(v['filename'])
-
-        # Ensure all changed inputs actually exist (some changed inputs could
-        # have been from deleted files).
-        return set(f for f in changed_inputs if os.path.exists(f))
-
-    def _binding_info(self, p):
-        """Compute binding metadata for an input path.
-
-        Returns a tuple of:
-
-          (stem, binding_stem, is_event, output_files)
-
-        output_files is itself a tuple. The first two items are the binding
-        header and C++ paths, respectively. The 2nd pair are the event header
-        and C++ paths or None if this isn't an event binding.
-        """
-        basename = os.path.basename(p)
-        stem = os.path.splitext(basename)[0]
-        binding_stem = '%sBinding' % stem
-
-        if stem in self._exported_stems:
-            header_dir = self._exported_header_dir
-        else:
-            header_dir = self._codegen_dir
-
-        is_event = stem in self._generated_events_stems
-
-        files = (
-            os.path.join(header_dir, '%s.h' % binding_stem),
-            os.path.join(self._codegen_dir, '%s.cpp' % binding_stem),
-            os.path.join(header_dir, '%s.h' % stem) if is_event else None,
-            os.path.join(self._codegen_dir, '%s.cpp' % stem) if is_event else None,
-        )
-
-        return stem, binding_stem, is_event, header_dir, files
-
-    def _example_paths(self, interface):
-        return (
-            os.path.join(self._codegen_dir, '%s-example.h' % interface),
-            os.path.join(self._codegen_dir, '%s-example.cpp' % interface))
-
-    def expected_build_output_files(self):
-        """Obtain the set of files generate_build_files() should write."""
-        paths = set()
-
-        # Account for global generation.
-        for p in self.GLOBAL_DECLARE_FILES:
-            paths.add(os.path.join(self._exported_header_dir, p))
-        for p in self.GLOBAL_DEFINE_FILES:
-            paths.add(os.path.join(self._codegen_dir, p))
-
-        for p in self._input_paths:
-            stem, binding_stem, is_event, header_dir, files = self._binding_info(p)
-            paths |= {f for f in files if f}
-
-        for interface in self.BUILD_EXAMPLE_INTERFACES:
-            for p in self._example_paths(interface):
-                paths.add(p)
-
-        return paths
-
-    def _generate_build_files_for_webidl(self, filename):
-        self.log(logging.INFO, 'webidl_generate_build_for_input',
-            {'filename': filename},
-            'Generating WebIDL files derived from {filename}')
-
-        stem, binding_stem, is_event, header_dir, files = self._binding_info(filename)
-        root = CGBindingRoot(self._config, binding_stem, filename)
-
-        result = self._maybe_write_codegen(root, files[0], files[1])
-
-        if is_event:
-            generated_event = CGEventRoot(self._config, stem)
-            result = self._maybe_write_codegen(generated_event, files[2],
-                files[3], result)
-
-        return result, root.deps()
-
-    def _global_dependencies_changed(self):
-        """Determine whether the global dependencies have changed."""
-        current_files = set(iter_modules_in_path(os.path.dirname(__file__)))
-
-        # We need to catch other .py files from /dom/bindings. We assume these
-        # are in the same directory as the config file.
-        current_files |= set(iter_modules_in_path(os.path.dirname(self._config_path)))
-
-        current_files.add(self._config_path)
-
-        current_hashes = {}
-        for f in current_files:
-            # This will fail if the file doesn't exist. If a current global
-            # dependency doesn't exist, something else is wrong.
-            with open(f, 'rb') as fh:
-                current_hashes[f] = hashlib.sha1(fh.read()).hexdigest()
-
-        # The set of files has changed.
-        if current_files ^ set(self._state['global_depends'].keys()):
-            return True, current_hashes
-
-        # Compare hashes.
-        for f, sha1 in current_hashes.items():
-            if sha1 != self._state['global_depends'][f]:
-                return True, current_hashes
-
-        return False, current_hashes
-
-    def _save_state(self):
-        with open(self._state_path, 'wb') as fh:
-            self._state.dump(fh)
-
-    def _maybe_write_codegen(self, obj, declare_path, define_path, result=None):
-        assert declare_path and define_path
-        if not result:
-            result = (set(), set(), set())
-
-        self._maybe_write_file(declare_path, obj.declare(), result)
-        self._maybe_write_file(define_path, obj.define(), result)
-
-        return result
-
-    def _maybe_write_file(self, path, content, result):
-        fh = FileAvoidWrite(path)
-        fh.write(content)
-        existed, updated = fh.close()
-
-        if not existed:
-            result[0].add(path)
-        elif updated:
-            result[1].add(path)
-        else:
-            result[2].add(path)
-
-
-def create_build_system_manager(topsrcdir, topobjdir, dist_dir):
-    """Create a WebIDLManager for use by the build system."""
-    src_dir = os.path.join(topsrcdir, 'dom', 'bindings')
-    obj_dir = os.path.join(topobjdir, 'dom', 'bindings')
-
-    with open(os.path.join(obj_dir, 'file-lists.json'), 'rb') as fh:
-        files = json.load(fh)
-
-    inputs = (files['webidls'], files['exported_stems'],
-        files['generated_events_stems'])
-
-    cache_dir = os.path.join(obj_dir, '_cache')
-    try:
-        os.makedirs(cache_dir)
-    except OSError as e:
-        if e.errno != errno.EEXIST:
-            raise
-
-    return WebIDLCodegenManager(
-        os.path.join(src_dir, 'Bindings.conf'),
-        inputs,
-        os.path.join(dist_dir, 'include', 'mozilla', 'dom'),
-        obj_dir,
-        os.path.join(obj_dir, 'codegen.json'),
-        cache_dir=cache_dir,
-        # The make rules include a codegen.pp file containing dependencies.
-        make_deps_path=os.path.join(obj_dir, 'codegen.pp'),
-        make_deps_target='codegen.pp',
-    )
-
-
-class BuildSystemWebIDL(MozbuildObject):
-    @property
-    def manager(self):
-        if not hasattr(self, '_webidl_manager'):
-            self._webidl_manager = create_build_system_manager(
-                self.topsrcdir, self.topobjdir, self.distdir)
-
-        return self._webidl_manager
diff --git a/dom/bindings/mozwebidl/test/Child.webidl b/dom/bindings/mozwebidl/test/Child.webidl
deleted file mode 100644
index f7d0a76c9d3..00000000000
--- a/dom/bindings/mozwebidl/test/Child.webidl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface Child : Parent {
-  void ChildBaz();
-};
diff --git a/dom/bindings/mozwebidl/test/DummyBinding.webidl b/dom/bindings/mozwebidl/test/DummyBinding.webidl
deleted file mode 100644
index e2ccc4b6974..00000000000
--- a/dom/bindings/mozwebidl/test/DummyBinding.webidl
+++ /dev/null
@@ -1,2 +0,0 @@
-interface DummyInterface {};
-interface DummyInterfaceWorkers {};
diff --git a/dom/bindings/mozwebidl/test/ExampleBinding.webidl b/dom/bindings/mozwebidl/test/ExampleBinding.webidl
deleted file mode 100644
index 34794993fe4..00000000000
--- a/dom/bindings/mozwebidl/test/ExampleBinding.webidl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* These interfaces are hard-coded and need to be defined. */
-interface TestExampleInterface {};
-interface TestExampleProxyInterface {};
diff --git a/dom/bindings/mozwebidl/test/Parent.webidl b/dom/bindings/mozwebidl/test/Parent.webidl
deleted file mode 100644
index 423f364aea2..00000000000
--- a/dom/bindings/mozwebidl/test/Parent.webidl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface Parent {
-  void MethodFoo();
-};
diff --git a/dom/bindings/mozwebidl/test/TestEvent.webidl b/dom/bindings/mozwebidl/test/TestEvent.webidl
deleted file mode 100644
index db085629186..00000000000
--- a/dom/bindings/mozwebidl/test/TestEvent.webidl
+++ /dev/null
@@ -1,13 +0,0 @@
-interface EventTarget {
-  void addEventListener();
-};
-
-interface Event {};
-
-callback EventHandlerNonNull = any (Event event);
-typedef EventHandlerNonNull? EventHandler;
-
-[NoInterfaceObject]
-interface TestEvent : EventTarget {
-  attribute EventHandler onfoo;
-};
diff --git a/dom/bindings/mozwebidl/test/test_mozwebidl.py b/dom/bindings/mozwebidl/test/test_mozwebidl.py
deleted file mode 100644
index de9a665c2a9..00000000000
--- a/dom/bindings/mozwebidl/test/test_mozwebidl.py
+++ /dev/null
@@ -1,276 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from __future__ import unicode_literals
-
-import imp
-import json
-import os
-import shutil
-import sys
-import tempfile
-import unittest
-
-from mozwebidl import (
-    WebIDLCodegenManager,
-    WebIDLCodegenManagerState,
-)
-
-from mozfile import NamedTemporaryFile
-
-from mozunit import (
-    MockedOpen,
-    main,
-)
-
-
-OUR_DIR = os.path.abspath(os.path.dirname(__file__))
-TOPSRCDIR = os.path.normpath(os.path.join(OUR_DIR, '..', '..', '..', '..'))
-
-
-class TestWebIDLCodegenManager(unittest.TestCase):
-    TEST_STEMS = {
-        'Child',
-        'Parent',
-        'ExampleBinding',
-        'TestEvent',
-    }
-
-    @property
-    def _static_input_paths(self):
-        s = {os.path.join(OUR_DIR, p) for p in os.listdir(OUR_DIR)
-            if p.endswith('.webidl')}
-
-        return s
-
-    @property
-    def _config_path(self):
-        config = os.path.join(TOPSRCDIR, 'dom', 'bindings', 'Bindings.conf')
-        self.assertTrue(os.path.exists(config))
-
-        return config
-
-    def _get_manager_args(self):
-        tmp = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, tmp)
-
-        cache_dir = os.path.join(tmp, 'cache')
-        os.mkdir(cache_dir)
-
-        ip = self._static_input_paths
-
-        inputs = (
-            ip,
-            {os.path.splitext(os.path.basename(p))[0] for p in ip},
-            set()
-        )
-
-        return dict(
-            config_path=self._config_path,
-            inputs=inputs,
-            exported_header_dir=os.path.join(tmp, 'exports'),
-            codegen_dir=os.path.join(tmp, 'codegen'),
-            state_path=os.path.join(tmp, 'state.json'),
-            make_deps_path=os.path.join(tmp, 'codegen.pp'),
-            make_deps_target='codegen.pp',
-            cache_dir=cache_dir,
-        )
-
-    def _get_manager(self):
-        return WebIDLCodegenManager(**self._get_manager_args())
-
-    def test_unknown_state_version(self):
-        """Loading a state file with a too new version resets state."""
-        args = self._get_manager_args()
-
-        p = args['state_path']
-
-        with open(p, 'wb') as fh:
-            json.dump({
-                'version': WebIDLCodegenManagerState.VERSION + 1,
-                'foobar': '1',
-            }, fh)
-
-        manager = WebIDLCodegenManager(**args)
-
-        self.assertEqual(manager._state['version'],
-            WebIDLCodegenManagerState.VERSION)
-        self.assertNotIn('foobar', manager._state)
-
-    def test_generate_build_files(self):
-        """generate_build_files() does the right thing from empty."""
-        manager = self._get_manager()
-        result = manager.generate_build_files()
-        self.assertEqual(len(result.inputs), 5)
-
-        output = manager.expected_build_output_files()
-        self.assertEqual(result.created, output)
-        self.assertEqual(len(result.updated), 0)
-        self.assertEqual(len(result.unchanged), 0)
-
-        for f in output:
-            self.assertTrue(os.path.isfile(f))
-
-        for f in manager.GLOBAL_DECLARE_FILES:
-            self.assertIn(os.path.join(manager._exported_header_dir, f), output)
-
-        for f in manager.GLOBAL_DEFINE_FILES:
-            self.assertIn(os.path.join(manager._codegen_dir, f), output)
-
-        for s in self.TEST_STEMS:
-            self.assertTrue(os.path.isfile(os.path.join(
-                manager._exported_header_dir, '%sBinding.h' % s)))
-            self.assertTrue(os.path.isfile(os.path.join(
-                manager._codegen_dir, '%sBinding.cpp' % s)))
-
-        self.assertTrue(os.path.isfile(manager._state_path))
-
-        with open(manager._state_path, 'rb') as fh:
-            state = json.load(fh)
-            self.assertEqual(state['version'], 1)
-            self.assertIn('webidls', state)
-
-            child = state['webidls']['Child.webidl']
-            self.assertEqual(len(child['inputs']), 2)
-            self.assertEqual(len(child['outputs']), 2)
-            self.assertEqual(child['sha1'], 'c41527cad3bc161fa6e7909e48fa11f9eca0468b')
-
-    def test_generate_build_files_load_state(self):
-        """State should be equivalent when instantiating a new instance."""
-        args = self._get_manager_args()
-        m1 = WebIDLCodegenManager(**args)
-        self.assertEqual(len(m1._state['webidls']), 0)
-        m1.generate_build_files()
-
-        m2 = WebIDLCodegenManager(**args)
-        self.assertGreater(len(m2._state['webidls']), 2)
-        self.assertEqual(m1._state, m2._state)
-
-    def test_no_change_no_writes(self):
-        """If nothing changes, no files should be updated."""
-        args = self._get_manager_args()
-        m1 = WebIDLCodegenManager(**args)
-        m1.generate_build_files()
-
-        m2 = WebIDLCodegenManager(**args)
-        result = m2.generate_build_files()
-
-        self.assertEqual(len(result.inputs), 0)
-        self.assertEqual(len(result.created), 0)
-        self.assertEqual(len(result.updated), 0)
-
-    def test_output_file_regenerated(self):
-        """If an output file disappears, it is regenerated."""
-        args = self._get_manager_args()
-        m1 = WebIDLCodegenManager(**args)
-        m1.generate_build_files()
-
-        rm_count = 0
-        for p in m1._state['webidls']['Child.webidl']['outputs']:
-            rm_count += 1
-            os.unlink(p)
-
-        for p in m1.GLOBAL_DECLARE_FILES:
-            rm_count += 1
-            os.unlink(os.path.join(m1._exported_header_dir, p))
-
-        m2 = WebIDLCodegenManager(**args)
-        result = m2.generate_build_files()
-        self.assertEqual(len(result.created), rm_count)
-
-    def test_only_rebuild_self(self):
-        """If an input file changes, only rebuild that one file."""
-        args = self._get_manager_args()
-        m1 = WebIDLCodegenManager(**args)
-        m1.generate_build_files()
-
-        child_path = None
-        for p in m1._input_paths:
-            if p.endswith('Child.webidl'):
-                child_path = p
-                break
-
-        self.assertIsNotNone(child_path)
-        child_content = open(child_path, 'rb').read()
-
-        with MockedOpen({child_path: child_content + '\n/* */'}):
-            m2 = WebIDLCodegenManager(**args)
-            result = m2.generate_build_files()
-            self.assertEqual(result.inputs, set([child_path]))
-            self.assertEqual(len(result.updated), 0)
-            self.assertEqual(len(result.created), 0)
-
-    def test_rebuild_dependencies(self):
-        """Ensure an input file used by others results in others rebuilding."""
-        args = self._get_manager_args()
-        m1 = WebIDLCodegenManager(**args)
-        m1.generate_build_files()
-
-        parent_path = None
-        child_path = None
-        for p in m1._input_paths:
-            if p.endswith('Parent.webidl'):
-                parent_path = p
-            elif p.endswith('Child.webidl'):
-                child_path = p
-
-        self.assertIsNotNone(parent_path)
-        parent_content = open(parent_path, 'rb').read()
-
-        with MockedOpen({parent_path: parent_content + '\n/* */'}):
-            m2 = WebIDLCodegenManager(**args)
-            result = m2.generate_build_files()
-            self.assertEqual(result.inputs, {child_path, parent_path})
-            self.assertEqual(len(result.updated), 0)
-            self.assertEqual(len(result.created), 0)
-
-    def test_python_change_regenerate_everything(self):
-        """If a Python file changes, we should attempt to rebuild everything."""
-
-        # We don't want to mutate files in the source directory because we want
-        # to be able to build from a read-only filesystem. So, we install a
-        # dummy module and rewrite the metadata to say it comes from the source
-        # directory.
-        #
-        # Hacking imp to accept a MockedFile doesn't appear possible. So for
-        # the first iteration we read from a temp file. The second iteration
-        # doesn't need to import, so we are fine with a mocked file.
-        fake_path = os.path.join(OUR_DIR, 'fakemodule.py')
-        with NamedTemporaryFile('wt') as fh:
-            fh.write('# Original content')
-            fh.flush()
-            mod = imp.load_source('mozwebidl.fakemodule', fh.name)
-            mod.__file__ = fake_path
-
-            args = self._get_manager_args()
-            m1 = WebIDLCodegenManager(**args)
-            with MockedOpen({fake_path: '# Original content'}):
-                old_exists = os.path.exists
-                try:
-                    def exists(p):
-                        if p == fake_path:
-                            return True
-                        return old_exists(p)
-
-                    os.path.exists = exists
-
-                    result = m1.generate_build_files()
-                    l = len(result.inputs)
-
-                    with open(fake_path, 'wt') as fh:
-                        fh.write('# Modified content')
-
-                    m2 = WebIDLCodegenManager(**args)
-                    result = m2.generate_build_files()
-                    self.assertEqual(len(result.inputs), l)
-
-                    result = m2.generate_build_files()
-                    self.assertEqual(len(result.inputs), 0)
-                finally:
-                    os.path.exists = old_exists
-                    del sys.modules['mozwebidl.fakemodule']
-
-
-if __name__ == '__main__':
-    main()
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index b6dec519193..78756bf35a0 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -2,18 +2,89 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# Do NOT export this library.  We don't actually want our test code
+# being added to libxul or anything.
+
+# pymake can't handle descending into dom/bindings several times simultaneously
+ifdef .PYMAKE
+.NOTPARALLEL:
+endif
+
+# Need this for $(test_webidl_files)
 include ../webidlsrcs.mk
 
-# $(test_stems) comes from webidlsrcs.mk.
-CPPSRCS += $(addprefix ../,$(test_stems))
+# But the webidl actually lives in our parent dir
+test_webidl_files := $(addprefix ../,$(test_webidl_files))
+# Store the actual locations of our source preprocessed files, so we
+# can depend on them sanely.
+source_preprocessed_test_webidl_files := $(addprefix $(srcdir)/,$(preprocessed_test_webidl_files))
+preprocessed_test_webidl_files := $(addprefix ../,$(preprocessed_test_webidl_files))
 
-# Bug 932082 tracks having bindings use namespaced includes.
-LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom -I..
+CPPSRCS += \
+  $(subst .webidl,Binding.cpp,$(test_webidl_files)) \
+  $(subst .webidl,Binding.cpp,$(preprocessed_test_webidl_files)) \
+  $(NULL)
+
+# If you change bindinggen_dependencies here, change it in
+# dom/bindings/Makefile.in too.  But note that we include ../Makefile
+# here manually, since $(GLOBAL_DEPS) won't cover it.
+bindinggen_dependencies := \
+  ../BindingGen.py \
+  ../Bindings.conf \
+  ../Configuration.py \
+  ../Codegen.py \
+  ../ParserResults.pkl \
+  ../parser/WebIDL.py \
+  ../Makefile \
+  $(GLOBAL_DEPS) \
+  $(NULL)
+
+ifdef GNU_CC
+CXXFLAGS += -Wno-uninitialized
+endif
 
 # Include rules.mk before any of our targets so our first target is coming from
 # rules.mk and running make with no target in this dir does the right thing.
 include $(topsrcdir)/config/rules.mk
 
+$(CPPSRCS): .BindingGen
+
+.BindingGen: $(bindinggen_dependencies) \
+             $(test_webidl_files) \
+             $(source_preprocessed_test_webidl_files) \
+             $(NULL)
+	# The export phase in dom/bindings is what actually looks at
+	# dependencies and regenerates things as needed, so just go ahead and
+	# make that phase here.  Also make our example interface files.  If the
+	# target used here ever changes, change the conditional around
+	# $(CPPSRCS) in dom/bindings/Makefile.in.
+	$(MAKE) -C .. export TestExampleInterface-example TestExampleProxyInterface-example
+	@$(TOUCH) $@
+
 check::
 	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) $(srcdir)/../parser/runtests.py
+
+# Since we define MOCHITEST_FILES, config/makefiles/mochitest.mk goes ahead and
+# sets up a rule with libs:: in itm which makes our .DEFAULT_TARGET be "libs".
+# Then ruls.mk does |.DEFAULT_TARGET ?= default| which leaves it as "libs".  So
+# if we make without an explicit target in this directory, we try to make
+# "libs", but with a $(MAKECMDGOALS) of empty string.  And then rules.mk
+# helpfully does not include our *.o.pp files, since it includes them only if
+# filtering some stuff out from $(MAKECMDGOALS) leaves it nonempty.  The upshot
+# is that if some headers change and we run make in this dir without an explicit
+# target things don't get rebuilt.
+#
+# On the other hand, if we set .DEFAULT_TARGET to "default" explicitly here,
+# then rules.mk will reinvoke make with "export" and "libs" but this time hey
+# will be passed as explicit targets, show up in $(MAKECMDGOALS), and things
+# will work.  Do this at the end of our Makefile so the rest of the build system
+# does not get a chance to muck with it after we set it.
+.DEFAULT_GOAL := default
+
+# Make sure to add .BindingGen to GARBAGE so we'll rebuild our example
+# files if someone goes through and deletes GARBAGE all over, which
+# will delete example files from our parent dir.
+GARBAGE += \
+  .BindingGen \
+  $(NULL)
diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build
index 5b129eee9e2..82db3c691cb 100644
--- a/dom/bindings/test/moz.build
+++ b/dom/bindings/test/moz.build
@@ -14,20 +14,9 @@ MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
-TEST_WEBIDL_FILES += [
-    'TestDictionary.webidl',
-    'TestJSImplInheritanceGen.webidl',
-    'TestTypedef.webidl',
-]
-
-PREPROCESSED_TEST_WEBIDL_FILES += [
-    'TestCodeGen.webidl',
-    'TestExampleGen.webidl',
-    'TestJSImplGen.webidl',
-]
-
 LOCAL_INCLUDES += [
     '/dom/bindings',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
 ]
+
diff --git a/dom/moz.build b/dom/moz.build
index 481886daf32..599efe94778 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -100,9 +100,12 @@ if CONFIG['MOZ_GAMEPAD']:
 if CONFIG['MOZ_NFC']:
     PARALLEL_DIRS += ['nfc']
 
+# bindings/test is here, because it needs to build after bindings/, and
+# we build subdirectories before ourselves.
 TEST_DIRS += [
     'tests',
     'imptests',
+    'bindings/test',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'cocoa', 'windows', 'android', 'qt', 'os2'):
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 628cf7aac3a..e3db21266b8 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -545,6 +545,18 @@ if CONFIG['MOZ_B2G_FM']:
         'FMRadio.webidl',
     ]
 
+if CONFIG['ENABLE_TESTS']:
+    TEST_WEBIDL_FILES += [
+        'TestDictionary.webidl',
+        'TestJSImplInheritanceGen.webidl',
+        'TestTypedef.webidl',
+    ]
+    PREPROCESSED_TEST_WEBIDL_FILES += [
+        'TestCodeGen.webidl',
+        'TestExampleGen.webidl',
+        'TestJSImplGen.webidl',
+    ]
+
 GENERATED_EVENTS_WEBIDL_FILES = [
     'BlobEvent.webidl',
     'CallGroupErrorEvent.webidl',
diff --git a/python/mozbuild/mozbuild/action/webidl.py b/python/mozbuild/mozbuild/action/webidl.py
deleted file mode 100644
index f174834282a..00000000000
--- a/python/mozbuild/mozbuild/action/webidl.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import sys
-
-from mozwebidl import BuildSystemWebIDL
-
-
-def main(argv):
-    """Perform WebIDL code generation required by the build system."""
-    manager = BuildSystemWebIDL.from_environment().manager
-    manager.generate_build_files()
-
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
index 2b8e3178484..827fbd07af3 100644
--- a/python/mozbuild/mozbuild/backend/common.py
+++ b/python/mozbuild/mozbuild/backend/common.py
@@ -12,14 +12,8 @@ import mozpack.path as mozpath
 from .base import BuildBackend
 
 from ..frontend.data import (
-    GeneratedEventWebIDLFile,
-    GeneratedWebIDLFile,
-    PreprocessedTestWebIDLFile,
-    PreprocessedWebIDLFile,
     TestManifest,
-    TestWebIDLFile,
     XPIDLFile,
-    WebIDLFile,
 )
 
 from ..util import DefaultOnReadDict
@@ -57,80 +51,6 @@ class XPIDLManager(object):
         self.modules.setdefault(entry['module'], set()).add(entry['root'])
 
 
-class WebIDLCollection(object):
-    """Collects WebIDL info referenced during the build."""
-
-    def __init__(self):
-        self.sources = set()
-        self.generated_sources = set()
-        self.generated_events_sources = set()
-        self.preprocessed_sources = set()
-        self.test_sources = set()
-        self.preprocessed_test_sources = set()
-
-    def all_regular_sources(self):
-        return self.sources | self.generated_sources | \
-            self.generated_events_sources | self.preprocessed_sources
-
-    def all_regular_basenames(self):
-        return [os.path.basename(source) for source in self.all_regular_sources()]
-
-    def all_regular_stems(self):
-        return [os.path.splitext(b)[0] for b in self.all_regular_basenames()]
-
-    def all_regular_bindinggen_stems(self):
-        for stem in self.all_regular_stems():
-            yield '%sBinding' % stem
-
-        for source in self.generated_events_sources:
-            yield os.path.splitext(os.path.basename(source))[0]
-
-    def all_regular_cpp_basenames(self):
-        for stem in self.all_regular_bindinggen_stems():
-            yield '%s.cpp' % stem
-
-    def all_test_sources(self):
-        return self.test_sources | self.preprocessed_test_sources
-
-    def all_test_basenames(self):
-        return [os.path.basename(source) for source in self.all_test_sources()]
-
-    def all_test_stems(self):
-        return [os.path.splitext(b)[0] for b in self.all_test_basenames()]
-
-    def all_test_cpp_basenames(self):
-        return ['%sBinding.cpp' % s for s in self.all_test_stems()]
-
-    def all_static_sources(self):
-        return self.sources | self.generated_events_sources | \
-            self.test_sources
-
-    def all_non_static_sources(self):
-        return self.generated_sources | self.preprocessed_sources | \
-            self.preprocessed_test_sources
-
-    def all_non_static_basenames(self):
-        return [os.path.basename(s) for s in self.all_non_static_sources()]
-
-    def all_preprocessed_sources(self):
-        return self.preprocessed_sources | self.preprocessed_test_sources
-
-    def all_sources(self):
-        return set(self.all_regular_sources()) | set(self.all_test_sources())
-
-    def all_basenames(self):
-        return [os.path.basename(source) for source in self.all_sources()]
-
-    def all_stems(self):
-        return [os.path.splitext(b)[0] for b in self.all_basenames()]
-
-    def generated_events_basenames(self):
-        return [os.path.basename(s) for s in self.generated_events_sources]
-
-    def generated_events_stems(self):
-        return [os.path.splitext(b)[0] for b in self.generated_events_basenames()]
-
-
 class TestManager(object):
     """Helps hold state related to tests."""
 
@@ -165,7 +85,6 @@ class CommonBackend(BuildBackend):
     def _init(self):
         self._idl_manager = XPIDLManager(self.environment)
         self._test_manager = TestManager(self.environment)
-        self._webidls = WebIDLCollection()
 
     def consume_object(self, obj):
         if isinstance(obj, TestManifest):
@@ -173,44 +92,13 @@ class CommonBackend(BuildBackend):
                 self._test_manager.add(test, flavor=obj.flavor,
                     topsrcdir=obj.topsrcdir)
 
-        elif isinstance(obj, XPIDLFile):
+        if isinstance(obj, XPIDLFile):
             self._idl_manager.register_idl(obj.source_path, obj.module)
 
-        elif isinstance(obj, WebIDLFile):
-            self._webidls.sources.add(mozpath.join(obj.srcdir, obj.basename))
-            obj.ack()
-
-        elif isinstance(obj, GeneratedEventWebIDLFile):
-            self._webidls.generated_events_sources.add(mozpath.join(
-                obj.srcdir, obj.basename))
-            obj.ack()
-
-        elif isinstance(obj, TestWebIDLFile):
-            self._webidls.test_sources.add(mozpath.join(obj.srcdir,
-                obj.basename))
-            obj.ack()
-
-        elif isinstance(obj, PreprocessedTestWebIDLFile):
-            self._webidls.preprocessed_test_sources.add(mozpath.join(
-                obj.srcdir, obj.basename))
-            obj.ack()
-
-        elif isinstance(obj, GeneratedWebIDLFile):
-            self._webidls.generated_sources.add(mozpath.join(obj.srcdir,
-                obj.basename))
-            obj.ack()
-
-        elif isinstance(obj, PreprocessedWebIDLFile):
-            self._webidls.preprocessed_sources.add(mozpath.join(
-                obj.srcdir, obj.basename))
-            obj.ack()
-
     def consume_finished(self):
         if len(self._idl_manager.idls):
             self._handle_idl_manager(self._idl_manager)
 
-        self._handle_webidl_collection(self._webidls)
-
         # Write out a machine-readable file describing every test.
         path = os.path.join(self.environment.topobjdir, 'all-tests.json')
         with self._write_file(path) as fh:
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 929b9fecc88..3ed3746ef74 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -5,15 +5,13 @@
 from __future__ import unicode_literals
 
 import itertools
-import json
 import logging
 import os
+import re
 import types
 
 from collections import namedtuple
 
-import mozwebidl
-
 import mozbuild.makeutil as mozmakeutil
 from mozpack.copier import FilePurger
 from mozpack.manifests import (
@@ -27,7 +25,9 @@ from ..frontend.data import (
     Defines,
     DirectoryTraversal,
     Exports,
+    GeneratedEventWebIDLFile,
     GeneratedInclude,
+    GeneratedWebIDLFile,
     HeaderFileSubstitution,
     HostProgram,
     HostSimpleProgram,
@@ -36,13 +36,17 @@ from ..frontend.data import (
     JavaJarData,
     LibraryDefinition,
     LocalInclude,
+    PreprocessedTestWebIDLFile,
+    PreprocessedWebIDLFile,
     Program,
     SandboxDerived,
     SandboxWrapped,
     SimpleProgram,
-    TestManifest,
+    TestWebIDLFile,
     VariablePassthru,
     XPIDLFile,
+    TestManifest,
+    WebIDLFile,
 )
 from ..util import (
     ensureParentDir,
@@ -264,6 +268,12 @@ class RecursiveMakeBackend(CommonBackend):
 
         self._backend_files = {}
         self._ipdl_sources = set()
+        self._webidl_sources = set()
+        self._generated_events_webidl_sources = set()
+        self._test_webidl_sources = set()
+        self._preprocessed_test_webidl_sources = set()
+        self._preprocessed_webidl_sources = set()
+        self._generated_webidl_sources = set()
 
         def detailed(summary):
             s = '{:d} total backend files. {:d} created; {:d} updated; {:d} unchanged'.format(
@@ -378,6 +388,33 @@ class RecursiveMakeBackend(CommonBackend):
         elif isinstance(obj, IPDLFile):
             self._ipdl_sources.add(mozpath.join(obj.srcdir, obj.basename))
 
+        elif isinstance(obj, WebIDLFile):
+            self._webidl_sources.add(mozpath.join(obj.srcdir, obj.basename))
+            self._process_webidl_basename(obj.basename)
+
+        elif isinstance(obj, GeneratedEventWebIDLFile):
+            self._generated_events_webidl_sources.add(mozpath.join(obj.srcdir, obj.basename))
+
+        elif isinstance(obj, TestWebIDLFile):
+            self._test_webidl_sources.add(mozpath.join(obj.srcdir,
+                                                       obj.basename))
+            # Test WebIDL files are not exported.
+
+        elif isinstance(obj, PreprocessedTestWebIDLFile):
+            self._preprocessed_test_webidl_sources.add(mozpath.join(obj.srcdir,
+                                                                    obj.basename))
+            # Test WebIDL files are not exported.
+
+        elif isinstance(obj, GeneratedWebIDLFile):
+            self._generated_webidl_sources.add(mozpath.join(obj.srcdir,
+                                                            obj.basename))
+            self._process_webidl_basename(obj.basename)
+
+        elif isinstance(obj, PreprocessedWebIDLFile):
+            self._preprocessed_webidl_sources.add(mozpath.join(obj.srcdir,
+                                                               obj.basename))
+            self._process_webidl_basename(obj.basename)
+
         elif isinstance(obj, Program):
             self._process_program(obj.program, backend_file)
 
@@ -551,9 +588,6 @@ class RecursiveMakeBackend(CommonBackend):
                                  poison_windows_h=False):
         files_per_unified_file = 16
 
-        # In case it's a generator.
-        files = sorted(files)
-
         explanation = "\n" \
             "# We build files in 'unified' mode by including several files\n" \
             "# together into a single source file.  This cuts down on\n" \
@@ -579,7 +613,7 @@ class RecursiveMakeBackend(CommonBackend):
                 return itertools.izip_longest(fillvalue=dummy_fill_value, *args)
 
             for i, unified_group in enumerate(grouper(files_per_unified_file,
-                                                      files)):
+                                                      sorted(files))):
                 just_the_filenames = list(filter_out_dummy(unified_group))
                 yield '%s%d.%s' % (unified_prefix, i, unified_suffix), just_the_filenames
 
@@ -686,10 +720,42 @@ class RecursiveMakeBackend(CommonBackend):
         with self._write_file(os.path.join(ipdl_dir, 'ipdlsrcs.mk')) as ipdls:
             mk.dump(ipdls, removal_guard=False)
 
-        # These contain autogenerated sources that the build config doesn't
-        # yet know about.
-        self._may_skip['compile'] -= {'ipc/ipdl'}
-        self._may_skip['compile'] -= {'dom/bindings', 'dom/bindings/test'}
+        self._may_skip['compile'] -= set(['ipc/ipdl'])
+
+        # Write out master lists of WebIDL source files.
+        bindings_dir = os.path.join(self.environment.topobjdir, 'dom', 'bindings')
+
+        mk = mozmakeutil.Makefile()
+
+        def write_var(variable, sources):
+            files = [os.path.basename(f) for f in sorted(sources)]
+            mk.add_statement('%s += %s' % (variable, ' '.join(files)))
+        write_var('webidl_files', self._webidl_sources)
+        write_var('generated_events_webidl_files', self._generated_events_webidl_sources)
+        write_var('test_webidl_files', self._test_webidl_sources)
+        write_var('preprocessed_test_webidl_files', self._preprocessed_test_webidl_sources)
+        write_var('generated_webidl_files', self._generated_webidl_sources)
+        write_var('preprocessed_webidl_files', self._preprocessed_webidl_sources)
+
+        all_webidl_files = itertools.chain(iter(self._webidl_sources),
+                                           iter(self._generated_events_webidl_sources),
+                                           iter(self._generated_webidl_sources),
+                                           iter(self._preprocessed_webidl_sources))
+        all_webidl_files = [os.path.basename(x) for x in all_webidl_files]
+        all_webidl_sources = [re.sub(r'\.webidl$', 'Binding.cpp', x) for x in all_webidl_files]
+
+        self._add_unified_build_rules(mk, all_webidl_sources,
+                                      bindings_dir,
+                                      unified_prefix='UnifiedBindings',
+                                      unified_files_makefile_variable='unified_binding_cpp_files',
+                                      poison_windows_h=True)
+
+        # Assume that Somebody Else has responsibility for correctly
+        # specifying removal dependencies for |all_webidl_sources|.
+        with self._write_file(os.path.join(bindings_dir, 'webidlsrcs.mk')) as webidls:
+            mk.dump(webidls, removal_guard=False)
+
+        self._may_skip['compile'] -= set(['dom/bindings', 'dom/bindings/test'])
 
         self._fill_root_mk()
 
@@ -942,6 +1008,10 @@ class RecursiveMakeBackend(CommonBackend):
     def _process_host_simple_program(self, program, backend_file):
         backend_file.write('HOST_SIMPLE_PROGRAMS += %s\n' % program)
 
+    def _process_webidl_basename(self, basename):
+        header = 'mozilla/dom/%sBinding.h' % os.path.splitext(basename)[0]
+        self._install_manifests['dist_include'].add_optional_exists(header)
+
     def _process_test_manifest(self, obj, backend_file):
         # Much of the logic in this function could be moved to CommonBackend.
         self.backend_input_files.add(os.path.join(obj.topsrcdir,
@@ -1034,80 +1104,3 @@ class RecursiveMakeBackend(CommonBackend):
 
             for manifest in sorted(manifests):
                 master.write('[include:%s]\n' % manifest)
-
-    def _handle_webidl_collection(self, webidls):
-        if not webidls.all_stems():
-            return
-
-        bindings_dir = os.path.join(self.environment.topobjdir, 'dom',
-            'bindings')
-
-        all_inputs = set(webidls.all_static_sources())
-        for s in webidls.all_non_static_basenames():
-            all_inputs.add(os.path.join(bindings_dir, s))
-
-        generated_events_stems = webidls.generated_events_stems()
-        exported_stems = webidls.all_regular_stems()
-
-        # The WebIDL manager reads configuration from a JSON file. So, we
-        # need to write this file early.
-        o = dict(
-            webidls=sorted(all_inputs),
-            generated_events_stems=sorted(generated_events_stems),
-            exported_stems=sorted(exported_stems),
-        )
-
-        file_lists = os.path.join(bindings_dir, 'file-lists.json')
-        with self._write_file(file_lists) as fh:
-            json.dump(o, fh, sort_keys=True)
-
-        manager = mozwebidl.create_build_system_manager(
-            self.environment.topsrcdir,
-            self.environment.topobjdir,
-            os.path.join(self.environment.topobjdir, 'dist')
-        )
-
-        # The manager is the source of truth on what files are generated.
-        # Consult it for install manifests.
-        include_dir = os.path.join(self.environment.topobjdir, 'dist',
-            'include')
-        for f in manager.expected_build_output_files():
-            if f.startswith(include_dir):
-                self._install_manifests['dist_include'].add_optional_exists(
-                    f[len(include_dir)+1:])
-
-        # We pass WebIDL info to make via a completely generated make file.
-        mk = Makefile()
-        mk.add_statement('nonstatic_webidl_files := %s' % ' '.join(
-            sorted(webidls.all_non_static_basenames())))
-        mk.add_statement('globalgen_sources := %s' % ' '.join(
-            sorted(manager.GLOBAL_DEFINE_FILES)))
-        mk.add_statement('test_sources := %s' % ' '.join(
-            sorted('%sBinding.cpp' % s for s in webidls.all_test_stems())))
-
-        # Add rules to preprocess bindings.
-        for source in sorted(webidls.all_preprocessed_sources()):
-            basename = os.path.basename(source)
-            rule = mk.create_rule([basename])
-            rule.add_dependencies([source, '$(GLOBAL_DEPS)'])
-            rule.add_commands([
-                # Remove the file before writing so bindings that go from
-                # static to preprocessed don't end up writing to a symlink,
-                # which would modify content in the source directory.
-                '$(RM) $@',
-                '$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) '
-                    '$(XULPPFLAGS) $< -o $@)'
-            ])
-
-        # Bindings are compiled in unified mode to speed up compilation and
-        # to reduce linker memory size. Note that test bindings are separated
-        # from regular ones so tests bindings aren't shipped.
-        self._add_unified_build_rules(mk,
-            webidls.all_regular_cpp_basenames(),
-            bindings_dir,
-            unified_prefix='UnifiedBindings',
-            unified_files_makefile_variable='unified_binding_cpp_files')
-
-        webidls_mk = os.path.join(bindings_dir, 'webidlsrcs.mk')
-        with self._write_file(webidls_mk) as fh:
-            mk.dump(fh, removal_guard=False)
diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
index 7dafae5b347..b8bdd8f4860 100644
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -275,10 +275,6 @@ class MozbuildObject(ProcessExecutionMixin):
     def bindir(self):
         return os.path.join(self.topobjdir, 'dist', 'bin')
 
-    @property
-    def includedir(self):
-        return os.path.join(self.topobjdir, 'dist', 'include')
-
     @property
     def statedir(self):
         return os.path.join(self.topobjdir, '.mozbuild')

From f5c053ab6ba49a06b2b45da2db60f12ddaf9b555 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Tue, 19 Nov 2013 19:21:11 +0100
Subject: [PATCH 35/92] Bug 894881 - Fix JIT fast paths to work with typed
 array properties. r=bhackett

---
 js/src/jit/BaselineIC.cpp | 14 +++++++++-----
 js/src/jit/IonBuilder.cpp | 17 ++++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index 26dd349d1fd..50223fd56fc 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -3269,10 +3269,14 @@ EffectlesslyLookupProperty(JSContext *cx, HandleObject obj, HandlePropertyName n
         *domProxyHasGeneration = (*shadowsResult == DoesntShadowUnique);
 
         checkObj = GetDOMProxyProto(obj);
-    }
-
-    if (!isDOMProxy && !obj->isNative())
+    } else if (obj->is<TypedArrayObject>() && obj->getProto()) {
+        // Typed array objects are non-native, but don't have any named
+        // properties. Just forward the lookup to the prototype, to allow
+        // inlining common getters like byteOffset.
+        checkObj = obj->getProto();
+    } else if (!obj->isNative()) {
         return true;
+    }
 
     if (checkObj->hasIdempotentProtoChain()) {
         if (!JSObject::lookupProperty(cx, checkObj, name, holder, shape))
@@ -3289,7 +3293,7 @@ static bool
 IsCacheableProtoChain(JSObject *obj, JSObject *holder, bool isDOMProxy=false)
 {
     JS_ASSERT_IF(isDOMProxy, IsCacheableDOMProxy(obj));
-    JS_ASSERT_IF(!isDOMProxy, obj->isNative());
+    JS_ASSERT_IF(!isDOMProxy, obj->isNative() || obj->is<TypedArrayObject>());
 
     // Don't handle objects which require a prototype guard. This should
     // be uncommon so handling it is likely not worth the complexity.
@@ -5974,7 +5978,7 @@ TryAttachNativeGetPropStub(JSContext *cx, HandleScript script, jsbytecode *pc,
         return false;
     }
 
-    if (!isDOMProxy && !obj->isNative())
+    if (!isDOMProxy && !obj->isNative() && !obj->is<TypedArrayObject>())
         return true;
 
     bool isCallProp = (JSOp(*pc) == JSOP_CALLPROP);
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index b09571f0b15..3f59b68a839 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -5934,8 +5934,14 @@ IonBuilder::maybeInsertResume()
 }
 
 static bool
-ClassHasEffectlessLookup(const Class *clasp)
+ClassHasEffectlessLookup(const Class *clasp, PropertyName *name)
 {
+    if (IsTypedArrayClass(clasp)) {
+        // Typed arrays have a lookupGeneric hook, but it only handles
+        // integers, not names.
+        JS_ASSERT(name);
+        return true;
+    }
     return clasp->isNative() && !clasp->ops.lookupGeneric;
 }
 
@@ -5974,7 +5980,7 @@ IonBuilder::testSingletonProperty(JSObject *obj, PropertyName *name)
     // property will change and trigger invalidation.
 
     while (obj) {
-        if (!ClassHasEffectlessLookup(obj->getClass()))
+        if (!ClassHasEffectlessLookup(obj->getClass(), name))
             return nullptr;
 
         types::TypeObjectKey *objType = types::TypeObjectKey::get(obj);
@@ -7785,12 +7791,13 @@ IonBuilder::objectsHaveCommonPrototype(types::TemporaryTypeSet *types, PropertyN
                 return false;
 
             const Class *clasp = type->clasp();
-            if (!ClassHasEffectlessLookup(clasp) || ClassHasResolveHook(compartment, clasp, name))
+            if (!ClassHasEffectlessLookup(clasp, name) || ClassHasResolveHook(compartment, clasp, name))
                 return false;
 
             // Look for a getter/setter on the class itself which may need
-            // to be called.
-            if (isGetter && clasp->ops.getGeneric)
+            // to be called. Ignore the getGeneric hook for typed arrays, it
+            // only handles integers and forwards names to the prototype.
+            if (isGetter && clasp->ops.getGeneric && !IsTypedArrayClass(clasp))
                 return false;
             if (!isGetter && clasp->ops.setGeneric)
                 return false;

From 4484b410ad0f8d7a288e3f3b5b854ba8a7c8cf12 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Tue, 19 Nov 2013 17:48:30 +0100
Subject: [PATCH 36/92] Bug 931354: OpenBSD doesn't provide
 arc4random_addrandom anymore, fix libevent accordingly by #ifndef'ing out its
 caller evutil_secure_rng_add_bytes() (which isnt called anywhere) r=joshaas

---
 .../src/third_party/libevent/README.mozilla   |  1 +
 .../src/third_party/libevent/evutil_rand.c    |  3 +-
 .../libevent/include/event2/util.h            |  2 +
 .../openbsd-no-arc4random_addrandom.patch     | 64 +++++++++++++++++++
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 ipc/chromium/src/third_party/libevent/openbsd-no-arc4random_addrandom.patch

diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla
index 608a62319b8..10c6845ffab 100644
--- a/ipc/chromium/src/third_party/libevent/README.mozilla
+++ b/ipc/chromium/src/third_party/libevent/README.mozilla
@@ -12,3 +12,4 @@ These files are taken from libevent-2.0.21-stable built on the development envir
 
 3. Apply "add mac-arc4random-buf.patch", which removes some bad OS X compatibility code. This will allow libevent to compile on all supported versions of OS X.
 
+4. Apply "openbsd-no-arc4random_addrandom.patch", which fixes the build on OpenBSD (which doesnt provide arc4random_addrandom anymore, see #931354)
diff --git a/ipc/chromium/src/third_party/libevent/evutil_rand.c b/ipc/chromium/src/third_party/libevent/evutil_rand.c
index c2d59335eb7..22e3c701e08 100644
--- a/ipc/chromium/src/third_party/libevent/evutil_rand.c
+++ b/ipc/chromium/src/third_party/libevent/evutil_rand.c
@@ -139,10 +139,11 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
 	ev_arc4random_buf(buf, n);
 }
 
+#ifndef __OpenBSD__
 void
 evutil_secure_rng_add_bytes(const char *buf, size_t n)
 {
 	arc4random_addrandom((unsigned char*)buf,
 	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
 }
-
+#endif
diff --git a/ipc/chromium/src/third_party/libevent/include/event2/util.h b/ipc/chromium/src/third_party/libevent/include/event2/util.h
index 4b7e8b45fc7..08c243826cd 100644
--- a/ipc/chromium/src/third_party/libevent/include/event2/util.h
+++ b/ipc/chromium/src/third_party/libevent/include/event2/util.h
@@ -672,6 +672,7 @@ void evutil_secure_rng_get_bytes(void *buf, size_t n);
  */
 int evutil_secure_rng_init(void);
 
+#ifndef __OpenBSD__
 /** Seed the random number generator with extra random bytes.
 
     You should almost never need to call this function; it should be
@@ -687,6 +688,7 @@ int evutil_secure_rng_init(void);
     @param datlen the number of bytes to read from datlen
  */
 void evutil_secure_rng_add_bytes(const char *dat, size_t datlen);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/ipc/chromium/src/third_party/libevent/openbsd-no-arc4random_addrandom.patch b/ipc/chromium/src/third_party/libevent/openbsd-no-arc4random_addrandom.patch
new file mode 100644
index 00000000000..d978328559f
--- /dev/null
+++ b/ipc/chromium/src/third_party/libevent/openbsd-no-arc4random_addrandom.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Landry Breuil <landry@openbsd.org>
+# Date 1384377262 -3600
+#      Wed Nov 13 22:14:22 2013 +0100
+# Node ID 026009b2c94dc564413d48df824fabec98e2c631
+# Parent  f2b602a5ee27b2e05abe84ea7cbd358dadd2ffb5
+Bug 931354: OpenBSD doesn't provide arc4random_addrandom anymore, fix libevent accordingly by #ifndef'ing out its caller evutil_secure_rng_add_bytes() (which isnt called anywhere) r=joshaas
+
+diff --git a/ipc/chromium/src/third_party/libevent/evutil_rand.c b/ipc/chromium/src/third_party/libevent/evutil_rand.c
+--- a/ipc/chromium/src/third_party/libevent/evutil_rand.c
++++ b/ipc/chromium/src/third_party/libevent/evutil_rand.c
+@@ -134,15 +134,16 @@ ev_arc4random_buf(void *buf, size_t n)
+ #endif /* } !_EVENT_HAVE_ARC4RANDOM */
+ 
+ void
+ evutil_secure_rng_get_bytes(void *buf, size_t n)
+ {
+ 	ev_arc4random_buf(buf, n);
+ }
+ 
++#ifndef __OpenBSD__
+ void
+ evutil_secure_rng_add_bytes(const char *buf, size_t n)
+ {
+ 	arc4random_addrandom((unsigned char*)buf,
+ 	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
+ }
+-
++#endif
+diff --git a/ipc/chromium/src/third_party/libevent/include/event2/util.h b/ipc/chromium/src/third_party/libevent/include/event2/util.h
+--- a/ipc/chromium/src/third_party/libevent/include/event2/util.h
++++ b/ipc/chromium/src/third_party/libevent/include/event2/util.h
+@@ -667,29 +667,31 @@ void evutil_secure_rng_get_bytes(void *b
+  * numbers.  You only need to call it if (a) you want to double-check
+  * that one of the seeding methods did succeed, or (b) you plan to drop
+  * the capability to seed (by chrooting, or dropping capabilities, or
+  * whatever), and you want to make sure that seeding happens before your
+  * program loses the ability to do it.
+  */
+ int evutil_secure_rng_init(void);
+ 
++#ifndef __OpenBSD__
+ /** Seed the random number generator with extra random bytes.
+ 
+     You should almost never need to call this function; it should be
+     sufficient to invoke evutil_secure_rng_init(), or let Libevent take
+     care of calling evutil_secure_rng_init() on its own.
+ 
+     If you call this function as a _replacement_ for the regular
+     entropy sources, then you need to be sure that your input
+     contains a fairly large amount of strong entropy.  Doing so is
+     notoriously hard: most people who try get it wrong.  Watch out!
+ 
+     @param dat a buffer full of a strong source of random numbers
+     @param datlen the number of bytes to read from datlen
+  */
+ void evutil_secure_rng_add_bytes(const char *dat, size_t datlen);
++#endif
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+ #endif /* _EVUTIL_H_ */

From 922b598103f58486a832ae5bf6317ae242636fda Mon Sep 17 00:00:00 2001
From: Camilo Viecco <cviecco@mozilla.com>
Date: Mon, 11 Nov 2013 16:37:06 -0800
Subject: [PATCH 37/92] Bug 912155 - Adding new interface in nssCertifcateDB
 for testing.  r=bsmith

---
 security/manager/ssl/public/nsIX509CertDB.idl | 28 ++++++-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    | 75 +++++++++++++++++++
 security/manager/ssl/tests/unit/head_psm.js   | 14 ++++
 3 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/security/manager/ssl/public/nsIX509CertDB.idl b/security/manager/ssl/public/nsIX509CertDB.idl
index 8d6f74e457e..53e50d3df5d 100644
--- a/security/manager/ssl/public/nsIX509CertDB.idl
+++ b/security/manager/ssl/public/nsIX509CertDB.idl
@@ -13,6 +13,7 @@ interface nsIFile;
 interface nsIInterfaceRequestor;
 interface nsIZipReader;
 interface nsIRecentBadCerts;
+interface nsIX509CertList;
 
 %{C++
 #define NS_X509CERTDB_CONTRACTID "@mozilla.org/security/x509certdb;1"
@@ -30,7 +31,7 @@ interface nsIOpenSignedJARFileCallback : nsISupports
  * This represents a service to access and manipulate 
  * X.509 certificates stored in a database.
  */
-[scriptable, uuid(ab0a1c52-f7fd-4fe7-9e65-7d3705a8580e)]
+[scriptable, uuid(3c2a5658-466a-11e3-a244-180373d97f23)]
 interface nsIX509CertDB : nsISupports {
 
   /**
@@ -298,4 +299,29 @@ interface nsIX509CertDB : nsISupports {
    * @param aName name of the cert for display purposes.
    */
   void addCert(in ACString certDER, in string aTrust, in string aName);
+
+  /** Warning: This interface is inteded to use only for testing only as:
+   *    1. It can create IO on the main thread.
+   *    2. It is in constant change, so in/out can change at any release.
+   *
+   *  Obtain the verification result for a cert given a particular usage.
+   *  On success, the call returns 0, the chain built during verification,
+   *  and whether the cert is good for EV usage.
+   *  On failure, the call returns the PRErrorCode for the verification failure
+   *
+   *  @param aCert Obtain the stored trust of this certificate
+   *  @param aUsage a integer representing the usage from NSS
+   *  @param aLocalOnly prevent network activity for revocation
+   *  @param verifedChain chain of verification up to the root if success
+   *  @param aHasEVPolicy bool that signified that the cert was an EV cert
+   *  @return 0 if success or the value or the error code for the verification
+   *          failure
+   */
+  int32_t /*PRErrorCode*/
+    verifyCertNow(in nsIX509Cert aCert,
+                  in int64_t /*SECCertificateUsage*/ aUsage,
+                  in bool aLocalOnly,
+                  out nsIX509CertList verifiedChain,
+                  out bool aHasEVPolicy);
+
 };
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index b2ec08d60b4..2db47098489 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -1668,3 +1668,78 @@ nsNSSCertificateDB::GetRecentBadCerts(bool isPrivate, nsIRecentBadCerts** result
   }
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsNSSCertificateDB::VerifyCertNow(nsIX509Cert* aCert,
+                                  int64_t /*SECCertificateUsage*/ aUsage,
+                                  bool aLocalOnly,
+                                  nsIX509CertList** verifiedChain,
+                                  bool* aHasEVPolicy,
+                                  int32_t* /*PRErrorCode*/ _retval )
+{
+  NS_ENSURE_ARG_POINTER(aCert);
+  NS_ENSURE_ARG_POINTER(aHasEVPolicy);
+  NS_ENSURE_ARG_POINTER(verifiedChain);
+  NS_ENSURE_ARG_POINTER(_retval);
+
+  *verifiedChain = nullptr;
+  *aHasEVPolicy = false;
+  *_retval = PR_UNKNOWN_ERROR;
+
+  nsNSSShutDownPreventionLock locker;
+  if (isAlreadyShutDown()) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  nsresult rv;
+#ifndef NSS_NO_LIBPKIX
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  inss->EnsureIdentityInfoLoaded();
+#endif
+
+  nsCOMPtr<nsIX509Cert2> x509Cert = do_QueryInterface(aCert);
+  if (!x509Cert) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  ScopedCERTCertificate nssCert(x509Cert->GetCert());
+
+  RefPtr<CertVerifier> certVerifier(GetDefaultCertVerifier());
+  NS_ENSURE_TRUE(certVerifier, NS_ERROR_FAILURE);
+
+  CertVerifier::Flags flags = aLocalOnly ? CertVerifier::FLAG_LOCAL_ONLY : 0;
+  CERTCertList* resultChain = nullptr;
+  SECOidTag evOidPolicy;
+  SECStatus srv;
+
+  srv = certVerifier->VerifyCert(nssCert,
+                                 aUsage, PR_Now(),
+                                 nullptr, // Assume no context
+                                 flags,
+                                 &resultChain,
+                                 &evOidPolicy,
+                                 nullptr);
+
+  PRErrorCode error = PR_GetError();
+
+  nsCOMPtr<nsIX509CertList> nssCertList;
+  // This adopts the list
+  nssCertList = new nsNSSCertList(resultChain, locker);
+  NS_ENSURE_TRUE(nssCertList, NS_ERROR_FAILURE);
+
+  if (srv == SECSuccess) {
+    if (evOidPolicy != SEC_OID_UNKNOWN) {
+      *aHasEVPolicy = true;
+    }
+    *_retval = 0;
+  } else {
+    NS_ENSURE_TRUE(evOidPolicy == SEC_OID_UNKNOWN, NS_ERROR_FAILURE);
+    NS_ENSURE_TRUE(error != 0, NS_ERROR_FAILURE);
+    *_retval = error;
+  }
+  nssCertList.forget(verifiedChain);
+
+  return NS_OK;
+}
diff --git a/security/manager/ssl/tests/unit/head_psm.js b/security/manager/ssl/tests/unit/head_psm.js
index 93a09f0b713..05322c3a9ac 100644
--- a/security/manager/ssl/tests/unit/head_psm.js
+++ b/security/manager/ssl/tests/unit/head_psm.js
@@ -31,6 +31,20 @@ const SEC_ERROR_OCSP_UNAUTHORIZED_RESPONSE              = SEC_ERROR_BASE + 130;
 const SEC_ERROR_OCSP_OLD_RESPONSE                       = SEC_ERROR_BASE + 132;
 const SEC_ERROR_OCSP_INVALID_SIGNING_CERT               = SEC_ERROR_BASE + 144;
 
+// Certificate Usages
+const certificateUsageSSLClient              = 0x0001;
+const certificateUsageSSLServer              = 0x0002;
+const certificateUsageSSLServerWithStepUp    = 0x0004;
+const certificateUsageSSLCA                  = 0x0008;
+const certificateUsageEmailSigner            = 0x0010;
+const certificateUsageEmailRecipient         = 0x0020;
+const certificateUsageObjectSigner           = 0x0040;
+const certificateUsageUserCertImport         = 0x0080;
+const certificateUsageVerifyCA               = 0x0100;
+const certificateUsageProtectedObjectSigner  = 0x0200;
+const certificateUsageStatusResponder        = 0x0400;
+const certificateUsageAnyCA                  = 0x0800;
+
 function readFile(file) {
   let fstream = Cc["@mozilla.org/network/file-input-stream;1"]
                   .createInstance(Ci.nsIFileInputStream);

From 6dcb5015db91e15527194dcf15220ffdc465e8af Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Mon, 18 Nov 2013 17:22:47 +1300
Subject: [PATCH 38/92] Bug 939662 - Remove "using namespace mozilla::dom;"
 from MediaDecoder.h and fix fallout.  r=cpearce

---
 content/media/DecoderTraits.cpp               |  2 +-
 content/media/MediaDecoder.cpp                |  8 +++---
 content/media/MediaDecoder.h                  | 25 ++++++++-----------
 content/media/MediaDecoderStateMachine.cpp    |  6 ++---
 content/media/MediaDecoderStateMachine.h      |  2 +-
 content/media/MediaResource.cpp               | 18 ++++++-------
 content/media/RtspMediaResource.cpp           |  6 ++---
 content/media/gstreamer/GStreamerReader.cpp   |  2 +-
 content/media/mediasource/MediaSource.h       |  1 -
 .../media/mediasource/MediaSourceDecoder.cpp  |  8 +++---
 .../media/mediasource/MediaSourceDecoder.h    |  8 +++---
 content/media/mediasource/SubBufferDecoder.h  |  2 +-
 content/media/ogg/OggReader.cpp               |  2 +-
 content/media/wmf/WMFReader.cpp               |  2 +-
 14 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp
index 7c8143441b2..ec1622f31f7 100644
--- a/content/media/DecoderTraits.cpp
+++ b/content/media/DecoderTraits.cpp
@@ -476,7 +476,7 @@ DecoderTraits::CreateDecoder(const nsACString& aType, MediaDecoderOwner* aOwner)
     // AMR audio is enabled for MMS, but we are discouraging Web and App
     // developers from using AMR, thus we only allow AMR to be played on WebApps.
     if (aType.EqualsASCII("audio/amr")) {
-      HTMLMediaElement* element = aOwner->GetMediaElement();
+      dom::HTMLMediaElement* element = aOwner->GetMediaElement();
       if (!element) {
         return nullptr;
       }
diff --git a/content/media/MediaDecoder.cpp b/content/media/MediaDecoder.cpp
index fad35fa7ad4..30d4c670aeb 100644
--- a/content/media/MediaDecoder.cpp
+++ b/content/media/MediaDecoder.cpp
@@ -570,7 +570,7 @@ nsresult MediaDecoder::Play()
  * (and can be -1 if aValue is before aRanges.Start(0)).
  */
 static bool
-IsInRanges(TimeRanges& aRanges, double aValue, int32_t& aIntervalIndex)
+IsInRanges(dom::TimeRanges& aRanges, double aValue, int32_t& aIntervalIndex)
 {
   uint32_t length;
   aRanges.GetLength(&length);
@@ -598,7 +598,7 @@ nsresult MediaDecoder::Seek(double aTime)
 
   NS_ABORT_IF_FALSE(aTime >= 0.0, "Cannot seek to a negative value.");
 
-  TimeRanges seekable;
+  dom::TimeRanges seekable;
   nsresult res;
   uint32_t length = 0;
   res = GetSeekable(&seekable);
@@ -1326,7 +1326,7 @@ bool MediaDecoder::IsMediaSeekable()
   return mMediaSeekable;
 }
 
-nsresult MediaDecoder::GetSeekable(TimeRanges* aSeekable)
+nsresult MediaDecoder::GetSeekable(dom::TimeRanges* aSeekable)
 {
   double initialTime = 0.0;
 
@@ -1492,7 +1492,7 @@ void MediaDecoder::Invalidate()
 
 // Constructs the time ranges representing what segments of the media
 // are buffered and playable.
-nsresult MediaDecoder::GetBuffered(TimeRanges* aBuffered) {
+nsresult MediaDecoder::GetBuffered(dom::TimeRanges* aBuffered) {
   if (mDecoderStateMachine) {
     return mDecoderStateMachine->GetBuffered(aBuffered);
   }
diff --git a/content/media/MediaDecoder.h b/content/media/MediaDecoder.h
index 0fcbf44fd8d..27a66180f14 100644
--- a/content/media/MediaDecoder.h
+++ b/content/media/MediaDecoder.h
@@ -201,8 +201,6 @@ class TimeRanges;
 }
 }
 
-using namespace mozilla::dom;
-
 namespace mozilla {
 namespace layers {
 class Image;
@@ -232,8 +230,6 @@ class MediaDecoder : public nsIObserver,
                      public AbstractMediaDecoder
 {
 public:
-  typedef mozilla::layers::Image Image;
-
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
@@ -371,7 +367,7 @@ public:
     MediaDecoder* mDecoder;
     // The last video image sent to the stream. Useful if we need to replicate
     // the image.
-    nsRefPtr<Image> mLastVideoImage;
+    nsRefPtr<layers::Image> mLastVideoImage;
     gfxIntSize mLastVideoImageDisplaySize;
     // This is set to true when the stream is initialized (audio and
     // video tracks added).
@@ -523,7 +519,7 @@ public:
   virtual bool IsTransportSeekable();
 
   // Return the time ranges that can be seeked into.
-  virtual nsresult GetSeekable(TimeRanges* aSeekable);
+  virtual nsresult GetSeekable(dom::TimeRanges* aSeekable);
 
   // Set the end time of the media resource. When playback reaches
   // this point the media pauses. aTime is in seconds.
@@ -559,7 +555,7 @@ public:
   virtual void MoveLoadsToBackground();
 
   // Returns a weak reference to the media decoder owner.
-  mozilla::MediaDecoderOwner* GetMediaOwner() const;
+  MediaDecoderOwner* GetMediaOwner() const;
 
   // Returns the current size of the framebuffer used in
   // MozAudioAvailable events.
@@ -584,7 +580,7 @@ public:
 
   // Constructs the time ranges representing what segments of the media
   // are buffered and playable.
-  virtual nsresult GetBuffered(TimeRanges* aBuffered);
+  virtual nsresult GetBuffered(dom::TimeRanges* aBuffered);
 
   // Returns the size, in bytes, of the heap memory used by the currently
   // queued decoded video and audio data.
@@ -595,7 +591,7 @@ public:
   {
     return mVideoFrameContainer;
   }
-  mozilla::layers::ImageContainer* GetImageContainer() MOZ_OVERRIDE;
+  layers::ImageContainer* GetImageContainer() MOZ_OVERRIDE;
 
   // Sets the length of the framebuffer used in MozAudioAvailable events.
   // The new size must be between 512 and 16384.
@@ -661,8 +657,8 @@ public:
   // held.
   void UpdatePlaybackPosition(int64_t aTime) MOZ_FINAL MOZ_OVERRIDE;
 
-  void SetAudioChannelType(AudioChannelType aType) { mAudioChannelType = aType; }
-  AudioChannelType GetAudioChannelType() { return mAudioChannelType; }
+  void SetAudioChannelType(dom::AudioChannelType aType) { mAudioChannelType = aType; }
+  dom::AudioChannelType GetAudioChannelType() { return mAudioChannelType; }
 
   // Send a new set of metadata to the state machine, to be dispatched to the
   // main thread to be presented when the |currentTime| of the media is greater
@@ -927,6 +923,7 @@ public:
     GetFrameStatistics().NotifyDecodedFrames(aParsed, aDecoded);
   }
 
+protected:
   /******
    * The following members should be accessed with the decoder lock held.
    ******/
@@ -1025,7 +1022,7 @@ private:
   // The |RestrictedAccessMonitor| member object.
   RestrictedAccessMonitor mReentrantMonitor;
 
-public:
+protected:
   // Data about MediaStreams that are being fed by this decoder.
   nsTArray<OutputStreamData> mOutputStreams;
   // The SourceMediaStream we are using to feed the mOutputStreams. This stream
@@ -1087,8 +1084,6 @@ public:
   // PlaybackEnded when mDecodedStream->mStream finishes.
   bool mTriggerPlaybackEndedWhenSourceStreamFinishes;
 
-protected:
-
   // Start timer to update download progress information.
   nsresult StartProgress();
 
@@ -1148,7 +1143,7 @@ protected:
 
   // Be assigned from media element during the initialization and pass to
   // AudioStream Class.
-  AudioChannelType mAudioChannelType;
+  dom::AudioChannelType mAudioChannelType;
 };
 
 } // namespace mozilla
diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp
index 72297f9ffa5..a056ceb874c 100644
--- a/content/media/MediaDecoderStateMachine.cpp
+++ b/content/media/MediaDecoderStateMachine.cpp
@@ -1605,7 +1605,7 @@ void MediaDecoderStateMachine::NotifyDataArrived(const char* aBuffer,
   // faster than played, mEndTime won't reflect the end of playable data
   // since we haven't played the frame at the end of buffered data. So update
   // mEndTime here as new data is downloaded to prevent such a lag.
-  TimeRanges buffered;
+  dom::TimeRanges buffered;
   if (mDecoder->IsInfinite() &&
       NS_SUCCEEDED(mDecoder->GetBuffered(&buffered)))
   {
@@ -1851,7 +1851,7 @@ int64_t MediaDecoderStateMachine::GetUndecodedData() const
   AssertCurrentThreadInMonitor();
   NS_ASSERTION(mState > DECODER_STATE_DECODING_METADATA,
                "Must have loaded metadata for GetBuffered() to work");
-  TimeRanges buffered;
+  dom::TimeRanges buffered;
 
   nsresult res = mDecoder->GetBuffered(&buffered);
   NS_ENSURE_SUCCESS(res, 0);
@@ -2713,7 +2713,7 @@ void MediaDecoderStateMachine::StartBuffering()
     stats.mDownloadRate/1024, stats.mDownloadRateReliable ? "" : " (unreliable)"));
 }
 
-nsresult MediaDecoderStateMachine::GetBuffered(TimeRanges* aBuffered) {
+nsresult MediaDecoderStateMachine::GetBuffered(dom::TimeRanges* aBuffered) {
   MediaResource* resource = mDecoder->GetResource();
   NS_ENSURE_TRUE(resource, NS_ERROR_FAILURE);
   resource->Pin();
diff --git a/content/media/MediaDecoderStateMachine.h b/content/media/MediaDecoderStateMachine.h
index 7e5aad6b01a..8897ef6e8b3 100644
--- a/content/media/MediaDecoderStateMachine.h
+++ b/content/media/MediaDecoderStateMachine.h
@@ -255,7 +255,7 @@ public:
     return mState == DECODER_STATE_SEEKING;
   }
 
-  nsresult GetBuffered(TimeRanges* aBuffered);
+  nsresult GetBuffered(dom::TimeRanges* aBuffered);
 
   void SetPlaybackRate(double aPlaybackRate);
   void SetPreservesPitch(bool aPreservesPitch);
diff --git a/content/media/MediaResource.cpp b/content/media/MediaResource.cpp
index 555058282dc..f5806b659e7 100644
--- a/content/media/MediaResource.cpp
+++ b/content/media/MediaResource.cpp
@@ -147,7 +147,7 @@ ChannelMediaResource::OnStartRequest(nsIRequest* aRequest)
 
   MediaDecoderOwner* owner = mDecoder->GetMediaOwner();
   NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE);
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   NS_ENSURE_TRUE(element, NS_ERROR_FAILURE);
   nsresult status;
   nsresult rv = aRequest->GetStatus(&status);
@@ -583,7 +583,7 @@ nsresult ChannelMediaResource::OpenChannel(nsIStreamListener** aStreamListener)
     // an authorizing Access-Control header.
     MediaDecoderOwner* owner = mDecoder->GetMediaOwner();
     NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE);
-    HTMLMediaElement* element = owner->GetMediaElement();
+    dom::HTMLMediaElement* element = owner->GetMediaElement();
     NS_ENSURE_TRUE(element, NS_ERROR_FAILURE);
     if (element->ShouldCheckAllowOrigin()) {
       nsRefPtr<nsCORSListenerProxy> crossSiteListener =
@@ -642,7 +642,7 @@ void ChannelMediaResource::SetupChannelHeaders()
     if (!owner) {
       return;
     }
-    HTMLMediaElement* element = owner->GetMediaElement();
+    dom::HTMLMediaElement* element = owner->GetMediaElement();
     if (!element) {
       return;
     }
@@ -805,7 +805,7 @@ void ChannelMediaResource::Suspend(bool aCloseImmediately)
     // Shutting down; do nothing.
     return;
   }
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   if (!element) {
     // Shutting down; do nothing.
     return;
@@ -840,7 +840,7 @@ void ChannelMediaResource::Resume()
     // Shutting down; do nothing.
     return;
   }
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   if (!element) {
     // Shutting down; do nothing.
     return;
@@ -889,7 +889,7 @@ ChannelMediaResource::RecreateChannel()
     // The decoder is being shut down, so don't bother opening a new channel
     return NS_OK;
   }
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   if (!element) {
     // The decoder is being shut down, so don't bother opening a new channel
     return NS_OK;
@@ -1309,7 +1309,7 @@ nsresult FileMediaResource::Open(nsIStreamListener** aStreamListener)
     // web server.
     MediaDecoderOwner* owner = mDecoder->GetMediaOwner();
     NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE);
-    HTMLMediaElement* element = owner->GetMediaElement();
+    dom::HTMLMediaElement* element = owner->GetMediaElement();
     NS_ENSURE_TRUE(element, NS_ERROR_FAILURE);
 
     rv = nsContentUtils::GetSecurityManager()->
@@ -1374,7 +1374,7 @@ already_AddRefed<MediaResource> FileMediaResource::CloneData(MediaDecoder* aDeco
     // The decoder is being shut down, so we can't clone
     return nullptr;
   }
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   if (!element) {
     // The decoder is being shut down, so we can't clone
     return nullptr;
@@ -1533,7 +1533,7 @@ void BaseMediaResource::MoveLoadsToBackground() {
     NS_WARNING("Null owner in MediaResource::MoveLoadsToBackground()");
     return;
   }
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   if (!element) {
     NS_WARNING("Null element in MediaResource::MoveLoadsToBackground()");
     return;
diff --git a/content/media/RtspMediaResource.cpp b/content/media/RtspMediaResource.cpp
index a9d4074e94c..20f78594e00 100644
--- a/content/media/RtspMediaResource.cpp
+++ b/content/media/RtspMediaResource.cpp
@@ -504,7 +504,7 @@ RtspMediaResource::OnConnected(uint8_t aTrackIdx,
 
   MediaDecoderOwner* owner = mDecoder->GetMediaOwner();
   NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE);
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   NS_ENSURE_TRUE(element, NS_ERROR_FAILURE);
 
   element->FinishDecoderSetup(mDecoder, this);
@@ -535,7 +535,7 @@ void RtspMediaResource::Suspend(bool aCloseImmediately)
 
   MediaDecoderOwner* owner = mDecoder->GetMediaOwner();
   NS_ENSURE_TRUE_VOID(owner);
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   NS_ENSURE_TRUE_VOID(element);
 
   mMediaStreamController->Suspend();
@@ -548,7 +548,7 @@ void RtspMediaResource::Resume()
 
   MediaDecoderOwner* owner = mDecoder->GetMediaOwner();
   NS_ENSURE_TRUE_VOID(owner);
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   NS_ENSURE_TRUE_VOID(element);
 
   if (mChannel) {
diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp
index 4cb1b80092f..c35d2e3149b 100644
--- a/content/media/gstreamer/GStreamerReader.cpp
+++ b/content/media/gstreamer/GStreamerReader.cpp
@@ -654,7 +654,7 @@ nsresult GStreamerReader::Seek(int64_t aTarget,
   return DecodeToTarget(aTarget);
 }
 
-nsresult GStreamerReader::GetBuffered(TimeRanges* aBuffered,
+nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered,
                                       int64_t aStartTime)
 {
   if (!mInfo.HasValidMedia()) {
diff --git a/content/media/mediasource/MediaSource.h b/content/media/mediasource/MediaSource.h
index 0e920fef121..295e82b8e3e 100644
--- a/content/media/mediasource/MediaSource.h
+++ b/content/media/mediasource/MediaSource.h
@@ -35,7 +35,6 @@ namespace dom {
 class GlobalObject;
 class SourceBuffer;
 class SourceBufferList;
-class TimeRanges;
 template <typename T> class Optional;
 
 #define MOZILLA_DOM_MEDIASOURCE_IMPLEMENTATION_IID \
diff --git a/content/media/mediasource/MediaSourceDecoder.cpp b/content/media/mediasource/MediaSourceDecoder.cpp
index 13895b9a95c..beeb3f3624a 100644
--- a/content/media/mediasource/MediaSourceDecoder.cpp
+++ b/content/media/mediasource/MediaSourceDecoder.cpp
@@ -120,7 +120,7 @@ private:
   }
 };
 
-MediaSourceDecoder::MediaSourceDecoder(HTMLMediaElement* aElement)
+MediaSourceDecoder::MediaSourceDecoder(dom::HTMLMediaElement* aElement)
   : mMediaSource(nullptr)
   , mVideoReader(nullptr),
     mAudioReader(nullptr)
@@ -148,13 +148,13 @@ MediaSourceDecoder::Load(nsIStreamListener**, MediaDecoder*)
 }
 
 nsresult
-MediaSourceDecoder::GetSeekable(TimeRanges* aSeekable)
+MediaSourceDecoder::GetSeekable(dom::TimeRanges* aSeekable)
 {
   double duration = mMediaSource->Duration();
   if (IsNaN(duration)) {
     // Return empty range.
   } else if (duration > 0 && mozilla::IsInfinite(duration)) {
-    nsRefPtr<TimeRanges> bufferedRanges = new TimeRanges();
+    nsRefPtr<dom::TimeRanges> bufferedRanges = new dom::TimeRanges();
     GetBuffered(bufferedRanges);
     aSeekable->Add(0, bufferedRanges->GetFinalEndTime());
   } else {
@@ -164,7 +164,7 @@ MediaSourceDecoder::GetSeekable(TimeRanges* aSeekable)
 }
 
 void
-MediaSourceDecoder::AttachMediaSource(MediaSource* aMediaSource)
+MediaSourceDecoder::AttachMediaSource(dom::MediaSource* aMediaSource)
 {
   MOZ_ASSERT(!mMediaSource && !mDecoderStateMachine);
   mMediaSource = aMediaSource;
diff --git a/content/media/mediasource/MediaSourceDecoder.h b/content/media/mediasource/MediaSourceDecoder.h
index e85f6164060..747876a6ba4 100644
--- a/content/media/mediasource/MediaSourceDecoder.h
+++ b/content/media/mediasource/MediaSourceDecoder.h
@@ -36,14 +36,14 @@ class MediaSource;
 class MediaSourceDecoder : public MediaDecoder
 {
 public:
-  MediaSourceDecoder(HTMLMediaElement* aElement);
+  MediaSourceDecoder(dom::HTMLMediaElement* aElement);
 
   virtual MediaDecoder* Clone() MOZ_OVERRIDE;
   virtual MediaDecoderStateMachine* CreateStateMachine() MOZ_OVERRIDE;
   virtual nsresult Load(nsIStreamListener**, MediaDecoder*) MOZ_OVERRIDE;
-  virtual nsresult GetSeekable(TimeRanges* aSeekable) MOZ_OVERRIDE;
+  virtual nsresult GetSeekable(dom::TimeRanges* aSeekable) MOZ_OVERRIDE;
 
-  void AttachMediaSource(MediaSource* aMediaSource);
+  void AttachMediaSource(dom::MediaSource* aMediaSource);
   void DetachMediaSource();
 
   SubBufferDecoder* CreateSubDecoder(const nsACString& aType);
@@ -80,7 +80,7 @@ public:
   }
 
 private:
-  MediaSource* mMediaSource;
+  dom::MediaSource* mMediaSource;
 
   nsTArray<nsRefPtr<SubBufferDecoder> > mDecoders;
   nsTArray<MediaDecoderReader*> mReaders; // Readers owned by Decoders.
diff --git a/content/media/mediasource/SubBufferDecoder.h b/content/media/mediasource/SubBufferDecoder.h
index cb11a444076..2444474e3d9 100644
--- a/content/media/mediasource/SubBufferDecoder.h
+++ b/content/media/mediasource/SubBufferDecoder.h
@@ -48,7 +48,7 @@ public:
     mParentDecoder->NotifyDataArrived(aBuffer, aLength, aOffset);
   }
 
-  nsresult GetBuffered(TimeRanges* aBuffered)
+  nsresult GetBuffered(dom::TimeRanges* aBuffered)
   {
     // XXX: Need mStartTime (from StateMachine) instead of passing 0.
     return mReader->GetBuffered(aBuffered, 0);
diff --git a/content/media/ogg/OggReader.cpp b/content/media/ogg/OggReader.cpp
index eb670c96a81..941cc04204c 100644
--- a/content/media/ogg/OggReader.cpp
+++ b/content/media/ogg/OggReader.cpp
@@ -1772,7 +1772,7 @@ nsresult OggReader::SeekBisection(int64_t aTarget,
   return NS_OK;
 }
 
-nsresult OggReader::GetBuffered(TimeRanges* aBuffered, int64_t aStartTime)
+nsresult OggReader::GetBuffered(dom::TimeRanges* aBuffered, int64_t aStartTime)
 {
   {
     mozilla::ReentrantMonitorAutoEnter mon(mMonitor);
diff --git a/content/media/wmf/WMFReader.cpp b/content/media/wmf/WMFReader.cpp
index 17c2610054b..48ba03be7d6 100644
--- a/content/media/wmf/WMFReader.cpp
+++ b/content/media/wmf/WMFReader.cpp
@@ -114,7 +114,7 @@ WMFReader::InitializeDXVA()
   MediaDecoderOwner* owner = mDecoder->GetOwner();
   NS_ENSURE_TRUE(owner, false);
 
-  HTMLMediaElement* element = owner->GetMediaElement();
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
   NS_ENSURE_TRUE(element, false);
 
   nsRefPtr<LayerManager> layerManager =

From 53df8db426695bd2affb949cc3c7520f92e1979c Mon Sep 17 00:00:00 2001
From: Nikhil Marathe <nsm.nikhil@gmail.com>
Date: Tue, 19 Nov 2013 10:39:51 -0800
Subject: [PATCH 39/92] Bug 939909 - Get rid of Optional<> from internal
 Promise functions. r=bz

--HG--
extra : rebase_source : bcf49b1b593504aeb619f4bbd16028e57861641b
---
 dom/promise/Promise.cpp               | 52 ++++++++++++---------------
 dom/promise/Promise.h                 | 12 +++----
 dom/promise/PromiseCallback.cpp       | 20 +++++------
 dom/promise/PromiseCallback.h         | 10 +++---
 dom/src/notification/Notification.cpp |  3 +-
 dom/webidl/Promise.webidl             |  2 +-
 6 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/dom/promise/Promise.cpp b/dom/promise/Promise.cpp
index 49879e478ff..47a9eb04b55 100644
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -191,25 +191,25 @@ Promise::EnabledForScope(JSContext* aCx, JSObject* /* unused */)
 
 void
 Promise::MaybeResolve(JSContext* aCx,
-                      const Optional<JS::Handle<JS::Value> >& aValue)
+                      JS::Handle<JS::Value> aValue)
 {
   MaybeResolveInternal(aCx, aValue);
 }
 
 void
 Promise::MaybeReject(JSContext* aCx,
-                     const Optional<JS::Handle<JS::Value> >& aValue)
+                     JS::Handle<JS::Value> aValue)
 {
   MaybeRejectInternal(aCx, aValue);
 }
 
 static void
 EnterCompartment(Maybe<JSAutoCompartment>& aAc, JSContext* aCx,
-                 const Optional<JS::Handle<JS::Value> >& aValue)
+                 JS::Handle<JS::Value> aValue)
 {
   // FIXME Bug 878849
-  if (aValue.WasPassed() && aValue.Value().isObject()) {
-    JS::Rooted<JSObject*> rooted(aCx, &aValue.Value().toObject());
+  if (aValue.isObject()) {
+    JS::Rooted<JSObject*> rooted(aCx, &aValue.toObject());
     aAc.construct(aCx, rooted);
   }
 }
@@ -234,18 +234,13 @@ Promise::JSCallback(JSContext *aCx, unsigned aArgc, JS::Value *aVp)
     return Throw(aCx, NS_ERROR_UNEXPECTED);
   }
 
-  Optional<JS::Handle<JS::Value> > value(aCx);
-  if (aArgc) {
-    value.Value() = args[0];
-  }
-
   v = js::GetFunctionNativeReserved(&args.callee(), SLOT_TASK);
   PromiseCallback::Task task = static_cast<PromiseCallback::Task>(v.toInt32());
 
   if (task == PromiseCallback::Resolve) {
-    promise->MaybeResolveInternal(aCx, value);
+    promise->MaybeResolveInternal(aCx, args.get(0));
   } else {
-    promise->MaybeRejectInternal(aCx, value);
+    promise->MaybeRejectInternal(aCx, args.get(0));
   }
 
   return true;
@@ -309,8 +304,8 @@ Promise::Constructor(const GlobalObject& aGlobal,
   aRv.WouldReportJSException();
 
   if (aRv.IsJSException()) {
-    Optional<JS::Handle<JS::Value> > value(cx);
-    aRv.StealJSException(cx, &value.Value());
+    JS::Rooted<JS::Value> value(cx);
+    aRv.StealJSException(cx, &value);
 
     Maybe<JSAutoCompartment> ac;
     EnterCompartment(ac, cx, value);
@@ -332,8 +327,7 @@ Promise::Resolve(const GlobalObject& aGlobal, JSContext* aCx,
 
   nsRefPtr<Promise> promise = new Promise(window);
 
-  Optional<JS::Handle<JS::Value> > value(aCx, aValue);
-  promise->MaybeResolveInternal(aCx, value);
+  promise->MaybeResolveInternal(aCx, aValue);
   return promise.forget();
 }
 
@@ -349,8 +343,7 @@ Promise::Reject(const GlobalObject& aGlobal, JSContext* aCx,
 
   nsRefPtr<Promise> promise = new Promise(window);
 
-  Optional<JS::Handle<JS::Value> > value(aCx, aValue);
-  promise->MaybeRejectInternal(aCx, value);
+  promise->MaybeRejectInternal(aCx, aValue);
   return promise.forget();
 }
 
@@ -420,8 +413,9 @@ Promise::RunTask()
   mResolveCallbacks.Clear();
   mRejectCallbacks.Clear();
 
-  JSAutoRequest ar(nsContentUtils::GetSafeJSContext());
-  Optional<JS::Handle<JS::Value> > value(nsContentUtils::GetSafeJSContext(), mResult);
+  JSContext* cx = nsContentUtils::GetSafeJSContext();
+  JSAutoRequest ar(cx);
+  JS::Rooted<JS::Value> value(cx, mResult);
 
   for (uint32_t i = 0; i < callbacks.Length(); ++i) {
     callbacks[i]->Call(value);
@@ -457,7 +451,7 @@ Promise::MaybeReportRejected()
 
 void
 Promise::MaybeResolveInternal(JSContext* aCx,
-                              const Optional<JS::Handle<JS::Value> >& aValue,
+                              JS::Handle<JS::Value> aValue,
                               PromiseTaskSync aAsynchronous)
 {
   if (mResolvePending) {
@@ -469,7 +463,7 @@ Promise::MaybeResolveInternal(JSContext* aCx,
 
 void
 Promise::MaybeRejectInternal(JSContext* aCx,
-                             const Optional<JS::Handle<JS::Value> >& aValue,
+                             JS::Handle<JS::Value> aValue,
                              PromiseTaskSync aAsynchronous)
 {
   if (mResolvePending) {
@@ -481,14 +475,14 @@ Promise::MaybeRejectInternal(JSContext* aCx,
 
 void
 Promise::ResolveInternal(JSContext* aCx,
-                         const Optional<JS::Handle<JS::Value> >& aValue,
+                         JS::Handle<JS::Value> aValue,
                          PromiseTaskSync aAsynchronous)
 {
   mResolvePending = true;
 
   // TODO: Bug 879245 - Then-able objects
-  if (aValue.WasPassed() && aValue.Value().isObject()) {
-    JS::Rooted<JSObject*> valueObj(aCx, &aValue.Value().toObject());
+  if (aValue.isObject()) {
+    JS::Rooted<JSObject*> valueObj(aCx, &aValue.toObject());
     Promise* nextPromise;
     nsresult rv = UNWRAP_OBJECT(Promise, aCx, valueObj, nextPromise);
 
@@ -504,13 +498,12 @@ Promise::ResolveInternal(JSContext* aCx,
   // value. Otherwise, the synchronous flag is unset, queue a task to process
   // own resolve callbacks with value. Otherwise, the synchronous flag is
   // unset, queue a task to process our resolve callbacks with value.
-  RunResolveTask(aValue.WasPassed() ? aValue.Value() : JS::UndefinedHandleValue,
-                 Resolved, aAsynchronous);
+  RunResolveTask(aValue, Resolved, aAsynchronous);
 }
 
 void
 Promise::RejectInternal(JSContext* aCx,
-                        const Optional<JS::Handle<JS::Value> >& aValue,
+                        JS::Handle<JS::Value> aValue,
                         PromiseTaskSync aAsynchronous)
 {
   mResolvePending = true;
@@ -518,8 +511,7 @@ Promise::RejectInternal(JSContext* aCx,
   // If the synchronous flag is set, process our reject callbacks with
   // value. Otherwise, the synchronous flag is unset, queue a task to process
   // promise's reject callbacks with value.
-  RunResolveTask(aValue.WasPassed() ? aValue.Value() : JS::UndefinedHandleValue,
-                 Rejected, aAsynchronous);
+  RunResolveTask(aValue, Rejected, aAsynchronous);
 }
 
 void
diff --git a/dom/promise/Promise.h b/dom/promise/Promise.h
index de2c06f1152..41f8c0b27ed 100644
--- a/dom/promise/Promise.h
+++ b/dom/promise/Promise.h
@@ -44,9 +44,9 @@ public:
   static bool EnabledForScope(JSContext* aCx, JSObject* /* unused */);
 
   void MaybeResolve(JSContext* aCx,
-                    const Optional<JS::Handle<JS::Value> >& aValue);
+                    JS::Handle<JS::Value> aValue);
   void MaybeReject(JSContext* aCx,
-                   const Optional<JS::Handle<JS::Value> >& aValue);
+                   JS::Handle<JS::Value> aValue);
 
   // WebIDL
 
@@ -120,18 +120,18 @@ private:
   void MaybeReportRejected();
 
   void MaybeResolveInternal(JSContext* aCx,
-                            const Optional<JS::Handle<JS::Value> >& aValue,
+                            JS::Handle<JS::Value> aValue,
                             PromiseTaskSync aSync = AsyncTask);
   void MaybeRejectInternal(JSContext* aCx,
-                           const Optional<JS::Handle<JS::Value> >& aValue,
+                           JS::Handle<JS::Value> aValue,
                            PromiseTaskSync aSync = AsyncTask);
 
   void ResolveInternal(JSContext* aCx,
-                       const Optional<JS::Handle<JS::Value> >& aValue,
+                       JS::Handle<JS::Value> aValue,
                        PromiseTaskSync aSync = AsyncTask);
 
   void RejectInternal(JSContext* aCx,
-                      const Optional<JS::Handle<JS::Value> >& aValue,
+                      JS::Handle<JS::Value> aValue,
                       PromiseTaskSync aSync = AsyncTask);
 
   // Static methods for the PromiseInit functions.
diff --git a/dom/promise/PromiseCallback.cpp b/dom/promise/PromiseCallback.cpp
index f8cb9b9c9a1..5312f000e23 100644
--- a/dom/promise/PromiseCallback.cpp
+++ b/dom/promise/PromiseCallback.cpp
@@ -37,11 +37,11 @@ PromiseCallback::~PromiseCallback()
 
 static void
 EnterCompartment(Maybe<JSAutoCompartment>& aAc, JSContext* aCx,
-                 const Optional<JS::Handle<JS::Value> >& aValue)
+                 JS::Handle<JS::Value> aValue)
 {
   // FIXME Bug 878849
-  if (aValue.WasPassed() && aValue.Value().isObject()) {
-    JS::Rooted<JSObject*> rooted(aCx, &aValue.Value().toObject());
+  if (aValue.isObject()) {
+    JS::Rooted<JSObject*> rooted(aCx, &aValue.toObject());
     aAc.construct(aCx, rooted);
   }
 }
@@ -71,7 +71,7 @@ ResolvePromiseCallback::~ResolvePromiseCallback()
 }
 
 void
-ResolvePromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
+ResolvePromiseCallback::Call(JS::Handle<JS::Value> aValue)
 {
   // Run resolver's algorithm with value and the synchronous flag set.
   AutoJSContext cx;
@@ -106,7 +106,7 @@ RejectPromiseCallback::~RejectPromiseCallback()
 }
 
 void
-RejectPromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
+RejectPromiseCallback::Call(JS::Handle<JS::Value> aValue)
 {
   // Run resolver's algorithm with value and the synchronous flag set.
   AutoJSContext cx;
@@ -143,7 +143,7 @@ WrapperPromiseCallback::~WrapperPromiseCallback()
 }
 
 void
-WrapperPromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
+WrapperPromiseCallback::Call(JS::Handle<JS::Value> aValue)
 {
   AutoJSContext cx;
   Maybe<JSAutoCompartment> ac;
@@ -153,15 +153,15 @@ WrapperPromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
 
   // If invoking callback threw an exception, run resolver's reject with the
   // thrown exception as argument and the synchronous flag set.
-  Optional<JS::Handle<JS::Value> > value(cx,
+  JS::Rooted<JS::Value> value(cx,
     mCallback->Call(mNextPromise->GetParentObject(), aValue, rv,
                     CallbackObject::eRethrowExceptions));
 
   rv.WouldReportJSException();
 
   if (rv.Failed() && rv.IsJSException()) {
-    Optional<JS::Handle<JS::Value> > value(cx);
-    rv.StealJSException(cx, &value.Value());
+    JS::Rooted<JS::Value> value(cx);
+    rv.StealJSException(cx, &value);
 
     Maybe<JSAutoCompartment> ac2;
     EnterCompartment(ac2, cx, value);
@@ -203,7 +203,7 @@ SimpleWrapperPromiseCallback::~SimpleWrapperPromiseCallback()
 }
 
 void
-SimpleWrapperPromiseCallback::Call(const Optional<JS::Handle<JS::Value> >& aValue)
+SimpleWrapperPromiseCallback::Call(JS::Handle<JS::Value> aValue)
 {
   ErrorResult rv;
   mCallback->Call(mPromise, aValue, rv);
diff --git a/dom/promise/PromiseCallback.h b/dom/promise/PromiseCallback.h
index 38089466eed..9a77b702898 100644
--- a/dom/promise/PromiseCallback.h
+++ b/dom/promise/PromiseCallback.h
@@ -24,7 +24,7 @@ public:
   PromiseCallback();
   virtual ~PromiseCallback();
 
-  virtual void Call(const Optional<JS::Handle<JS::Value> >& aValue) = 0;
+  virtual void Call(JS::Handle<JS::Value> aValue) = 0;
 
   enum Task {
     Resolve,
@@ -46,7 +46,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(WrapperPromiseCallback,
                                            PromiseCallback)
 
-  void Call(const Optional<JS::Handle<JS::Value> >& aValue) MOZ_OVERRIDE;
+  void Call(JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
 
   WrapperPromiseCallback(Promise* aNextPromise, AnyCallback* aCallback);
   ~WrapperPromiseCallback();
@@ -64,7 +64,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SimpleWrapperPromiseCallback,
                                            PromiseCallback)
 
-  void Call(const Optional<JS::Handle<JS::Value> >& aValue) MOZ_OVERRIDE;
+  void Call(JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
 
   SimpleWrapperPromiseCallback(Promise* aPromise,
                                AnyCallback* aCallback);
@@ -84,7 +84,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ResolvePromiseCallback,
                                            PromiseCallback)
 
-  void Call(const Optional<JS::Handle<JS::Value> >& aValue) MOZ_OVERRIDE;
+  void Call(JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
 
   ResolvePromiseCallback(Promise* aPromise);
   ~ResolvePromiseCallback();
@@ -102,7 +102,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(RejectPromiseCallback,
                                            PromiseCallback)
 
-  void Call(const Optional<JS::Handle<JS::Value> >& aValue) MOZ_OVERRIDE;
+  void Call(JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
 
   RejectPromiseCallback(Promise* aPromise);
   ~RejectPromiseCallback();
diff --git a/dom/src/notification/Notification.cpp b/dom/src/notification/Notification.cpp
index a03d899c5cd..20e4cecaee6 100644
--- a/dom/src/notification/Notification.cpp
+++ b/dom/src/notification/Notification.cpp
@@ -87,8 +87,7 @@ public:
   NS_IMETHOD Done(JSContext* aCx)
   {
     JSAutoCompartment ac(aCx, mGlobal);
-    Optional<JS::Handle<JS::Value>> result(aCx,
-                                           JS::ObjectValue(*mNotifications));
+    JS::Rooted<JS::Value> result(aCx, JS::ObjectValue(*mNotifications));
     mPromise->MaybeResolve(aCx, result);
     return NS_OK;
   }
diff --git a/dom/webidl/Promise.webidl b/dom/webidl/Promise.webidl
index 8cea8a33aff..f2ca4c665ec 100644
--- a/dom/webidl/Promise.webidl
+++ b/dom/webidl/Promise.webidl
@@ -11,7 +11,7 @@
 // have different types for "platform-provided function" and "user-provided
 // function"; for now, we just use "object".
 callback PromiseInit = void (object resolve, object reject);
-callback AnyCallback = any (optional any value);
+callback AnyCallback = any (any value);
 
 [Func="mozilla::dom::Promise::EnabledForScope", Constructor(PromiseInit init)]
 interface Promise {

From 297a29ac6d6cc23d6ab754064de67aa4b7e067d5 Mon Sep 17 00:00:00 2001
From: Nikhil Marathe <nsm.nikhil@gmail.com>
Date: Tue, 19 Nov 2013 10:43:51 -0800
Subject: [PATCH 40/92] Bug 882076 - C++ callbacks to DOM Promises.
 r=baku,mccr8

---
 dom/promise/Promise.cpp            | 15 +++++++++++
 dom/promise/Promise.h              |  8 ++++--
 dom/promise/PromiseCallback.cpp    | 42 ++++++++++++++++++++++++++++++
 dom/promise/PromiseCallback.h      | 19 ++++++++++++++
 dom/promise/PromiseNativeHandler.h | 39 +++++++++++++++++++++++++++
 dom/promise/moz.build              |  1 +
 6 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 dom/promise/PromiseNativeHandler.h

diff --git a/dom/promise/Promise.cpp b/dom/promise/Promise.cpp
index 47a9eb04b55..e715af35748 100644
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -11,6 +11,7 @@
 #include "mozilla/dom/PromiseBinding.h"
 #include "mozilla/Preferences.h"
 #include "PromiseCallback.h"
+#include "PromiseNativeHandler.h"
 #include "nsContentUtils.h"
 #include "nsPIDOMWindow.h"
 #include "WorkerPrivate.h"
@@ -22,6 +23,8 @@
 namespace mozilla {
 namespace dom {
 
+NS_IMPL_ISUPPORTS0(PromiseNativeHandler)
+
 // PromiseTask
 
 // This class processes the promise's callbacks with promise's result.
@@ -379,6 +382,18 @@ Promise::Catch(const Optional<OwningNonNull<AnyCallback> >& aRejectCallback)
   return Then(resolveCb, aRejectCallback);
 }
 
+void
+Promise::AppendNativeHandler(PromiseNativeHandler* aRunnable)
+{
+  nsRefPtr<PromiseCallback> resolveCb =
+  new NativePromiseCallback(aRunnable, Resolved);
+
+  nsRefPtr<PromiseCallback> rejectCb =
+  new NativePromiseCallback(aRunnable, Rejected);
+
+  AppendCallbacks(resolveCb, rejectCb);
+}
+
 void
 Promise::AppendCallbacks(PromiseCallback* aResolveCallback,
                          PromiseCallback* aRejectCallback)
diff --git a/dom/promise/Promise.h b/dom/promise/Promise.h
index 41f8c0b27ed..f416e647e6b 100644
--- a/dom/promise/Promise.h
+++ b/dom/promise/Promise.h
@@ -20,13 +20,15 @@
 namespace mozilla {
 namespace dom {
 
-class PromiseInit;
-class PromiseCallback;
 class AnyCallback;
+class PromiseCallback;
+class PromiseInit;
+class PromiseNativeHandler;
 
 class Promise MOZ_FINAL : public nsISupports,
                           public nsWrapperCache
 {
+  friend class NativePromiseCallback;
   friend class PromiseTask;
   friend class PromiseResolverTask;
   friend class ResolvePromiseCallback;
@@ -78,6 +80,8 @@ public:
   already_AddRefed<Promise>
   Catch(const Optional<OwningNonNull<AnyCallback> >& aRejectCallback);
 
+  void AppendNativeHandler(PromiseNativeHandler* aRunnable);
+
 private:
   enum PromiseState {
     Pending,
diff --git a/dom/promise/PromiseCallback.cpp b/dom/promise/PromiseCallback.cpp
index 5312f000e23..48167292423 100644
--- a/dom/promise/PromiseCallback.cpp
+++ b/dom/promise/PromiseCallback.cpp
@@ -6,6 +6,7 @@
 
 #include "PromiseCallback.h"
 #include "mozilla/dom/Promise.h"
+#include "mozilla/dom/PromiseNativeHandler.h"
 
 namespace mozilla {
 namespace dom {
@@ -209,6 +210,47 @@ SimpleWrapperPromiseCallback::Call(JS::Handle<JS::Value> aValue)
   mCallback->Call(mPromise, aValue, rv);
 }
 
+// NativePromiseCallback
+
+NS_IMPL_CYCLE_COLLECTION_INHERITED_1(NativePromiseCallback,
+                                     PromiseCallback, mHandler)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(NativePromiseCallback)
+NS_INTERFACE_MAP_END_INHERITING(PromiseCallback)
+
+NS_IMPL_ADDREF_INHERITED(NativePromiseCallback, PromiseCallback)
+NS_IMPL_RELEASE_INHERITED(NativePromiseCallback, PromiseCallback)
+
+NativePromiseCallback::NativePromiseCallback(PromiseNativeHandler* aHandler,
+                                             Promise::PromiseState aState)
+  : mHandler(aHandler)
+  , mState(aState)
+{
+  MOZ_ASSERT(aHandler);
+  MOZ_COUNT_CTOR(NativePromiseCallback);
+}
+
+NativePromiseCallback::~NativePromiseCallback()
+{
+  MOZ_COUNT_DTOR(NativePromiseCallback);
+}
+
+void
+NativePromiseCallback::Call(JS::Handle<JS::Value> aValue)
+{
+  if (mState == Promise::Resolved) {
+    mHandler->ResolvedCallback(aValue);
+    return;
+  }
+
+  if (mState == Promise::Rejected) {
+    mHandler->RejectedCallback(aValue);
+    return;
+  }
+
+  NS_NOTREACHED("huh?");
+}
+
 /* static */ PromiseCallback*
 PromiseCallback::Factory(Promise* aNextPromise, AnyCallback* aCallback,
                          Task aTask)
diff --git a/dom/promise/PromiseCallback.h b/dom/promise/PromiseCallback.h
index 9a77b702898..260d1bc0c61 100644
--- a/dom/promise/PromiseCallback.h
+++ b/dom/promise/PromiseCallback.h
@@ -111,6 +111,25 @@ private:
   nsRefPtr<Promise> mPromise;
 };
 
+// NativePromiseCallback wraps a NativePromiseHandler.
+class NativePromiseCallback MOZ_FINAL : public PromiseCallback
+{
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(NativePromiseCallback,
+                                           PromiseCallback)
+
+  void Call(JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+
+  NativePromiseCallback(PromiseNativeHandler* aHandler,
+                        Promise::PromiseState aState);
+  ~NativePromiseCallback();
+
+private:
+  nsRefPtr<PromiseNativeHandler> mHandler;
+  Promise::PromiseState mState;
+};
+
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/promise/PromiseNativeHandler.h b/dom/promise/PromiseNativeHandler.h
new file mode 100644
index 00000000000..a9f8c505d5d
--- /dev/null
+++ b/dom/promise/PromiseNativeHandler.h
@@ -0,0 +1,39 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_PromiseNativeHandler_h
+#define mozilla_dom_PromiseNativeHandler_h
+
+#include "nsISupports.h"
+
+namespace mozilla {
+namespace dom {
+
+/*
+ * PromiseNativeHandler allows C++ to react to a Promise being rejected/resolved.
+ * A PromiseNativeHandler can be appended to a Promise using
+ * Promise::AppendNativeHandler().
+ */
+class PromiseNativeHandler : public nsISupports
+{
+public:
+  // NS_IMPL_ISUPPORTS0 in Promise.cpp.
+  NS_DECL_ISUPPORTS
+
+  virtual ~PromiseNativeHandler()
+  { }
+
+  virtual void
+  ResolvedCallback(JS::Handle<JS::Value> aValue) = 0;
+
+  virtual void
+  RejectedCallback(JS::Handle<JS::Value> aValue) = 0;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_PromiseNativeHandler_h
diff --git a/dom/promise/moz.build b/dom/promise/moz.build
index 17c44e69848..3de60321932 100644
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -10,6 +10,7 @@ XPIDL_MODULE = 'dom_promise'
 
 EXPORTS.mozilla.dom += [
     'Promise.h',
+    'PromiseNativeHandler.h'
 ]
 
 SOURCES += [

From 3af5d76d719b80b80a4af41f1eff0dc263df0fed Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Mon, 18 Nov 2013 11:55:33 -0800
Subject: [PATCH 41/92] Bug 939080 - Allow support-files in manifests to exist
 in parent paths; r=ted

--HG--
extra : rebase_source : fcbd7e71efacde1151d4142132312291e297bc68
extra : amend_source : 0c78233f8b853654af474c54de6869ce55aa0533
---
 build/docs/test_manifests.rst                    |  3 ---
 python/mozbuild/mozbuild/frontend/emitter.py     |  8 ++------
 .../child/mochitest.ini                          |  4 ++++
 .../child/test_foo.js                            |  0
 .../moz.build                                    |  4 ++++
 .../support-file.txt                             |  0
 .../mozbuild/test/frontend/test_emitter.py       | 16 ++++++++++++++++
 7 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/test_foo.js
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/support-file.txt

diff --git a/build/docs/test_manifests.rst b/build/docs/test_manifests.rst
index cab4a1a5ab9..802fb68c2cc 100644
--- a/build/docs/test_manifests.rst
+++ b/build/docs/test_manifests.rst
@@ -176,9 +176,6 @@ Files referenced by manifests are automatically installed into the object
 directory into paths defined in
 :py:func:`mozbuild.frontend.emitter.TreeMetadataEmitter._process_test_manifest`.
 
-Referenced files in the manifest not in the same directory tree as the manifest
-file are **not** installed.
-
 .. _reftest_manifests:
 
 Reftest Manifests
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 697f52a3223..0c99f072912 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -444,12 +444,8 @@ class TreeMetadataEmitter(LoggingMixin):
                         else:
                             full = mozpath.normpath(mozpath.join(manifest_dir,
                                 pattern))
-                            # Only install paths in our directory. This
-                            # rule is somewhat arbitrary and could be lifted.
-                            if not full.startswith(manifest_dir):
-                                continue
-
-                            obj.installs[full] = mozpath.join(out_dir, pattern)
+                            obj.installs[full] = mozpath.normpath(
+                                mozpath.join(out_dir, pattern))
 
             # We also copy the manifest into the output directory.
             out_path = mozpath.join(out_dir, os.path.basename(manifest_path))
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini
new file mode 100644
index 00000000000..c7882242916
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+support-files = ../support-file.txt
+
+[test_foo.js]
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/test_foo.js b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/test_foo.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build
new file mode 100644
index 00000000000..a40e2562504
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build
@@ -0,0 +1,4 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+MOCHITEST_MANIFESTS += ['child/mochitest.ini']
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/support-file.txt b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/support-file.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
index 4bb9adea3f7..cbad40fd3b0 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -346,6 +346,22 @@ class TestEmitterBasic(unittest.TestCase):
         basenames = set(os.path.basename(k) for k in o.installs.keys())
         self.assertEqual(basenames, {'mochitest.ini', 'test_active.html'})
 
+    def test_test_manifest_parent_support_files_dir(self):
+        """support-files referencing a file in a parent directory works."""
+        reader = self.reader('test-manifest-parent-support-files-dir')
+
+        objs = [o for o in self.read_topsrcdir(reader)
+                if isinstance(o, TestManifest)]
+
+        self.assertEqual(len(objs), 1)
+
+        o = objs[0]
+
+        expected = os.path.join(o.srcdir, 'support-file.txt')
+        self.assertIn(expected, o.installs)
+        self.assertEqual(o.installs[expected],
+            'testing/mochitest/tests/support-file.txt')
+
     def test_ipdl_sources(self):
         reader = self.reader('ipdl_sources')
         objs = self.read_topsrcdir(reader)

From 1c75e7c443f1d26f1c4405ba5b3cde856f78c7eb Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 14:10:15 -0500
Subject: [PATCH 42/92] Bug 939580 - #include LOCAL_INCLUDES after the source
 dir and current dir includes; r=gps

---
 config/config.mk               | 2 +-
 dom/base/moz.build             | 1 +
 dom/workers/RuntimeService.cpp | 2 +-
 js/src/config/config.mk        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index e1beb15a584..2f03e336e25 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -477,9 +477,9 @@ OS_INCLUDES += $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
 # NSPR_CFLAGS and NSS_CFLAGS must appear ahead of OS_INCLUDES to avoid Linux
 # builds wrongly picking up system NSPR/NSS header files.
 INCLUDES = \
-  $(LOCAL_INCLUDES) \
   -I$(srcdir) \
   -I. \
+  $(LOCAL_INCLUDES) \
   -I$(DIST)/include \
   $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \
   $(NSPR_CFLAGS) $(NSS_CFLAGS) \
diff --git a/dom/base/moz.build b/dom/base/moz.build
index a6e9069510d..333a9598483 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -57,6 +57,7 @@ EXPORTS.mozilla.dom += [
     'MessageChannel.h',
     'MessagePort.h',
     'MessagePortList.h',
+    'Navigator.h',
     'ScreenOrientation.h',
     'StructuredCloneTags.h',
     'URL.h',
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 382037ffba8..bbfcf87d151 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -35,7 +35,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Util.h"
-#include <Navigator.h>
+#include "mozilla/dom/Navigator.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollector.h"
 #include "nsDOMJSUtils.h"
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index e1beb15a584..2f03e336e25 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -477,9 +477,9 @@ OS_INCLUDES += $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
 # NSPR_CFLAGS and NSS_CFLAGS must appear ahead of OS_INCLUDES to avoid Linux
 # builds wrongly picking up system NSPR/NSS header files.
 INCLUDES = \
-  $(LOCAL_INCLUDES) \
   -I$(srcdir) \
   -I. \
+  $(LOCAL_INCLUDES) \
   -I$(DIST)/include \
   $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \
   $(NSPR_CFLAGS) $(NSS_CFLAGS) \

From d778db48a9ae3db812124a4b02f7b948613a5088 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 14:11:16 -0500
Subject: [PATCH 43/92] Bug 939571 - Build Web Audio in unified mode;
 r=glandium

---
 content/media/webaudio/blink/moz.build | 2 +-
 content/media/webaudio/moz.build       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build
index 23dfaa1d24c..e890ca87cbc 100644
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'Biquad.cpp',
     'DirectConvolver.cpp',
     'DynamicsCompressor.cpp',
diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build
index ee0f0e11468..4599cc522c2 100644
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -48,7 +48,7 @@ EXPORTS.mozilla.dom += [
     'WaveShaperNode.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AnalyserNode.cpp',
     'AudioBuffer.cpp',
     'AudioBufferSourceNode.cpp',

From 9538c3f67212dc6fbe740c97bf43e63f2bc40f7c Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 6 Nov 2013 17:52:52 -0500
Subject: [PATCH 44/92] Bug 934646 - Delete unused resources. r=mfinkle

These resources weren't defined in moz.build, so they were never
copied to $OBJDIR/mobile/android/base/res.  This means they could not
have been referenced by the system.  (Of course, text search turns up
zero uses as well.)
---
 .../drawable-hdpi/awesomebar_sep_left.9.png      | Bin 216 -> 0 bytes
 .../drawable-hdpi/awesomebar_sep_right.9.png     | Bin 206 -> 0 bytes
 .../drawable-hdpi/awesomebar_tab_center.9.png    | Bin 599 -> 0 bytes
 .../drawable-hdpi/awesomebar_tab_left.9.png      | Bin 372 -> 0 bytes
 .../drawable-hdpi/awesomebar_tab_right.9.png     | Bin 347 -> 0 bytes
 .../drawable-hdpi/ic_notif_button_cancel.png     | Bin 763 -> 0 bytes
 .../drawable-hdpi/ic_notif_button_pause.png      | Bin 362 -> 0 bytes
 .../drawable-hdpi/ic_notif_button_resume.png     | Bin 670 -> 0 bytes
 .../drawable-mdpi/awesomebar_sep_left.9.png      | Bin 208 -> 0 bytes
 .../drawable-mdpi/awesomebar_sep_right.9.png     | Bin 202 -> 0 bytes
 .../drawable-mdpi/awesomebar_tab_center.9.png    | Bin 442 -> 0 bytes
 .../drawable-mdpi/awesomebar_tab_left.9.png      | Bin 278 -> 0 bytes
 .../drawable-mdpi/awesomebar_tab_right.9.png     | Bin 261 -> 0 bytes
 .../drawable-mdpi/ic_notif_button_cancel.png     | Bin 497 -> 0 bytes
 .../drawable-mdpi/ic_notif_button_pause.png      | Bin 252 -> 0 bytes
 .../drawable-mdpi/ic_notif_button_resume.png     | Bin 463 -> 0 bytes
 .../drawable-xhdpi/awesomebar_sep_left.9.png     | Bin 220 -> 0 bytes
 .../drawable-xhdpi/awesomebar_sep_right.9.png    | Bin 207 -> 0 bytes
 .../drawable-xhdpi/awesomebar_tab_center.9.png   | Bin 794 -> 0 bytes
 .../drawable-xhdpi/awesomebar_tab_left.9.png     | Bin 462 -> 0 bytes
 .../drawable-xhdpi/awesomebar_tab_right.9.png    | Bin 432 -> 0 bytes
 .../drawable-xhdpi/ic_notif_button_cancel.png    | Bin 1261 -> 0 bytes
 .../drawable-xhdpi/ic_notif_button_pause.png     | Bin 389 -> 0 bytes
 .../drawable-xhdpi/ic_notif_button_resume.png    | Bin 853 -> 0 bytes
 .../awesomebar_sep_left.9.png                    | Bin 221 -> 0 bytes
 .../awesomebar_sep_right.9.png                   | Bin 208 -> 0 bytes
 .../awesomebar_tab_center.9.png                  | Bin 841 -> 0 bytes
 .../awesomebar_tab_left.9.png                    | Bin 504 -> 0 bytes
 .../awesomebar_tab_right.9.png                   | Bin 445 -> 0 bytes
 .../awesomebar_sep_left.9.png                    | Bin 213 -> 0 bytes
 .../awesomebar_sep_right.9.png                   | Bin 205 -> 0 bytes
 .../awesomebar_tab_center.9.png                  | Bin 589 -> 0 bytes
 .../awesomebar_tab_left.9.png                    | Bin 351 -> 0 bytes
 .../awesomebar_tab_right.9.png                   | Bin 320 -> 0 bytes
 .../awesomebar_sep_left.9.png                    | Bin 225 -> 0 bytes
 .../awesomebar_sep_right.9.png                   | Bin 212 -> 0 bytes
 .../awesomebar_tab_center.9.png                  | Bin 1145 -> 0 bytes
 .../awesomebar_tab_left.9.png                    | Bin 638 -> 0 bytes
 .../awesomebar_tab_right.9.png                   | Bin 561 -> 0 bytes
 39 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_sep_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_sep_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_tab_center.9.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_tab_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/awesomebar_tab_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_notif_button_cancel.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_notif_button_pause.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_notif_button_resume.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_sep_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_sep_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/awesomebar_tab_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ic_notif_button_cancel.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ic_notif_button_pause.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ic_notif_button_resume.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_center.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_notif_button_cancel.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_notif_button_pause.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_notif_button_resume.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_center.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_center.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png

diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_left.9.png
deleted file mode 100644
index 9efdd76be3eee2d49c62b9d6a8559412afa0bb83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^EI@3^!3HGLu6vb%1kxRS9T^xl_H+M9WCij$3p^r=
z85sBuf-vKbiP>*~g6t)pzOL+d8F^TY%-z|teglQ1N?apKg7ec#$`gxH83GbB^Gfvm
zTtgJfjP*?Q3=Isv6fFd*a`bd@46*P}PH<@WZ=g1ZQG{VLC%3_$|NYD6sxg(8mKtO$
zd|7cIqoP5Wsqcxy<dBX;jcq<Hy2g&NT$lJwncw6v<R9E@@wY`I9cUPXr>mdKI;Vst
E0O{gCIRF3v

diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_sep_right.9.png
deleted file mode 100644
index ce36b7407eda5dc0c954d1526c1f70c25c58c4e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^EI@3^!3HGLu6vb%1kxRS9T^xl_H+M9WCij$3p^r=
z85sBufG}g$wN6f;AbW|YuPggqMjjR;b9c6^-#{U$64!{5;QX|b^2DN4hJeJ(yb?V>
z*ARs=V?9$nLj!{^MGJwd%spKkLoEE08=C$HNbyXtOfZ|s^#8x|kxcb~@Njl<Nl^(=
t1r3MEAsvbhJRIB&3>P~7J3O*yW>|l9vqeFP=1ZUv44$rjF6*2UngFGVI5_|S

diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_center.9.png
deleted file mode 100644
index f05ac804f9bb77cba81612c5bce2ee0dffa22a40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq003D4001=z1^@s6Dm_Pz0006WNkl<Zc-rmU
zyGsKx90%~K;3ViIIw%NEf)3(q_b(8{KS2=P6kL3)K5!9n5ho`RL<a>I{{lA!2c0^I
z)Lt&ROVXlf{GAr7wrU?at=DhhONTy^`y`i3dT_DW-xl)=sfbcB4T)$mKn8MjkV7q;
zr#f6ukGMiDxLj>9p^g|==kyw<Fp5txA;r(s5zo|lOl{bvwk$eaj|!3QG{)5aJLI6@
zOz0^(phF4|5zuBwoH(AGVNCWAdQC+lGsYUJp_7!ee}MW^u4$ytGnQ(v2xQ;)n;F+D
z)G!$V+|PLo&c>wB1Al@{r&K-l_FP19bK-EdU&hET9y#dQ%tgdhSrp@PmIhc|sK|sn
zPL-vr5I7r8pC+Viv5p+{9#ybW)wmyXlN74o8uBZ!-T`b*B<FJ23NroJCP2TQr|B9s
zSQawP!4rV|F)ov`yCme7RfJIYKrC<r<GM{nAtw^1fxdVJyu#ypYOg3{+QqE`u9QuS
z9xDjh@%=7L6D5vjp>Fd`8z$ds;s9XfK+CmnkvUhr^uZ@!m6ep^=(aDBnUK3cvXb?@
z$ahM$(wh$evU4Ng-Q1i-4sH(t$Kp!ElhZlKSQlH*#Rp_Z=pmrk4=p76-jHeYu?&<@
z{(D}^A`5*9lrW+%-ys7etN<CvKt_NJWFR9z1~LL<AOjfzGLV4`WFP|>0Wy$*i~t$P
l2#|psZRB5i7ErY&_6(|u1!p(z#i#%P002ovPDHLkV1nL#0E++s

diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_left.9.png
deleted file mode 100644
index d0f69846570720f6882f6bc4aa390a6b8140750e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq001KZ001=z1^@s6%T`j~0003yNkl<Zc-rmQ
zElxv05CGs8P$Z-YstQ361QciB20cIp0tE&Ern;Bl6eu*NBwPYR5N+Ar*<UJvWghU7
zXZl0i$BdXs#?E}%*&VS(@e{e0q(Kg-I|RdcLV^*DU<4x=!3ah$f)R{h1S6PPF?Q~N
z4Mw|g%?D%SfCXk4LK`t3EHDb<8Dd!c4HX)~JqrxL+a5wbSzxq_{SrcsdCqwY5n~n@
z1e{k8Qq1qEys*G%h`l<53<EIPM@%Be<eWFFy+V$uKV?#kv7uWnI8uypse=vQr$PP=
zqiwpF2WcEL8s%-gBRBI9jbi}(2{w3I6w(OBm~f1RZ~uZ=E2bQWap4pTJ}iS+34@Dk
zLwSFsY`VlEcbIV%#8iw@ss#W$N~PUb?+?q_fA0quuFA`3Y<yf-^I4e8Ad4^H3>q!%
SBox*F0000<MNUMnLSTZL<BoIy

diff --git a/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_right.9.png
deleted file mode 100644
index cf16c8e7615a801288d0971e020bb085de7b9725..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001KZ001=z1^@s6%T`j~0003ZNkl<Zc-rmP
zJxW7C6o%oeq_a?i+Sx1EXfKF6uof3!Wg!?`jEhKPDcD)4osDiFMeg~TpBqKtI9D_T
z#1uiuSDb;jnd*TvGcZ*(-(?exHxQONW*Vk)jAI<*7{@rqF^+MJV;tic$4tizL)e1B
z)FGY2U??;<I2g?zs@g@t7->2N!sI>@=9QUOP%uW4PjN7sACWM|91mbHrE4UNQ5fyx
zU^G9N*&+(YSer8#Old?h?x0}WUSf>vD44dp!N8VKFkhe$!Ws(3YE93~c^3ln-5W{j
zm22NY!2I;Yp*bq31q94^bQID>xp5nF$4vBI#&=t~6v=xtj`80xzaLD^_bmCUJ!7ot
tL?j*#W8ALmW>Z8~iD>z+Pn-c%eF6tM{#xwB$v*%9002ovPDHLkV1jH`kq`g?

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_notif_button_cancel.png b/mobile/android/base/resources/drawable-hdpi/ic_notif_button_cancel.png
deleted file mode 100644
index b1bcd06079dc098921ce1501daf086a839a050ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10(eP8K~!jg?U}J^8$lFB@1{$wN}xs}LLU<KLKuSy#^hI27z{29
z217_bC4b;Pq;%mp4*rEmJ}G7gEz3%NZ)T-+ur5qFZ|)iGT<yFq0R7K;*R_FM9RRx4
z0ibKWS%AKzsidMM9|K9fl!++-LrJ%izDxS5e2AH(J4rt!P295q&lmv@z>>AT0EM$o
z9CP3=uqtc*0mhyhp2a=@ziZ~BZW7ENm9<utI!oZOT&q=paap*@eAKnW{Bc?9xuMRo
z+^A7o029JbyUl#mm7(4VVb`0?S0NsNVJ<)qcru!gy4+Illfiry;vVSd01Q|kGLJ4A
zYMnaFS2fK65HL%GIIq+=D~)^2f8&LOvmUxRn-ASKEr8F7=1uWz1rY1l^BN&x&W**q
z7eIvgOL>kx^2D(lK-gk1RhAge1`xhDv}#-YwhkadET$aJCN;(G&H+SvJXTeW+r0yb
z5R<7|<gVYwjck}P_bz+&%pEw-*!}qEo#lAQF@KR^z7BD^Z-C1d%vT{+glOIiz*URp
z>kucq2DsjV`8ve$E&vL`3zpYV3dEA|;@BEML3p+G8hIxCM=TN{=4}8JgiA$=`D#3R
z<90>3M9p#mrU~X(G{>Shb|b_f2cS>5SX(ajmN@jp?~>3^=;Z*2(AubX<2ISM#GoaH
zW0!97Qax)5jo93ki-*n=f7{|XcIQkjM(ctiwEODax!BV*$6jSL#d7S*wcc8cW6Zis
z7Y~^!?ixlto?|!8)KW|Z5aGFe!WeS~h#1rN7+Q(-Q9#mn;+~}Ul73~s&xh{|A0_>e
t^yr?P2=Hq3X1|fW8XW+-)&Zbv{R1#$Nns?;kY)e?002ovPDHLkV1gB0Q;7fo

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_notif_button_pause.png b/mobile/android/base/resources/drawable-hdpi/ic_notif_button_pause.png
deleted file mode 100644
index 5f635fc10aba60c7360e69170c69507a1f4df38c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq
zL=J;6qiBJz6HrjH#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWIa~o-U3d
z8I5meI&vK{5OGmYTB-g~>XEHY%id1w{0F8k{-H<GVobOXs!iA>!Sq>y#pus7`&)UF
z9E5Z?2bzD-7Yj&cG(F3m6MjX8QHJX$$Ad}F^2->`WuE)UP_X`0Tguyti9IUI&nTQs
zT$tw(xlV6cdidAP&v;8R`DWTMy%4|ld&*S1+v_IiUixF7z-S6K4G*#TS&3DW-OO`$
z&*y!pHfLZ6K9#ggkD=na*=Dx~ED7-^+!?O7ewBWv{O!`b^S9EP^miSNaOh>dVxs?n
ZQ7LXG$Haem)<7>ac)I$ztaD0e0ssbzf=~be

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_notif_button_resume.png b/mobile/android/base/resources/drawable-hdpi/ic_notif_button_resume.png
deleted file mode 100644
index ac69ea59a43370a3d777570c7e8d5a882a32cf13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10vkz0K~!jg?b*+Z%~2S~@z<Rzl!daf@-O(YP$b#0kj9TlvB3g6
zTUjVuODPMnku3`~Op&r-WBgpBP!>WIW$s*yGZ)<%&79|ZzV~}4^R8QWbDrn(>3Qxs
z&pEf%?RG6>Mw%8-l|=(hvuL1cA_ku00+trm5~3B@Mtch;un(__D#|2Mfu4c2c#6?-
za`LJ28)#z%ZsI(a6j78(q=h<WH~tX&@wTd{9ICWXKO6B3JK}QkDQTdMl^DahVC-xn
zE%ej;`u#o*;zMqN97<N8pRLlFu`Q5e-qdNJja9gZ(`W^9%}Jz%eqdQ3*KHie$H3Zu
zGRRqIyR=JfDjBrS7Md;BYCOQHV2l|=TIf5L7s!1BNARUekU>_UpHV!)hAKgtG%$iS
zc!c9sg5*;28KW&7ikEOr8V<8)+5msfheMKyEQZ0r-!Wh0E^K6m@1ryQIf*N|iz5a~
zR-l9T(vCC{3D9&4jbojlc$zWLnT~N5JMpPXutB%bB)&=aggX`D{AQ2_y3+k%58ec0
z%wQ1HXwUFvY*tV_^;cjLQ#gUEfn0M^r-3QF!)|G4tA#pSXbkJsD4z1$Xm5)=gI)L>
z5tT#97V1cslLNRLR+LF816@4EUJLALvG@HVwivK@s#TyPz0w`S^<s)Lsbb)@G)2BF
zrY1n-RpOTPGI11Niz~_`VqmEFFaM<+Di#ei&4M@Z3!9jND^Z?P5&!@I07*qoM6N<$
Ef_wTT0ssI2

diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_sep_left.9.png
deleted file mode 100644
index 707c0ed921bc3827bfef2265276cb3df3ff49321..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qn!3HGP#m@Es38XvvIx;Y9?C1WI$O`0h7I;J!
zGcfQS1YyP<6SLm}1=&kHeO=k_GV-wK=^d4tp9U0?Dshb{3C>R|DNig)We7;j%q!9J
za}7}_GuAWJGc+*xQnV1L%F@%tF+?LcIl-afzk%8uMiGY1hAa~Q{<{bJwmHPc%AOJ6
wu+?&C|Dd3}$Y4u?w@Jql<{-YSOyBq!UOuZ*W~;fF12lxe)78&qol`;+0F=r)U;qFB

diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_sep_right.9.png
deleted file mode 100644
index 716ad8e91c5e680cde9d76119a925c7efc63251e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qn!3HGP#m@Es38XvvIx;Y9?C1WI$O`0h7I;J!
zGcfQS0Aa?gYn_}xLG}_)Usv|Kj65uQdPk+^rvZheN?apKg7ec#$`gxH83GbB^Gfvm
zTtgJfjP*?Q3=Isv6fFd*GWK+F4ABTqZfN=+AjLDmGQq5@@&A9pM^Ct}T)leG)s6Lq
pszdJ#XEq5Y1%@jh<vsqS11(FfQdWL0?+(<?;OXk;vd$@?2>@9rIQjqp

diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png
deleted file mode 100644
index 94e9de61b6253d08d3724371d09f7361af175ef1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq002Ay001Ni1^@s6)p=Qj0004jNkl<Zc-rmS
zyGp}Q7{Kw2DhfV<lZb+YE<S)S;h;`#K7oU;po@dx;$;=w)ZIZG1;NFkgODMYbIoZB
zML)mPP*OCtHi;&u-+@0_%4vUXdd?Z*IK>Yruu?{86IXD+Sb|3$fl`a1GCNF~BkY<9
z^MqFqlNjWvg)!`f$><KR=S)O<Lg@7dz{H<|nbyl(Mu+$z8aYv;X0RLlA~s(ECQAbc
zvblzDbo)=ptO730zVG`pg@NPAaN=X^y<*sOZYY`?xxv0_FW_X)6^8Z|N^|<dZJrJ0
z+^oj8OkJ?4?m6ePzXD6yo=;X=sA&(b3sXaZ<7J;I^H^hSH?GX(P+;704(g6gwL1{Z
zd9;Er>R1HUjJ4)6!QIo6J=mn?#kb&ORR#-t3$$MP0>(Y;%u+DmB7D*ZPEJ$CS}^{X
zJrAaPU_6L#S&aSMrew6;1IK%o?ch+DtJE)y%eUp=*q8>xI7DCq6PUmRCNO~sOke^N
kn7{-c2rl?Bg(~NK0D5@*h3x;J*Z=?k07*qoM6N<$g44Xqwg3PC

diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png
deleted file mode 100644
index ef913b716afdbe708f0d4bcd6888bc045b709b55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq000;O001Ni1^@s6lh67t0002pNkl<Zc-rmI
zJq`g;5Ww+QNHj#D(`gm1piqfM9Kms%K<Nkyg;FJMp_P4k^FDTGHzGW<VG|K6#7_4n
znR5QWWQ4ene=N(eg^M;jAOaA800bZa0bnb8UuOlt;)oY;xL^b5JvD9d$Oh1R#<ZRj
z*suWrNuT0ZKEUESkFx;U;iQOH4oJifMI#nKO4+2~{yAP5;GAnyZ1)<k1kiCdpwQu6
z{4c<mtg9?8DRL=`{|rQtZ)lxP>2O7R{uC|+0HBrsRK;=6m}ICN&cLK|Fv*q<PTxe!
c0ME4I1_VudjeC-aSO5S307*qoM6N<$f<O*%kN^Mx

diff --git a/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-mdpi/awesomebar_tab_right.9.png
deleted file mode 100644
index 454f34a06ad75b06c5208aa9a6ab2552303b9a7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 261
zcmV+g0s8)lP)<h;3K|Lk000e1NJLTq000;O001Ni1^@s6lh67t0002YNkl<Zc-rmN
zEe--P5C!1!lc13t04~4*uoy1E3HAb5GzyEsa1kznLEtv+cFNAOsA0MxfPjP$o@<lW
zr0UCbI;k<3CHFiI1_<E+lYj&yAOQ(TK(mYVpn#=v3I!bT8Vh(n={2>H6-aTuOrU_H
zY6}MVnllfOfaq&lL4jBWQ9VQgF?)Sc9V8%soQscuxWG%Tq=f^TlsoTz9|&l4%5C8J
zkA3+9c;;9TFY-{2P{3;rmUvT8m1(bL-t#yPX}nIYwEOPE5m3wxWU_KZMJ|pL00000
LNkvXXu0mjfw}oYV

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_notif_button_cancel.png b/mobile/android/base/resources/drawable-mdpi/ic_notif_button_cancel.png
deleted file mode 100644
index 64e7c9a3c200c669ee311ddc1452453e46c9020c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 497
zcmV<N0S^9&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10d7e|K~z|U?Uzk%!Y~kphpu~!h^VLsh(M6!{G1_2Xh4K@zAlV~
zq0Wq5Dn*s@B=78bU+m|ftN@u)Z?n2D0RIJ`5|K_s+Kjq|h#W<vF?#}9+W`Yk15g|N
z1y}=LzzAG{gVtXwbhs4=H2`~MOc|JaU2h+f1<*vyLx@<x51@ZC564tF0LO_!UKd~+
z^xr7vUR@4A!Oy9TK~%sea5DN1K$`>b93~CooM2v0`B;fAv8Ps(6<QO(3YVq}O8RpE
ze8{YIel`z7`Z9pv!gfwHk8ZhG%ef2QCGF@QMdX@XHIa0C`?3^`xaHdX)e`J7%tMGC
z7vPrw_S`R{TzQD{w*a+aKH@^D&CZBB%+|R8ZG!m;w==3lh$07|GYa-RhRh1-h`ZpD
z0V?7%poMEUF$Ub#-sAxIg5jIMPo);BSZLK(k+lo_tH=yf&}tr^aq4}Lat<`O^^1mR
nqP4gjnMd*pmS3|4U|xL#Wo(iwv{AY?00000NkvXXu0mjf#~;iT

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_notif_button_pause.png b/mobile/android/base/resources/drawable-mdpi/ic_notif_button_pause.png
deleted file mode 100644
index 81712cabed27c3aba37a0789a41f0196af80459d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt+|FE{-7)
zt#7Xzay1z6v_9PbYRS5}ReksVn_N10)N#&~T^3Uoy;vafkkv@VW>)^%PQ##0s}@~n
z{lTrk@Y?gY%42<_hrA7}uhxhkP?aoy^Jz{k^M_1Mg$4#D4lr@S=ENC?`ER2VJf3mB
mXwW^~Ti!2SdzM9m_XgvIUy_Znsh%MJF?hQAxvX<aXaWEb+gQT@

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_notif_button_resume.png b/mobile/android/base/resources/drawable-mdpi/ic_notif_button_resume.png
deleted file mode 100644
index 77f87b387b96f89fb54374c8452fcdc121a05e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Zd6mK~z|U?bo|5L{S*U@!z09MB*8gXq2K95g|f})=P-m18C@V
zB7#EV0VdHYTneH=Bs7XMhD;d6G0hZapUXHQR=xLL|MRVHUrwoBuPag=g}VO(1Ok+?
z)GmNhKoh>Bie0SW?WX~1==y@V#T0Jx0!Y#W-5A6v=86DljPJuXHpG?5q$CkE>jhVs
z#(i3VEZeXLLpaAo5dhGMe(YgA&3aiPXjTPhn8jl#K%OUIFGg{R@ge|-D>Z;4tfACu
zLY@&ctAb<9e>bSzm(fM50U=+O^u<y~gk|jK0gyyhJYW*nArtb9AQCs<aHx4GKu81;
zR<R&HqJxz+f*PJNgOfB1WNE@kd=JdvDUCVldmzFV#<G}`Jc1AL0keq1EXGLy8WFtW
zPQ1l_{7LqL1B~QpPFMxX*uiF=#tnsBMs3xv_%r(30H3RcRM*L2<_rJ;002ovPDHLk
FV1mZ@xbXl0

diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_left.9.png
deleted file mode 100644
index df1b602a22b9fc628151cf01787b1db48b0bd1e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^EI{nW!3HE>Cz?uv1kxRS9T^xl_H+M9WCij$3p^r=
z85sBuf-vKbiP>*~g6t)pzOL+d8F^StMOG>F`T>QcN?apKg7ec#$`gxH83GbB^Gfvm
zTtgJfjP*?Q3=Isv6fFd*a`kj^46*P}PH<@WZ=g1ZQG{XhNr8kP|K-o_VH8@idUdlU
zi&H;WPaC_1BG3LO1`d%thof>@xwai*mEu+StC6O_*`UnHpp*T{J@47JK%jvPp00i_
I>zopr0Cy5TrvLx|

diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_sep_right.9.png
deleted file mode 100644
index 0a9aa330ddb611d01cf5da1b16a2a68321b68e23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^EI{nW!3HE>Cz?uv1kxRS9T^xl_H+M9WCij$3p^r=
z85sBufG}g$wN6f;AbW|YuPggqMjjSZkyQ%4en26q64!{5;QX|b^2DN4hJeJ(yb?V>
z*ARs=V?9$nLj!{^MGJwdEIeHtLoEE08=C$HNbyXtOfcKY^#8x|5%!=3>(=q<8EF}4
v8O&kLnACVez=6$$tKp1;A-mFt`HT$l!JphE8ft$4&0z3!^>bP0l+XkK(*HQ}

diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_center.9.png
deleted file mode 100644
index 812f6a380e949649ab1265784151535a11b1144d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq004FX002e^1^@s68QoyK0008vNkl<Zc-rlq
zy=xRf7>Cbq1RKRdu(1)eP*Cv;v=AFB{{RaMD;u#8EEELAN|9hCh=|%)h=mHqUc^cW
zg4$@IvGKCI^Kmm970vpNo*^Wjcgf}McJ`iuhb0``?f#zKcV=e>Qmd7}6(u677TpQc
zI&+Fx#L^H;qkGj_ug&b_!PNQ_sqvRG<L?Tine}6G{2*k)ccB;{Ue4`{9N!Bsg~xJ!
zH#6<eXT}}V+V2`Kiq%6awkV3FA%xVrGa~Y#1oUaZ!WNUCnaSS?_eA)~#M&*D7ArDW
zD(jER9e+nIexgDm+hhH>9B-t?9g!TCS3+#kXl#`Wx-J)%4wcLngi<bfjD%dG6f6DZ
z0lAQ;!W2SV@=R-YI0~`hPHYNAT<1JbO}?*`Vx{j`C1vKKoa8q|Er=<l{Vi+l`qGF^
zOuqNeNDx7bz=SgH_`t;~lb<fZ`(*`j_v`gyP2a_aVS6YY2<RzqjQP5`Z(_sjiu~vk
zg6~ghPHn!w=VHSkDGbvIystQ=8i#r&R-`VIA9+O3gPErebLl-1E2Fh*1Uyi5=G?YL
z6&qGB2(}#a&K<t%wim0^<R<x2L$IY`RJz3_U5Rb>t1k$%WN3e`E3skClpssVkHqAA
z79_Ur+y+W;sh`@{Qc+jTTkP*$00da>^<Al`^Aa0|)vTq)@d{*&S=X^xW&Hy}i=`yz
zS2_}#Wo|o9YgB!0p5*z)wqjH5ZxdK_PwmzJiVd?G;SM0I=uorPZ;M%*(A-%<iW6n>
zQ?11s|CW%Vokt$~r`WJNpMWBNYL(wHM{L;0OgOP`NOvQ1#L5RB2`BnjpU=&epW<&B
z-bpakATfUTv{+^Q1wyF|m#4+bAFl|cI;%c2#WIChA!dpt5X1sv0kMEsKrCVj1hIfv
zKrA2@5Q|s>K`bB^5DSO}#3GhJ5DSO}!~$Xgv4|xQ!~$Xgv4B`W?2wDCmFpkeL-*8v
Y0Zwdd2m))=(EtDd07*qoM6N<$f|NsVPXGV_

diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_left.9.png
deleted file mode 100644
index 80b413d6f07d3097e8a032bceb34fb12313e6ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmeAS@N?(olHy`uVBq!ia0vp^dO+;P!3HEZ%Pj+vj8i>b978H@y}fRz@8T%H@W9)p
zm1AjNho9oafG+t3BK8g%szQ66mVab6QPN_qYi_e&5We%y=H15c@4c~gxn`k0QT&|j
z^Sga#R4%`(x#^Qurag5#N2`cn(gN4bheZF`-;RFB6~5z;=(>Vd?HFv#?#`ABCzU%(
zw&)4vO+0t>VD?snoW?yCI~ez$GM77YFxG4NqX!HI$6mz9%&D&aEUL@jSE9<7cR_#O
zV%LMZzk~}58jh(X%O5!?d*Pw`77mLfyR#S63k%%hL@r)DT<N{8rmatEp2|rM=KP}v
zEC0yWxAuvhTV1<Y*2>Gmp?0Um=Ed#I7i<<kur3MtQ2m9QXVcsTiyOBei@T<|>-`6T
zLk*6%Qco0{zu0$ZvdR3!1F72|>^nGnf5{TtbI1HIE<LpRszFN7{<E&{>zMU;@8xiQ
z_#JcR3)7$FAJojwmdRWy)!%5_`Z-0Sr0-c&_OBIp53dl}v9(M@@Hpcq&Dp7&&t0AV
y<KgCK7xE>~@JUo1W4}{iH;pluo&V6LPfV;L44yu(e_aH|5QC?ypUXO@geCxkrqQqf

diff --git a/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-xhdpi/awesomebar_tab_right.9.png
deleted file mode 100644
index 5d5b36266edca44315ce672b0a4a8afef78af0c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^dO+;P!3HEZ%Pj+vjOCs#jv*Dd-rnBrb;LpB*vAzL
zaSmHVjvRBEf8f|9ae-*<i*6gXZj5t@c073QRL~c}H)~xt2#8*5edCkXc1EMZavtOL
zB-X&ye;;uFnH{oU<?u<?AQ6e#C11A+=L#R<{Lj2cVNSszPIVka<AY;MG<_;MUQZ}^
z{a8}%&e1OlMm-hBmU0zx3gy+<w6$da3rpb;)C-+DP4VHeqro0Kz6Bk#=;RQW?Y%vt
zK>oc;ih$rc<GpdMEz$GWeO>dN`B3ShmK|)I*X4Q*lRFCL8f5Ydzk8g0dwHcx#k*zf
z)6cAbu(Nos5p&0fJBnI1*Bx5Bc|WdTpLW*%!TjudmgbEd=kHpF>nj~9&c9U`8u~cn
zgWpo#uVJfI7Xw+j(wEj1pEm}w-e0>a{;Oh7=G)6ALVI>=zdi7)YAH`**zrtxu06Y>
zc3)w(y!iW2-@fO0PxLc)oe{gGc;@NqDaUg+Ybx6x>V9wU|E20EdzJO&4;7rYDZn^j
N@O1TaS?83{1OSQ5#nAu&

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_cancel.png b/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_cancel.png
deleted file mode 100644
index f00e43782fcc7b279bcc8dd7ffedbf495c55045b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11Zqh{K~#90?V8JrTtyVde?1ddGGnIa#S9Z>Cn6F=#I^CU%t8<)
zD#1WdaFdOHM79nDg9*{lF(E`EAxqzjVVI0DCcbsZN|XpjP~64&T%0cK?&-&^s?$?Q
z`h$XL=H7G8_uZ;n=bkz>N!-mCD;+>-j07khKxvEwC>=m)j07khKxvEwC>=m)cnL58
zG=NLMvXjkTI0766W?ZaE${mxER`nllO4{RKx7%20@pE0$bgs?ZfbNsDrtR32wB$&<
zCh1ty_Ew9ZYm(}v1lTQUy$kt(pCm0hkw4yre85#nQ#&odl%$P5<O6<?w2(>uL?7}2
z8?pzoBLdWAs#nE#lI9cqj7d6GfqcNaY)KAPfN9yfi^VsR<|4_TjvybfCVMFlMSvOE
zn>Q6-Nt&(TXIxUFc~1=afK^Eo75qdCa5N#9P7K<*#wDF?UYkNbpwY)i+lWboehsNZ
zM%u9#_z<Xf`QI+!EO4Odqn6=kvhtNxm1>TVh~zvSY5Uf-OVR}=+czaGt0JdZ0Z{jZ
zBn4sXx<}H*Oj`k)ip)Z5QuK_j0dE4Yl0Q|i0Jnhs88!kofqlTwF*l_M07m*P;4t|j
zc;H8j{4cRLrhW|ycm;SHBcJnP%srU+9(bGt@{m3Q0>&^A4pL?&d<#5*Eu$pl)&sVH
zL%<pGXF@E##-@ETdGINSYymF==h!(BZeUOTw_HQHOQ03wSR(VBm%$$R5_k&u-NTq?
zP4FM!Mc_S0o1ORqcoHY_;9nHIgQc?XJKF{L9DDM&J&g{dDtrfc9=P26?XkwL08ayd
zIM`~#u*%~10`twkbGF7H-YwwotcZGG7y?WI9{`Uz*b3t92hL+(jIQt&ppJd+KI&{2
z;2CVIbrr!=fN9_(;1Nfgop=^_7u#}O;3dE;@G<bPlf7OLmS;3@62U`&IgI>X2U~*>
zGR*_PJ2=FjYhWJu1b8SnkO%}3Ucx@avN+`2ya0R(JeXl4HAe^{90X31vDKyuu!xa=
zAk}dbIXOZQ;Sg4wNwSq9z!LBoaDR%!4qV2vyi^1c4r67ycoAX>h|PlIrc(j)qO2gg
zTh-1P`ymu)k14Xq8*}lptmNzw=ml9RJlLL6+<9X^+bbH90GFHsJg;{0Vbqm&?%2)8
zkuLVLPlo=CUSBOM4O^e*fETbY#!lSEK6h_q_zCZTh3b)2p8*qUZ-t3{Dh=7$-ylD;
zvV+uAT$df>4&`KMQr%l(dLfWMEj#kA>Ss=Nq#lcFitHPT6#!WiLci9SPV%QB$%ip7
zYp$q@t4in>N)Z4J-ns($6S6j!R6h%{Hk(1%P-34@YGA1M))mMf&m<qlqO9Sn7uJ>7
zACxNq+P-zQCL|u@!&p-H1Z+(SeL<cAAbaVww$4N)A`xSc+7q!=MfL-A8(s$^Gr;Ru
z7s(qQ276!`Siy3V*MPrr4SJpo{Vy@<7B3w@X^aFY9YAS}1SlOqX^aFY9YAT^^#c40
X@w81DKldN}00000NkvXXu0mjfR9Gk5

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_pause.png b/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_pause.png
deleted file mode 100644
index bc3930fcc219c390aab75ba2d659264d19254c05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&nLJ$_
zLn`LHon^?^<RHQ-AJ_HxMedgGOjUfgQ#Njil$I7&T_cdjYuqV1d;jE49g&iyQ`XGn
z)pbZ_h-x^-u!W(QF@sTx`2v$kG0P2gP38LSDt`~G`L{Lg&7Qv@Kl9qcAKqeouCiPI
zx}WE^sh@Y9`kG(C4OGmwfHk9o!MXj~66Uw!f7qcSHZ0TcZ7}6=;JzTyAhzJ6=7ukA
zYZJlt9GEB9q>I4>+V0=D)I5h5WIr3jw=V)YoM7gR#A8d7-rAlleDKTk<l>}z3zOcu
sKl>5#ZT&|vpv5o?3>kDCHveMqmr>R5lze6;0Sqz*Pgg&ebxsLQ095geRsaA1

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_resume.png b/mobile/android/base/resources/drawable-xhdpi/ic_notif_button_resume.png
deleted file mode 100644
index 2ce52f803941cc582a296542acddb3c94c9ccc7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10@6uDK~#90?b<(Rl~)+Y@lUMP(n`g}$*Dr2LWdL-aVUt0OP91*
zgfvJjROlp5E{=i@4&tJlLzXzGv|U;RrBs4cY(T+91W{5d4o0FvqPY$y7cWtZ$@`r5
zyf5DGk_+Mfp6C2{e&@b_&OoQr@jkPnbOWX78&JA|()0}|-9Tyj29$1~G!X{;fxqy1
zfL84c1Y8Jp1!nLg&Q=wylZXlE8n6cAIEhsOy0s870rMDG_}p3e{5N*vZdLKzL{0#&
zjM$8S@J)bzR-z5)WgULOQG5_kCkqh~c<${B>_*~G?7_cPi$#-j0(cdPuQ7=o0rf)3
zZ9p&UrE7-6L3Kljh`=m9T;g|r#}9Z|wRlzPoPb_-Nxu@?0_s<ylmV~-mvJzlhh-BH
zfoJ%rqQ-fQV!CQGOQk8B(Gad<u<pVoBe0myFoFF+dhbM&41m=*g)w{*sQXr$5`o1G
zOE*-Tau;ga1oZNSWWsPJeKgwu_*ja=X(=AzG&KT?`AOO!H%1FLeFAzJlzu9QB1PL|
z0DOvbIBx0pA8#b$N^n|gtZpXoJ?>W#i7?<1)>ai+CO7eA6@j)zU@;R_1=?!B3mg(~
z*}SrPFSQ%+pY(k3a)el04Cp>wy&`RVQ&GZgiNF9(V7tJ@(~b#vf_*Z*b8NZ+xA5J<
z-z+pa0^`^s<Kk(i0dqJY?esIj+ON^H2uw-4{FOk>|D{P2a7nu3t8MW#!+;KsVJ99`
zZ)a&lL}0$ccOPRfE(G+kEK2SHH}EZP2lTLPN=0A{TNPeB^&2pUpD}``0ktbrX9Vs^
z2dAzE)C?o{1a$v*5npN8;;APBN2K!r#ScTgiJTFbmQI2E7EmJ_xeS<;?&9tQ=w~HI
z1kOlDUmCx7Vhxy;9#W1<r$$;qL<D}7Oc=qn0KHm?crnsy+VXZd8+`*xH&B|s0i_!#
fP2Ygh4V303iw~YqV&68P00000NkvXXu0mjfz*lU%

diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_left.9.png
deleted file mode 100644
index 697c696a7aa7e8a3d1372d36ceba0e30db1432af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^EI{nV!3HGfEdH7V5=eLSb!1@J*w6hZkrl}2Ebxdd
zW?<ku2*QjzCT70{3bL1Y`ns~;W#nNomwk9DJOd~sRpJ^^5}cn_Ql40p$`Fv4nOCCc
z=Nh6=W~^tbXJ}yXrD!2gm7AxFV~B-+a)Lv{e*?8Sj3Nx1S1KO(@ZWwGYjfCwb?f+^
zg>cwv8A!=JXfe1l>F|QHNfLaA!}t=l`zI`7+%GnPHz4}JMm7e;)*oK?-s{EyO=R$N
L^>bP0l+XkKR%k=p

diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_sep_right.9.png
deleted file mode 100644
index 2469120423dbb5b8f1726c0b067bb1bd2bd0112c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^EI{nV!3HGfEdH7V5=eLSb!1@J*w6hZkrl}2Ebxdd
zW?<ku0K$w}*E%_Yg6t)pzOL+d8F^UDWgngj&j1QZmAFQf1m~xflqVLYG6W=M=9TFA
zxrQi|8S9zq85$UTDOw0rW$EeS7-Hd{+|cwtK#FIAWrEpNmVf`<JNWY&ckQy;abm@R
x6$dVeF7W)epp(I9K^p@HgYHj$m4C(z3_XHByhOzxG6D@@@O1TaS?83{1OU%DJ{tf4

diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_center.9.png
deleted file mode 100644
index 9b06fd67db15b0f12c4d738a4d55fcd7523bc135..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 841
zcmV-P1GfB$P)<h;3K|Lk000e1NJLTq004ae002q|1^@s6mj7EY0009JNkl<Zc-rlo
zJ!lj`7>1(}1qHS8r?C?h4A|IfC05bKLP10{rG=FiqJ<#-U<x}0dqEIU5pCjMAsDq1
zK@kx##^iQpXLn`|B<K2VJjg}E<#M^p?an>}58T0VJG{@$x8Lo~_Vg5Mq&cLJqp%Za
zwC)?}NM|6Ofpmr+(sMJ$o!cB3yElm3ac$f=9lD#!xCg>p;j=I<D4{B(U8Gu@$9QdC
z?}Ufhd;{aotI!R|`+Z9N+Jf}Dp_E#uBiFCO<dO(}A|Z`+S!AaORFn+Kk9klTdpM5c
z4W*K<tnE{wJtI7mFeW{fJRiTOD_59Y);ivurs;C;q-QI-R_=yNDtSJ>3KuF-w5{;c
zjhWc0B6mZCCx~s5&_2z2fx=18nwKDSw`B5Dh-{f*>38-^>0g#>=`z6;L6n@530tJK
z3;SHf@s3<d*V^vnoZT@drRlpeI-0J@jdUsHCuCw1$mul6hc>PHbTQ?8)pVnVkfp@w
z$R6#A^dJb<);di@bcgG*=z5n-y4HHV9P|yrcNgjI?}+%79hW{blCG8mz9RJ8aK8od
z=|axoy>gIy1f9FTb+;E->YJDT_l5x>=d#p?$<?+?*HLnSaC0u+*duL|p55b?FRc)4
z?y;3P-o9w**|lH!vd08k7~W^i_M)U`H~k5+aAp2l%hIPWz!>*~APdJ-#kgH9NzX3w
z6JRk3jC<W+N6y^R$E@AN=7+-ne?PP!>DhUK(2Bm=?Z<47LsQa!TDy@|?#uQoH_()H
zZQNM`^M+4zoZHj?wmiuPzY~^McjNjSN)N*1AVGOXlngbLE+2YCQ2z1H<=GkO+2b}P
ze(J>c)qZhK>DnYG3CLIJ?ps|$m)4i|mjvW-L#N|Cv!vHbdzEm!zF0FjOL`EwV+7+p
zUuH>Hp}R{cCBWLg8R^Ewgi?y9Vo%pgCy;XR0_i2(V1e`!f^?(<(gEp!bU->F9gq%4
z2c!ei0qKBrKsq2DkPb)(q$8a`kPb)(qyy3c>40=VIv^d84oHX2Nw2+ta?tY!0sETe
Tf(LY100000NkvXXu0mjfnMs{^

diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png
deleted file mode 100644
index 6d98383b5b36c10f17748c2aa624b4734d88d2a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 504
zcmeAS@N?(olHy`uVBq!ia0vp^MnLSv!3HFM`mxJ0Ffi`-ba4!+xb^nNUVRov3APWP
z1qJ86P*Kt9Z0qn_KIy^-dkxp6A}asbyo9O(CuNv;b@nx7_!Zuq+kg9}@`;LXdO}AZ
zy}NUK-|X~Bp4)EK*4><0e($c+LbIAvBIYh_e#Qb$9Ev;dJ#PWgc!*19Kfd^zpr^2~
z(7UqnO?P|6`)Y<tA^wZE&N4kZ>O7?|dS?Sep|YINl+(eSPIgCj#C{YASslk9cf^@V
zShr5m#o6ht-%;l+>wFac%&y>QlCN>^Xqhrc+Vz9@#|c}uEAlN0F=@W=ev#r<J@Z{&
z&K*rGx7Pk`5n$Ggw3eK8qpMA%yN;v%{@eVHGtL|Ie+hhgqwlgz@#HhN^6C(NrOg5g
zzc#A-y>d+vTC`QpZNq0bftk%2Z=YS5ci+701P_aMri0}6UWfH(6^s}I&Ef*pc4doQ
z2=(}Ce05hU%Z`8g3$!N~tm#?2<ef@ATQutn4i!u83mg5~&2I7J)O51fZIQYl*0HtB
z<@Ki~qmOLo8k21v?2J7q-KMhFFX(o&g4}Aee6xAsT5+y7O7A4_dp{Krea>|Ks9)<p
e?nkZX52+g*Pbr-(;ok;~Q3g*}KbLh*2~7YO(9%T!

diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png
deleted file mode 100644
index ff6980547158a1edfa5f0ba055ea17bf8811e8cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 445
zcmeAS@N?(olHy`uVBq!ia0vp^MnLSv!3HFM`mxJ0Ffg`wx;TbZ+<JR^y*G=a2>XXn
zgAOs?CIyL{NAnfjW^-tD9L+PC{YE@TZQ~7=Zn4=HbGCF9%sX@L%(;D$N97;)R8?;;
zSTLie|NQ}RF}2!?!?Vp3H}~A<Vh+kLh-VaVVE8FHiIIszp@9J}@x^(~*2zi=x2D}z
zQaE*CCWl8}=Q}5fsSKQ_e()*^Tsyv+y|Xgy&R(er6QplVWZF5A(NlAktDr#ag_S*B
z5mmwG&U!Z-`5~+*P<3){^aKXaol}@RlTR<>=~&AC{EkTViSl#K9L_=tFOS`y%((H(
zx~=h(8Gg>`o2ofo)!~xh=SoNIKZ<uxfBN71yS}L;`g7rK*<&}H_Zd80TXt2b+T-p;
z9$8x<-{STwy$WG395n3@OJ6#jea5wB!P;Y;2`$D;?7thfb6$PfQh08{vDR6$KWUZi
z{%aAsUi!0%xVG6DK_d;lXI6VXwtm!2{hRmap4VIh+wEJ|rS%#L?_ZJjINs&lNjnCw
X$uiCPTj%uxqlLlK)z4*}Q$iB}RW7-o

diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_left.9.png
deleted file mode 100644
index 721997f85b68dbd991dc00c1cfe476b45ab0f3b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^EI@3;!3HF&FIAlb38XvvIx;Y9?C1WI$O`0h7I;J!
zGcfQS1YyP<6SLm}1=&kHeO=k_GV-uk@+SSuY61#LmAFQf1m~xflqVLYG6W=M=9TFA
zxrQi|8S9zq85$UTDOw0rW#{SQ7-Hd{oZ!&#-#~2+qX@%hPHuxg|NEECRbwhGEj7qi
z__E>v2N(Y=6-^%JjZZmpESYt_$<O()Fs)%R6T_lcD=u`*=JN)c#Ng@b=d#Wzp$P!8
C^FI#&

diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_sep_right.9.png
deleted file mode 100644
index c88a504435e058bccd07c1375cebb7adf011bdec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^EI@3;!3HF&FIAlb38XvvIx;Y9?C1WI$O`0h7I;J!
zGcfQS0Aa?gYn_}xLG}_)Usv|Kj65usyh;DEnt(!5C9V-A!TD(=<%vb93;~Imc_n&&
zt|1C##(JiDh6V;-iWUM@nR&W6hFJI~H#GeZkm8wOnP4`N>HmM_Bbn*};o<D!lA;os
tOeUT|5=<u=HZX87^#0&i`De_)aOd2L3#*>~_5+&0;OXk;vd$@?2>=|rIu8H<

diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png
deleted file mode 100644
index 461ca3049580a4adcad918a79ff12dcc953c6619..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq002|~001%w1^@s6!p8iD0006MNkl<Zc-rmU
zJxjwt9LMqcJm};gC?dKl_yR;66dfGINdyJKP4FcM?rsXsqA0kio1i%8>g1$?pg1T#
z-Q_OHB?wCVr_^ArZB3J=ZTbs*DIMB7J~X}K3QZ)Uznq9F*;UfPV|F<J1!(z$7VYBP
z?$UHMp-HvGrP}1eJfp`;>XG7<O*tWFr{4Q9IhHU_-Lc&{&|D^kuzM;7R7%;(r8&c;
zwauh@E&^6qz0o{(nXcwvm1-|LP$tY#Ce%Jn^u3G`v-QcObwVG4X~%IIN(xGo8K+z6
zyaExkb;pHTAlRlzK{d_proj(m1o^ugy6eUw0o8PKjs`ShjQJyL>*d91DGDgv2K6+^
zdUZgip<Xe==nEB;FdJz_+^arJFOBQ=U?`x3Sw~;g2UU#uof5(r4h+hqxe81#!MWLA
zFeq()XMvc}gJBqLzClx4BMHFFXzzVYUxl^4K<R}?z{|P%Fa8_UJwyOlUQnGet1~ZX
za#fesHNf)6q}s>}iiOBmAGGQ3%?+xn3qbj5Gb^ZO*h2vF-TSLj9e;wlhXDX8XdAVh
z0s8dhG*{0lQs~{%VqTL5%7irqm;fujZVjY?((S$jm;ecD#RGMJOGzG40VdG7sRt^A
zIRcR2d7$)U4Itry-UB3DP=Ejwpa4Yx1t>rfKmiI+1W<qi6rc#800k%lC_v)|8sVP;
b#J$89vF-&V-QM;100000NkvXXu0mjfM(+e!

diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png
deleted file mode 100644
index 178bb1dad4b0f587d71f0ba019d469e226777e40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq001HY001%w1^@s6Igtrj0003dNkl<Zc-rmQ
zJ!%3$6bJB45K@NZ0D6H`dH@O7r%PdBZEK&#+5=d501GSckd(QARjLHs_u=mBVxj9>
zR9M8Xpzhn^4NN)n|G}Gi1LJw?kz}UYPz}!-3{tSF7{nk3F^EA7Vi1EE#2^MSh(WF+
zNRqokK!{wm5D=iKrw);_l#t!8I>e{w9oVUV5P5?5Qios=*HeT#L;#=a5a6)6MW{iT
z`PpaprwU2Cs05F*2o;F*jE`MJ?hqi?me8dt#OJ6Zfs1{JTp)5L9wexL2#^azUe%g}
ze4j$x3<40Bk=)=|DQ*Ul65LNIY)GRT%Et3^0at+lz$4Dw+vW`X{5Sk8NE$*!Pl#~^
xg5U))cts9d(h<A<%#CF6<j_^T6p|=UZv`cYbn$hM6ng*w002ovPDHLkV1gA>lp_ED

diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png
deleted file mode 100644
index d307e7994d030d3caf67c8102d2e47ee6d3d7aac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq001HY001%w1^@s6Igtrj00038Nkl<Zc-rmP
zze)o^5XbSu+CK;ub}4Lq3m?E*E87I|E%F+%PpeI8`*c1)u)AY-XZLn4hX|8Bk0gSE
z5)At*X5rgh^<npzWs4%;k}qvO<X)nXpCE-o6rvD?C`2I&QHVkmq7a4b2q9`OARx{+
z4-gRRd4>XM%Tf*zAYy&I1%dE03gkV6aE1U8OFYDYc%Gv`geYD?KvFL#5OIO8At0$m
zRaHj_5HZ9P2uNRZ4+7zjgt<Y0^qBn*x<5hsf5!8pG3Gcs<g>tU-7PI52YDgeUQ?rg
z+@YNz>*_T8rY^+0GRE_qkZ*%9^^}fq+~K-=%hvU!bISn{omy*8etS+x=86^CRe*f~
Szk<L30000<MNUMnLSTZf`+!&g

diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_left.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_left.9.png
deleted file mode 100644
index 163e955eb851af5b44b2d2824fb9fbe8ebb331c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^EI^#Z!3HGDV~Q+60_l#vjtmSN`?>!lvI6;>1s;*b
z3=Dh+K$tP>S|=w^kiEpy*OmP)BM*x;V`QC+Hc&{a#5JNMI6tkVJh3R1As{g`uSCz!
zHAJDzSkF|?(7@nJ(L$gqFHaZ85DWk0AOHW`GjlLA&TvRP!1B;2MA%`ISkhww@fE9A
zH?s;I(O=B8_#xw2pT#E=E1t7ue6-X#Wf&pKpg;MffP$4x1J{3J28NsYsVla7Z*c*d
O%HZkh=d#Wzp$Pz5u0cis

diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png
deleted file mode 100644
index cb5d678fa1c880c284c667369bdfad28792a4992..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^EI^#Z!3HGDV~Q+60_l#vjtmSN`?>!lvI6;>1s;*b
z3=DkxL735kHCP2G$X?><>&kwYk%z^aF|y7@8z>}I;u=vBoS#-wo>-L15RjOeSEA?V
z8lq5UtY@lcXkhTAXdzIQt*47)h=qT0L(_i;1|<a<15U;Sv$re;Yh({Gm6nz|{9ADV
x1U-Zq3fsCFI0Cd79wmr3bTMg8I8e{VuvI;E#RTu|j6j1JJYD@<);T3K0RZ+NIJf`+

diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_center.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_center.9.png
deleted file mode 100644
index 6b92b662d4bb522337a78b52a54b379a339dc79c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1145
zcmeAS@N?(olHy`uVBq!ia0vp^%YZnEgAGXD`ncjM0|SeLr;B4q#jUq<eLF%!We%us
z^5_v0^H`*3(#0eg#8smFVv$13j*B``XOucw!rd}B-*E*6x{0tXT;tmv)+JTzEU+R#
z+qGrUq5hfW=WL(vDPFfYWc&ZQJ9&)G9sj-W`QG2Z5BHas7vKN?=iX1d^tQHD;*s)!
zFIUtsby&=G@nJIL1fnA<97j|nCVY3k^R3SF>@xlA*?HH`?Vlb|?=jCmTlyUL^d~=8
znLW&}yvF*UBl5@}>#ysC-|N1&|7d%Nwenv~WPOD6|9#v3@jkuuHCfT7cSh>I+-bHk
ztFO<WeyB2b_Lt<;%lS(-gglw_waX>tucKYRmUvq)r@q%dIoC6KohxE@DQ<k|{PR!T
zBsqZ%n(s8F_0-h<y6paN>qW*li==H5`_peGdrr!m8uigQ>u{g3-A!4J_g<g(ix^6G
zbk4fiGI^3ov%}t($G!f4xxMFR{|2?QUh8F-7XRO7V!U6;Yh}d49pCCommWP+ztE`a
zp7O~Zog#rB=NFiHzLM5fO|$dz$=MaX?~jI%OW#NPXLnaOieHx4@5yEouJPrc)65T3
zua$@K%$afR)={M=;vz-%*XJqv=G@TNy{F8qxU6Pnc&oI?yM_mc@_!zwz2Bv|e+}y;
z`=2Xb_yjLtHW#1u?v=IS++u&x)g~g37$)!dur%mZ=RSerGdrI@S-L*BKvYs9vVN_1
z@%*{M!N25Q&tO}nvMlY-GmWEXw#RwyKOE>W_31jJm)lkxS#$G?>b32P_aD!S_#Y;c
z6lML7=dAf1{pH*0+*c+&+kNb*>%S!i3BTk5Bsb=3x}K>y8y)u`or^I|@riqEmEN+l
zhb$-CcP^iFD0k_lR9j)=^~*eMOit+Q&a=+)JM+h6-k*(9ob75B*Fp`C{%P;}tfV46
z>sHO3LkTMi4YzVydm3#yv7-3h$-eGLAKpwMp4<<a$B%}n%~9HTA#d`%BeQ<}Ns<!2
zCKf(zLQKZ=*Y&A45A}7NY+$#l@kx%qo#gjUN@?bWo5pW`rhVFW#3$#+EElKa<@=-S
zH>4VVHa@B%xa)}Q(o0X*c4i*76yk_YS(0fOy7wQGy3E4c=~th>$WGgQb(*pY|E~Mj
zdE`xWo~@0(snqA?(7(g*^t;75ZJLV=d=4!r|6wjIRQza~z7X49;m^w}kD8>_s5Z;J
z_$u{lhID<IpJD2fEz?~bIgcCgozYbb_jC4~ZJj0>JnLhq3WwKhE3ZGZB#-K>TcG9{
zaBa@Bf09S9=>6?uaqNt#b2xMI^@_u`lbBQc&b{CL+E#m-!e2fiX2CV{_Z$2A=)G^(
zumIBk(v^>Fe7wR!*hE#$v(ZEC_FwG|PQ$KB7DGk1e-1t!LPuDRusHZQ_%J{iPzpQW
s1)&bC07)M@f5ny=N0}XTc>eO&-kAQuzw4C;ut;I>boFyt=akR{0C_1BDF6Tf

diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png
deleted file mode 100644
index 3faaa5de7634e9bcfc9a5efedf30ef9d6416556c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 638
zcmeAS@N?(olHy`uVBq!ia0vp^PC%T*!3HFs{9wJuz`*3{>EaktaqI1^^V%(r66_yb
z75(~(3e>y;_57w36;5mxac4hy)m78$qkBPUUfw719S@!<P26&`_WAMO=X#d(q)%Jx
zd+mMf?)RVP&boE`-S^M?j6a__lV+rUcKXXTQo9d4<zZmtaA05(h%kUM8W>m<2r@5V
zQ{hs|vL~O3#Z>TqKf@x1hh~g|3R|qx`2|%y*I&4{xqZT|bxey4blz}QcRbpVz%Lla
z{Y@am#Z>5kX*I{vGZBJ~rY#rJ`fXj#-SXr5e?m^_QrTXSMpYKyNxC97$K{+fc7G6S
zls)qLcEM4(CMNxT?FYCXUHTm+C1(CcvBgOHslW|~Cv#sf+Q3=OA$j|6zd(e8%PHU5
zwh2`o*MqE%ODWw6^~mMl-!vhMgKPW8(3UGs7sRTk9kSin7N8}$G=cxVqlc_Z-0noK
zrTe-kXm#9ISi;uS<P%_S@9M$YawYHO+l|uN9XZ#wyWe{EPi(<D#VMPdAF};kFYt=*
z(YI^cIiGI(pQLd`m1XK_-Y;xtrdX$W+qy6;(EXzFR<ci<HQ=(q!wI3s(&CPM+j5D)
zlvA<i<#Nk}?z$VXTN$$0oV<(!eq8s;IloHwU%cXyJ@2R8IuppdA-GES|NXs50w(8X
zyH5JzddfHWh3T(N%vGOmMsfaA?l7p-Tx#XS?{6|+#Wv&$kK3u9_PzE~cb<Nzpb}Cw
pvCRF;&qYGnwObWzKF_OU+gobI`zXBlATV7qc)I$ztaD0e0swVe1Y7_B

diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png
deleted file mode 100644
index f1c22da3770c777ff5cf87189c2d171eb7f3d8dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmeAS@N?(olHy`uVBq!ia0vp^PC%T*!3HFs{9wJuz`*#!)5S5Q;?~={_TIA{We$A2
zkTfxC;x9HARza13g%|d*ZRgW<YVXQ-SmG>raBs6SJG;APZoJD~mzPR>bFFqBo$#dc
z-Mf=_C*N50{QXJOK<>trmk(<B_pwZRd${=g-^d`Xqoy_UtL%^2*$6l=FtP|RI~g=E
zFmWglO(cMHfwe-3kM;^vHl1(KQ0TeM<m8rh$54RrQ1;z<tWF9+Z_OGx1ne6%6uQ>v
zGGDCJ`qb~xl6CL5yF<yT>5UVFCckGE+~qavEUUtyFF$x(Ui4pEo2lSr?a&hCwRKqo
z$6H3hT~nTZQ59I2d^6XM#i{E7Ted+*l4b6UKdb_Cmmm7KD(r8>7lH3J$1QbS3eywq
z89sgwm?rgGtmDGYQ=h^eTI$rT>X}_$IF-$N?ND<1&byW07dy20y^5^n>zEL%7C(9O
z$>tl1yZ&CdWy}63ZU4u$6H`BLbpG<rBqjTwtLAnI>mzUZLej#sOzq{YUCgyFKU<x1
zBJTR@uj+=*clN57z1uDG%&g0rKeEs*srAS6lGjB)ZM=H^PD#nzdcgB?iIQE%zqy|6
zN2dfG%Tu3OtN(s>`KP-<?5A&Sy7pEw`OK1QzcQCTlIQ0QeD$AQW@E@Mwz!|#hO-Q;
Rje$vl!PC{xWt~$(697Uf>S6!@


From 0f4c4191c2b07cdfec6cd24843ea744e59a5ac80 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 7 Nov 2013 15:01:54 -0500
Subject: [PATCH 45/92] Bug 934646 - Replace hard-coded Android resource ID.
 r=mfinkle

---
 mobile/android/base/tests/testReaderMode.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/tests/testReaderMode.java b/mobile/android/base/tests/testReaderMode.java
index 137901bbada..e52273d0475 100644
--- a/mobile/android/base/tests/testReaderMode.java
+++ b/mobile/android/base/tests/testReaderMode.java
@@ -21,6 +21,9 @@ public class testReaderMode extends AboutHomeTest {
     static final int EVENT_CLEAR_DELAY_MS = 3000;
     static final int READER_ICON_MAX_WAIT_MS = 15000;
 
+    // IDs for UI views.
+    private static final String PAGE_ACTION_LAYOUT_ID = "page_action_layout";
+
     @Override
     protected int getTestType() {
         return TEST_MOCHITEST;
@@ -153,7 +156,7 @@ public class testReaderMode extends AboutHomeTest {
 
     // Get the reader icon method
     protected View getReaderIcon() {
-        View pageActionLayout = mSolo.getView(0x7f070025);
+        View pageActionLayout = mSolo.getView(PAGE_ACTION_LAYOUT_ID);
         final ViewGroup actionLayoutEntry = (ViewGroup)pageActionLayout;
         View icon = actionLayoutEntry.getChildAt(1);
         if (icon == null || icon.getVisibility() != View.VISIBLE) {

From 82f8a9a6a4b5efaffa56d5e326144bdd9394d27f Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 19 Nov 2013 10:37:04 -0800
Subject: [PATCH 46/92] Black-box self hosted functions (bug 933738); r=fitzgen

---
 toolkit/devtools/server/actors/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index aa85e1e5c98..2d45c257fcd 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -3902,7 +3902,7 @@ function ThreadSources(aThreadActor, aUseSourceMaps, aAllowPredicate,
  * Must be a class property because it needs to persist across reloads, same as
  * the breakpoint store.
  */
-ThreadSources._blackBoxedSources = new Set();
+ThreadSources._blackBoxedSources = new Set(["self-hosted"]);
 ThreadSources._prettyPrintedSources = new Map();
 
 ThreadSources.prototype = {

From 7e6b594102a82f5426532bf609ad4bf5646ff17b Mon Sep 17 00:00:00 2001
From: Anton Kovalyov <anton@mozilla.com>
Date: Tue, 19 Nov 2013 10:54:19 -0800
Subject: [PATCH 47/92] Bug 920570 - requestLongerTimeout for
 browser_codemirror and re-enable it on Linux. r=me

---
 browser/devtools/sourceeditor/test/browser.ini           | 3 +--
 browser/devtools/sourceeditor/test/browser_codemirror.js | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/devtools/sourceeditor/test/browser.ini b/browser/devtools/sourceeditor/test/browser.ini
index 71158a11f54..ace13b6ea83 100644
--- a/browser/devtools/sourceeditor/test/browser.ini
+++ b/browser/devtools/sourceeditor/test/browser.ini
@@ -30,5 +30,4 @@ support-files =
 [browser_bug731721_debugger_stepping.js]
 [browser_bug744021_next_prev_bracket_jump.js]
 [browser_codemirror.js]
-skip-if = os == "linux"
-[browser_sourceeditor_initialization.js]
+[browser_sourceeditor_initialization.js]
\ No newline at end of file
diff --git a/browser/devtools/sourceeditor/test/browser_codemirror.js b/browser/devtools/sourceeditor/test/browser_codemirror.js
index dd70ad99ef0..70d2ca2b451 100644
--- a/browser/devtools/sourceeditor/test/browser_codemirror.js
+++ b/browser/devtools/sourceeditor/test/browser_codemirror.js
@@ -8,6 +8,7 @@ const HOST = 'mochi.test:8888';
 const URI  = "http://" + HOST + "/browser/browser/devtools/sourceeditor/test/codemirror.html";
 
 function test() {
+  requestLongerTimeout(2);
   waitForExplicitFinish();
 
   let tab = gBrowser.addTab();

From 7a7c632d77e99eabb6c8d638072ffe5c993445be Mon Sep 17 00:00:00 2001
From: Sam Foster <sfoster@mozilla.com>
Date: Tue, 19 Nov 2013 11:40:56 -0800
Subject: [PATCH 48/92] Bug 926036 - Extend the label bindings to assign to
 textContent to get normal line-wrapping when attached. r=mbrubeck

---
 .../metro/base/content/bindings/bindings.xml  | 50 +++++++++++++++++++
 browser/metro/base/content/browser.css        |  9 ++--
 browser/metro/base/content/browser.xul        | 16 +++---
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/browser/metro/base/content/bindings/bindings.xml b/browser/metro/base/content/bindings/bindings.xml
index 15267577c1f..f06b2c0bc20 100644
--- a/browser/metro/base/content/bindings/bindings.xml
+++ b/browser/metro/base/content/bindings/bindings.xml
@@ -306,4 +306,54 @@
       </handler>
     </handlers>
   </binding>
+
+  <binding id="line-wrap-label" extends="chrome://global/content/bindings/text.xml#text-label">
+    <implementation>
+      <constructor>
+        <![CDATA[
+          if (this.hasAttribute("value")) {
+            this.textContent = this.getAttribute("value");
+            this.removeAttribute("value");
+          }
+        ]]>
+      </constructor>
+      <property name="value">
+        <getter>
+          <![CDATA[
+            return this.textContent;
+          ]]>
+        </getter>
+        <setter>
+          <![CDATA[
+            return (this.textContent = val);
+          ]]>
+        </setter>
+      </property>
+    </implementation>
+  </binding>
+  <binding id="line-wrap-text-link" extends="chrome://global/content/bindings/text.xml#text-link">
+    <implementation>
+      <constructor>
+        <![CDATA[
+          if (this.hasAttribute("value")) {
+            this.textContent = this.getAttribute("value");
+            this.removeAttribute("value");
+          }
+        ]]>
+      </constructor>
+      <property name="value">
+        <getter>
+          <![CDATA[
+            return this.textContent;
+          ]]>
+        </getter>
+        <setter>
+          <![CDATA[
+            return (this.textContent = val);
+          ]]>
+        </setter>
+      </property>
+    </implementation>
+  </binding>
+
 </bindings>
diff --git a/browser/metro/base/content/browser.css b/browser/metro/base/content/browser.css
index a24fdce798c..ae410f4c65f 100644
--- a/browser/metro/base/content/browser.css
+++ b/browser/metro/base/content/browser.css
@@ -29,19 +29,22 @@ appbar {
 flyoutpanel {
   -moz-binding: url('chrome://browser/content/bindings/flyoutpanel.xml#flyoutpanelBinding');
 }
-
 cssthrobber {
   -moz-binding: url('chrome://browser/content/bindings/cssthrobber.xml#cssthrobberBinding');
 }
+label[linewrap] {
+  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#line-wrap-label");
+}
+label[linewrap].text-link, label[onclick][linewrap] {
+  -moz-binding: url("chrome://browser/content/bindings/bindings.xml#line-wrap-text-link");
+}
 
 settings {
   -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#settings");
 }
-
 setting {
   display: none;
 }
-
 autoscroller {
   -moz-binding: url('chrome://browser/content/bindings/popup.xml#element-popup');
 }
diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index 7009235a62f..af3637ccc79 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -371,12 +371,10 @@
                        oncommand="Appbar.dispatchContextualAction('clear')"/>
       </toolbar>
     </appbar>
-
     <autoscroller class="autoscroller" id="autoscrollerid"/>
-
     <flyoutpanel id="about-flyoutpanel" class="flyout-narrow" headertext="&aboutHeader.title;">
-      <label id="about-product-label" value="&aboutHeader.product.label;"/>
-      <label value="&aboutHeader.company.label;"/>
+      <label id="about-product-label" linewrap="true" value="&aboutHeader.product.label;"/>
+      <label value="&aboutHeader.company.label;" linewrap="true"/>
 #expand <label id="about-version-label">__MOZ_APP_VERSION__</label>
       <vbox id="updateBox">
 #ifdef MOZ_UPDATER
@@ -411,26 +409,24 @@
             <label>&update.otherInstanceHandlingUpdates;</label>
           </hbox>
           <hbox id="manualUpdate" align="center">
-            <label>&update.manual.start;</label><label id="manualLink" class="text-link"/><label>&update.manual.end;</label>
+            <label>&update.manual.start;</label><label id="manualLink" linewrap="true" class="text-link"/><label>&update.manual.end;</label>
           </hbox>
         </deck>
 #endif
       </vbox>
-
 #if MOZ_UPDATE_CHANNEL != release
 #ifdef MOZ_UPDATER
-      <description class="text-blurb" id="currentChannelText">&channel.description.start;<label id="currentChannel"/>&channel.description.end;</description>
+      <description class="text-blurb" id="currentChannelText">&channel.description.start;<label id="currentChannel" linewrap="true"/>&channel.description.end;</description>
 #endif
 #endif
       <label id="about-policy-label"
+            linewrap="true"
             onclick="FlyoutPanelsUI.AboutFlyoutPanel.onPolicyClick(event);"
             class="text-link" value="&aboutHeader.policy.label;"/>
       <spacer class="flyoutpanel-hack"/>
     </flyoutpanel>
-
 #ifdef MOZ_SERVICES_SYNC
     <flyoutpanel id="sync-flyoutpanel" class="flyout-narrow" headertext="&sync.flyout.title;">
-
       <vbox id="sync-presetup-container" collapsed="true">
         <description>&sync.flyout.presetup.description1;</description>
         <separator />
@@ -440,11 +436,11 @@
           <image src="chrome://browser/skin/images/plus-34.png" />
           <separator />
           <label value="&sync.flyout.presetup.setup.label;"
+                 linewrap="true"
                  class="text-link" />
           <spacer flex="1" />
         </hbox>
       </vbox>
-
       <vbox id="sync-setup-container" collapsed="true">
         <description>&sync.flyout.setup.description1;</description>
         <description>&sync.flyout.setup.description2;</description>

From ffaf5d563e0bcb1726d72c7c184199598416bced Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 19 Nov 2013 11:11:25 -0500
Subject: [PATCH 49/92] Bug 935753 - Firefox displays the "This is a secure
 Firefox page" indicator on pages served by addons. r=MattN

---
 browser/base/content/browser.js                     | 13 ++++++++++---
 .../base/content/test/general/browser_bug590206.js  |  6 ++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fac713990e3..45ef66e8e75 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6338,14 +6338,21 @@ var gIdentityHandler = {
     let nsIWebProgressListener = Ci.nsIWebProgressListener;
 
     // For some URIs like data: we can't get a host and so can't do
-    // anything useful here. Chrome URIs however get special treatment.
+    // anything useful here.
     let unknown = false;
     try {
       uri.host;
     } catch (e) { unknown = true; }
 
-    if ((uri.scheme == "chrome" || uri.scheme == "about") &&
-        uri.spec !== "about:blank") {
+    // Chrome URIs however get special treatment. Some chrome URIs are
+    // whitelisted to provide a positive security signal to the user.
+    let chromeWhitelist = ["about:addons", "about:app-manager", "about:config",
+                           "about:crashes", "about:healthreport", "about:home",
+                           "about:newaddon", "about:permissions", "about:preferences",
+                           "about:privatebrowsing", "about:sessionstore",
+                           "about:support", "about:welcomeback"];
+    let lowercaseSpec = uri.spec.toLowerCase();
+    if (chromeWhitelist.some(function(whitelistedSpec) lowercaseSpec.startsWith(whitelistedSpec))) {
       this.setMode(this.IDENTITY_MODE_CHROMEUI);
     } else if (unknown) {
       this.setMode(this.IDENTITY_MODE_UNKNOWN);
diff --git a/browser/base/content/test/general/browser_bug590206.js b/browser/base/content/test/general/browser_bug590206.js
index c661053bfac..c0c00b32a90 100644
--- a/browser/base/content/test/general/browser_bug590206.js
+++ b/browser/base/content/test/general/browser_bug590206.js
@@ -61,14 +61,16 @@ function test_blank() {
 function test_chrome() {
   let oldTab = gBrowser.selectedTab;
 
+  // Since users aren't likely to type in full chrome URLs, we won't show
+  // the positive security indicator on it, but we will show it on about:addons.
   loadNewTab("chrome://mozapps/content/extensions/extensions.xul", function(aNewTab) {
-    is(getIdentityMode(), "chromeUI", "Identity should be chrome");
+    is(getIdentityMode(), "unknownIdentity", "Identity should be chrome");
 
     gBrowser.selectedTab = oldTab;
     is(getIdentityMode(), "unknownIdentity", "Identity should be unknown");
 
     gBrowser.selectedTab = aNewTab;
-    is(getIdentityMode(), "chromeUI", "Identity should be chrome");
+    is(getIdentityMode(), "unknownIdentity", "Identity should be chrome");
 
     gBrowser.removeTab(aNewTab);
 

From a658af853137e492285a620380d6e9de3ed7458b Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 19 Nov 2013 14:55:11 -0500
Subject: [PATCH 50/92] Bug 935753 - Fix test comment. DONTBUILD. r=me

---
 browser/base/content/test/general/browser_bug590206.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/test/general/browser_bug590206.js b/browser/base/content/test/general/browser_bug590206.js
index c0c00b32a90..077e9f01880 100644
--- a/browser/base/content/test/general/browser_bug590206.js
+++ b/browser/base/content/test/general/browser_bug590206.js
@@ -64,13 +64,13 @@ function test_chrome() {
   // Since users aren't likely to type in full chrome URLs, we won't show
   // the positive security indicator on it, but we will show it on about:addons.
   loadNewTab("chrome://mozapps/content/extensions/extensions.xul", function(aNewTab) {
-    is(getIdentityMode(), "unknownIdentity", "Identity should be chrome");
+    is(getIdentityMode(), "unknownIdentity", "Identity should be unknown");
 
     gBrowser.selectedTab = oldTab;
     is(getIdentityMode(), "unknownIdentity", "Identity should be unknown");
 
     gBrowser.selectedTab = aNewTab;
-    is(getIdentityMode(), "unknownIdentity", "Identity should be chrome");
+    is(getIdentityMode(), "unknownIdentity", "Identity should be unknown");
 
     gBrowser.removeTab(aNewTab);
 

From edad724fdaeb9aa6f799e427145ea291cfa134d4 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 19 Nov 2013 11:57:35 -0800
Subject: [PATCH 51/92] Bug 768667 - Provide an action mode for compatibility
 with old Android versions. r=sriram

---
 mobile/android/base/ActionModeCompat.java     | 101 ++++++++++++
 mobile/android/base/ActionModeCompatView.java | 151 ++++++++++++++++++
 mobile/android/base/BrowserApp.java           |  81 ++++++++--
 .../base/locales/en-US/android_strings.dtd    |   5 +
 mobile/android/base/menu/GeckoMenu.java       |  26 ++-
 mobile/android/base/moz.build                 |  12 ++
 .../base/resources/drawable-hdpi/ab_done.png  | Bin 0 -> 737 bytes
 .../ab_stacked_transparent_light_holo.9.png   | Bin 0 -> 222 bytes
 .../resources/drawable-hdpi/menu_light.png    | Bin 0 -> 148 bytes
 .../base/resources/drawable-mdpi/ab_done.png  | Bin 0 -> 552 bytes
 .../ab_stacked_transparent_light_holo.9.png   | Bin 0 -> 210 bytes
 .../resources/drawable-mdpi/menu_light.png    | Bin 0 -> 131 bytes
 .../base/resources/drawable-xhdpi/ab_done.png | Bin 0 -> 915 bytes
 .../ab_stacked_transparent_light_holo.9.png   | Bin 0 -> 242 bytes
 .../resources/drawable-xhdpi/menu_light.png   | Bin 0 -> 184 bytes
 .../base/resources/layout/actionbar.xml       |  40 +++++
 .../base/resources/layout/gecko_app.xml       |  20 ++-
 .../base/resources/values-v11/styles.xml      |  16 ++
 .../android/base/resources/values/styles.xml  |  33 ++++
 .../android/base/resources/values/themes.xml  |   1 +
 mobile/android/base/strings.xml.in            |   4 +
 .../android/base/toolbar/BrowserToolbar.java  |   3 +-
 .../android/base/widget/GeckoPopupMenu.java   |   5 +-
 23 files changed, 467 insertions(+), 31 deletions(-)
 create mode 100644 mobile/android/base/ActionModeCompat.java
 create mode 100644 mobile/android/base/ActionModeCompatView.java
 create mode 100644 mobile/android/base/resources/drawable-hdpi/ab_done.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/menu_light.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/ab_done.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/menu_light.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/ab_done.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/menu_light.png
 create mode 100644 mobile/android/base/resources/layout/actionbar.xml

diff --git a/mobile/android/base/ActionModeCompat.java b/mobile/android/base/ActionModeCompat.java
new file mode 100644
index 00000000000..19d1fb4928b
--- /dev/null
+++ b/mobile/android/base/ActionModeCompat.java
@@ -0,0 +1,101 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import org.mozilla.gecko.widget.GeckoPopupMenu;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+class ActionModeCompat implements GeckoPopupMenu.OnMenuItemClickListener,
+                                  View.OnClickListener {
+    private final String LOGTAG = "GeckoActionModeCompat";
+
+    private Callback mCallback;
+    private ActionModeCompatView mView;
+    private Presenter mPresenter;
+
+    /* A set of callbacks to be called during this ActionMode's lifecycle. These will control the
+     * creation, interaction with, and destruction of menuitems for the view */
+    public static interface Callback {
+        /* Called when action mode is first created. Implementors should use this to inflate menu resources. */
+        public boolean onCreateActionMode(ActionModeCompat mode, Menu menu);
+
+        /* Called to refresh an action mode's action menu. Called whenever the mode is invalidated. Implementors
+         * should use this to enable/disable/show/hide menu items. */
+        public boolean onPrepareActionMode(ActionModeCompat mode, Menu menu);
+
+        /* Called to report a user click on an action button. */
+        public boolean onActionItemClicked(ActionModeCompat mode, MenuItem item);
+
+        /* Called when an action mode is about to be exited and destroyed. */
+        public void onDestroyActionMode(ActionModeCompat mode);
+    }
+
+    /* Presenters handle the actual showing/hiding of the action mode UI in the app. Its their responsibility
+     * to create an action mode, and assign it Callbacks and ActionModeCompatView's. */
+    public static interface Presenter {
+        /* Called when an action mode should be shown */
+        public void startActionModeCompat(final Callback callback);
+
+        /* Called when whatever action mode is showing should be hidden */
+        public void endActionModeCompat();
+    }
+
+    public ActionModeCompat(Presenter presenter, Callback callback, ActionModeCompatView view) {
+        mPresenter = presenter;
+        mCallback = callback;
+
+        mView = view;
+        mView.initForMode(this);
+    }
+
+    public void finish() {
+        // Clearing the menu will also clear the ActionItemBar
+        mView.getMenu().clear();
+        if (mCallback != null) {
+            mCallback.onDestroyActionMode(this);
+        }
+    }
+
+    public CharSequence getTitle() {
+        return mView.getTitle();
+    }
+
+    public void setTitle(CharSequence title) {
+        mView.setTitle(title);
+    }
+
+    public void setTitle(int resId) {
+        mView.setTitle(resId);
+    }
+
+    public Menu getMenu() {
+        return mView.getMenu();
+    }
+
+    public void invalidate() {
+        if (mCallback != null) {
+            mCallback.onPrepareActionMode(this, mView.getMenu());
+        }
+        mView.invalidate();
+    }
+
+    /* GeckoPopupMenu.OnMenuItemClickListener */
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        if (mCallback != null) {
+            return mCallback.onActionItemClicked(this, item);
+        }
+        return false;
+    }
+
+    /* View.OnClickListener*/
+    @Override
+    public void onClick(View v) {
+        mPresenter.endActionModeCompat();
+    }
+}
diff --git a/mobile/android/base/ActionModeCompatView.java b/mobile/android/base/ActionModeCompatView.java
new file mode 100644
index 00000000000..5e1184a9661
--- /dev/null
+++ b/mobile/android/base/ActionModeCompatView.java
@@ -0,0 +1,151 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import org.mozilla.gecko.menu.GeckoMenu;
+import org.mozilla.gecko.menu.MenuPopup;
+import org.mozilla.gecko.menu.MenuPanel;
+import org.mozilla.gecko.menu.MenuItemActionBar;
+import org.mozilla.gecko.widget.GeckoPopupMenu;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuInflater;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.view.View;
+import android.view.ViewGroup;
+import android.content.Context;
+import android.widget.TextView;
+import android.widget.ImageButton;
+import android.widget.Button;
+import android.widget.PopupWindow;
+import android.util.AttributeSet;
+
+class ActionModeCompatView extends LinearLayout implements GeckoMenu.ActionItemBarPresenter {
+    private final String LOGTAG = "GeckoActionModeCompatPresenter";
+
+    private static final int SPEC = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+
+    private Button mTitleView;
+    private ImageButton mMenuButton;
+    private ViewGroup mActionButtonBar;
+    private GeckoPopupMenu mPopupMenu;
+
+    // Maximum number of items to show as actions
+    private static final int MAX_ACTION_ITEMS = 4;
+
+    private int mActionButtonsWidth = 0;
+
+    public ActionModeCompatView(Context context) {
+        this(context, null);
+    }
+
+    public ActionModeCompatView(Context context, AttributeSet attrs) {
+        this(context, null, 0);
+    }
+
+    public ActionModeCompatView(Context context, AttributeSet attrs, int style) {
+        super(context, attrs, style);
+    }
+
+    @Override
+    public void onFinishInflate() {
+        mTitleView = (Button) findViewById(R.id.actionmode_title);
+        mMenuButton = (ImageButton) findViewById(R.id.actionbar_menu);
+        mActionButtonBar = (ViewGroup) findViewById(R.id.actionbar_buttons);
+
+        mPopupMenu = new GeckoPopupMenu(getContext(), mMenuButton);
+        ((GeckoMenu) mPopupMenu.getMenu()).setActionItemBarPresenter(this);
+
+        mMenuButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                openMenu();
+            }
+        });
+    }
+
+    public void initForMode(final ActionModeCompat mode) {
+        mTitleView.setOnClickListener(mode);
+        mPopupMenu.setOnMenuItemClickListener(mode);
+    }
+
+    public CharSequence getTitle() {
+        return mTitleView.getText();
+    }
+
+    public void setTitle(CharSequence title) {
+        mTitleView.setText(title);
+    }
+
+    public void setTitle(int resId) {
+        mTitleView.setText(resId);
+    }
+
+    public Menu getMenu() {
+        return mPopupMenu.getMenu();
+    }
+
+    public void invalidate() {
+        mMenuButton.setVisibility(mPopupMenu.getMenu().hasVisibleItems() ? View.VISIBLE : View.GONE);
+        super.invalidate();
+    }
+
+    /* GeckoMenu.ActionItemBarPresenter */
+    @Override
+    public boolean addActionItem(View actionItem) {
+        final int count = mActionButtonBar.getChildCount();
+        if (count >= MAX_ACTION_ITEMS) {
+            return false;
+        }
+
+        int maxWidth = mActionButtonBar.getMeasuredWidth();
+        if (maxWidth == 0) {
+            mActionButtonBar.measure(SPEC, SPEC);
+            maxWidth = mActionButtonBar.getMeasuredWidth();
+        }
+
+        // Since we don't know how many items will be added, we always reserve space for the overflow menu
+        mMenuButton.measure(SPEC, SPEC);
+        maxWidth -= mMenuButton.getMeasuredWidth();
+
+        if (mActionButtonsWidth <= 0) {
+            mActionButtonsWidth = 0;
+
+            // Loop over child views, measure them, and add their width to the taken width
+            for (int i = 0; i < count; i++) {
+                View v = mActionButtonBar.getChildAt(i);
+                v.measure(SPEC, SPEC);
+                mActionButtonsWidth += v.getMeasuredWidth();
+            }
+        }
+
+        actionItem.measure(SPEC, SPEC);
+        int w = actionItem.getMeasuredWidth();
+        if (mActionButtonsWidth + w < maxWidth) {
+            // We cache the new width of our children.
+            mActionButtonsWidth += w;
+            mActionButtonBar.addView(actionItem);
+            return true;
+        }
+        return false;
+    }
+
+    /* GeckoMenu.ActionItemBarPresenter */
+    @Override
+    public void removeActionItem(View actionItem) {
+        mActionButtonsWidth -= actionItem.getMeasuredWidth();
+        mActionButtonBar.removeView(actionItem);
+    }
+
+    public void openMenu() {
+        mPopupMenu.openMenu();
+    }
+
+    public void closeMenu() {
+        mPopupMenu.dismiss();
+    }
+
+}
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 26a6954d739..859197dea7c 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -14,6 +14,7 @@ import org.mozilla.gecko.favicons.LoadFaviconTask;
 import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
+import org.mozilla.gecko.gfx.LayerMarginsAnimator;
 import org.mozilla.gecko.health.BrowserHealthRecorder;
 import org.mozilla.gecko.health.BrowserHealthReporter;
 import org.mozilla.gecko.home.BrowserSearch;
@@ -71,8 +72,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.animation.Interpolator;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
+import android.widget.ViewFlipper;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -88,7 +91,8 @@ abstract public class BrowserApp extends GeckoApp
                                             BrowserSearch.OnSearchListener,
                                             BrowserSearch.OnEditSuggestionListener,
                                             HomePager.OnNewTabsListener,
-                                            OnUrlOpenListener {
+                                            OnUrlOpenListener,
+                                            ActionModeCompat.Presenter {
     private static final String LOGTAG = "GeckoBrowserApp";
 
     private static final String PREF_CHROME_DYNAMICTOOLBAR = "browser.chrome.dynamictoolbar";
@@ -111,10 +115,13 @@ abstract public class BrowserApp extends GeckoApp
     private BrowserSearch mBrowserSearch;
     private View mBrowserSearchContainer;
 
+    public ViewFlipper mViewFlipper;
+    public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
     private HomePager mHomePager;
     private View mHomePagerContainer;
     protected Telemetry.Timer mAboutHomeStartupTimer = null;
+    private ActionModeCompat mActionMode;
 
     private static final int GECKO_TOOLS_MENU = -1;
     private static final int ADDON_MENU_OFFSET = 1000;
@@ -265,7 +272,7 @@ abstract public class BrowserApp extends GeckoApp
             switch (keyCode) {
                 case KeyEvent.KEYCODE_BUTTON_Y:
                     // Toggle/focus the address bar on gamepad-y button.
-                    if (mBrowserToolbar.isVisible()) {
+                    if (mViewFlipper.getVisibility() == View.VISIBLE) {
                         if (isDynamicToolbarEnabled() && !isHomePagerVisible()) {
                             if (mLayerView != null) {
                                 mLayerView.getLayerMarginsAnimator().hideMargins(false);
@@ -425,6 +432,9 @@ abstract public class BrowserApp extends GeckoApp
 
         super.onCreate(savedInstanceState);
 
+        mViewFlipper = (ViewFlipper) findViewById(R.id.browser_actionbar);
+        mActionBar = (ActionModeCompatView) findViewById(R.id.actionbar);
+
         mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {
             // Show the target URL immediately in the toolbar
@@ -602,6 +612,11 @@ abstract public class BrowserApp extends GeckoApp
             return;
         }
 
+        if (mActionMode != null) {
+            endActionModeCompat();
+            return;
+        }
+
         super.onBackPressed();
     }
 
@@ -660,7 +675,7 @@ abstract public class BrowserApp extends GeckoApp
                 mLayerView.getLayerClient().setOnMetricsChangedListener(this);
             }
             setToolbarMargin(0);
-            mHomePagerContainer.setPadding(0, mBrowserToolbar.getHeight(), 0, 0);
+            mHomePagerContainer.setPadding(0, mViewFlipper.getHeight(), 0, 0);
         } else {
             // Immediately show the toolbar when disabling the dynamic
             // toolbar.
@@ -668,8 +683,8 @@ abstract public class BrowserApp extends GeckoApp
                 mLayerView.getLayerClient().setOnMetricsChangedListener(null);
             }
             mHomePagerContainer.setPadding(0, 0, 0, 0);
-            if (mBrowserToolbar != null) {
-                mBrowserToolbar.scrollTo(0, 0);
+            if (mViewFlipper != null) {
+                mViewFlipper.scrollTo(0, 0);
             }
         }
 
@@ -902,7 +917,7 @@ abstract public class BrowserApp extends GeckoApp
 
     @Override
     public void onMetricsChanged(ImmutableViewportMetrics aMetrics) {
-        if (isHomePagerVisible() || mBrowserToolbar == null) {
+        if (isHomePagerVisible() || mViewFlipper == null) {
             return;
         }
 
@@ -911,7 +926,7 @@ abstract public class BrowserApp extends GeckoApp
         if (aMetrics.getPageHeight() <= aMetrics.getHeight()) {
             if (mDynamicToolbarCanScroll) {
                 mDynamicToolbarCanScroll = false;
-                if (!mBrowserToolbar.isVisible()) {
+                if (mViewFlipper.getVisibility() != View.VISIBLE) {
                     ThreadUtils.postToUiThread(new Runnable() {
                         public void run() {
                             mLayerView.getLayerMarginsAnimator().showMargins(false);
@@ -923,7 +938,7 @@ abstract public class BrowserApp extends GeckoApp
             mDynamicToolbarCanScroll = true;
         }
 
-        final View toolbarLayout = mBrowserToolbar;
+        final View toolbarLayout = mViewFlipper;
         final int marginTop = Math.round(aMetrics.marginTop);
         ThreadUtils.postToUiThread(new Runnable() {
             public void run() {
@@ -958,8 +973,8 @@ abstract public class BrowserApp extends GeckoApp
 
     public void refreshToolbarHeight() {
         int height = 0;
-        if (mBrowserToolbar != null) {
-            height = mBrowserToolbar.getHeight();
+        if (mViewFlipper != null) {
+            height = mViewFlipper.getHeight();
         }
 
         if (!isDynamicToolbarEnabled() || isHomePagerVisible()) {
@@ -992,9 +1007,9 @@ abstract public class BrowserApp extends GeckoApp
             @Override
             public void run() {
                 if (aShow) {
-                    mBrowserToolbar.show();
+                    mViewFlipper.setVisibility(View.VISIBLE);
                 } else {
-                    mBrowserToolbar.hide();
+                    mViewFlipper.setVisibility(View.GONE);
                     if (hasTabsSideBar()) {
                         hideTabs();
                     }
@@ -1010,8 +1025,8 @@ abstract public class BrowserApp extends GeckoApp
         ThreadUtils.postToUiThread(new Runnable() {
             @Override
             public void run() {
-                mBrowserToolbar.show();
-                mBrowserToolbar.requestFocusFromTouch();
+                mViewFlipper.setVisibility(View.VISIBLE);
+                mViewFlipper.requestFocusFromTouch();
             }
         });
     }
@@ -1974,13 +1989,13 @@ abstract public class BrowserApp extends GeckoApp
             @Override
             public void run() {
                 if (fullscreen) {
-                    mBrowserToolbar.hide();
+                    mViewFlipper.setVisibility(View.GONE);
                     if (isDynamicToolbarEnabled()) {
                         mLayerView.getLayerMarginsAnimator().hideMargins(true);
                         mLayerView.getLayerMarginsAnimator().setMaxMargins(0, 0, 0, 0);
                     }
                 } else {
-                    mBrowserToolbar.show();
+                    mViewFlipper.setVisibility(View.VISIBLE);
                     if (isDynamicToolbarEnabled()) {
                         mLayerView.getLayerMarginsAnimator().showMargins(true);
                         mLayerView.getLayerMarginsAnimator().setMaxMargins(0, mToolbarHeight, 0, 0);
@@ -2461,4 +2476,38 @@ abstract public class BrowserApp extends GeckoApp
         Log.w(LOGTAG, "No candidate updater found; ignoring launch request.");
         return false;
     }
+
+    /* Implementing ActionModeCompat.Presenter */
+    @Override
+    public void startActionModeCompat(final ActionModeCompat.Callback callback) {
+        // If actionMode is null, we're not currently showing one. Flip to the action mode view
+        if (mActionMode == null) {
+            mViewFlipper.showNext();
+            LayerMarginsAnimator margins = mLayerView.getLayerMarginsAnimator();
+            margins.setMaxMargins(0, mViewFlipper.getHeight(), 0, 0);
+            margins.setMarginsPinned(true);
+            margins.showMargins(false);
+        } else {
+            // Otherwise, we're already showing an action mode. Just finish it and show the new one
+            mActionMode.finish();
+        }
+
+        mActionMode = new ActionModeCompat(BrowserApp.this, callback, mActionBar);
+        if (callback.onCreateActionMode(mActionMode, mActionMode.getMenu())) {
+            mActionMode.invalidate();
+        }
+    }
+
+    /* Implementing ActionModeCompat.Presenter */
+    @Override
+    public void endActionModeCompat() {
+        if (mActionMode == null) {
+            return;
+        }
+
+        mActionMode.finish();
+        mActionMode = null;
+        mLayerView.getLayerMarginsAnimator().setMarginsPinned(false);
+        mViewFlipper.showPrevious();
+    }
 }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 72e1ae1ae5b..e6b04fa9766 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -372,3 +372,8 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 
 <!ENTITY exit_guest_session_title "&brandShortName; will now restart">
 <!ENTITY exit_guest_session_text "The browsing data from this session will be deleted.">
+
+<!-- These are only used for accessiblity for the done and overflow-menu buttons in the actionbar.
+     They are never shown to users -->
+<!ENTITY actionbar_menu "Menu">
+<!ENTITY actionbar_done "Done">
diff --git a/mobile/android/base/menu/GeckoMenu.java b/mobile/android/base/menu/GeckoMenu.java
index a3f49dac1a7..49f60044dcc 100644
--- a/mobile/android/base/menu/GeckoMenu.java
+++ b/mobile/android/base/menu/GeckoMenu.java
@@ -66,7 +66,7 @@ public class GeckoMenu extends ListView
      */
     public static interface ActionItemBarPresenter {
         // Add an action-item.
-        public void addActionItem(View actionItem);
+        public boolean addActionItem(View actionItem);
 
         // Remove an action-item.
         public void removeActionItem(View actionItem);
@@ -151,7 +151,7 @@ public class GeckoMenu extends ListView
         mItems.add(menuItem);
     }
 
-    private void addActionItem(final GeckoMenuItem menuItem) {
+    private boolean addActionItem(final GeckoMenuItem menuItem) {
         menuItem.setOnShowAsActionChangedListener(this);
 
         if (mActionItems.size() == 0 && 
@@ -173,6 +173,8 @@ public class GeckoMenu extends ListView
         mActionItems.put(menuItem, actionView);
         mActionItemBarPresenter.addActionItem(actionView);
         mItems.add(menuItem);
+
+        return true;
     }
 
     @Override
@@ -224,6 +226,12 @@ public class GeckoMenu extends ListView
         mAdapter.clear();
 
         mItems.clear();
+
+        if (mActionItemBarPresenter != null) {
+            for (View item : mActionItems.values()) {
+                mActionItemBarPresenter.removeActionItem(item);
+            }
+        }
         mActionItems.clear();
     }
 
@@ -266,7 +274,7 @@ public class GeckoMenu extends ListView
     @Override
     public boolean hasVisibleItems() {
         for (GeckoMenuItem menuItem : mItems) {
-            if (menuItem.isVisible())
+            if (menuItem.isVisible() && !mActionItems.containsKey(menuItem))
                 return true;
         }
 
@@ -362,10 +370,11 @@ public class GeckoMenu extends ListView
     public void onShowAsActionChanged(GeckoMenuItem item, boolean isActionItem) {
         removeItem(item.getItemId());
 
-        if (isActionItem)
-            addActionItem(item);
-        else
-            addItem(item);
+        if (isActionItem && addActionItem(item)) {
+            return;
+        }
+
+        addItem(item);
     }
 
     public void onItemChanged(GeckoMenuItem item) {
@@ -476,11 +485,12 @@ public class GeckoMenu extends ListView
         }
 
         @Override
-        public void addActionItem(View actionItem) {
+        public boolean addActionItem(View actionItem) {
             LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(actionItem.getLayoutParams());
             params.weight = 1.0f;
             actionItem.setLayoutParams(params);
             addView(actionItem);
+            return true;
         }
 
         @Override
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 16d0f461d1e..c4eefdb1c78 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -82,6 +82,8 @@ if CONFIG['MOZ_WEBRTC']:
 
 gbjar = add_java_jar('gecko-browser')
 gbjar.sources += [
+    'ActionModeCompat.java',
+    'ActionModeCompatView.java',
     'ActivityHandlerHelper.java',
     'AlertNotification.java',
     'animation/AnimatorProxy.java',
@@ -404,6 +406,8 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi-v11/ic_menu_share.png',
     'resources/drawable-hdpi-v11/ic_menu_tools.png',
     'resources/drawable-hdpi-v11/ic_status_logo.png',
+    'resources/drawable-hdpi/ab_done.png',
+    'resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png',
     'resources/drawable-hdpi/abouthome_thumbnail.png',
     'resources/drawable-hdpi/alert_addon.png',
     'resources/drawable-hdpi/alert_app.png',
@@ -461,6 +465,7 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/menu_item_check.png',
     'resources/drawable-hdpi/menu_item_more.png',
     'resources/drawable-hdpi/menu_item_uncheck.png',
+    'resources/drawable-hdpi/menu_light.png',
     'resources/drawable-hdpi/menu_panel_bg.9.png',
     'resources/drawable-hdpi/menu_pb.png',
     'resources/drawable-hdpi/menu_popup_arrow_bottom.png',
@@ -542,6 +547,8 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi-v11/ic_menu_share.png',
     'resources/drawable-mdpi-v11/ic_menu_tools.png',
     'resources/drawable-mdpi-v11/ic_status_logo.png',
+    'resources/drawable-mdpi/ab_done.png',
+    'resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png',
     'resources/drawable-mdpi/abouthome_thumbnail.png',
     'resources/drawable-mdpi/alert_addon.png',
     'resources/drawable-mdpi/alert_app.png',
@@ -602,6 +609,7 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/menu_item_check.png',
     'resources/drawable-mdpi/menu_item_more.png',
     'resources/drawable-mdpi/menu_item_uncheck.png',
+    'resources/drawable-mdpi/menu_light.png',
     'resources/drawable-mdpi/menu_panel_bg.9.png',
     'resources/drawable-mdpi/menu_pb.png',
     'resources/drawable-mdpi/menu_popup_arrow_bottom.png',
@@ -678,6 +686,8 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi-v11/ic_menu_share.png',
     'resources/drawable-xhdpi-v11/ic_menu_tools.png',
     'resources/drawable-xhdpi-v11/ic_status_logo.png',
+    'resources/drawable-xhdpi/ab_done.png',
+    'resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png',
     'resources/drawable-xhdpi/abouthome_thumbnail.png',
     'resources/drawable-xhdpi/alert_addon.png',
     'resources/drawable-xhdpi/alert_app.png',
@@ -733,6 +743,7 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/menu_item_check.png',
     'resources/drawable-xhdpi/menu_item_more.png',
     'resources/drawable-xhdpi/menu_item_uncheck.png',
+    'resources/drawable-xhdpi/menu_light.png',
     'resources/drawable-xhdpi/menu_panel_bg.9.png',
     'resources/drawable-xhdpi/menu_pb.png',
     'resources/drawable-xhdpi/menu_popup_arrow_bottom.png',
@@ -830,6 +841,7 @@ ANDROID_RESFILES += [
     'resources/layout-xlarge-v11/home_history_tabs_indicator.xml',
     'resources/layout-xlarge-v11/remote_tabs_child.xml',
     'resources/layout-xlarge-v11/remote_tabs_group.xml',
+    'resources/layout/actionbar.xml',
     'resources/layout/arrow_popup.xml',
     'resources/layout/autocomplete_list.xml',
     'resources/layout/autocomplete_list_item.xml',
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_done.png b/mobile/android/base/resources/drawable-hdpi/ab_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed03f620f8ef9e969d0471ab76329038e25c9f0d
GIT binary patch
literal 737
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3CnFFjoxLn02py%z6(IY8q0$M=`{k_{&Q=;t<2
zt8!*r>&D`|W2$+>pS=eAb}M##+^cbdA<!VvN4X*~DdzdD$46gocztW@=DV@;PrrNe
z`F7>4dCLPr0$oL~Mm8Bn#4$+9@L$(#*Pp%fW0&@t4F~+Q4$6OeIrG`|nG22@uVa-C
zJ=H0n)NABBE9V2Z<J0ZTXV)8hPPPyEA@pQ3`<DNIReYmDEDmyfii}p#@LFTk+U(t$
z%(Lgiq&0t}rk$^U_iXbPkAN9#k{&+TD0tSLeaX$x+1qRX1)Io=Dy%rdad!O&0rsQX
zeUE;;kmXT#;oxdcmHYYUc!ga}2uH%lru;t~_Ia^?l4TMmAC9X@Z&<M7y!X1GWn#h$
zf2uC4{kOnep09yzanGU+mc1PUFCKiK{Nvr_El1_bB@Q26cFfhiWuLyc%|XW-UWd!s
zIpnUM?%3?m@@&5G<Ih)3YOdH^5Zo?#{OGcCmdBn3Z#|*I%M-VGdSAbsh1Dam$2%gf
zSRQv-81Y1t*Js<$3Df##XIMQ_D=*ym^HjOYf%nUvKXzaCVB>rDh$}Ob?>#U7^{{%b
z^;_|*S@)*|RLscvyw85$_Y2}8p?L-UY)vO;|NFUQJ(sNEA?BESpVrme#d7mboB7l}
z-Tl+e|M{(6F|!lpnSU$jtXi?CXvKcs<;$n_y<4FKOaZDTt`Q|Ei6yC4$wjF^iowXh
z&`{UFLf61N#L&#jz{twj7|6CVFbMhoZ8M67-29Zxv`Q2WrdForKm^fXYnBlV)F276
tAviy+q&%@GmBBG3KPgqgGdD3kH7GSPrLyp3str&PgQu&X%Q~loCIB{EJ2wCT

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png b/mobile/android/base/resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f8ae5a633f19ce0bb45c19619f5d1206a000b8
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S*pj^6T^Rm@;DWu&Cj&(|3p^r=
z85p>QL70(Y)*K0-AbW|YuPggqZdP^~Vb?!-B|xEUPZ!6Kh{JDhY~*YR;AwfdyZwP&
z*|vQ3=Uca43Opy-A|m)tTA}8Ng6kZY(2a9d^kz<VdH(gvOD?1DzRtePJQ4;82O1ce
z*<cK{%o~2!duM9xKcFRFJ~dM1<&N-Ge{9cqUipyngVm>BeA3EWydY~CJYD@<);T3K
F0RSlSOHu#;

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/menu_light.png b/mobile/android/base/resources/drawable-hdpi/menu_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb6aef1d069a14a7fc1cea9780c919c61679e4fa
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtXipc%kc@k8uWjUIP~c#3xZ62X
z=G4p^oaPsfxfS0Jish)R3f(&WG9yqa14Evg(y_dGGlfCy2iXqR3?>_SEs{VyhV?DH
iJ0OaDc|iOR772{!kNsXaOPT8&i0|p@=d#Wzp$Py$I4IEo

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/ab_done.png b/mobile/android/base/resources/drawable-mdpi/ab_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..b28b3b54f4c81d482f797f31936cbd4013c093b5
GIT binary patch
literal 552
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~Ijfv1aOh{y4_S9ba-JBqkHTrZXEaifjpNYW7o
zp-Ubd&IgJo2<&v8$G35^;Tskk#t2~^NlC?&yDV(Ca&uB1b9CBkO)cqrw|D8TKToRF
zI(8j)Hm_*m)V}Gu(AmZ?>+lr!|Ew$fc6F-Mb^2PC^>5kCb?-yw@xD*CTf6%^rv51n
zu|M&RMY8TuK!x`HjjgjxbG!Ig&nSGQ(EnVUqiU&qoaH15q1mNr`vuRlFlL+adKX`+
zs(G(GZ+*g<rY^;kzjIX#S3KJO`I&`n>GNpURMpV)N-wqLW)~-JKU!1N^uTZarp(au
zRVr*pp2gnEY&GX<vUWY4_UCg-z|kh{+iO4WS+Hz{me%Yq33nI0KL63paaqKt<2$6I
zC*4|}89qT%?DoOg>I)J=?c?L+7E14!w(i?Kf2&j6te3n$Zi&Cq1Pnyg64!{5l*E!$
ztK_0oAjM#0U}&goV4-VZ9%5)_Wng4wYz$;u85o58|F#)LLvDUbW?ChR22(3jb0C6f
zur<pF25OK5*$|wcR#Ki=l*-_klAn~S;F+74o*I;zm{M7IGSvpCh{4m<&t;ucLK6VU
CG}6rg

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png b/mobile/android/base/resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..130d442b9cbc3aab9cf070078c3a99c311787004
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)H@lb>Q*`~AJfKj#r;B5V$MLt<47pkZcw8>-RNBFB
z9sT`DRqon9-aFqp)QI)>r~E3IF+piXChr2S3ClmPxY-}S``U!knZ`?kxwKX+XyVd(
z!N>IGYDfOscV~+~UGF`na`W6v>)wFN50C6*cpo5Db#1z?4A3eDPgg&ebxsLQ0CY%8
A^#A|>

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/menu_light.png b/mobile/android/base/resources/drawable-mdpi/menu_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d681697f799729aa60bcc03878b8718ef5f705
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kch)?uW#gKP~c&9OkaNH
zNWhsXa}P0HP*CC8e>x;QVw%w1wevX{81fiqT9$oZHH(4a215zM2{s3I28IOo7eJ#J
d>KPlRN5&o6d@ywr|9haR44$rjF6*2UngC}HDAND{

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_done.png b/mobile/android/base/resources/drawable-xhdpi/ab_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb19810bc2062509e4e4968099a359ad73818728
GIT binary patch
literal 915
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfwTh{zxw<m0jO=Zr;B4q#=W;QPUZ_G%CyaYzuB<Wh5uO8fh&`@
zy$J2izI-%q<yN=kM|b!0c1896Q<jT~PD(bH?q61&IBkBr<c4XDGa1>0jNgl<&3j(^
zeD(x}!be9sh1LD$__>xwFX-mty1-MRJ?GVgBPRYo&#phmts!D?ltV3&FI%+a$=z1Z
zV;YH<PBRpJdOWY=H}~Y8;+6?dnBQl!E{btb^x5%)MZU5<vYKbHH8bD8#_s<|q<uo3
ziv@5bU;Q?}@^x?jD;|xOLNyIVl^=(c+RW`{v5FkZFsKn>l1iMSDgJ+|>#46F---v^
z=n46F|IdfFb=)S0I4<keb%xjdaN}<I|2F6bkFhJ~Y?jk|z8$|Ff8e{*`EQ5MBqU5;
za>Coo@!g}n4Nex)S*)#RZPN@k9D49tzo1o|L;8h-cSg(aGrNAg7qQ^lmAJNnY2BwD
zmg$yB$_Kc(9`bFT@$ln4rdg7D8~IZ-f3I60`0mq%qw5167@Xn!BqR{_Lfuy~aYE2x
zQ4_Q6{SU<tJ$yZvu~{iIXiB3F+v`#hnLl&7|2sA|Z+PFoz2Q*8Odics9L}X8K*ci-
z7k#YcW0H%CXAGF3Gr3IOMQrj`Ve|D5a&;!H*(9*9R=Kgusmmlahs`k3dRx=6XKMX-
zzO8<8lmGs{jR*E~9TEr&J$Uf^?zh)9HeC0qwr6x-=wUC(vt|`grPXH+HP34&H(!sb
zu5UcWCBBO5kk%nyIprBDH&Pn!rrl;2T(Rau_`)NW^LD&7Ke_RCP4)9{j{B77JhQxR
z;j;K(?*GX$)@!%$Z);eb5V)kDhfN_u<)+eczwEco+!p*vopyRj3Mx00&X=uzdzd36
z%)-A-Zrh2CcdLFEF!dc0()1~Mn<;O{_2MZ{?Ek|{S65tp`wg6ep4Xq2KlWMV9><2c
z;lT8&TH+c}l9E`GYL#4+3Zxi}3=9o*4J>pG%tH*#tPG5-jE#Y8D+7a&|KB#FXvob^
z$xN$6(O_z2Y7RsY4Yp<(!9Wd?ARB`7(@M${i&7aJQ}UBi6+Ckj(^G>|6H_V+Po~-c
P6)||a`njxgN@xNAiwS~-

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png b/mobile/android/base/resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..28aeaa77b7fdfd3dde728b6f19956767fe230b51
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwYn_bLGrL)Krq^{o6#W5t~-rHLnc^eFPTrOI-9FZ&8
z^5)2%Eg=S{E~c=^EPU~wb&-1X$~P*j&XuX`{G_XXvC{VItV7>&uP$+9Vq)PCP;h8q
zV8q3!a<~<GNI=+d^;dO|{>8K8&Q2=1!@ZjI$>TXL%ryt=7@f1lSKVXJ`V4dmgQu&X
J%Q~loCIE)8Oo#vg

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/menu_light.png b/mobile/android/base/resources/drawable-xhdpi/menu_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..930ca8d95e8bee5a1240fba645d9dab919abd734
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^`0({Ar-gYUf;;epuoZ6aJO@&
z%&D0-IKvGL&8p&qV;O7KuliPO1yl(K>(rHwor_8Hg9|Y9Gj8!^hz0Vk4~QZ}ABcvv
nF)(akj$uTI?LshtEWgbR4Rf6*RPme*0Ev6L`njxgN@xNAEX^ml

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/layout/actionbar.xml b/mobile/android/base/resources/layout/actionbar.xml
new file mode 100644
index 00000000000..8d2f3afbe3e
--- /dev/null
+++ b/mobile/android/base/resources/layout/actionbar.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.ActionModeCompatView xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/actionbar"
+              android:layout_height="fill_parent"
+              android:layout_width="fill_parent"
+              style="@style/GeckoActionBar">
+
+  <LinearLayout android:layout_height="fill_parent"
+                android:layout_width="fill_parent"
+                style="@style/GeckoActionBar">
+
+    <Button android:id="@+id/actionmode_title"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            style="@style/GeckoActionBar.Title"/>
+
+    <!-- Draw a separator to the left of the title -->
+    <View android:layout_height="fill_parent"
+          android:layout_width="1dp"
+          android:layout_marginTop="10dp"
+          android:layout_marginBottom="10dp"
+          android:background="@android:color/darker_gray"/>
+
+    <LinearLayout android:id="@+id/actionbar_buttons"
+                  android:layout_height="fill_parent"
+                  android:layout_width="0dip"
+                  android:layout_weight="1"
+                  style="@style/GeckoActionBar.Buttons"/>
+
+    <ImageButton android:id="@+id/actionbar_menu"
+                 android:layout_height="fill_parent"
+                 android:layout_width="@dimen/browser_toolbar_icon_width"
+                 style="@style/GeckoActionBar.Button.MenuButton"/>
+  </LinearLayout>
+
+</org.mozilla.gecko.ActionModeCompatView>
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index e1226b08f16..25c3d82ee71 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -67,13 +67,25 @@
              view. To make sure the EditText is not the first focusable view in
              the root view, BrowserToolbar should be specified as low in the
              view hierarchy as possible. -->
-        <org.mozilla.gecko.toolbar.BrowserToolbar
-                android:id="@id/browser_toolbar"
-                style="@style/BrowserToolbar"
+
+        <ViewFlipper android:id="@+id/browser_actionbar"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
-                android:focusable="true"/>
+                android:focusable="true">
+
+            <org.mozilla.gecko.toolbar.BrowserToolbar
+                android:id="@id/browser_toolbar"
+                    style="@style/BrowserToolbar"
+                    android:layout_width="fill_parent"
+                    android:layout_height="@dimen/browser_toolbar_height"
+                    android:clickable="true"
+                    android:focusable="true"/>
+
+            <include layout="@layout/actionbar"
+                     android:id="@+id/actionbar"/>
+
+        </ViewFlipper>
 
     </view>
 
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index eb1ced1698b..4b576ec5fbd 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -74,4 +74,20 @@
         <item name="android:textColor">#FF000000</item>
     </style>
 
+    <style name="GeckoActionBar" parent="@android:style/Widget.Holo.Light.ActionMode">
+        <item name="android:background">@drawable/ab_stacked_transparent_light_holo</item>
+    </style>
+
+    <style name="GeckoActionBar.Title" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+        <item name="android:drawableLeft">?android:attr/actionModeCloseDrawable</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:paddingLeft">15dp</item>
+        <item name="android:paddingRight">15dp</item>
+    </style>
+
+    <style name="GeckoActionBar.Button.MenuButton" parent="android:style/Widget.Holo.Light.ActionButton.Overflow">
+        <item name="android:scaleType">center</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
 </resources>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index c42102a0409..0557182b61e 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -540,4 +540,37 @@
         <item name="android:layout_gravity">center_vertical</item>
     </style>
 
+    <style name="GeckoActionBar">
+        <item name="android:background">@drawable/ab_stacked_transparent_light_holo</item>
+    </style>
+
+    <style name="GeckoActionBar.Title">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textAppearance">@style/TextAppearance.Medium</item>
+        <item name="android:drawableLeft">@drawable/ab_done</item>
+        <item name="android:paddingLeft">15dp</item>
+        <item name="android:paddingRight">15dp</item>
+        <item name="android:contentDescription">@string/actionbar_done</item>
+    </style>
+
+    <style name="GeckoActionBar.Button" parent="Widget.MenuItemActionBar">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="GeckoActionBar.Button.MenuButton">
+        <item name="android:scaleType">center</item>
+        <item name="android:src">@drawable/menu_light</item>
+        <item name="android:contentDescription">@string/actionbar_menu</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <style name="GeckoActionBar.Buttons">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/text_color_primary</item>
+        <item name="android:gravity">right</item>
+    </style>
+
 </resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index e35ae7af892..a837b3a427c 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -82,6 +82,7 @@
         <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item>
         <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item>
         <item name="homeListViewStyle">@style/Widget.HomeListView</item>
+        <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
     </style>
 
     <style name="Gecko.Preferences" parent="GeckoPreferencesBase"/>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index a6b1d067be2..a29f8a87602 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -350,4 +350,8 @@
 
   <string name="exit_guest_session_title">&exit_guest_session_title;</string>
   <string name="exit_guest_session_text">&exit_guest_session_text;</string>
+
+  <string name="actionbar_menu">&actionbar_menu;</string>
+  <string name="actionbar_done">&actionbar_done;</string>
+
 </resources>
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 9df27be5b7a..70b9f167ae7 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -1761,8 +1761,9 @@ public class BrowserToolbar extends GeckoRelativeLayout
     }
 
     @Override
-    public void addActionItem(View actionItem) {
+    public boolean addActionItem(View actionItem) {
         mActionItemBar.addView(actionItem);
+        return true;
     }
 
     @Override
diff --git a/mobile/android/base/widget/GeckoPopupMenu.java b/mobile/android/base/widget/GeckoPopupMenu.java
index a6f2e6d8a32..017c1b0f85b 100644
--- a/mobile/android/base/widget/GeckoPopupMenu.java
+++ b/mobile/android/base/widget/GeckoPopupMenu.java
@@ -65,6 +65,9 @@ public class GeckoPopupMenu implements GeckoMenu.Callback,
         mMenuPopup = new MenuPopup(context);
         mMenuPanel = new MenuPanel(context, null);
 
+        mMenuPanel.addView(mMenu);
+        mMenuPopup.setPanelView(mMenuPanel);
+
         setAnchor(anchor);
     }
 
@@ -95,8 +98,6 @@ public class GeckoPopupMenu implements GeckoMenu.Callback,
         if (menuRes > 0) {
             mMenuInflater.inflate(menuRes, mMenu);
         }
-        mMenuPanel.addView(mMenu);
-        mMenuPopup.setPanelView(mMenuPanel);
     }
 
     /**

From efd71cba3ef2656793dab8f4ca82eb232f6d1eae Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 19 Nov 2013 11:57:37 -0800
Subject: [PATCH 52/92] Bug 768667 - Use an actionmode for text selection.
 r=margaret,sriram

--HG--
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
rename : mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
---
 mobile/android/base/TextSelection.java        | 135 ++++++++++++++
 mobile/android/base/moz.build                 |  16 +-
 .../base/resources/drawable-hdpi/copy.png     | Bin 0 -> 199 bytes
 .../base/resources/drawable-hdpi/cut.png      | Bin 0 -> 564 bytes
 .../ic_menu_share.png                         | Bin
 .../base/resources/drawable-hdpi/paste.png    | Bin 0 -> 337 bytes
 .../resources/drawable-hdpi/select_all.png    | Bin 0 -> 216 bytes
 .../base/resources/drawable-mdpi/copy.png     | Bin 0 -> 161 bytes
 .../base/resources/drawable-mdpi/cut.png      | Bin 0 -> 357 bytes
 .../ic_menu_share.png                         | Bin
 .../base/resources/drawable-mdpi/paste.png    | Bin 0 -> 203 bytes
 .../base/resources/drawable-xhdpi/copy.png    | Bin 0 -> 252 bytes
 .../base/resources/drawable-xhdpi/cut.png     | Bin 0 -> 996 bytes
 .../ic_menu_share.png                         | Bin
 .../base/resources/drawable-xhdpi/paste.png   | Bin 0 -> 442 bytes
 .../chrome/content/SelectionHandler.js        | 173 +++++++++++++++---
 mobile/android/chrome/content/browser.js      |  77 ++++----
 .../locales/en-US/chrome/browser.properties   |   3 +-
 18 files changed, 332 insertions(+), 72 deletions(-)
 create mode 100644 mobile/android/base/resources/drawable-hdpi/copy.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/cut.png
 rename mobile/android/base/resources/{drawable-hdpi-v11 => drawable-hdpi}/ic_menu_share.png (100%)
 create mode 100644 mobile/android/base/resources/drawable-hdpi/paste.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/select_all.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/copy.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/cut.png
 rename mobile/android/base/resources/{drawable-mdpi-v11 => drawable-mdpi}/ic_menu_share.png (100%)
 create mode 100644 mobile/android/base/resources/drawable-mdpi/paste.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/copy.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/cut.png
 rename mobile/android/base/resources/{drawable-xhdpi-v11 => drawable-xhdpi}/ic_menu_share.png (100%)
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/paste.png

diff --git a/mobile/android/base/TextSelection.java b/mobile/android/base/TextSelection.java
index 675905b7e5f..1a407ab4de1 100644
--- a/mobile/android/base/TextSelection.java
+++ b/mobile/android/base/TextSelection.java
@@ -4,17 +4,31 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.gfx.BitmapUtils;
+import org.mozilla.gecko.gfx.BitmapUtils.BitmapLoader;
 import org.mozilla.gecko.gfx.Layer;
 import org.mozilla.gecko.gfx.LayerView;
+import org.mozilla.gecko.menu.GeckoMenu;
+import org.mozilla.gecko.menu.GeckoMenuItem;
 import org.mozilla.gecko.util.EventDispatcher;
 import org.mozilla.gecko.util.FloatUtils;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.ActionModeCompat.Callback;
+
+import android.content.Context;
+import android.app.Activity;
+import android.graphics.drawable.Drawable;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 import android.util.Log;
 import android.view.View;
 
@@ -30,6 +44,24 @@ class TextSelection extends Layer implements GeckoEventListener {
     private float mViewTop;
     private float mViewZoom;
 
+    private TextSelectionActionModeCallback mCallback;
+
+    // These timers are used to avoid flicker caused by selection handles showing/hiding quickly. For isntance
+    // when moving between single handle caret mode and two handle selection mode.
+    private Timer mActionModeTimer = new Timer("actionMode");
+    private class ActionModeTimerTask extends TimerTask {
+        @Override
+        public void run() {
+            ThreadUtils.postToUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    endActionMode();
+                }
+            });
+        }
+    };
+    private ActionModeTimerTask mActionModeTimerTask;
+
     TextSelection(TextSelectionHandle startHandle,
                   TextSelectionHandle middleHandle,
                   TextSelectionHandle endHandle,
@@ -47,6 +79,7 @@ class TextSelection extends Layer implements GeckoEventListener {
             registerEventListener("TextSelection:ShowHandles");
             registerEventListener("TextSelection:HideHandles");
             registerEventListener("TextSelection:PositionHandles");
+            registerEventListener("TextSelection:Update");
         }
     }
 
@@ -54,6 +87,7 @@ class TextSelection extends Layer implements GeckoEventListener {
         unregisterEventListener("TextSelection:ShowHandles");
         unregisterEventListener("TextSelection:HideHandles");
         unregisterEventListener("TextSelection:PositionHandles");
+        unregisterEventListener("TextSelection:Update");
     }
 
     private TextSelectionHandle getHandle(String name) {
@@ -86,12 +120,23 @@ class TextSelection extends Layer implements GeckoEventListener {
                         if (layerView != null) {
                             layerView.addLayer(TextSelection.this);
                         }
+
+                        if (mActionModeTimerTask != null)
+                            mActionModeTimerTask.cancel();
+                        showActionMode(message.getJSONArray("actions"));
+                    } else if (event.equals("TextSelection:Update")) {
+                        if (mActionModeTimerTask != null)
+                            mActionModeTimerTask.cancel();
+                        showActionMode(message.getJSONArray("actions"));
                     } else if (event.equals("TextSelection:HideHandles")) {
                         LayerView layerView = GeckoAppShell.getLayerView();
                         if (layerView != null) {
                             layerView.removeLayer(TextSelection.this);
                         }
 
+                        mActionModeTimerTask = new ActionModeTimerTask();
+                        mActionModeTimer.schedule(mActionModeTimerTask, 250);
+
                         mStartHandle.setVisibility(View.GONE);
                         mMiddleHandle.setVisibility(View.GONE);
                         mEndHandle.setVisibility(View.GONE);
@@ -115,6 +160,28 @@ class TextSelection extends Layer implements GeckoEventListener {
         });
     }
 
+    private void showActionMode(final JSONArray items) {
+        if (mCallback != null) {
+            mCallback.updateItems(items);
+            return;
+        }
+
+        final Context context = mStartHandle.getContext();
+        if (context instanceof ActionModeCompat.Presenter) {
+            final ActionModeCompat.Presenter presenter = (ActionModeCompat.Presenter) context;
+            mCallback = new TextSelectionActionModeCallback(items);
+            presenter.startActionModeCompat(mCallback);
+        }
+    }
+
+    private void endActionMode() {
+        Context context = mStartHandle.getContext();
+        if (context instanceof ActionModeCompat.Presenter) {
+            final ActionModeCompat.Presenter presenter = (ActionModeCompat.Presenter) context;
+            presenter.endActionModeCompat();
+        }
+    }
+
     @Override
     public void draw(final RenderContext context) {
         // cache the relevant values from the context and bail out if they are the same. we do this
@@ -150,4 +217,72 @@ class TextSelection extends Layer implements GeckoEventListener {
     private void unregisterEventListener(String event) {
         mEventDispatcher.unregisterEventListener(event, this);
     }
+
+    private class TextSelectionActionModeCallback implements Callback {
+        private JSONArray mItems;
+        private ActionModeCompat mActionMode;
+    
+        public TextSelectionActionModeCallback(JSONArray items) {
+            mItems = items;
+        }
+
+        public void updateItems(JSONArray items) {
+            mItems = items;
+            if (mActionMode != null) {
+                mActionMode.invalidate();
+            }
+        }
+
+        @Override
+        public boolean onPrepareActionMode(final ActionModeCompat mode, final Menu menu) {
+            // Android would normally expect us to only update the state of menu items here
+            // To make the js-java interaction a bit simpler, we just wipe out the menu here and recreate all
+            // the javascript menu items in onPrepare instead. This will be called any time invalidate() is called on the
+            // action mode.
+            menu.clear();
+
+            int length = mItems.length();
+            for (int i = 0; i < length; i++) {
+                try {
+                    final JSONObject obj = mItems.getJSONObject(i);
+                    final GeckoMenuItem menuitem = (GeckoMenuItem) menu.add(0, i, 0, obj.optString("label"));
+                    menuitem.setShowAsAction(obj.optBoolean("showAsAction") ? 1 : 0);
+
+                    BitmapUtils.getDrawable(mStartHandle.getContext(), obj.optString("icon"), new BitmapLoader() {
+                        public void onBitmapFound(Drawable d) {
+                            if (d != null) {
+                                menuitem.setIcon(d);
+                            }
+                        }
+                    });
+                } catch(Exception ex) {
+                    Log.i(LOGTAG, "Exception building menu", ex);
+                }
+            }
+            return true;
+        }
+
+        public boolean onCreateActionMode(ActionModeCompat mode, Menu menu) {
+            mActionMode = mode;
+            return true;
+        }
+
+        public boolean onActionItemClicked(ActionModeCompat mode, MenuItem item) {
+            try {
+                final JSONObject obj = mItems.getJSONObject(item.getItemId());
+                GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:Action", obj.optString("id")));
+                return true;
+            } catch(Exception ex) {
+                Log.i(LOGTAG, "Exception calling action", ex);
+            }
+            return false;
+        }
+
+        // Called when the user exits the action mode
+        public void onDestroyActionMode(ActionModeCompat mode) {
+            mActionMode = null;
+            mCallback = null;
+            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:End", null));
+        }
+    }
 }
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index c4eefdb1c78..5df41d14c79 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -403,7 +403,6 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi-v11/ic_menu_reload.png',
     'resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png',
     'resources/drawable-hdpi-v11/ic_menu_settings.png',
-    'resources/drawable-hdpi-v11/ic_menu_share.png',
     'resources/drawable-hdpi-v11/ic_menu_tools.png',
     'resources/drawable-hdpi-v11/ic_status_logo.png',
     'resources/drawable-hdpi/ab_done.png',
@@ -420,6 +419,8 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/bookmark_folder_closed.png',
     'resources/drawable-hdpi/bookmark_folder_opened.png',
     'resources/drawable-hdpi/close.png',
+    'resources/drawable-hdpi/copy.png',
+    'resources/drawable-hdpi/cut.png',
     'resources/drawable-hdpi/favicon.png',
     'resources/drawable-hdpi/find_close.png',
     'resources/drawable-hdpi/find_next.png',
@@ -443,6 +444,7 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/ic_menu_new_private_tab.png',
     'resources/drawable-hdpi/ic_menu_new_tab.png',
     'resources/drawable-hdpi/ic_menu_reload.png',
+    'resources/drawable-hdpi/ic_menu_share.png',
     'resources/drawable-hdpi/ic_status_logo.png',
     'resources/drawable-hdpi/ic_url_bar_go.png',
     'resources/drawable-hdpi/ic_url_bar_reader.png',
@@ -471,6 +473,7 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/menu_popup_arrow_bottom.png',
     'resources/drawable-hdpi/menu_popup_arrow_top.png',
     'resources/drawable-hdpi/menu_popup_bg.9.png',
+    'resources/drawable-hdpi/paste.png',
     'resources/drawable-hdpi/pause.png',
     'resources/drawable-hdpi/pin.png',
     'resources/drawable-hdpi/play.png',
@@ -478,6 +481,7 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/reader_active.png',
     'resources/drawable-hdpi/reader_cropped.png',
     'resources/drawable-hdpi/reading_list.png',
+    'resources/drawable-hdpi/select_all.png',
     'resources/drawable-hdpi/shield.png',
     'resources/drawable-hdpi/shield_doorhanger.png',
     'resources/drawable-hdpi/spinner_default.9.png',
@@ -544,7 +548,6 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi-v11/ic_menu_reload.png',
     'resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png',
     'resources/drawable-mdpi-v11/ic_menu_settings.png',
-    'resources/drawable-mdpi-v11/ic_menu_share.png',
     'resources/drawable-mdpi-v11/ic_menu_tools.png',
     'resources/drawable-mdpi-v11/ic_status_logo.png',
     'resources/drawable-mdpi/ab_done.png',
@@ -564,6 +567,8 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/bookmarkdefaults_favicon_addons.png',
     'resources/drawable-mdpi/bookmarkdefaults_favicon_support.png',
     'resources/drawable-mdpi/close.png',
+    'resources/drawable-mdpi/copy.png',
+    'resources/drawable-mdpi/cut.png',
     'resources/drawable-mdpi/desktop_notification.png',
     'resources/drawable-mdpi/favicon.png',
     'resources/drawable-mdpi/find_close.png',
@@ -586,6 +591,7 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/ic_menu_new_private_tab.png',
     'resources/drawable-mdpi/ic_menu_new_tab.png',
     'resources/drawable-mdpi/ic_menu_reload.png',
+    'resources/drawable-mdpi/ic_menu_share.png',
     'resources/drawable-mdpi/ic_status_logo.png',
     'resources/drawable-mdpi/ic_url_bar_go.png',
     'resources/drawable-mdpi/ic_url_bar_reader.png',
@@ -615,6 +621,7 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/menu_popup_arrow_bottom.png',
     'resources/drawable-mdpi/menu_popup_arrow_top.png',
     'resources/drawable-mdpi/menu_popup_bg.9.png',
+    'resources/drawable-mdpi/paste.png',
     'resources/drawable-mdpi/pause.png',
     'resources/drawable-mdpi/pin.png',
     'resources/drawable-mdpi/play.png',
@@ -683,7 +690,6 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi-v11/ic_menu_reload.png',
     'resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png',
     'resources/drawable-xhdpi-v11/ic_menu_settings.png',
-    'resources/drawable-xhdpi-v11/ic_menu_share.png',
     'resources/drawable-xhdpi-v11/ic_menu_tools.png',
     'resources/drawable-xhdpi-v11/ic_status_logo.png',
     'resources/drawable-xhdpi/ab_done.png',
@@ -700,6 +706,8 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/bookmark_folder_closed.png',
     'resources/drawable-xhdpi/bookmark_folder_opened.png',
     'resources/drawable-xhdpi/close.png',
+    'resources/drawable-xhdpi/copy.png',
+    'resources/drawable-xhdpi/cut.png',
     'resources/drawable-xhdpi/favicon.png',
     'resources/drawable-xhdpi/find_close.png',
     'resources/drawable-xhdpi/find_next.png',
@@ -721,6 +729,7 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/ic_menu_new_private_tab.png',
     'resources/drawable-xhdpi/ic_menu_new_tab.png',
     'resources/drawable-xhdpi/ic_menu_reload.png',
+    'resources/drawable-xhdpi/ic_menu_share.png',
     'resources/drawable-xhdpi/ic_status_logo.png',
     'resources/drawable-xhdpi/ic_url_bar_go.png',
     'resources/drawable-xhdpi/ic_url_bar_reader.png',
@@ -749,6 +758,7 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/menu_popup_arrow_bottom.png',
     'resources/drawable-xhdpi/menu_popup_arrow_top.png',
     'resources/drawable-xhdpi/menu_popup_bg.9.png',
+    'resources/drawable-xhdpi/paste.png',
     'resources/drawable-xhdpi/pause.png',
     'resources/drawable-xhdpi/pin.png',
     'resources/drawable-xhdpi/play.png',
diff --git a/mobile/android/base/resources/drawable-hdpi/copy.png b/mobile/android/base/resources/drawable-hdpi/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dd8865f4a9aefc688496d3f3da1a3a131adf40c
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtK2I0Nkc@k8Z|vqhpupoA7@Q_w
z_Q@)9udww*Ggp<C9}<U3J)8UGPIOEto;Ft-sNn&FL(fIF?+fF*HB}k*vt%q^mM^%I
z!GfvFlsTc9k?Vnq!}{HcKy@G3Bi`<AXJOdFYoW@>@YUVJlYya`=fKS7H+x@B<7D{2
uAY#tUut0Xhm*Zj#;RjB!GB7lpW#pH<6t>~W*2aFI0Sun5elF{r5}E)DS3++9

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/cut.png b/mobile/android/base/resources/drawable-hdpi/cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..c760936ee152c1e85e625404b32fcdb1e634f079
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005|Nkl<ZXx{Ca
z&r1S96o3~|L<A2ZT|xwrF5UVd0tpEs!i#hWIz$o?b?6X8#D;`)lOkkMV*gsZyoG7l
zUA3CksX08BnO)wSZ}$C~U2i&_dNzya033h=_@e+on3W6$18<f%0ILD!F|epOfPV!5
zcm^a*e-)?$#c0kJfE>`%?i~X;TL4aF8~}H64T0_|0_f6I?A2thA>*NGfOVk!gT?28
zXR$R=e7_=dV^aVHz>kao7qXL!0(3NcPe5DIeQWX!tN~Zr^Utz?(wuK^l2WOMKsAdP
z*i_sgRD$tLQeu+p_%Vwf1Gm6ov<X=SaSqrAMlp->ftI*kQp)s!Z2|kDJL@b|mYt7t
ziIJqsYi-BdX*!pcMr*)h48)rTRGX!1*>zwScokhenQO`TU>+UI1jvbdL~(JY0UWI|
zKojUE#DVJnja37v0GA0t{0^LG_b0PlDJy`y<nAD5;SUlEYKlD9p6LTSN~+BiU<-Ij
zNSPZc@o^sm`yt(EC+e|G0#t#Um|mu(9!O@i5<yBU@oKV_C@OhA5SOTbBW4aXdpE$I
zxSjE4E^6pXKTNfKC7?@6MGt|%)&os5s{_q%9VvTCZSdt90v%fb3NiJgYtvT=HKyun
z&9Dt%<+{<i08IWLupYp)IDo$g;QmrN00-azGLcVt>!g&I;4<<60000<MNUMnLSTYj
CdhCn<

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
rename to mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
diff --git a/mobile/android/base/resources/drawable-hdpi/paste.png b/mobile/android/base/resources/drawable-hdpi/paste.png
new file mode 100644
index 0000000000000000000000000000000000000000..886c49317e0b1477bfdc4a4b7601d6caf8649198
GIT binary patch
literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003PNkl<ZXx{CW
zAq&Dl7=|7AFDxce#5N560>LEy1jCY`U^ZARR>Kgx%_P`t3$i9+wfF}t7Gb`Fvk1f8
zZF+a|zVI-PvE!b7-`zP;6cucaLjfBET-TMIw+K3*CB^~Rf``l`VHj!?=z=yliE$n5
zz{VDVIXHur823R9jCBe43hjA#6KKj#00B>@K%Ap^HdH<~K_FAUC6F{}2~1M1Z3?al
z?|fYXuahTD_F!#_Kn3(bS+YZJ;#duI3RJ;BTwJPI#%t9jFcK13ase}40*j1)Kh7Nt
zP1wYFg#r|?Nx)a!sH^}5BwOfHJXU}$q}DF109z=hwqXU>LOESxtN;ZlKmiJvFYvQa
j;BN#>4h1Mc0m}uRhhk;0b4%-u00000NkvXXu0mjfBBFkh

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/select_all.png b/mobile/android/base/resources/drawable-hdpi/select_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..902402e26efd69430ebd4ff0d25bf075f475ce73
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt`JOJ0AsP4H&OFF@KtX`z`n;UO
zRyxi)%B45jY-fhsDGD$J`p@~x`AcHYL%))>rfX%`ftnZ+#1B;0djxSPdIf2wp4xRy
z>O0E`%h?)}r%d|BvSa#%7k}OzC}OZkxZC);Ykraa=hXKG>}QzwOby6yc*i$`{Q#rP
z0)7K-L+*?0FPOhD${b+a&G$hqO)N?5P~%3v5B3I939TSo7|xvK%-7W4zva{KWgxDn
LtDnm{r-UW|osUjv

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/copy.png b/mobile/android/base/resources/drawable-mdpi/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..74cb920f487b60595b896c04ebc6bdf9dbd746ce
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3{Mxwkch)?uN#UrDDW^}xU+Kk
z+sxOm7VuB;YDqhB?1MaGoTE#FB*%y7hM7MT3eH_(u;Gy{n8|Y>KsA~%ZZ0R|J_eKb
z`?L~59+bZhIe3Pvg!>ZXxw?)yTbW}g`*|MN(%8a%;rt4o2Ml?B|4s?!&2|CW$>8bg
K=d#Wzp$P!zMLW3w

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/cut.png b/mobile/android/base/resources/drawable-mdpi/cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e6a93fe4fd079ccc034d09f86ffa37a2e9e2f5e
GIT binary patch
literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003jNkl<ZSi@uZ
z|NlS3Kw^eb2Mjs~7#kbUq!J$b4qzY?4;}|#!z0cC0zh00<(C7oJUtu$!z@5t1;ouj
ztPOQY10@bn0AgDp79!FC{!nwWppFRx;yy|oU<mR7RIV867)~6PYXI?dv}`#Qh)pPs
z0wy4~2I5Yrnkhh>4#c`pIR<D5^&rV70<jqo^HMVrvI4Oi5Kll-53)1@h})t3IGClh
z%mtt*2!{H!8yY(8(D<fHHUv2!5bA(VBnQOP+5w;_Z~>)iB=sP66jBr<(jp4b6Co&N
zX8^H2QX=GoMhAK#<fGI9Mo8JP6q*gWNyvsEz6B)?kcV0-LSjLb1H|mqD2T`@iff=n
zu?97YVsa`Y5omP5qD^|VJusx2WFxdyJlZoFaSi|g$re{=C@D2h00000NkvXXu0mjf
DLCbr?

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png b/mobile/android/base/resources/drawable-mdpi/ic_menu_share.png
similarity index 100%
rename from mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
rename to mobile/android/base/resources/drawable-mdpi/ic_menu_share.png
diff --git a/mobile/android/base/resources/drawable-mdpi/paste.png b/mobile/android/base/resources/drawable-mdpi/paste.png
new file mode 100644
index 0000000000000000000000000000000000000000..61fd91c8808a6cc1c8bcae5d7c5db8305c92bd44
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNuDl_ArXg@fBgS%f7l_Z&G9uu
za&od$1arsig%QmYs-i3w$aZX9xMQvu-waQdu;!$utjwnjiwsry9Qgg@ZNw@Q1N}|e
z4H!2X3w(c2cz|UEb7bbjh5(@^n~7q4FO&~53THfIDEj!JkYS&KyriPRip31^TYB6W
zV;3iwi1&!OEasD#$0zZ@?d1WBgf00NNiqx!(q7A+auxiV2y`8Tr>mdKI;Vst0O;>T
A>;M1&

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/copy.png b/mobile/android/base/resources/drawable-xhdpi/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..364b1692f3eadd2b28e8dbf3d3e83aed90b7ba14
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hdo^!Ln>~)y}q0GumKON!>%)S
z_d0#MdL~`7&YUlzImNCuQTc=Zp6ja?@>MXIez~`}2&5SV4m|34Y$0n?d`@=TH6V9`
zzC&Kk!*rKB3?gh1q73Q`Gx*p%fZ}tw5?;F(F@bb2Fsx(Vkm7$roAHkFqgcrYf`aQ$
zi85>udT@Qe6H@>q!&0pY3?U2-JGoRCL>UtJBO-baGwy3=4p_^?u!?bw6bI0Nr;KI1
kKx!N7kL@7yfS~m=<KvUJC#-jxwim?pboFyt=akR{00^E>i~s-t

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/cut.png b/mobile/android/base/resources/drawable-xhdpi/cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4e4d81f367d31034dc364793a430f63c7bd19db
GIT binary patch
literal 996
zcmV<A0~`E_P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000B4Nkl<Zc-rln
zUx<ur7{GtFvu&DIlE{UQkkls9CRWaIfg}$Jkw|i(q`g8R#&O})Ij2r-=i;~$7eeIX
zMQ+3*HXb2u{<QhirfD~wPHEG$+pL>sPH$h|%+8#h-I;H^&($~Yzxm$Z`}}=pCJYY`
z^F7Oi03ZMe00MvjAOHve3QB8h>zP`5VG-F^&iHgX9RLIX0YC)-l=}js73bWU03ZMe
z00MvjpuqP#=Vk!wfEFMH^aGv1T@e|oYXHu<c|beR7&G-1@RzC%)g=JuTnhLFXtu6C
z;3KdY_`%vPtLp7U11JJ!2k^6fd?+I4Jd-#AGyxe^Jy~}EoO3gQqd<c-b%;o}*WYeF
zVNg{Mj5`45Tm!HOm;?L+bcx771pyoa=6X%nMZ{TOGjIZ!1oW%w@oE6r11$BL27xEQ
zeGz##%FQnU_QrHQ1~R}hU|JrGs=8`vzzSd!Ffr2I3*0xY$d<Wz|8z%^Uf_3C%~s6^
zn5W+8IV)eXK$mGnZ;9*e2NsSnY`_5D6p?IA<N@ZiwnyyNmv@%DJQb0_0&A=RHW!%R
zV{!j2&?6$bn#=^vem4V?i=18;&?zE)-n=$om*@5K(hXb{kx%1!Au`%9*aWNv)_4g^
zoV+$wZUS~jHlG15*ohYvRjoMyd6@=mDZ!@Wy#0BLEF>8~URr={!1PFaAMnBeP51Kq
z4j@<R;z<C2nZin7gQ@%waM*l83i!=TAZ^ti^#-8PO4`--oC6Me0RFIXr!BtM6@XTY
z3{xWQpFI<p>V>;MO+yk7U<R-Qm{;b!XTVuYq!I~WqL&>u6dBiTVXzU{6B*kFT(U8V
z0<hfFJyoFp3-HLY!p~m&k{Ag2T;WPFzfdaxW|_MGSfKx{ZTfi;`(6cXEmHWr1l|De
zee<X`fJs&nw#D>)1s<B3XG&aepIvzslPvH6xB(1Q3qU@uua7B*KLGbEqZ=$!lTyIR
z63gKX@N31(;SvGtj+}bdHr!cm9FLK>3z3|y-wXWYWsbL0^;)$|U;!{2_}5<UYXx(M
z1GfHu1tW0Xp2zk|Y>YC&|5He%y=t-}5)#MmQnW?@U=d-JJ$G4hgsJ~At0_LI>Zzmy
zDD?d)Q}xMS>fB?dk<T+Os_LD31%O?#wcBY&<t6ZU#eW*BF#vg$Ukl8)g6gA}P3DqP
z4vz*vUEBu*0ObG}X;bA$01yBq?2nQGKmZT`j4yzCmjECD2mk_r03ZPPj^!Ienu?#G
S=-;CN0000<MNUMnLSTXcoVgbO

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
diff --git a/mobile/android/base/resources/drawable-xhdpi/paste.png b/mobile/android/base/resources/drawable-xhdpi/paste.png
new file mode 100644
index 0000000000000000000000000000000000000000..6edd4b222ef06eeb46acd9c90ff81bcee1df867f
GIT binary patch
literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KesaSW-r_4byb_hAQ_wvS>l
zE&_!Y7Ovi5(J_htq1K}2$+vl%c6e|%d9XXi#IRU%_~|`jFDT)+=v3g-Q|f5uP-+sm
ze}MPVlq1%Ap3G}*-?q^A<@!IDS#F)%v_|xE7BkSMrEwEfI=jEi2A|G4Ww$T<`Kzz%
zt^F>WR5W;A4OQO1ZU1WKuUASK7C*Z>ch`p7)2?jU6?WX0-6G_0miOM9xr@Ku{vRT}
zkeNqDwtkm=nw`Dco8327GWf(Y<Xu_0cmJ}qB<2sB7=ExfDCO^1Y^7>{dhsjqihBwr
z4SlRDHkEPD5oh5wSQmCB#<d~3G&4V&b;AEOYga|OFaEp6?~1c5!>8ao^JW#))cg*p
z7E{h>aNYXgr9%DEb586pZgb1Yzjn=S=POv!X2V#s^6Rd@Jip?A-eF*HWDMCEb;iHQ
zj4^?Qp`(oDlnyh4GK0fo_X7+EI2Z)3a!4>pFfv&1udq;KFkk{}0Ta6aG&q5b3bu?}
dP|=2t>*fKTPbR$5o3jk0#M9N!Wt~$(69Bzut#1GT

literal 0
HcmV?d00001

diff --git a/mobile/android/chrome/content/SelectionHandler.js b/mobile/android/chrome/content/SelectionHandler.js
index 777048e6d7d..54f4362ef25 100644
--- a/mobile/android/chrome/content/SelectionHandler.js
+++ b/mobile/android/chrome/content/SelectionHandler.js
@@ -49,21 +49,23 @@ var SelectionHandler = {
 
   _addObservers: function sh_addObservers() {
     Services.obs.addObserver(this, "Gesture:SingleTap", false);
-    Services.obs.addObserver(this, "Window:Resize", false);
     Services.obs.addObserver(this, "Tab:Selected", false);
     Services.obs.addObserver(this, "after-viewport-change", false);
     Services.obs.addObserver(this, "TextSelection:Move", false);
     Services.obs.addObserver(this, "TextSelection:Position", false);
+    Services.obs.addObserver(this, "TextSelection:End", false);
+    Services.obs.addObserver(this, "TextSelection:Action", false);
     BrowserApp.deck.addEventListener("compositionend", this, false);
   },
 
   _removeObservers: function sh_removeObservers() {
     Services.obs.removeObserver(this, "Gesture:SingleTap");
-    Services.obs.removeObserver(this, "Window:Resize");
     Services.obs.removeObserver(this, "Tab:Selected");
     Services.obs.removeObserver(this, "after-viewport-change");
     Services.obs.removeObserver(this, "TextSelection:Move");
     Services.obs.removeObserver(this, "TextSelection:Position");
+    Services.obs.removeObserver(this, "TextSelection:End");
+    Services.obs.removeObserver(this, "TextSelection:Action");
     BrowserApp.deck.removeEventListener("compositionend", this);
   },
 
@@ -84,17 +86,17 @@ var SelectionHandler = {
         break;
       }
       case "Tab:Selected":
+      case "TextSelection:End":
         this._closeSelection();
         break;
-
-      case "Window:Resize": {
-        if (this._activeType == this.TYPE_SELECTION) {
-          // Knowing when the page is done drawing is hard, so let's just cancel
-          // the selection when the window changes. We should fix this later.
-          this._closeSelection();
+      case "TextSelection:Action":
+        for (let type in this.actions) {
+          if (this.actions[type].id == aData) {
+            this.actions[type].action(this._targetElement);
+            break;
+          }
         }
         break;
-      }
       case "after-viewport-change": {
         if (this._activeType == this.TYPE_SELECTION) {
           // Update the cache after the viewport changes (e.g. panning, zooming).
@@ -229,16 +231,24 @@ var SelectionHandler = {
     // Clear any existing selection from the document
     this._contentWindow.getSelection().removeAllRanges();
 
+    // If we didn't have any coordinates to associate with this event (for instance, selectAll is chosen from
+    // the actionMode), set them to a point inside the top left corner of the target
+    if (aX == undefined || aY == undefined) {
+      let rect = this._targetElement.getBoundingClientRect();
+      aX = rect.left + 1;
+      aY = rect.top  + 1;
+    }
+
     if (!this._domWinUtils.selectAtPoint(aX, aY, Ci.nsIDOMWindowUtils.SELECT_WORDNOSPACE)) {
       this._deactivate();
-      return;
+      return false;
     }
 
     let selection = this._getSelection();
     // If the range didn't have any text, let's bail
-    if (!selection || selection.rangeCount == 0) {
+    if (!selection || selection.rangeCount == 0 || selection.getRangeAt(0).collapsed) {
       this._deactivate();
-      return;
+      return false;
     }
 
     // Add a listener to end the selection if it's removed programatically
@@ -274,17 +284,135 @@ var SelectionHandler = {
     // Do not select text far away from where the user clicked
     if (distance > maxSelectionDistance) {
       this._closeSelection();
-      return;
+      return false;
     }
 
     this._positionHandles(positions);
+    this._sendMessage("TextSelection:ShowHandles", [this.HANDLE_TYPE_START, this.HANDLE_TYPE_END], aX, aY);
+    return true;
+  },
+
+
+  /* Reads a value from an action. If the action defines the value as a function, will return the result of calling
+     the function. Otherwise, will return the value itself. If the value isn't defined for this action, will return a default */
+  _getValue: function(obj, name, defaultValue) {
+    if (!(name in obj))
+      return defaultValue;
+
+    if (typeof obj[name] == "function")
+      return obj[name](this._targetElement);
+
+    return obj[name];
+  },
+
+  _sendMessage: function(type, handles, aX, aY) {
+    let actions = [];
+    for (let type in this.actions) {
+      let action = this.actions[type];
+      if (action.selector.matches(this._targetElement, aX, aY)) {
+        let a = {
+          id: action.id,
+          label: this._getValue(action, "label", ""),
+          icon: this._getValue(action, "icon", "drawable://ic_status_logo"),
+          showAsAction: this._getValue(action, "showAsAction", true),
+        };
+        actions.push(a);
+      }
+    }
 
     sendMessageToJava({
-      type: "TextSelection:ShowHandles",
-      handles: [this.HANDLE_TYPE_START, this.HANDLE_TYPE_END]
+      type: type,
+      handles: handles,
+      actions: actions,
     });
   },
 
+  _updateMenu: function() {
+    this._sendMessage("TextSelection:Update");
+  },
+
+  actions: {
+    SELECT_ALL: {
+      label: Strings.browser.GetStringFromName("contextmenu.selectAll"),
+      id: "selectall_action",
+      icon: "drawable://select_all",
+      action: function(aElement) {
+        SelectionHandler.selectAll(aElement);
+      },
+      selector: ClipboardHelper.selectAllContext,
+    },
+
+    CUT: {
+      label: Strings.browser.GetStringFromName("contextmenu.cut"),
+      id: "cut_action",
+      icon: "drawable://cut",
+      action: function(aElement) {
+        let start = aElement.selectionStart;
+        let end   = aElement.selectionEnd;
+
+        SelectionHandler.copySelection();
+        aElement.value = aElement.value.substring(0, start) + aElement.value.substring(end)
+
+        SelectionHandler._updateMenu();
+      },
+      selector: ClipboardHelper.cutContext,
+    },
+
+    COPY: {
+      label: Strings.browser.GetStringFromName("contextmenu.copy"),
+      id: "copy_action",
+      icon: "drawable://copy",
+      action: function() {
+        SelectionHandler.copySelection();
+        SelectionHandler._updateMenu();
+      },
+      selector: ClipboardHelper.getCopyContext(false)
+    },
+
+    PASTE: {
+      label: Strings.browser.GetStringFromName("contextmenu.paste"),
+      id: "paste_action",
+      icon: "drawable://paste",
+      action: function(aElement) {
+        ClipboardHelper.paste(aElement);
+        SelectionHandler._positionHandles();
+        SelectionHandler._updateMenu();
+      },
+      selector: ClipboardHelper.pasteContext,
+    },
+
+    SHARE: {
+      label: Strings.browser.GetStringFromName("contextmenu.share"),
+      id: "share_action",
+      icon: "drawable://ic_menu_share",
+      action: function() {
+        SelectionHandler.shareSelection();
+        SelectionHandler._closeSelection();
+      },
+      showAsAction: function(aElement) {
+        return !(aElement instanceof HTMLInputElement && aElement.mozIsTextField(false))
+      },
+      selector: ClipboardHelper.shareContext,
+    },
+
+    SEARCH: {
+      label: function() {
+        return Strings.browser.formatStringFromName("contextmenu.search", [Services.search.defaultEngine.name], 1);
+      },
+      id: "search_action",
+      icon: "drawable://ic_url_bar_search",
+      showAsAction: function(aElement) {
+        return !(aElement instanceof HTMLInputElement && aElement.mozIsTextField(false))
+      },
+      action: function() {
+        SelectionHandler.searchSelection();
+        SelectionHandler._closeSelection();
+      },
+      selector: ClipboardHelper.searchWithContext,
+    },
+
+  },
+
   /*
    * Called by BrowserEventHandler when the user taps in a form input.
    * Initializes SelectionHandler and positions the caret handle.
@@ -292,6 +420,12 @@ var SelectionHandler = {
    * @param aX, aY tap location in client coordinates.
    */
   attachCaret: function sh_attachCaret(aElement) {
+    // See if its an input element, and it isn't disabled, nor handled by Android native dialog
+    if (aElement.disabled ||
+        InputWidgetHelper.hasInputWidget(aElement) ||
+        !((aElement instanceof HTMLInputElement && aElement.mozIsTextField(false)) ||
+          (aElement instanceof HTMLTextAreaElement)))
+      return;
     this._initTargetInfo(aElement);
 
     this._contentWindow.addEventListener("keydown", this, false);
@@ -300,10 +434,7 @@ var SelectionHandler = {
     this._activeType = this.TYPE_CURSOR;
     this._positionHandles();
 
-    sendMessageToJava({
-      type: "TextSelection:ShowHandles",
-      handles: [this.HANDLE_TYPE_MIDDLE]
-    });
+    this._sendMessage("TextSelection:ShowHandles", [this.HANDLE_TYPE_MIDDLE]);
   },
 
   _initTargetInfo: function sh_initTargetInfo(aElement) {
@@ -348,8 +479,8 @@ var SelectionHandler = {
   },
 
   // Used by the contextmenu "matches" functions in ClipboardHelper
-  shouldShowContextMenu: function sh_shouldShowContextMenu(aX, aY) {
-    return (this._activeType == this.TYPE_SELECTION) && this._pointInSelection(aX, aY);
+  isSelectionActive: function sh_isSelectionActive() {
+    return (this._activeType == this.TYPE_SELECTION);
   },
 
   selectAll: function sh_selectAll(aElement, aX, aY) {
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 31815ea9d51..2e997996222 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -327,7 +327,6 @@ var BrowserApp = {
     IndexedDB.init();
     HealthReportStatusListener.init();
     XPInstallObserver.init();
-    ClipboardHelper.init();
     CharacterEncoding.init();
     ActivityObserver.init();
     WebappsUI.init();
@@ -2102,8 +2101,11 @@ var NativeWindow = {
         this._target = null;
         BrowserEventHandler._cancelTapHighlight();
 
-        if (SelectionHandler.canSelect(target))
-          SelectionHandler.startSelection(target, aX, aY);
+        if (SelectionHandler.canSelect(target)) {
+          if (!SelectionHandler.startSelection(target, aX, aY)) {
+            SelectionHandler.attachCaret(target);
+          }
+        }
       }
     },
 
@@ -4388,12 +4390,7 @@ var BrowserEventHandler = {
             this._sendMouseEvent("mousedown", element, x, y);
             this._sendMouseEvent("mouseup",   element, x, y);
 
-            // See if its an input element, and it isn't disabled, nor handled by Android native dialog
-            if (!element.disabled &&
-                !InputWidgetHelper.hasInputWidget(element) &&
-                ((element instanceof HTMLInputElement && element.mozIsTextField(false)) ||
-                (element instanceof HTMLTextAreaElement)))
-              SelectionHandler.attachCaret(element);
+            SelectionHandler.attachCaret(element);
 
             // scrollToFocusedInput does its own checks to find out if an element should be zoomed into
             BrowserApp.scrollToFocusedInput(BrowserApp.selectedBrowser);
@@ -6181,36 +6178,6 @@ var ClipboardHelper = {
   // Recorded so search with option can be removed/replaced when default engine changed.
   _searchMenuItem: -1,
 
-  init: function() {
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.copy"), ClipboardHelper.getCopyContext(false), ClipboardHelper.copy.bind(ClipboardHelper));
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.copyAll"), ClipboardHelper.getCopyContext(true), ClipboardHelper.copy.bind(ClipboardHelper));
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.selectWord"), ClipboardHelper.selectWordContext, ClipboardHelper.selectWord.bind(ClipboardHelper));
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.selectAll"), ClipboardHelper.selectAllContext, ClipboardHelper.selectAll.bind(ClipboardHelper));
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.share"), ClipboardHelper.shareContext, ClipboardHelper.share.bind(ClipboardHelper));
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.paste"), ClipboardHelper.pasteContext, ClipboardHelper.paste.bind(ClipboardHelper));
-    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.changeInputMethod"), NativeWindow.contextmenus.textContext, ClipboardHelper.inputMethod.bind(ClipboardHelper));
-
-    // We add this contextmenu item right before the menu is built to avoid having to initialise the search service early.
-    Services.obs.addObserver(this, "before-build-contextmenu", false);
-  },
-
-  uninit: function ch_uninit() {
-    Services.obs.removeObserver(this, "before-build-contextmenu");
-  },
-
-  observe: function observe(aSubject, aTopic) {
-    if (aTopic == "before-build-contextmenu") {
-      this._setSearchMenuItem();
-    }
-  },
-
-  _setSearchMenuItem: function setSearchMenuItem() {
-    if (this._searchMenuItem) {
-      NativeWindow.contextmenus.remove(this._searchMenuItem);
-    }
-    this._searchMenuItem = NativeWindow.contextmenus.add(Strings.browser.formatStringFromName("contextmenu.search", [Services.search.defaultEngine.name], 1), ClipboardHelper.searchWithContext, ClipboardHelper.searchWith.bind(ClipboardHelper));
-  },
-
   get clipboardHelper() {
     delete this.clipboardHelper;
     return this.clipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
@@ -6222,7 +6189,7 @@ var ClipboardHelper = {
   },
 
   copy: function(aElement, aX, aY) {
-    if (SelectionHandler.shouldShowContextMenu(aX, aY)) {
+    if (SelectionHandler.isSelectionActive()) {
       SelectionHandler.copySelection();
       return;
     }
@@ -6269,7 +6236,7 @@ var ClipboardHelper = {
     return {
       matches: function(aElement, aX, aY) {
         // Do not show "Copy All" for normal non-input text selection.
-        if (!isCopyAll && SelectionHandler.shouldShowContextMenu(aX, aY))
+        if (!isCopyAll && SelectionHandler.isSelectionActive())
           return true;
 
         if (NativeWindow.contextmenus.textContext.matches(aElement)) {
@@ -6302,7 +6269,7 @@ var ClipboardHelper = {
 
   selectAllContext: {
     matches: function selectAllContextMatches(aElement, aX, aY) {
-      if (SelectionHandler.shouldShowContextMenu(aX, aY))
+      if (SelectionHandler.isSelectionActive())
         return true;
 
       if (NativeWindow.contextmenus.textContext.matches(aElement))
@@ -6314,13 +6281,13 @@ var ClipboardHelper = {
 
   shareContext: {
     matches: function shareContextMatches(aElement, aX, aY) {
-      return SelectionHandler.shouldShowContextMenu(aX, aY);
+      return SelectionHandler.isSelectionActive();
     }
   },
 
   searchWithContext: {
     matches: function searchWithContextMatches(aElement, aX, aY) {
-      return SelectionHandler.shouldShowContextMenu(aX, aY);
+      return SelectionHandler.isSelectionActive();
     }
   },
 
@@ -6332,6 +6299,16 @@ var ClipboardHelper = {
       }
       return false;
     }
+  },
+
+  cutContext: {
+    matches: function(aElement) {
+      let copyctx = ClipboardHelper.getCopyContext(false);
+      if (NativeWindow.contextmenus.textContext.matches(aElement)) {
+        return copyctx.matches(aElement);
+      }
+      return false;
+    }
   }
 };
 
@@ -6638,13 +6615,21 @@ var SearchEngines = {
     Services.obs.addObserver(this, "SearchEngines:GetVisible", false);
     Services.obs.addObserver(this, "SearchEngines:SetDefault", false);
     Services.obs.addObserver(this, "SearchEngines:Remove", false);
-    let contextName = Strings.browser.GetStringFromName("contextmenu.addSearchEngine");
+
     let filter = {
       matches: function (aElement) {
         return (aElement.form && NativeWindow.contextmenus.textContext.matches(aElement));
       }
     };
-    this._contextMenuId = NativeWindow.contextmenus.add(contextName, filter, this.addEngine);
+    SelectionHandler.actions.SEARCH_ADD = {
+      id: "add_search_action",
+      label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine"),
+      icon: "drawable://ic_url_bar_search",
+      selector: filter,
+      action: function(aElement) {
+        SearchEngines.addEngine(aElement);
+      }
+    }
   },
 
   uninit: function uninit() {
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index b2a46142b87..2de19889e09 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -193,8 +193,7 @@ contextmenu.saveAudio=Save Audio
 contextmenu.addToContacts=Add to Contacts
 
 contextmenu.copy=Copy
-contextmenu.copyAll=Copy All
-contextmenu.selectWord=Select Word
+contextmenu.cut=Cut
 contextmenu.selectAll=Select All
 contextmenu.paste=Paste
 

From 9917bd81e16c4a3727c33e56868fc4a4af5e43a8 Mon Sep 17 00:00:00 2001
From: Steven MacLeod <smacleod@mozilla.com>
Date: Tue, 19 Nov 2013 14:57:46 -0500
Subject: [PATCH 53/92] Bug 918024 - Remove the synchronous fallback for
 reading in Session Store initialization. r=Yoric, f=ttaubert

---
 browser/components/nsBrowserContentHandler.js | 14 ++--
 .../sessionstore/nsISessionStartup.idl        | 14 ++--
 .../sessionstore/src/SessionFile.jsm          | 69 -------------------
 .../sessionstore/src/SessionWorker.js         | 24 -------
 .../sessionstore/src/nsSessionStartup.js      | 41 ++++++-----
 .../test/browser_833286_atomic_backup.js      | 10 ---
 .../test/unit/test_startup_nosession_sync.js  | 15 ----
 .../test/unit/test_startup_session_sync.js    | 17 -----
 .../sessionstore/test/unit/xpcshell.ini       |  2 -
 browser/components/test/browser_bug538331.js  |  4 ++
 toolkit/components/telemetry/Histograms.json  |  7 --
 11 files changed, 47 insertions(+), 170 deletions(-)
 delete mode 100644 browser/components/sessionstore/test/unit/test_startup_nosession_sync.js
 delete mode 100644 browser/components/sessionstore/test/unit/test_startup_session_sync.js

diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index 1624089522b..466950c1d7c 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -549,7 +549,7 @@ nsBrowserContentHandler.prototype = {
     }
 
     var overridePage = "";
-    var haveUpdateSession = false;
+    var willRestoreSession = false;
     try {
       // Read the old value of homepage_override.mstone before
       // needHomepageOverride updates it, so that we can later add it to the
@@ -568,11 +568,15 @@ nsBrowserContentHandler.prototype = {
             overridePage = Services.urlFormatter.formatURLPref("startup.homepage_welcome_url");
             break;
           case OVERRIDE_NEW_MSTONE:
-            // Check whether we have a session to restore. If we do, we assume
-            // that this is an "update" session.
+            // Check whether we will restore a session. If we will, we assume
+            // that this is an "update" session. This does not take crashes
+            // into account because that requires waiting for the session file
+            // to be read. If a crash occurs after updating, before restarting,
+            // we may open the startPage in addition to restoring the session.
             var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"]
                                .getService(Components.interfaces.nsISessionStartup);
-            haveUpdateSession = ss.doRestore();
+            willRestoreSession = ss.isAutomaticRestoreEnabled();
+
             overridePage = Services.urlFormatter.formatURLPref("startup.homepage_override_url");
             if (prefb.prefHasUserValue("app.update.postupdate"))
               overridePage = getPostUpdateOverridePage(overridePage);
@@ -600,7 +604,7 @@ nsBrowserContentHandler.prototype = {
       startPage = "";
 
     // Only show the startPage if we're not restoring an update session.
-    if (overridePage && startPage && !haveUpdateSession)
+    if (overridePage && startPage && !willRestoreSession)
       return overridePage + "|" + startPage;
 
     return overridePage || startPage || "about:blank";
diff --git a/browser/components/sessionstore/nsISessionStartup.idl b/browser/components/sessionstore/nsISessionStartup.idl
index a8e786d03e9..a1121a76660 100644
--- a/browser/components/sessionstore/nsISessionStartup.idl
+++ b/browser/components/sessionstore/nsISessionStartup.idl
@@ -10,7 +10,7 @@
  * - and allows to restore everything into one window.
  */
 
-[scriptable, uuid(51f4b9f0-f3d2-11e2-bb62-2c24dd830245)]
+[scriptable, uuid(6c79d4c1-f071-4c5c-a7fb-676adb144584)]
 interface nsISessionStartup: nsISupports
 {
   /**
@@ -23,12 +23,18 @@ interface nsISessionStartup: nsISupports
   readonly attribute jsval state;
 
   /**
-   * Determines whether there is a pending session restore and makes sure that
-   * we're initialized before returning. If we're not yet this will read the
-   * session file synchronously.
+   * Determines whether there is a pending session restore. Should only be
+   * called after initialization has completed.
    */
   boolean doRestore();
 
+  /**
+   * Determines whether automatic session restoration is enabled for this
+   * launch of the browser. This does not include crash restoration, and will
+   * return false if restoration will only be caused by a crash.
+   */
+  boolean isAutomaticRestoreEnabled();
+
   /**
    * Returns whether we will restore a session that ends up replacing the
    * homepage. The browser uses this to not start loading the homepage if
diff --git a/browser/components/sessionstore/src/SessionFile.jsm b/browser/components/sessionstore/src/SessionFile.jsm
index ad46237ffc0..9c059bb5e54 100644
--- a/browser/components/sessionstore/src/SessionFile.jsm
+++ b/browser/components/sessionstore/src/SessionFile.jsm
@@ -38,16 +38,10 @@ Cu.import("resource://gre/modules/AsyncShutdown.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",
   "resource://gre/modules/TelemetryStopwatch.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-  "resource://gre/modules/NetUtil.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-  "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
   "@mozilla.org/base/telemetry;1", "nsITelemetry");
-XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
-  "resource://gre/modules/Deprecated.jsm");
 
 this.SessionFile = {
   /**
@@ -56,15 +50,6 @@ this.SessionFile = {
   read: function () {
     return SessionFileInternal.read();
   },
-  /**
-   * Read the contents of the session file, synchronously.
-   */
-  syncRead: function () {
-    Deprecated.warning(
-      "syncRead is deprecated and will be removed in a future version",
-      "https://bugzilla.mozilla.org/show_bug.cgi?id=532150")
-    return SessionFileInternal.syncRead();
-  },
   /**
    * Write the contents of the session file, asynchronously.
    */
@@ -161,60 +146,6 @@ let SessionFileInternal = {
    */
   _isClosed: false,
 
-  /**
-   * Utility function to safely read a file synchronously.
-   * @param aPath
-   *        A path to read the file from.
-   * @returns string if successful, undefined otherwise.
-   */
-  readAuxSync: function (aPath) {
-    let text;
-    try {
-      let file = new FileUtils.File(aPath);
-      let chan = NetUtil.newChannel(file);
-      let stream = chan.open();
-      text = NetUtil.readInputStreamToString(stream, stream.available(),
-        {charset: "utf-8"});
-    } catch (e if e.result == Components.results.NS_ERROR_FILE_NOT_FOUND) {
-      // Ignore exceptions about non-existent files.
-    } catch (ex) {
-      // Any other error.
-      Cu.reportError(ex);
-    } finally {
-      return text;
-    }
-  },
-
-  /**
-   * Read the sessionstore file synchronously.
-   *
-   * This function is meant to serve as a fallback in case of race
-   * between a synchronous usage of the API and asynchronous
-   * initialization.
-   *
-   * In case if sessionstore.js file does not exist or is corrupted (something
-   * happened between backup and write), attempt to read the sessionstore.bak
-   * instead.
-   */
-  syncRead: function () {
-    // Start measuring the duration of the synchronous read.
-    TelemetryStopwatch.start("FX_SESSION_RESTORE_SYNC_READ_FILE_MS");
-    // First read the sessionstore.js.
-    let text = this.readAuxSync(this.path);
-    if (typeof text === "undefined") {
-      // If sessionstore.js does not exist or is corrupted, read sessionstore.bak.
-      text = this.readAuxSync(this.backupPath);
-    }
-    // Finish the telemetry probe and return an empty string.
-    TelemetryStopwatch.finish("FX_SESSION_RESTORE_SYNC_READ_FILE_MS");
-    text = text || "";
-
-    // The worker needs to know the initial state read from
-    // disk so that writeLoadStateOnceAfterStartup() works.
-    SessionWorker.post("setInitialState", [text]);
-    return text;
-  },
-
   read: function () {
     return SessionWorker.post("read").then(msg => {
       this._recordTelemetry(msg.telemetry);
diff --git a/browser/components/sessionstore/src/SessionWorker.js b/browser/components/sessionstore/src/SessionWorker.js
index 0d50b2f4ab8..c62464265ee 100644
--- a/browser/components/sessionstore/src/SessionWorker.js
+++ b/browser/components/sessionstore/src/SessionWorker.js
@@ -73,30 +73,6 @@ let Agent = {
   // The path to sessionstore.bak
   backupPath: OS.Path.join(OS.Constants.Path.profileDir, "sessionstore.bak"),
 
-  /**
-   * This method is only intended to be called by SessionFile.syncRead() and
-   * can be removed when we're not supporting synchronous SessionStore
-   * initialization anymore. When sessionstore.js is read from disk
-   * synchronously the state string must be supplied to the worker manually by
-   * calling this method.
-   */
-  setInitialState: function (aState) {
-    // SessionFile.syncRead() should not be called after startup has finished.
-    // Thus we also don't support any setInitialState() calls after we already
-    // wrote the loadState to disk.
-    if (this.hasWrittenLoadStateOnce) {
-      throw new Error("writeLoadStateOnceAfterStartup() must only be called once.");
-    }
-
-    // Initial state might have been filled by read() already but yet we might
-    // be called by SessionFile.syncRead() before SessionStore.jsm had a chance
-    // to call writeLoadStateOnceAfterStartup(). It's safe to ignore
-    // setInitialState() calls if this happens.
-    if (!this.initialState) {
-      this.initialState = aState;
-    }
-  },
-
   /**
    * Read the session from disk.
    * In case sessionstore.js does not exist, attempt to read sessionstore.bak.
diff --git a/browser/components/sessionstore/src/nsSessionStartup.js b/browser/components/sessionstore/src/nsSessionStartup.js
index 5f4dc214555..42e0987ff3e 100644
--- a/browser/components/sessionstore/src/nsSessionStartup.js
+++ b/browser/components/sessionstore/src/nsSessionStartup.js
@@ -48,6 +48,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "SessionFile",
 
 const STATE_RUNNING_STR = "running";
 
+// 'browser.startup.page' preference value to resume the previous session.
+const BROWSER_STARTUP_RESUME_SESSION = 3;
+
 function debug(aMsg) {
   aMsg = ("SessionStartup: " + aMsg).replace(/\S{80}/g, "$&\n");
   Services.console.logStringMessage(aMsg);
@@ -138,7 +141,7 @@ SessionStartup.prototype = {
 
       let doResumeSessionOnce = Services.prefs.getBoolPref("browser.sessionstore.resume_session_once");
       let doResumeSession = doResumeSessionOnce ||
-            Services.prefs.getIntPref("browser.startup.page") == 3;
+            Services.prefs.getIntPref("browser.startup.page") == BROWSER_STARTUP_RESUME_SESSION;
 
       // If this is a normal restore then throw away any previous session
       if (!doResumeSessionOnce)
@@ -226,9 +229,9 @@ SessionStartup.prototype = {
   },
 
   /**
-   * Determines whether there is a pending session restore and makes sure that
-   * we're initialized before returning. If we're not yet this will read the
-   * session file synchronously.
+   * Determines whether there is a pending session restore. Should only be
+   * called after initialization has completed.
+   * @throws Error if initialization is not complete yet.
    * @returns bool
    */
   doRestore: function sss_doRestore() {
@@ -236,6 +239,18 @@ SessionStartup.prototype = {
     return this._willRestore();
   },
 
+  /**
+   * Determines whether automatic session restoration is enabled for this
+   * launch of the browser. This does not include crash restoration. In
+   * particular, if session restore is configured to restore only in case of
+   * crash, this method returns false.
+   * @returns bool
+   */
+  isAutomaticRestoreEnabled: function () {
+    return Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") ||
+           Services.prefs.getIntPref("browser.startup.page") == BROWSER_STARTUP_RESUME_SESSION;
+  },
+
   /**
    * Determines whether there is a pending session restore.
    * @returns bool
@@ -275,20 +290,12 @@ SessionStartup.prototype = {
     return this._sessionType;
   },
 
-  // Ensure that initialization is complete.
-  // If initialization is not complete yet, fall back to a synchronous
-  // initialization and kill ongoing asynchronous initialization
+  // Ensure that initialization is complete. If initialization is not complete
+  // yet, something is attempting to use the old synchronous initialization,
+  // throw an error.
   _ensureInitialized: function sss__ensureInitialized() {
-    try {
-      if (this._initialized) {
-        // Initialization is complete, nothing else to do
-        return;
-      }
-      let contents = SessionFile.syncRead();
-      this._onSessionFileRead(contents);
-    } catch(ex) {
-      debug("ensureInitialized: could not read session " + ex + ", " + ex.stack);
-      throw ex;
+    if (!this._initialized) {
+      throw new Error("Session Store is not initialized.");
     }
   },
 
diff --git a/browser/components/sessionstore/test/browser_833286_atomic_backup.js b/browser/components/sessionstore/test/browser_833286_atomic_backup.js
index f4d7ab41ac6..7f482273cbf 100644
--- a/browser/components/sessionstore/test/browser_833286_atomic_backup.js
+++ b/browser/components/sessionstore/test/browser_833286_atomic_backup.js
@@ -104,11 +104,6 @@ function testReadBackup() {
   let ssDataRead = yield SessionFile.read();
   is(ssDataRead, gSSData, "SessionFile.read read sessionstore.js correctly.");
 
-  // Read sessionstore.js with SessionFile.syncRead.
-  ssDataRead = SessionFile.syncRead();
-  is(ssDataRead, gSSData,
-    "SessionFile.syncRead read sessionstore.js correctly.");
-
   // Remove sessionstore.js to test fallback onto sessionstore.bak.
   yield OS.File.remove(path);
   ssExists = yield OS.File.exists(path);
@@ -119,11 +114,6 @@ function testReadBackup() {
   is(ssDataRead, gSSBakData,
     "SessionFile.read read sessionstore.bak correctly.");
 
-  // Read sessionstore.bak with SessionFile.syncRead.
-  ssDataRead = SessionFile.syncRead();
-  is(ssDataRead, gSSBakData,
-    "SessionFile.syncRead read sessionstore.bak correctly.");
-
   nextTest(testBackupUnchanged);
 }
 
diff --git a/browser/components/sessionstore/test/unit/test_startup_nosession_sync.js b/browser/components/sessionstore/test/unit/test_startup_nosession_sync.js
deleted file mode 100644
index a06770a39eb..00000000000
--- a/browser/components/sessionstore/test/unit/test_startup_nosession_sync.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-
-// Test nsISessionStartup.sessionType in the following scenario:
-// - no sessionstore.js;
-// - the session store has not been loaded yet, so we have to trigger
-//    synchronous fallback
-
-function run_test() {
-  do_get_profile();
-  let startup = Cc["@mozilla.org/browser/sessionstartup;1"].
-    getService(Ci.nsISessionStartup);
-  do_check_eq(startup.sessionType, Ci.nsISessionStartup.NO_SESSION);
-}
\ No newline at end of file
diff --git a/browser/components/sessionstore/test/unit/test_startup_session_sync.js b/browser/components/sessionstore/test/unit/test_startup_session_sync.js
deleted file mode 100644
index f8e56d3e9fa..00000000000
--- a/browser/components/sessionstore/test/unit/test_startup_session_sync.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-
-// Test nsISessionStartup.sessionType in the following scenario:
-// - valid sessionstore.js;
-// - the session store has not been loaded yet, so we have to trigger
-//    synchronous fallback
-
-function run_test() {
-  let profd = do_get_profile();
-  let source = do_get_file("data/sessionstore_valid.js");
-  source.copyTo(profd, "sessionstore.js");
-  let startup = Cc["@mozilla.org/browser/sessionstartup;1"].
-    getService(Ci.nsISessionStartup);
-  do_check_eq(startup.sessionType, Ci.nsISessionStartup.DEFER_SESSION);
-}
\ No newline at end of file
diff --git a/browser/components/sessionstore/test/unit/xpcshell.ini b/browser/components/sessionstore/test/unit/xpcshell.ini
index 10737448add..509e68905a8 100644
--- a/browser/components/sessionstore/test/unit/xpcshell.ini
+++ b/browser/components/sessionstore/test/unit/xpcshell.ini
@@ -6,7 +6,5 @@ support-files = data/sessionstore_valid.js
 
 [test_backup.js]
 [test_backup_once.js]
-[test_startup_nosession_sync.js]
 [test_startup_nosession_async.js]
-[test_startup_session_sync.js]
 [test_startup_session_async.js]
diff --git a/browser/components/test/browser_bug538331.js b/browser/components/test/browser_bug538331.js
index d559795db52..eedaba1965b 100644
--- a/browser/components/test/browser_bug538331.js
+++ b/browser/components/test/browser_bug538331.js
@@ -118,6 +118,10 @@ function test()
 {
   waitForExplicitFinish();
 
+  // Reset the startup page pref since it may have been set by other tests
+  // and we will assume it is default.
+  Services.prefs.clearUserPref('browser.startup.page');
+
   if (gPrefService.prefHasUserValue(PREF_MSTONE)) {
     gOriginalMStone = gPrefService.getCharPref(PREF_MSTONE);
   }
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 9a7ff277412..8560aa4fd04 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -2804,13 +2804,6 @@
     "extended_statistics_ok": true,
     "description": "Session restore: Time to read the session data from the file on disk (ms)"
   },
-  "FX_SESSION_RESTORE_SYNC_READ_FILE_MS": {
-    "kind": "exponential",
-    "high": "3000",
-    "n_buckets": 10,
-    "extended_statistics_ok": true,
-    "description": "Session restore: Time to read the session data from the file on disk, using the synchronous fallback (ms)"
-  },
   "FX_SESSION_RESTORE_WRITE_FILE_MS": {
     "kind": "exponential",
     "high": "3000",

From b02d5797846aff86097100f7f3a3ea067acb1a0e Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@tormail.org>
Date: Tue, 19 Nov 2013 14:58:00 -0500
Subject: [PATCH 54/92] Bug 939527 - Make OS.File.stat() use correct type for
 file size. r=Yoric

---
 .../components/osfile/modules/osfile_unix_back.jsm    | 11 +----------
 .../components/osfile/modules/osfile_unix_front.jsm   |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/toolkit/components/osfile/modules/osfile_unix_back.jsm b/toolkit/components/osfile/modules/osfile_unix_back.jsm
index a3aedd3b63b..b16d645806f 100644
--- a/toolkit/components/osfile/modules/osfile_unix_back.jsm
+++ b/toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -92,15 +92,6 @@
        Type.gid_t =
          Type.intn_t(Const.OSFILE_SIZEOF_GID_T).withName("gid_t");
 
-       /**
-        * A file size (st_size in struct stat)
-        */
-       if (OS.Constants.Sys.Name == "NetBSD") {
-         Type.stat_size_t = Type.off_t.withName("stat_size_t");
-       } else {
-         Type.stat_size_t = Type.size_t.withName("stat_size_t");
-       }
-
        /**
         * Type |time_t|
         */
@@ -174,7 +165,7 @@
          }
 
          stat.add_field_at(Const.OSFILE_OFFSETOF_STAT_ST_SIZE,
-                        "st_size", Type.stat_size_t.implementation);
+                        "st_size", Type.off_t.implementation);
          Type.stat = stat.getType();
        }
 
diff --git a/toolkit/components/osfile/modules/osfile_unix_front.jsm b/toolkit/components/osfile/modules/osfile_unix_front.jsm
index 6ea8ad68ab7..73a8b5ce5d2 100644
--- a/toolkit/components/osfile/modules/osfile_unix_front.jsm
+++ b/toolkit/components/osfile/modules/osfile_unix_front.jsm
@@ -792,7 +792,7 @@
      File.Info = function Info(stat) {
        let isDir = (stat.st_mode & Const.S_IFMT) == Const.S_IFDIR;
        let isSymLink = (stat.st_mode & Const.S_IFMT) == Const.S_IFLNK;
-       let size = Type.stat_size_t.importFromC(stat.st_size);
+       let size = Type.off_t.importFromC(stat.st_size);
 
        let lastAccessDate = new Date(stat.st_atime * 1000);
        let lastModificationDate = new Date(stat.st_mtime * 1000);

From 219aad07eb94c942a13dbe06236d7a4e7994f4d8 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Mon, 11 Nov 2013 15:13:28 -0600
Subject: [PATCH 55/92] Bug 862558 - Web Console should always be available /
 visible;r=msucan

---
 browser/devtools/debugger/debugger-panes.js   |   1 +
 browser/devtools/framework/toolbox.js         |  88 ++++++-
 browser/devtools/framework/toolbox.xul        |   7 +-
 browser/devtools/shared/widgets/Tooltip.js    |   3 +
 browser/devtools/webconsole/test/browser.ini  |   1 +
 .../test/browser_webconsole_split.js          | 238 ++++++++++++++++++
 6 files changed, 332 insertions(+), 6 deletions(-)
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_split.js

diff --git a/browser/devtools/debugger/debugger-panes.js b/browser/devtools/debugger/debugger-panes.js
index 1af08b2c9db..82ef6a0b3bb 100644
--- a/browser/devtools/debugger/debugger-panes.js
+++ b/browser/devtools/debugger/debugger-panes.js
@@ -1516,6 +1516,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, {
       case e.DOM_VK_RETURN:
       case e.DOM_VK_ENTER:
       case e.DOM_VK_ESCAPE:
+        e.stopPropagation();
         DebuggerView.editor.focus();
         return;
     }
diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index fa585e8757b..85fafacf2db 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -67,6 +67,7 @@ function Toolbox(target, selectedTool, hostType, hostOptions) {
   this._toolRegistered = this._toolRegistered.bind(this);
   this._toolUnregistered = this._toolUnregistered.bind(this);
   this._refreshHostTitle = this._refreshHostTitle.bind(this);
+  this._splitConsoleOnKeypress = this._splitConsoleOnKeypress.bind(this)
   this.destroy = this.destroy.bind(this);
 
   this._target.on("close", this.destroy);
@@ -229,11 +230,55 @@ Toolbox.prototype = {
     }, true);
   },
 
+  _splitConsoleOnKeypress: function(e) {
+    if (e.keyCode === e.DOM_VK_ESCAPE) {
+      this.toggleSplitConsole();
+    }
+  },
+
   _addToolSwitchingKeys: function() {
     let nextKey = this.doc.getElementById("toolbox-next-tool-key");
     nextKey.addEventListener("command", this.selectNextTool.bind(this), true);
     let prevKey = this.doc.getElementById("toolbox-previous-tool-key");
     prevKey.addEventListener("command", this.selectPreviousTool.bind(this), true);
+
+    // Split console uses keypress instead of command so the event can be
+    // cancelled with stopPropagation on the keypress, and not preventDefault.
+    this.doc.addEventListener("keypress", this._splitConsoleOnKeypress, false);
+  },
+
+  /**
+   * Make sure that the console is showing up properly based on all the
+   * possible conditions.
+   *   1) If the console tab is selected, then regardless of split state
+   *      it should take up the full height of the deck, and we should
+   *      hide the deck and splitter.
+   *   2) If the console tab is not selected and it is split, then we should
+   *      show the splitter, deck, and console.
+   *   3) If the console tab is not selected and it is *not* split,
+   *      then we should hide the console and splitter, and show the deck
+   *      at full height.
+   */
+  _refreshConsoleDisplay: function() {
+    let deck = this.doc.getElementById("toolbox-deck");
+    let webconsolePanel = this.doc.getElementById("toolbox-panel-webconsole");
+    let splitter = this.doc.getElementById("toolbox-console-splitter");
+    let openedConsolePanel = this.currentToolId === "webconsole";
+
+    if (openedConsolePanel) {
+      deck.setAttribute("collapsed", "true");
+      splitter.setAttribute("hidden", "true");
+      webconsolePanel.removeAttribute("collapsed");
+    } else {
+      deck.removeAttribute("collapsed");
+      if (this._splitConsole) {
+        webconsolePanel.removeAttribute("collapsed");
+        splitter.removeAttribute("hidden");
+      } else {
+        webconsolePanel.setAttribute("collapsed", "true");
+        splitter.setAttribute("hidden", "true");
+      }
+    }
   },
 
   /**
@@ -502,8 +547,11 @@ Toolbox.prototype = {
     }
     let vbox = this.doc.createElement("vbox");
     vbox.className = "toolbox-panel " + toolDefinition.bgTheme;
-    vbox.id = "toolbox-panel-" + id;
 
+    // There is already a container for the webconsole frame.
+    if (!this.doc.getElementById("toolbox-panel-" + id)) {
+      vbox.id = "toolbox-panel-" + id;
+    }
 
     // If there is no tab yet, or the ordinal to be added is the largest one.
     if (tabs.childNodes.length == 0 ||
@@ -613,7 +661,6 @@ Toolbox.prototype = {
     let tab = this.doc.getElementById("toolbox-tab-" + id);
     tab.setAttribute("selected", "true");
 
-
     if (this.currentToolId == id) {
       // re-focus tool to get key events again
       this.focusTool(id);
@@ -656,6 +703,7 @@ Toolbox.prototype = {
     deck.selectedIndex = index;
 
     this.currentToolId = id;
+    this._refreshConsoleDisplay();
     if (id != "options") {
       Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
     }
@@ -680,6 +728,27 @@ Toolbox.prototype = {
     iframe.focus();
   },
 
+  /**
+   * Toggles the split state of the webconsole.  If the webconsole panel
+   * is already selected, then this command is ignored.
+   */
+  toggleSplitConsole: function() {
+    let openedConsolePanel = this.currentToolId === "webconsole";
+
+    // Don't allow changes when console is open, since it could be confusing
+    if (!openedConsolePanel) {
+      this._splitConsole = !this._splitConsole;
+      this._refreshConsoleDisplay();
+      this.emit("split-console");
+
+      if (this._splitConsole) {
+        this.loadTool("webconsole").then(() => {
+          this.focusTool("webconsole");
+        });
+      }
+    }
+  },
+
   /**
    * Loads the tool next to the currently selected tool.
    */
@@ -789,7 +858,7 @@ Toolbox.prototype = {
       iframe.swapFrameLoaders(this.frame);
 
       this._host.off("window-closed", this.destroy);
-      this._host.destroy();
+      this.destroyHost();
 
       this._host = newHost;
 
@@ -876,6 +945,17 @@ Toolbox.prototype = {
     return this.doc.getElementById("toolbox-notificationbox");
   },
 
+  /**
+   * Destroy the current host, and remove event listeners from its frame.
+   *
+   * @return {promise} to be resolved when the host is destroyed.
+   */
+  destroyHost: function() {
+    this.doc.removeEventListener("keypress",
+      this._splitConsoleOnKeypress, false);
+    return this._host.destroy();
+  },
+
   /**
    * Remove all UI elements, detach from target and clear up
    */
@@ -917,7 +997,7 @@ Toolbox.prototype = {
       container.removeChild(container.firstChild);
     }
 
-    outstanding.push(this._host.destroy());
+    outstanding.push(this.destroyHost());
 
     this._telemetry.destroy();
 
diff --git a/browser/devtools/framework/toolbox.xul b/browser/devtools/framework/toolbox.xul
index cb7742100a4..1d161c2ef18 100644
--- a/browser/devtools/framework/toolbox.xul
+++ b/browser/devtools/framework/toolbox.xul
@@ -74,7 +74,10 @@
       </hbox>
 #endif
     </toolbar>
-    <deck id="toolbox-deck" flex="1">
-    </deck>
+    <vbox flex="1">
+      <deck id="toolbox-deck" flex="1" minheight="75" />
+      <splitter id="toolbox-console-splitter" class="devtools-horizontal-splitter" hidden="true" />
+      <box minheight="75" flex="1" id="toolbox-panel-webconsole" collapsed="true" />
+    </vbox>
   </notificationbox>
 </window>
diff --git a/browser/devtools/shared/widgets/Tooltip.js b/browser/devtools/shared/widgets/Tooltip.js
index dcecf38fa73..bcda36789d1 100644
--- a/browser/devtools/shared/widgets/Tooltip.js
+++ b/browser/devtools/shared/widgets/Tooltip.js
@@ -172,6 +172,9 @@ function Tooltip(doc, options) {
   this._onKeyPress = event => {
     this.emit("keypress", event.keyCode);
     if (this.options.get("closeOnKeys").indexOf(event.keyCode) !== -1) {
+      if (!this.panel.hidden) {
+        event.stopPropagation();
+      }
       this.hide();
     }
   };
diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini
index 4d718c90d67..5f0fdc6fedc 100644
--- a/browser/devtools/webconsole/test/browser.ini
+++ b/browser/devtools/webconsole/test/browser.ini
@@ -236,6 +236,7 @@ skip-if = os == "linux"
 [browser_webconsole_output_order.js]
 [browser_webconsole_property_provider.js]
 [browser_webconsole_scratchpad_panel_link.js]
+[browser_webconsole_split.js]
 [browser_webconsole_view_source.js]
 [browser_webconsole_reflow.js]
 [browser_webconsole_log_file_filter.js]
diff --git a/browser/devtools/webconsole/test/browser_webconsole_split.js b/browser/devtools/webconsole/test/browser_webconsole_split.js
new file mode 100644
index 00000000000..ebf3f3e7e53
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_split.js
@@ -0,0 +1,238 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+function test()
+{
+  let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+  let {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
+  let Toolbox = devtools.Toolbox;
+  let toolbox;
+
+  addTab("data:text/html;charset=utf-8,Web Console test for splitting");
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+    testConsoleLoadOnDifferentPanel()
+  }, true);
+
+  function testConsoleLoadOnDifferentPanel()
+  {
+    info("About to check console loads even when non-webconsole panel is open");
+
+    openPanel("inspector").then(() => {
+      toolbox.on("webconsole-ready", () => {
+        ok(true, "Webconsole has been triggered as loaded while another tool is active");
+        testKeyboardShortcuts();
+      });
+
+      // Opens split console.
+      toolbox.toggleSplitConsole();
+    });
+  }
+
+  function testKeyboardShortcuts()
+  {
+    info("About to check that panel responds to ESCAPE keyboard shortcut");
+
+    toolbox.once("split-console", () => {
+      ok(true, "Split console has been triggered via ESCAPE keypress");
+      checkAllTools();
+    });
+
+    // Closes split console.
+    EventUtils.sendKey("ESCAPE", toolbox.frame.contentWindow);
+  }
+
+  function checkAllTools()
+  {
+    info("About to check split console with each panel individually.");
+
+    Task.spawn(function() {
+      yield openAndCheckPanel("jsdebugger");
+      yield openAndCheckPanel("inspector");
+      yield openAndCheckPanel("styleeditor");
+      yield openAndCheckPanel("jsprofiler");
+      yield openAndCheckPanel("netmonitor");
+
+      yield checkWebconsolePanelOpened();
+      testBottomHost();
+    });
+  }
+
+  function getCurrentUIState()
+  {
+    let win = toolbox.doc.defaultView;
+    let deck = toolbox.doc.getElementById("toolbox-deck");
+    let webconsolePanel = toolbox.doc.getElementById("toolbox-panel-webconsole");
+    let splitter = toolbox.doc.getElementById("toolbox-console-splitter");
+
+    let containerHeight = parseFloat(win.getComputedStyle(deck.parentNode).getPropertyValue("height"));
+    let deckHeight = parseFloat(win.getComputedStyle(deck).getPropertyValue("height"));
+    let webconsoleHeight = parseFloat(win.getComputedStyle(webconsolePanel).getPropertyValue("height"));
+    let splitterVisibility = !splitter.getAttribute("hidden");
+    let openedConsolePanel = toolbox.currentToolId === "webconsole";
+
+    return {
+      deckHeight: deckHeight,
+      containerHeight: containerHeight,
+      webconsoleHeight: webconsoleHeight,
+      splitterVisibility: splitterVisibility,
+      openedConsolePanel: openedConsolePanel
+    };
+  }
+
+  function checkWebconsolePanelOpened()
+  {
+    info("About to check special cases when webconsole panel is open.");
+
+    let deferred = promise.defer();
+
+    // Start with console split, so we can test for transition to main panel.
+    toolbox.toggleSplitConsole();
+
+    let currentUIState = getCurrentUIState();
+
+    ok (currentUIState.splitterVisibility, "Splitter is visible when console is split");
+    ok (currentUIState.deckHeight > 0, "Deck has a height > 0 when console is split");
+    ok (currentUIState.webconsoleHeight > 0, "Web console has a height > 0 when console is split");
+    ok (!currentUIState.openedConsolePanel, "The console panel is not the current tool");
+
+    openPanel("webconsole").then(() => {
+
+      let currentUIState = getCurrentUIState();
+
+      ok (!currentUIState.splitterVisibility, "Splitter is hidden when console is opened.");
+      is (currentUIState.deckHeight, 0, "Deck has a height == 0 when console is opened.");
+      is (currentUIState.webconsoleHeight, currentUIState.containerHeight, "Web console is full height.");
+      ok (currentUIState.openedConsolePanel, "The console panel is the current tool");
+
+      // Make sure splitting console does nothing while webconsole is opened
+      toolbox.toggleSplitConsole();
+
+      let currentUIState = getCurrentUIState();
+
+      ok (!currentUIState.splitterVisibility, "Splitter is hidden when console is opened.");
+      is (currentUIState.deckHeight, 0, "Deck has a height == 0 when console is opened.");
+      is (currentUIState.webconsoleHeight, currentUIState.containerHeight, "Web console is full height.");
+      ok (currentUIState.openedConsolePanel, "The console panel is the current tool");
+
+      // Make sure that split state is saved after opening another panel
+      openPanel("inspector").then(() => {
+        let currentUIState = getCurrentUIState();
+        ok (currentUIState.splitterVisibility, "Splitter is visible when console is split");
+        ok (currentUIState.deckHeight > 0, "Deck has a height > 0 when console is split");
+        ok (currentUIState.webconsoleHeight > 0, "Web console has a height > 0 when console is split");
+        ok (!currentUIState.openedConsolePanel, "The console panel is not the current tool");
+
+        toolbox.toggleSplitConsole();
+        deferred.resolve();
+
+      });
+    });
+    return deferred.promise;
+  }
+
+  function openPanel(toolId, callback)
+  {
+    let deferred = promise.defer();
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.showToolbox(target, toolId).then(function(box) {
+      toolbox = box;
+      deferred.resolve();
+    }).then(null, console.error);
+    return deferred.promise;
+  }
+
+  function openAndCheckPanel(toolId)
+  {
+    let deferred = promise.defer();
+    openPanel(toolId).then(() => {
+      info ("Checking toolbox for " + toolId);
+      checkToolboxUI(toolbox.getCurrentPanel());
+      deferred.resolve();
+    });
+    return deferred.promise;
+  }
+
+  function checkToolboxUI()
+  {
+    let currentUIState = getCurrentUIState();
+
+    ok (!currentUIState.splitterVisibility, "Splitter is hidden by default");
+    is (currentUIState.deckHeight, currentUIState.containerHeight, "Deck has a height > 0 by default");
+    is (currentUIState.webconsoleHeight, 0, "Web console is collapsed by default");
+    ok (!currentUIState.openedConsolePanel, "The console panel is not the current tool");
+
+    toolbox.toggleSplitConsole();
+
+    let currentUIState = getCurrentUIState();
+
+    ok (currentUIState.splitterVisibility, "Splitter is visible when console is split");
+    ok (currentUIState.deckHeight > 0, "Deck has a height > 0 when console is split");
+    ok (currentUIState.webconsoleHeight > 0, "Web console has a height > 0 when console is split");
+    is (currentUIState.deckHeight + currentUIState.webconsoleHeight,
+          currentUIState.containerHeight,
+        "Everything adds up to container height");
+    ok (!currentUIState.openedConsolePanel, "The console panel is not the current tool");
+
+    toolbox.toggleSplitConsole();
+
+    let currentUIState = getCurrentUIState();
+
+    ok (!currentUIState.splitterVisibility, "Splitter is hidden after toggling");
+    is (currentUIState.deckHeight, currentUIState.containerHeight, "Deck has a height > 0 after toggling");
+    is (currentUIState.webconsoleHeight, 0, "Web console is collapsed after toggling");
+    ok (!currentUIState.openedConsolePanel, "The console panel is not the current tool");
+  }
+
+
+  function testBottomHost()
+  {
+    checkHostType(Toolbox.HostType.BOTTOM);
+
+    checkToolboxUI();
+
+    toolbox.switchHost(Toolbox.HostType.SIDE).then(testSidebarHost);
+  }
+
+  function testSidebarHost()
+  {
+    checkHostType(Toolbox.HostType.SIDE);
+
+    checkToolboxUI();
+
+    toolbox.switchHost(Toolbox.HostType.WINDOW).then(testWindowHost);
+  }
+
+  function testWindowHost()
+  {
+    checkHostType(Toolbox.HostType.WINDOW);
+
+    checkToolboxUI();
+
+    testDestroy();
+  }
+
+  function checkHostType(hostType)
+  {
+    is(toolbox.hostType, hostType, "host type is " + hostType);
+
+    let pref = Services.prefs.getCharPref("devtools.toolbox.host");
+    is(pref, hostType, "host pref is " + hostType);
+  }
+
+  function testDestroy()
+  {
+    toolbox.destroy().then(function() {
+      let target = TargetFactory.forTab(gBrowser.selectedTab);
+      gDevTools.showToolbox(target).then(finish);
+    });
+  }
+
+  function finish()
+  {
+    toolbox = null;
+    finishTest();
+  }
+}

From 06028442a664dd87a5d4f00665e276fef9660b08 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Mon, 18 Nov 2013 23:43:09 -0500
Subject: [PATCH 56/92] Bug 939680 - Implement nsINetworkLinkService.linkType
 on Android r=blassey

---
 mobile/android/base/GeckoAppShell.java        | 72 +++++++++++++++++++
 .../android/nsAndroidNetworkLinkService.cpp   | 10 ++-
 widget/android/GeneratedJNIWrappers.cpp       | 28 ++++++++
 widget/android/GeneratedJNIWrappers.h         |  2 +
 4 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index cebe06dc7a8..7601d4fa466 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -66,6 +66,7 @@ import android.os.MessageQueue;
 import android.os.SystemClock;
 import android.os.Vibrator;
 import android.provider.Settings;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.DisplayMetrics;
@@ -133,6 +134,18 @@ public class GeckoAppShell
     static public final int WPL_STATE_IS_DOCUMENT = 0x00020000;
     static public final int WPL_STATE_IS_NETWORK = 0x00040000;
 
+    /* Keep in sync with constants found here:
+      http://mxr.mozilla.org/mozilla-central/source/netwerk/base/public/nsINetworkLinkService.idl
+    */
+    static public final int LINK_TYPE_UNKNOWN = 0;
+    static public final int LINK_TYPE_ETHERNET = 1;
+    static public final int LINK_TYPE_USB = 2;
+    static public final int LINK_TYPE_WIFI = 3;
+    static public final int LINK_TYPE_WIMAX = 4;
+    static public final int LINK_TYPE_2G = 5;
+    static public final int LINK_TYPE_3G = 6;
+    static public final int LINK_TYPE_4G = 7;
+
     public static final String SHORTCUT_TYPE_WEBAPP = "webapp";
     public static final String SHORTCUT_TYPE_BOOKMARK = "bookmark";
 
@@ -1532,6 +1545,65 @@ public class GeckoAppShell
         return true;
     }
 
+    @GeneratableAndroidBridgeTarget
+    public static int networkLinkType() {
+        ConnectivityManager cm = (ConnectivityManager)
+            getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo info = cm.getActiveNetworkInfo();
+        if (info == null) {
+            return LINK_TYPE_UNKNOWN;
+        }
+
+        switch (info.getType()) {
+            case ConnectivityManager.TYPE_ETHERNET:
+                return LINK_TYPE_ETHERNET;
+            case ConnectivityManager.TYPE_WIFI:
+                return LINK_TYPE_WIFI;
+            case ConnectivityManager.TYPE_WIMAX:
+                return LINK_TYPE_WIMAX;
+            case ConnectivityManager.TYPE_MOBILE:
+                break; // We will handle sub-types after the switch.
+            default:
+                Log.w(LOGTAG, "Ignoring the current network type.");
+                return LINK_TYPE_UNKNOWN;
+        }
+
+        TelephonyManager tm = (TelephonyManager)
+            getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        if (tm == null) {
+            Log.e(LOGTAG, "Telephony service does not exist");
+            return LINK_TYPE_UNKNOWN;
+        }
+
+        switch (tm.getNetworkType()) {
+            case TelephonyManager.NETWORK_TYPE_IDEN:
+            case TelephonyManager.NETWORK_TYPE_CDMA:
+            case TelephonyManager.NETWORK_TYPE_GPRS:
+                return LINK_TYPE_2G;
+            case TelephonyManager.NETWORK_TYPE_1xRTT:
+            case TelephonyManager.NETWORK_TYPE_EDGE:
+                return LINK_TYPE_2G; // 2.5G
+            case TelephonyManager.NETWORK_TYPE_UMTS:
+            case TelephonyManager.NETWORK_TYPE_EVDO_0:
+                return LINK_TYPE_3G;
+            case TelephonyManager.NETWORK_TYPE_HSPA:
+            case TelephonyManager.NETWORK_TYPE_HSDPA:
+            case TelephonyManager.NETWORK_TYPE_HSUPA:
+            case TelephonyManager.NETWORK_TYPE_EVDO_A:
+            case TelephonyManager.NETWORK_TYPE_EVDO_B:
+            case TelephonyManager.NETWORK_TYPE_EHRPD:
+                return LINK_TYPE_3G; // 3.5G
+            case TelephonyManager.NETWORK_TYPE_HSPAP:
+                return LINK_TYPE_3G; // 3.75G
+            case TelephonyManager.NETWORK_TYPE_LTE:
+                return LINK_TYPE_4G; // 3.9G
+            case TelephonyManager.NETWORK_TYPE_UNKNOWN:
+            default:
+                Log.w(LOGTAG, "Connected to an unknown mobile network!");
+                return LINK_TYPE_UNKNOWN;
+        }
+    }
+
     @GeneratableAndroidBridgeTarget
     public static void setSelectedLocale(String localeCode) {
         /* Bug 713464: This method is still called from Gecko side.
diff --git a/netwerk/system/android/nsAndroidNetworkLinkService.cpp b/netwerk/system/android/nsAndroidNetworkLinkService.cpp
index f8d64660e05..01ed147847c 100644
--- a/netwerk/system/android/nsAndroidNetworkLinkService.cpp
+++ b/netwerk/system/android/nsAndroidNetworkLinkService.cpp
@@ -49,7 +49,13 @@ nsAndroidNetworkLinkService::GetLinkType(uint32_t *aLinkType)
 {
   NS_ENSURE_ARG_POINTER(aLinkType);
 
-  // XXX This function has not yet been implemented for this platform
-  *aLinkType = nsINetworkLinkService::LINK_TYPE_UNKNOWN;
+  if (!mozilla::AndroidBridge::Bridge()) {
+    // Fail soft here and assume a connection exists
+    NS_WARNING("GetLinkType is not supported without a bridge connection");
+    *aLinkType = nsINetworkLinkService::LINK_TYPE_UNKNOWN;
+    return NS_OK;
+  }
+
+  *aLinkType = mozilla::AndroidBridge::Bridge()->NetworkLinkType();
   return NS_OK;
 }
diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
index 1b9b2f13586..27d1ca4d4fb 100644
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -66,6 +66,7 @@ void AndroidBridge::InitStubs(JNIEnv *jEnv) {
     jLockScreenOrientation = getStaticMethod("lockScreenOrientation", "(I)V");
     jMarkURIVisited = getStaticMethod("markUriVisited", "(Ljava/lang/String;)V");
     jMoveTaskToBack = getStaticMethod("moveTaskToBack", "()V");
+    jNetworkLinkType = getStaticMethod("networkLinkType", "()I");
     jNotifyDefaultPrevented = getStaticMethod("notifyDefaultPrevented", "(Z)V");
     jNotifyIME = getStaticMethod("notifyIME", "(I)V");
     jNotifyIMEChange = getStaticMethod("notifyIMEChange", "(Ljava/lang/String;III)V");
@@ -1451,6 +1452,33 @@ void AndroidBridge::MoveTaskToBack() {
     env->PopLocalFrame(NULL);
 }
 
+int32_t AndroidBridge::NetworkLinkType() {
+    JNIEnv *env = GetJNIEnv();
+    if (!env) {
+        ALOG_BRIDGE("Aborted: No env - %s", __PRETTY_FUNCTION__);
+        return 0;
+    }
+
+    if (env->PushLocalFrame(0) != 0) {
+        ALOG_BRIDGE("Exceptional exit of: %s", __PRETTY_FUNCTION__);
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return 0;
+    }
+
+    int32_t temp = env->CallStaticIntMethod(mGeckoAppShellClass, jNetworkLinkType);
+
+    if (env->ExceptionCheck()) {
+        ALOG_BRIDGE("Exceptional exit of: %s", __PRETTY_FUNCTION__);
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        env->PopLocalFrame(NULL);
+        return 0;
+    }
+    env->PopLocalFrame(NULL);
+    return temp;
+}
+
 void AndroidBridge::NotifyDefaultPrevented(bool a0) {
     JNIEnv *env = GetJNIEnv();
     if (!env) {
diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h
index c7158524224..c755afbe923 100644
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -50,6 +50,7 @@ jmethodID jKillAnyZombies;
 jmethodID jLockScreenOrientation;
 jmethodID jMarkURIVisited;
 jmethodID jMoveTaskToBack;
+jmethodID jNetworkLinkType;
 jmethodID jNotifyDefaultPrevented;
 jmethodID jNotifyIME;
 jmethodID jNotifyIMEChange;
@@ -160,6 +161,7 @@ void KillAnyZombies();
 void LockScreenOrientation(int32_t a0);
 void MarkURIVisited(const nsAString& a0);
 void MoveTaskToBack();
+int32_t NetworkLinkType();
 void NotifyDefaultPrevented(bool a0);
 static void NotifyIME(int32_t a0);
 static void NotifyIMEChange(const nsAString& a0, int32_t a1, int32_t a2, int32_t a3);

From 659ccf34190ad34a8aead410fd76cf166e3b23e9 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 19 Nov 2013 17:33:27 -0500
Subject: [PATCH 57/92] Backed out changesets 26df3bab1ab9 and 3c9dbe653a4e
 (bug 768667) for Android test bustage.

--HG--
rename : mobile/android/base/resources/drawable-hdpi/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
rename : mobile/android/base/resources/drawable-mdpi/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
---
 mobile/android/base/ActionModeCompat.java     | 101 ----------
 mobile/android/base/ActionModeCompatView.java | 151 ---------------
 mobile/android/base/BrowserApp.java           |  81 ++------
 mobile/android/base/TextSelection.java        | 135 --------------
 .../base/locales/en-US/android_strings.dtd    |   5 -
 mobile/android/base/menu/GeckoMenu.java       |  26 +--
 mobile/android/base/moz.build                 |  28 +--
 .../ic_menu_share.png                         | Bin
 .../base/resources/drawable-hdpi/ab_done.png  | Bin 737 -> 0 bytes
 .../ab_stacked_transparent_light_holo.9.png   | Bin 222 -> 0 bytes
 .../base/resources/drawable-hdpi/copy.png     | Bin 199 -> 0 bytes
 .../base/resources/drawable-hdpi/cut.png      | Bin 564 -> 0 bytes
 .../resources/drawable-hdpi/menu_light.png    | Bin 148 -> 0 bytes
 .../base/resources/drawable-hdpi/paste.png    | Bin 337 -> 0 bytes
 .../resources/drawable-hdpi/select_all.png    | Bin 216 -> 0 bytes
 .../ic_menu_share.png                         | Bin
 .../base/resources/drawable-mdpi/ab_done.png  | Bin 552 -> 0 bytes
 .../ab_stacked_transparent_light_holo.9.png   | Bin 210 -> 0 bytes
 .../base/resources/drawable-mdpi/copy.png     | Bin 161 -> 0 bytes
 .../base/resources/drawable-mdpi/cut.png      | Bin 357 -> 0 bytes
 .../resources/drawable-mdpi/menu_light.png    | Bin 131 -> 0 bytes
 .../base/resources/drawable-mdpi/paste.png    | Bin 203 -> 0 bytes
 .../ic_menu_share.png                         | Bin
 .../base/resources/drawable-xhdpi/ab_done.png | Bin 915 -> 0 bytes
 .../ab_stacked_transparent_light_holo.9.png   | Bin 242 -> 0 bytes
 .../base/resources/drawable-xhdpi/copy.png    | Bin 252 -> 0 bytes
 .../base/resources/drawable-xhdpi/cut.png     | Bin 996 -> 0 bytes
 .../resources/drawable-xhdpi/menu_light.png   | Bin 184 -> 0 bytes
 .../base/resources/drawable-xhdpi/paste.png   | Bin 442 -> 0 bytes
 .../base/resources/layout/actionbar.xml       |  40 ----
 .../base/resources/layout/gecko_app.xml       |  20 +-
 .../base/resources/values-v11/styles.xml      |  16 --
 .../android/base/resources/values/styles.xml  |  33 ----
 .../android/base/resources/values/themes.xml  |   1 -
 mobile/android/base/strings.xml.in            |   4 -
 .../android/base/toolbar/BrowserToolbar.java  |   3 +-
 .../android/base/widget/GeckoPopupMenu.java   |   5 +-
 .../chrome/content/SelectionHandler.js        | 173 +++---------------
 mobile/android/chrome/content/browser.js      |  77 ++++----
 .../locales/en-US/chrome/browser.properties   |   3 +-
 40 files changed, 103 insertions(+), 799 deletions(-)
 delete mode 100644 mobile/android/base/ActionModeCompat.java
 delete mode 100644 mobile/android/base/ActionModeCompatView.java
 rename mobile/android/base/resources/{drawable-hdpi => drawable-hdpi-v11}/ic_menu_share.png (100%)
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ab_done.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/copy.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/cut.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/menu_light.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/paste.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/select_all.png
 rename mobile/android/base/resources/{drawable-mdpi => drawable-mdpi-v11}/ic_menu_share.png (100%)
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ab_done.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/copy.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/cut.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/menu_light.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/paste.png
 rename mobile/android/base/resources/{drawable-xhdpi => drawable-xhdpi-v11}/ic_menu_share.png (100%)
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ab_done.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/copy.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/cut.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/menu_light.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/paste.png
 delete mode 100644 mobile/android/base/resources/layout/actionbar.xml

diff --git a/mobile/android/base/ActionModeCompat.java b/mobile/android/base/ActionModeCompat.java
deleted file mode 100644
index 19d1fb4928b..00000000000
--- a/mobile/android/base/ActionModeCompat.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.widget.GeckoPopupMenu;
-
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-class ActionModeCompat implements GeckoPopupMenu.OnMenuItemClickListener,
-                                  View.OnClickListener {
-    private final String LOGTAG = "GeckoActionModeCompat";
-
-    private Callback mCallback;
-    private ActionModeCompatView mView;
-    private Presenter mPresenter;
-
-    /* A set of callbacks to be called during this ActionMode's lifecycle. These will control the
-     * creation, interaction with, and destruction of menuitems for the view */
-    public static interface Callback {
-        /* Called when action mode is first created. Implementors should use this to inflate menu resources. */
-        public boolean onCreateActionMode(ActionModeCompat mode, Menu menu);
-
-        /* Called to refresh an action mode's action menu. Called whenever the mode is invalidated. Implementors
-         * should use this to enable/disable/show/hide menu items. */
-        public boolean onPrepareActionMode(ActionModeCompat mode, Menu menu);
-
-        /* Called to report a user click on an action button. */
-        public boolean onActionItemClicked(ActionModeCompat mode, MenuItem item);
-
-        /* Called when an action mode is about to be exited and destroyed. */
-        public void onDestroyActionMode(ActionModeCompat mode);
-    }
-
-    /* Presenters handle the actual showing/hiding of the action mode UI in the app. Its their responsibility
-     * to create an action mode, and assign it Callbacks and ActionModeCompatView's. */
-    public static interface Presenter {
-        /* Called when an action mode should be shown */
-        public void startActionModeCompat(final Callback callback);
-
-        /* Called when whatever action mode is showing should be hidden */
-        public void endActionModeCompat();
-    }
-
-    public ActionModeCompat(Presenter presenter, Callback callback, ActionModeCompatView view) {
-        mPresenter = presenter;
-        mCallback = callback;
-
-        mView = view;
-        mView.initForMode(this);
-    }
-
-    public void finish() {
-        // Clearing the menu will also clear the ActionItemBar
-        mView.getMenu().clear();
-        if (mCallback != null) {
-            mCallback.onDestroyActionMode(this);
-        }
-    }
-
-    public CharSequence getTitle() {
-        return mView.getTitle();
-    }
-
-    public void setTitle(CharSequence title) {
-        mView.setTitle(title);
-    }
-
-    public void setTitle(int resId) {
-        mView.setTitle(resId);
-    }
-
-    public Menu getMenu() {
-        return mView.getMenu();
-    }
-
-    public void invalidate() {
-        if (mCallback != null) {
-            mCallback.onPrepareActionMode(this, mView.getMenu());
-        }
-        mView.invalidate();
-    }
-
-    /* GeckoPopupMenu.OnMenuItemClickListener */
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        if (mCallback != null) {
-            return mCallback.onActionItemClicked(this, item);
-        }
-        return false;
-    }
-
-    /* View.OnClickListener*/
-    @Override
-    public void onClick(View v) {
-        mPresenter.endActionModeCompat();
-    }
-}
diff --git a/mobile/android/base/ActionModeCompatView.java b/mobile/android/base/ActionModeCompatView.java
deleted file mode 100644
index 5e1184a9661..00000000000
--- a/mobile/android/base/ActionModeCompatView.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.menu.GeckoMenu;
-import org.mozilla.gecko.menu.MenuPopup;
-import org.mozilla.gecko.menu.MenuPanel;
-import org.mozilla.gecko.menu.MenuItemActionBar;
-import org.mozilla.gecko.widget.GeckoPopupMenu;
-
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuInflater;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.view.View;
-import android.view.ViewGroup;
-import android.content.Context;
-import android.widget.TextView;
-import android.widget.ImageButton;
-import android.widget.Button;
-import android.widget.PopupWindow;
-import android.util.AttributeSet;
-
-class ActionModeCompatView extends LinearLayout implements GeckoMenu.ActionItemBarPresenter {
-    private final String LOGTAG = "GeckoActionModeCompatPresenter";
-
-    private static final int SPEC = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-
-    private Button mTitleView;
-    private ImageButton mMenuButton;
-    private ViewGroup mActionButtonBar;
-    private GeckoPopupMenu mPopupMenu;
-
-    // Maximum number of items to show as actions
-    private static final int MAX_ACTION_ITEMS = 4;
-
-    private int mActionButtonsWidth = 0;
-
-    public ActionModeCompatView(Context context) {
-        this(context, null);
-    }
-
-    public ActionModeCompatView(Context context, AttributeSet attrs) {
-        this(context, null, 0);
-    }
-
-    public ActionModeCompatView(Context context, AttributeSet attrs, int style) {
-        super(context, attrs, style);
-    }
-
-    @Override
-    public void onFinishInflate() {
-        mTitleView = (Button) findViewById(R.id.actionmode_title);
-        mMenuButton = (ImageButton) findViewById(R.id.actionbar_menu);
-        mActionButtonBar = (ViewGroup) findViewById(R.id.actionbar_buttons);
-
-        mPopupMenu = new GeckoPopupMenu(getContext(), mMenuButton);
-        ((GeckoMenu) mPopupMenu.getMenu()).setActionItemBarPresenter(this);
-
-        mMenuButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                openMenu();
-            }
-        });
-    }
-
-    public void initForMode(final ActionModeCompat mode) {
-        mTitleView.setOnClickListener(mode);
-        mPopupMenu.setOnMenuItemClickListener(mode);
-    }
-
-    public CharSequence getTitle() {
-        return mTitleView.getText();
-    }
-
-    public void setTitle(CharSequence title) {
-        mTitleView.setText(title);
-    }
-
-    public void setTitle(int resId) {
-        mTitleView.setText(resId);
-    }
-
-    public Menu getMenu() {
-        return mPopupMenu.getMenu();
-    }
-
-    public void invalidate() {
-        mMenuButton.setVisibility(mPopupMenu.getMenu().hasVisibleItems() ? View.VISIBLE : View.GONE);
-        super.invalidate();
-    }
-
-    /* GeckoMenu.ActionItemBarPresenter */
-    @Override
-    public boolean addActionItem(View actionItem) {
-        final int count = mActionButtonBar.getChildCount();
-        if (count >= MAX_ACTION_ITEMS) {
-            return false;
-        }
-
-        int maxWidth = mActionButtonBar.getMeasuredWidth();
-        if (maxWidth == 0) {
-            mActionButtonBar.measure(SPEC, SPEC);
-            maxWidth = mActionButtonBar.getMeasuredWidth();
-        }
-
-        // Since we don't know how many items will be added, we always reserve space for the overflow menu
-        mMenuButton.measure(SPEC, SPEC);
-        maxWidth -= mMenuButton.getMeasuredWidth();
-
-        if (mActionButtonsWidth <= 0) {
-            mActionButtonsWidth = 0;
-
-            // Loop over child views, measure them, and add their width to the taken width
-            for (int i = 0; i < count; i++) {
-                View v = mActionButtonBar.getChildAt(i);
-                v.measure(SPEC, SPEC);
-                mActionButtonsWidth += v.getMeasuredWidth();
-            }
-        }
-
-        actionItem.measure(SPEC, SPEC);
-        int w = actionItem.getMeasuredWidth();
-        if (mActionButtonsWidth + w < maxWidth) {
-            // We cache the new width of our children.
-            mActionButtonsWidth += w;
-            mActionButtonBar.addView(actionItem);
-            return true;
-        }
-        return false;
-    }
-
-    /* GeckoMenu.ActionItemBarPresenter */
-    @Override
-    public void removeActionItem(View actionItem) {
-        mActionButtonsWidth -= actionItem.getMeasuredWidth();
-        mActionButtonBar.removeView(actionItem);
-    }
-
-    public void openMenu() {
-        mPopupMenu.openMenu();
-    }
-
-    public void closeMenu() {
-        mPopupMenu.dismiss();
-    }
-
-}
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 859197dea7c..26a6954d739 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -14,7 +14,6 @@ import org.mozilla.gecko.favicons.LoadFaviconTask;
 import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
-import org.mozilla.gecko.gfx.LayerMarginsAnimator;
 import org.mozilla.gecko.health.BrowserHealthRecorder;
 import org.mozilla.gecko.health.BrowserHealthReporter;
 import org.mozilla.gecko.home.BrowserSearch;
@@ -72,10 +71,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.animation.Interpolator;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
-import android.widget.ViewFlipper;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -91,8 +88,7 @@ abstract public class BrowserApp extends GeckoApp
                                             BrowserSearch.OnSearchListener,
                                             BrowserSearch.OnEditSuggestionListener,
                                             HomePager.OnNewTabsListener,
-                                            OnUrlOpenListener,
-                                            ActionModeCompat.Presenter {
+                                            OnUrlOpenListener {
     private static final String LOGTAG = "GeckoBrowserApp";
 
     private static final String PREF_CHROME_DYNAMICTOOLBAR = "browser.chrome.dynamictoolbar";
@@ -115,13 +111,10 @@ abstract public class BrowserApp extends GeckoApp
     private BrowserSearch mBrowserSearch;
     private View mBrowserSearchContainer;
 
-    public ViewFlipper mViewFlipper;
-    public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
     private HomePager mHomePager;
     private View mHomePagerContainer;
     protected Telemetry.Timer mAboutHomeStartupTimer = null;
-    private ActionModeCompat mActionMode;
 
     private static final int GECKO_TOOLS_MENU = -1;
     private static final int ADDON_MENU_OFFSET = 1000;
@@ -272,7 +265,7 @@ abstract public class BrowserApp extends GeckoApp
             switch (keyCode) {
                 case KeyEvent.KEYCODE_BUTTON_Y:
                     // Toggle/focus the address bar on gamepad-y button.
-                    if (mViewFlipper.getVisibility() == View.VISIBLE) {
+                    if (mBrowserToolbar.isVisible()) {
                         if (isDynamicToolbarEnabled() && !isHomePagerVisible()) {
                             if (mLayerView != null) {
                                 mLayerView.getLayerMarginsAnimator().hideMargins(false);
@@ -432,9 +425,6 @@ abstract public class BrowserApp extends GeckoApp
 
         super.onCreate(savedInstanceState);
 
-        mViewFlipper = (ViewFlipper) findViewById(R.id.browser_actionbar);
-        mActionBar = (ActionModeCompatView) findViewById(R.id.actionbar);
-
         mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {
             // Show the target URL immediately in the toolbar
@@ -612,11 +602,6 @@ abstract public class BrowserApp extends GeckoApp
             return;
         }
 
-        if (mActionMode != null) {
-            endActionModeCompat();
-            return;
-        }
-
         super.onBackPressed();
     }
 
@@ -675,7 +660,7 @@ abstract public class BrowserApp extends GeckoApp
                 mLayerView.getLayerClient().setOnMetricsChangedListener(this);
             }
             setToolbarMargin(0);
-            mHomePagerContainer.setPadding(0, mViewFlipper.getHeight(), 0, 0);
+            mHomePagerContainer.setPadding(0, mBrowserToolbar.getHeight(), 0, 0);
         } else {
             // Immediately show the toolbar when disabling the dynamic
             // toolbar.
@@ -683,8 +668,8 @@ abstract public class BrowserApp extends GeckoApp
                 mLayerView.getLayerClient().setOnMetricsChangedListener(null);
             }
             mHomePagerContainer.setPadding(0, 0, 0, 0);
-            if (mViewFlipper != null) {
-                mViewFlipper.scrollTo(0, 0);
+            if (mBrowserToolbar != null) {
+                mBrowserToolbar.scrollTo(0, 0);
             }
         }
 
@@ -917,7 +902,7 @@ abstract public class BrowserApp extends GeckoApp
 
     @Override
     public void onMetricsChanged(ImmutableViewportMetrics aMetrics) {
-        if (isHomePagerVisible() || mViewFlipper == null) {
+        if (isHomePagerVisible() || mBrowserToolbar == null) {
             return;
         }
 
@@ -926,7 +911,7 @@ abstract public class BrowserApp extends GeckoApp
         if (aMetrics.getPageHeight() <= aMetrics.getHeight()) {
             if (mDynamicToolbarCanScroll) {
                 mDynamicToolbarCanScroll = false;
-                if (mViewFlipper.getVisibility() != View.VISIBLE) {
+                if (!mBrowserToolbar.isVisible()) {
                     ThreadUtils.postToUiThread(new Runnable() {
                         public void run() {
                             mLayerView.getLayerMarginsAnimator().showMargins(false);
@@ -938,7 +923,7 @@ abstract public class BrowserApp extends GeckoApp
             mDynamicToolbarCanScroll = true;
         }
 
-        final View toolbarLayout = mViewFlipper;
+        final View toolbarLayout = mBrowserToolbar;
         final int marginTop = Math.round(aMetrics.marginTop);
         ThreadUtils.postToUiThread(new Runnable() {
             public void run() {
@@ -973,8 +958,8 @@ abstract public class BrowserApp extends GeckoApp
 
     public void refreshToolbarHeight() {
         int height = 0;
-        if (mViewFlipper != null) {
-            height = mViewFlipper.getHeight();
+        if (mBrowserToolbar != null) {
+            height = mBrowserToolbar.getHeight();
         }
 
         if (!isDynamicToolbarEnabled() || isHomePagerVisible()) {
@@ -1007,9 +992,9 @@ abstract public class BrowserApp extends GeckoApp
             @Override
             public void run() {
                 if (aShow) {
-                    mViewFlipper.setVisibility(View.VISIBLE);
+                    mBrowserToolbar.show();
                 } else {
-                    mViewFlipper.setVisibility(View.GONE);
+                    mBrowserToolbar.hide();
                     if (hasTabsSideBar()) {
                         hideTabs();
                     }
@@ -1025,8 +1010,8 @@ abstract public class BrowserApp extends GeckoApp
         ThreadUtils.postToUiThread(new Runnable() {
             @Override
             public void run() {
-                mViewFlipper.setVisibility(View.VISIBLE);
-                mViewFlipper.requestFocusFromTouch();
+                mBrowserToolbar.show();
+                mBrowserToolbar.requestFocusFromTouch();
             }
         });
     }
@@ -1989,13 +1974,13 @@ abstract public class BrowserApp extends GeckoApp
             @Override
             public void run() {
                 if (fullscreen) {
-                    mViewFlipper.setVisibility(View.GONE);
+                    mBrowserToolbar.hide();
                     if (isDynamicToolbarEnabled()) {
                         mLayerView.getLayerMarginsAnimator().hideMargins(true);
                         mLayerView.getLayerMarginsAnimator().setMaxMargins(0, 0, 0, 0);
                     }
                 } else {
-                    mViewFlipper.setVisibility(View.VISIBLE);
+                    mBrowserToolbar.show();
                     if (isDynamicToolbarEnabled()) {
                         mLayerView.getLayerMarginsAnimator().showMargins(true);
                         mLayerView.getLayerMarginsAnimator().setMaxMargins(0, mToolbarHeight, 0, 0);
@@ -2476,38 +2461,4 @@ abstract public class BrowserApp extends GeckoApp
         Log.w(LOGTAG, "No candidate updater found; ignoring launch request.");
         return false;
     }
-
-    /* Implementing ActionModeCompat.Presenter */
-    @Override
-    public void startActionModeCompat(final ActionModeCompat.Callback callback) {
-        // If actionMode is null, we're not currently showing one. Flip to the action mode view
-        if (mActionMode == null) {
-            mViewFlipper.showNext();
-            LayerMarginsAnimator margins = mLayerView.getLayerMarginsAnimator();
-            margins.setMaxMargins(0, mViewFlipper.getHeight(), 0, 0);
-            margins.setMarginsPinned(true);
-            margins.showMargins(false);
-        } else {
-            // Otherwise, we're already showing an action mode. Just finish it and show the new one
-            mActionMode.finish();
-        }
-
-        mActionMode = new ActionModeCompat(BrowserApp.this, callback, mActionBar);
-        if (callback.onCreateActionMode(mActionMode, mActionMode.getMenu())) {
-            mActionMode.invalidate();
-        }
-    }
-
-    /* Implementing ActionModeCompat.Presenter */
-    @Override
-    public void endActionModeCompat() {
-        if (mActionMode == null) {
-            return;
-        }
-
-        mActionMode.finish();
-        mActionMode = null;
-        mLayerView.getLayerMarginsAnimator().setMarginsPinned(false);
-        mViewFlipper.showPrevious();
-    }
 }
diff --git a/mobile/android/base/TextSelection.java b/mobile/android/base/TextSelection.java
index 1a407ab4de1..675905b7e5f 100644
--- a/mobile/android/base/TextSelection.java
+++ b/mobile/android/base/TextSelection.java
@@ -4,31 +4,17 @@
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.gecko.gfx.BitmapUtils.BitmapLoader;
 import org.mozilla.gecko.gfx.Layer;
 import org.mozilla.gecko.gfx.LayerView;
-import org.mozilla.gecko.menu.GeckoMenu;
-import org.mozilla.gecko.menu.GeckoMenuItem;
 import org.mozilla.gecko.util.EventDispatcher;
 import org.mozilla.gecko.util.FloatUtils;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.ActionModeCompat.Callback;
-
-import android.content.Context;
-import android.app.Activity;
-import android.graphics.drawable.Drawable;
-import android.view.Menu;
-import android.view.MenuItem;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Timer;
-import java.util.TimerTask;
-
 import android.util.Log;
 import android.view.View;
 
@@ -44,24 +30,6 @@ class TextSelection extends Layer implements GeckoEventListener {
     private float mViewTop;
     private float mViewZoom;
 
-    private TextSelectionActionModeCallback mCallback;
-
-    // These timers are used to avoid flicker caused by selection handles showing/hiding quickly. For isntance
-    // when moving between single handle caret mode and two handle selection mode.
-    private Timer mActionModeTimer = new Timer("actionMode");
-    private class ActionModeTimerTask extends TimerTask {
-        @Override
-        public void run() {
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    endActionMode();
-                }
-            });
-        }
-    };
-    private ActionModeTimerTask mActionModeTimerTask;
-
     TextSelection(TextSelectionHandle startHandle,
                   TextSelectionHandle middleHandle,
                   TextSelectionHandle endHandle,
@@ -79,7 +47,6 @@ class TextSelection extends Layer implements GeckoEventListener {
             registerEventListener("TextSelection:ShowHandles");
             registerEventListener("TextSelection:HideHandles");
             registerEventListener("TextSelection:PositionHandles");
-            registerEventListener("TextSelection:Update");
         }
     }
 
@@ -87,7 +54,6 @@ class TextSelection extends Layer implements GeckoEventListener {
         unregisterEventListener("TextSelection:ShowHandles");
         unregisterEventListener("TextSelection:HideHandles");
         unregisterEventListener("TextSelection:PositionHandles");
-        unregisterEventListener("TextSelection:Update");
     }
 
     private TextSelectionHandle getHandle(String name) {
@@ -120,23 +86,12 @@ class TextSelection extends Layer implements GeckoEventListener {
                         if (layerView != null) {
                             layerView.addLayer(TextSelection.this);
                         }
-
-                        if (mActionModeTimerTask != null)
-                            mActionModeTimerTask.cancel();
-                        showActionMode(message.getJSONArray("actions"));
-                    } else if (event.equals("TextSelection:Update")) {
-                        if (mActionModeTimerTask != null)
-                            mActionModeTimerTask.cancel();
-                        showActionMode(message.getJSONArray("actions"));
                     } else if (event.equals("TextSelection:HideHandles")) {
                         LayerView layerView = GeckoAppShell.getLayerView();
                         if (layerView != null) {
                             layerView.removeLayer(TextSelection.this);
                         }
 
-                        mActionModeTimerTask = new ActionModeTimerTask();
-                        mActionModeTimer.schedule(mActionModeTimerTask, 250);
-
                         mStartHandle.setVisibility(View.GONE);
                         mMiddleHandle.setVisibility(View.GONE);
                         mEndHandle.setVisibility(View.GONE);
@@ -160,28 +115,6 @@ class TextSelection extends Layer implements GeckoEventListener {
         });
     }
 
-    private void showActionMode(final JSONArray items) {
-        if (mCallback != null) {
-            mCallback.updateItems(items);
-            return;
-        }
-
-        final Context context = mStartHandle.getContext();
-        if (context instanceof ActionModeCompat.Presenter) {
-            final ActionModeCompat.Presenter presenter = (ActionModeCompat.Presenter) context;
-            mCallback = new TextSelectionActionModeCallback(items);
-            presenter.startActionModeCompat(mCallback);
-        }
-    }
-
-    private void endActionMode() {
-        Context context = mStartHandle.getContext();
-        if (context instanceof ActionModeCompat.Presenter) {
-            final ActionModeCompat.Presenter presenter = (ActionModeCompat.Presenter) context;
-            presenter.endActionModeCompat();
-        }
-    }
-
     @Override
     public void draw(final RenderContext context) {
         // cache the relevant values from the context and bail out if they are the same. we do this
@@ -217,72 +150,4 @@ class TextSelection extends Layer implements GeckoEventListener {
     private void unregisterEventListener(String event) {
         mEventDispatcher.unregisterEventListener(event, this);
     }
-
-    private class TextSelectionActionModeCallback implements Callback {
-        private JSONArray mItems;
-        private ActionModeCompat mActionMode;
-    
-        public TextSelectionActionModeCallback(JSONArray items) {
-            mItems = items;
-        }
-
-        public void updateItems(JSONArray items) {
-            mItems = items;
-            if (mActionMode != null) {
-                mActionMode.invalidate();
-            }
-        }
-
-        @Override
-        public boolean onPrepareActionMode(final ActionModeCompat mode, final Menu menu) {
-            // Android would normally expect us to only update the state of menu items here
-            // To make the js-java interaction a bit simpler, we just wipe out the menu here and recreate all
-            // the javascript menu items in onPrepare instead. This will be called any time invalidate() is called on the
-            // action mode.
-            menu.clear();
-
-            int length = mItems.length();
-            for (int i = 0; i < length; i++) {
-                try {
-                    final JSONObject obj = mItems.getJSONObject(i);
-                    final GeckoMenuItem menuitem = (GeckoMenuItem) menu.add(0, i, 0, obj.optString("label"));
-                    menuitem.setShowAsAction(obj.optBoolean("showAsAction") ? 1 : 0);
-
-                    BitmapUtils.getDrawable(mStartHandle.getContext(), obj.optString("icon"), new BitmapLoader() {
-                        public void onBitmapFound(Drawable d) {
-                            if (d != null) {
-                                menuitem.setIcon(d);
-                            }
-                        }
-                    });
-                } catch(Exception ex) {
-                    Log.i(LOGTAG, "Exception building menu", ex);
-                }
-            }
-            return true;
-        }
-
-        public boolean onCreateActionMode(ActionModeCompat mode, Menu menu) {
-            mActionMode = mode;
-            return true;
-        }
-
-        public boolean onActionItemClicked(ActionModeCompat mode, MenuItem item) {
-            try {
-                final JSONObject obj = mItems.getJSONObject(item.getItemId());
-                GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:Action", obj.optString("id")));
-                return true;
-            } catch(Exception ex) {
-                Log.i(LOGTAG, "Exception calling action", ex);
-            }
-            return false;
-        }
-
-        // Called when the user exits the action mode
-        public void onDestroyActionMode(ActionModeCompat mode) {
-            mActionMode = null;
-            mCallback = null;
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:End", null));
-        }
-    }
 }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index e6b04fa9766..72e1ae1ae5b 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -372,8 +372,3 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 
 <!ENTITY exit_guest_session_title "&brandShortName; will now restart">
 <!ENTITY exit_guest_session_text "The browsing data from this session will be deleted.">
-
-<!-- These are only used for accessiblity for the done and overflow-menu buttons in the actionbar.
-     They are never shown to users -->
-<!ENTITY actionbar_menu "Menu">
-<!ENTITY actionbar_done "Done">
diff --git a/mobile/android/base/menu/GeckoMenu.java b/mobile/android/base/menu/GeckoMenu.java
index 49f60044dcc..a3f49dac1a7 100644
--- a/mobile/android/base/menu/GeckoMenu.java
+++ b/mobile/android/base/menu/GeckoMenu.java
@@ -66,7 +66,7 @@ public class GeckoMenu extends ListView
      */
     public static interface ActionItemBarPresenter {
         // Add an action-item.
-        public boolean addActionItem(View actionItem);
+        public void addActionItem(View actionItem);
 
         // Remove an action-item.
         public void removeActionItem(View actionItem);
@@ -151,7 +151,7 @@ public class GeckoMenu extends ListView
         mItems.add(menuItem);
     }
 
-    private boolean addActionItem(final GeckoMenuItem menuItem) {
+    private void addActionItem(final GeckoMenuItem menuItem) {
         menuItem.setOnShowAsActionChangedListener(this);
 
         if (mActionItems.size() == 0 && 
@@ -173,8 +173,6 @@ public class GeckoMenu extends ListView
         mActionItems.put(menuItem, actionView);
         mActionItemBarPresenter.addActionItem(actionView);
         mItems.add(menuItem);
-
-        return true;
     }
 
     @Override
@@ -226,12 +224,6 @@ public class GeckoMenu extends ListView
         mAdapter.clear();
 
         mItems.clear();
-
-        if (mActionItemBarPresenter != null) {
-            for (View item : mActionItems.values()) {
-                mActionItemBarPresenter.removeActionItem(item);
-            }
-        }
         mActionItems.clear();
     }
 
@@ -274,7 +266,7 @@ public class GeckoMenu extends ListView
     @Override
     public boolean hasVisibleItems() {
         for (GeckoMenuItem menuItem : mItems) {
-            if (menuItem.isVisible() && !mActionItems.containsKey(menuItem))
+            if (menuItem.isVisible())
                 return true;
         }
 
@@ -370,11 +362,10 @@ public class GeckoMenu extends ListView
     public void onShowAsActionChanged(GeckoMenuItem item, boolean isActionItem) {
         removeItem(item.getItemId());
 
-        if (isActionItem && addActionItem(item)) {
-            return;
-        }
-
-        addItem(item);
+        if (isActionItem)
+            addActionItem(item);
+        else
+            addItem(item);
     }
 
     public void onItemChanged(GeckoMenuItem item) {
@@ -485,12 +476,11 @@ public class GeckoMenu extends ListView
         }
 
         @Override
-        public boolean addActionItem(View actionItem) {
+        public void addActionItem(View actionItem) {
             LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(actionItem.getLayoutParams());
             params.weight = 1.0f;
             actionItem.setLayoutParams(params);
             addView(actionItem);
-            return true;
         }
 
         @Override
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 5df41d14c79..16d0f461d1e 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -82,8 +82,6 @@ if CONFIG['MOZ_WEBRTC']:
 
 gbjar = add_java_jar('gecko-browser')
 gbjar.sources += [
-    'ActionModeCompat.java',
-    'ActionModeCompatView.java',
     'ActivityHandlerHelper.java',
     'AlertNotification.java',
     'animation/AnimatorProxy.java',
@@ -403,10 +401,9 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi-v11/ic_menu_reload.png',
     'resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png',
     'resources/drawable-hdpi-v11/ic_menu_settings.png',
+    'resources/drawable-hdpi-v11/ic_menu_share.png',
     'resources/drawable-hdpi-v11/ic_menu_tools.png',
     'resources/drawable-hdpi-v11/ic_status_logo.png',
-    'resources/drawable-hdpi/ab_done.png',
-    'resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png',
     'resources/drawable-hdpi/abouthome_thumbnail.png',
     'resources/drawable-hdpi/alert_addon.png',
     'resources/drawable-hdpi/alert_app.png',
@@ -419,8 +416,6 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/bookmark_folder_closed.png',
     'resources/drawable-hdpi/bookmark_folder_opened.png',
     'resources/drawable-hdpi/close.png',
-    'resources/drawable-hdpi/copy.png',
-    'resources/drawable-hdpi/cut.png',
     'resources/drawable-hdpi/favicon.png',
     'resources/drawable-hdpi/find_close.png',
     'resources/drawable-hdpi/find_next.png',
@@ -444,7 +439,6 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/ic_menu_new_private_tab.png',
     'resources/drawable-hdpi/ic_menu_new_tab.png',
     'resources/drawable-hdpi/ic_menu_reload.png',
-    'resources/drawable-hdpi/ic_menu_share.png',
     'resources/drawable-hdpi/ic_status_logo.png',
     'resources/drawable-hdpi/ic_url_bar_go.png',
     'resources/drawable-hdpi/ic_url_bar_reader.png',
@@ -467,13 +461,11 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/menu_item_check.png',
     'resources/drawable-hdpi/menu_item_more.png',
     'resources/drawable-hdpi/menu_item_uncheck.png',
-    'resources/drawable-hdpi/menu_light.png',
     'resources/drawable-hdpi/menu_panel_bg.9.png',
     'resources/drawable-hdpi/menu_pb.png',
     'resources/drawable-hdpi/menu_popup_arrow_bottom.png',
     'resources/drawable-hdpi/menu_popup_arrow_top.png',
     'resources/drawable-hdpi/menu_popup_bg.9.png',
-    'resources/drawable-hdpi/paste.png',
     'resources/drawable-hdpi/pause.png',
     'resources/drawable-hdpi/pin.png',
     'resources/drawable-hdpi/play.png',
@@ -481,7 +473,6 @@ ANDROID_RESFILES += [
     'resources/drawable-hdpi/reader_active.png',
     'resources/drawable-hdpi/reader_cropped.png',
     'resources/drawable-hdpi/reading_list.png',
-    'resources/drawable-hdpi/select_all.png',
     'resources/drawable-hdpi/shield.png',
     'resources/drawable-hdpi/shield_doorhanger.png',
     'resources/drawable-hdpi/spinner_default.9.png',
@@ -548,10 +539,9 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi-v11/ic_menu_reload.png',
     'resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png',
     'resources/drawable-mdpi-v11/ic_menu_settings.png',
+    'resources/drawable-mdpi-v11/ic_menu_share.png',
     'resources/drawable-mdpi-v11/ic_menu_tools.png',
     'resources/drawable-mdpi-v11/ic_status_logo.png',
-    'resources/drawable-mdpi/ab_done.png',
-    'resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png',
     'resources/drawable-mdpi/abouthome_thumbnail.png',
     'resources/drawable-mdpi/alert_addon.png',
     'resources/drawable-mdpi/alert_app.png',
@@ -567,8 +557,6 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/bookmarkdefaults_favicon_addons.png',
     'resources/drawable-mdpi/bookmarkdefaults_favicon_support.png',
     'resources/drawable-mdpi/close.png',
-    'resources/drawable-mdpi/copy.png',
-    'resources/drawable-mdpi/cut.png',
     'resources/drawable-mdpi/desktop_notification.png',
     'resources/drawable-mdpi/favicon.png',
     'resources/drawable-mdpi/find_close.png',
@@ -591,7 +579,6 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/ic_menu_new_private_tab.png',
     'resources/drawable-mdpi/ic_menu_new_tab.png',
     'resources/drawable-mdpi/ic_menu_reload.png',
-    'resources/drawable-mdpi/ic_menu_share.png',
     'resources/drawable-mdpi/ic_status_logo.png',
     'resources/drawable-mdpi/ic_url_bar_go.png',
     'resources/drawable-mdpi/ic_url_bar_reader.png',
@@ -615,13 +602,11 @@ ANDROID_RESFILES += [
     'resources/drawable-mdpi/menu_item_check.png',
     'resources/drawable-mdpi/menu_item_more.png',
     'resources/drawable-mdpi/menu_item_uncheck.png',
-    'resources/drawable-mdpi/menu_light.png',
     'resources/drawable-mdpi/menu_panel_bg.9.png',
     'resources/drawable-mdpi/menu_pb.png',
     'resources/drawable-mdpi/menu_popup_arrow_bottom.png',
     'resources/drawable-mdpi/menu_popup_arrow_top.png',
     'resources/drawable-mdpi/menu_popup_bg.9.png',
-    'resources/drawable-mdpi/paste.png',
     'resources/drawable-mdpi/pause.png',
     'resources/drawable-mdpi/pin.png',
     'resources/drawable-mdpi/play.png',
@@ -690,10 +675,9 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi-v11/ic_menu_reload.png',
     'resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png',
     'resources/drawable-xhdpi-v11/ic_menu_settings.png',
+    'resources/drawable-xhdpi-v11/ic_menu_share.png',
     'resources/drawable-xhdpi-v11/ic_menu_tools.png',
     'resources/drawable-xhdpi-v11/ic_status_logo.png',
-    'resources/drawable-xhdpi/ab_done.png',
-    'resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png',
     'resources/drawable-xhdpi/abouthome_thumbnail.png',
     'resources/drawable-xhdpi/alert_addon.png',
     'resources/drawable-xhdpi/alert_app.png',
@@ -706,8 +690,6 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/bookmark_folder_closed.png',
     'resources/drawable-xhdpi/bookmark_folder_opened.png',
     'resources/drawable-xhdpi/close.png',
-    'resources/drawable-xhdpi/copy.png',
-    'resources/drawable-xhdpi/cut.png',
     'resources/drawable-xhdpi/favicon.png',
     'resources/drawable-xhdpi/find_close.png',
     'resources/drawable-xhdpi/find_next.png',
@@ -729,7 +711,6 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/ic_menu_new_private_tab.png',
     'resources/drawable-xhdpi/ic_menu_new_tab.png',
     'resources/drawable-xhdpi/ic_menu_reload.png',
-    'resources/drawable-xhdpi/ic_menu_share.png',
     'resources/drawable-xhdpi/ic_status_logo.png',
     'resources/drawable-xhdpi/ic_url_bar_go.png',
     'resources/drawable-xhdpi/ic_url_bar_reader.png',
@@ -752,13 +733,11 @@ ANDROID_RESFILES += [
     'resources/drawable-xhdpi/menu_item_check.png',
     'resources/drawable-xhdpi/menu_item_more.png',
     'resources/drawable-xhdpi/menu_item_uncheck.png',
-    'resources/drawable-xhdpi/menu_light.png',
     'resources/drawable-xhdpi/menu_panel_bg.9.png',
     'resources/drawable-xhdpi/menu_pb.png',
     'resources/drawable-xhdpi/menu_popup_arrow_bottom.png',
     'resources/drawable-xhdpi/menu_popup_arrow_top.png',
     'resources/drawable-xhdpi/menu_popup_bg.9.png',
-    'resources/drawable-xhdpi/paste.png',
     'resources/drawable-xhdpi/pause.png',
     'resources/drawable-xhdpi/pin.png',
     'resources/drawable-xhdpi/play.png',
@@ -851,7 +830,6 @@ ANDROID_RESFILES += [
     'resources/layout-xlarge-v11/home_history_tabs_indicator.xml',
     'resources/layout-xlarge-v11/remote_tabs_child.xml',
     'resources/layout-xlarge-v11/remote_tabs_group.xml',
-    'resources/layout/actionbar.xml',
     'resources/layout/arrow_popup.xml',
     'resources/layout/autocomplete_list.xml',
     'resources/layout/autocomplete_list_item.xml',
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_share.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
rename to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_done.png b/mobile/android/base/resources/drawable-hdpi/ab_done.png
deleted file mode 100644
index ed03f620f8ef9e969d0471ab76329038e25c9f0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 737
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3CnFFjoxLn02py%z6(IY8q0$M=`{k_{&Q=;t<2
zt8!*r>&D`|W2$+>pS=eAb}M##+^cbdA<!VvN4X*~DdzdD$46gocztW@=DV@;PrrNe
z`F7>4dCLPr0$oL~Mm8Bn#4$+9@L$(#*Pp%fW0&@t4F~+Q4$6OeIrG`|nG22@uVa-C
zJ=H0n)NABBE9V2Z<J0ZTXV)8hPPPyEA@pQ3`<DNIReYmDEDmyfii}p#@LFTk+U(t$
z%(Lgiq&0t}rk$^U_iXbPkAN9#k{&+TD0tSLeaX$x+1qRX1)Io=Dy%rdad!O&0rsQX
zeUE;;kmXT#;oxdcmHYYUc!ga}2uH%lru;t~_Ia^?l4TMmAC9X@Z&<M7y!X1GWn#h$
zf2uC4{kOnep09yzanGU+mc1PUFCKiK{Nvr_El1_bB@Q26cFfhiWuLyc%|XW-UWd!s
zIpnUM?%3?m@@&5G<Ih)3YOdH^5Zo?#{OGcCmdBn3Z#|*I%M-VGdSAbsh1Dam$2%gf
zSRQv-81Y1t*Js<$3Df##XIMQ_D=*ym^HjOYf%nUvKXzaCVB>rDh$}Ob?>#U7^{{%b
z^;_|*S@)*|RLscvyw85$_Y2}8p?L-UY)vO;|NFUQJ(sNEA?BESpVrme#d7mboB7l}
z-Tl+e|M{(6F|!lpnSU$jtXi?CXvKcs<;$n_y<4FKOaZDTt`Q|Ei6yC4$wjF^iowXh
z&`{UFLf61N#L&#jz{twj7|6CVFbMhoZ8M67-29Zxv`Q2WrdForKm^fXYnBlV)F276
tAviy+q&%@GmBBG3KPgqgGdD3kH7GSPrLyp3str&PgQu&X%Q~loCIB{EJ2wCT

diff --git a/mobile/android/base/resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png b/mobile/android/base/resources/drawable-hdpi/ab_stacked_transparent_light_holo.9.png
deleted file mode 100644
index 55f8ae5a633f19ce0bb45c19619f5d1206a000b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S*pj^6T^Rm@;DWu&Cj&(|3p^r=
z85p>QL70(Y)*K0-AbW|YuPggqZdP^~Vb?!-B|xEUPZ!6Kh{JDhY~*YR;AwfdyZwP&
z*|vQ3=Uca43Opy-A|m)tTA}8Ng6kZY(2a9d^kz<VdH(gvOD?1DzRtePJQ4;82O1ce
z*<cK{%o~2!duM9xKcFRFJ~dM1<&N-Ge{9cqUipyngVm>BeA3EWydY~CJYD@<);T3K
F0RSlSOHu#;

diff --git a/mobile/android/base/resources/drawable-hdpi/copy.png b/mobile/android/base/resources/drawable-hdpi/copy.png
deleted file mode 100644
index 0dd8865f4a9aefc688496d3f3da1a3a131adf40c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtK2I0Nkc@k8Z|vqhpupoA7@Q_w
z_Q@)9udww*Ggp<C9}<U3J)8UGPIOEto;Ft-sNn&FL(fIF?+fF*HB}k*vt%q^mM^%I
z!GfvFlsTc9k?Vnq!}{HcKy@G3Bi`<AXJOdFYoW@>@YUVJlYya`=fKS7H+x@B<7D{2
uAY#tUut0Xhm*Zj#;RjB!GB7lpW#pH<6t>~W*2aFI0Sun5elF{r5}E)DS3++9

diff --git a/mobile/android/base/resources/drawable-hdpi/cut.png b/mobile/android/base/resources/drawable-hdpi/cut.png
deleted file mode 100644
index c760936ee152c1e85e625404b32fcdb1e634f079..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005|Nkl<ZXx{Ca
z&r1S96o3~|L<A2ZT|xwrF5UVd0tpEs!i#hWIz$o?b?6X8#D;`)lOkkMV*gsZyoG7l
zUA3CksX08BnO)wSZ}$C~U2i&_dNzya033h=_@e+on3W6$18<f%0ILD!F|epOfPV!5
zcm^a*e-)?$#c0kJfE>`%?i~X;TL4aF8~}H64T0_|0_f6I?A2thA>*NGfOVk!gT?28
zXR$R=e7_=dV^aVHz>kao7qXL!0(3NcPe5DIeQWX!tN~Zr^Utz?(wuK^l2WOMKsAdP
z*i_sgRD$tLQeu+p_%Vwf1Gm6ov<X=SaSqrAMlp->ftI*kQp)s!Z2|kDJL@b|mYt7t
ziIJqsYi-BdX*!pcMr*)h48)rTRGX!1*>zwScokhenQO`TU>+UI1jvbdL~(JY0UWI|
zKojUE#DVJnja37v0GA0t{0^LG_b0PlDJy`y<nAD5;SUlEYKlD9p6LTSN~+BiU<-Ij
zNSPZc@o^sm`yt(EC+e|G0#t#Um|mu(9!O@i5<yBU@oKV_C@OhA5SOTbBW4aXdpE$I
zxSjE4E^6pXKTNfKC7?@6MGt|%)&os5s{_q%9VvTCZSdt90v%fb3NiJgYtvT=HKyun
z&9Dt%<+{<i08IWLupYp)IDo$g;QmrN00-azGLcVt>!g&I;4<<60000<MNUMnLSTYj
CdhCn<

diff --git a/mobile/android/base/resources/drawable-hdpi/menu_light.png b/mobile/android/base/resources/drawable-hdpi/menu_light.png
deleted file mode 100644
index bb6aef1d069a14a7fc1cea9780c919c61679e4fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtXipc%kc@k8uWjUIP~c#3xZ62X
z=G4p^oaPsfxfS0Jish)R3f(&WG9yqa14Evg(y_dGGlfCy2iXqR3?>_SEs{VyhV?DH
iJ0OaDc|iOR772{!kNsXaOPT8&i0|p@=d#Wzp$Py$I4IEo

diff --git a/mobile/android/base/resources/drawable-hdpi/paste.png b/mobile/android/base/resources/drawable-hdpi/paste.png
deleted file mode 100644
index 886c49317e0b1477bfdc4a4b7601d6caf8649198..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003PNkl<ZXx{CW
zAq&Dl7=|7AFDxce#5N560>LEy1jCY`U^ZARR>Kgx%_P`t3$i9+wfF}t7Gb`Fvk1f8
zZF+a|zVI-PvE!b7-`zP;6cucaLjfBET-TMIw+K3*CB^~Rf``l`VHj!?=z=yliE$n5
zz{VDVIXHur823R9jCBe43hjA#6KKj#00B>@K%Ap^HdH<~K_FAUC6F{}2~1M1Z3?al
z?|fYXuahTD_F!#_Kn3(bS+YZJ;#duI3RJ;BTwJPI#%t9jFcK13ase}40*j1)Kh7Nt
zP1wYFg#r|?Nx)a!sH^}5BwOfHJXU}$q}DF109z=hwqXU>LOESxtN;ZlKmiJvFYvQa
j;BN#>4h1Mc0m}uRhhk;0b4%-u00000NkvXXu0mjfBBFkh

diff --git a/mobile/android/base/resources/drawable-hdpi/select_all.png b/mobile/android/base/resources/drawable-hdpi/select_all.png
deleted file mode 100644
index 902402e26efd69430ebd4ff0d25bf075f475ce73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt`JOJ0AsP4H&OFF@KtX`z`n;UO
zRyxi)%B45jY-fhsDGD$J`p@~x`AcHYL%))>rfX%`ftnZ+#1B;0djxSPdIf2wp4xRy
z>O0E`%h?)}r%d|BvSa#%7k}OzC}OZkxZC);Ykraa=hXKG>}QzwOby6yc*i$`{Q#rP
z0)7K-L+*?0FPOhD${b+a&G$hqO)N?5P~%3v5B3I939TSo7|xvK%-7W4zva{KWgxDn
LtDnm{r-UW|osUjv

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_menu_share.png b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
similarity index 100%
rename from mobile/android/base/resources/drawable-mdpi/ic_menu_share.png
rename to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
diff --git a/mobile/android/base/resources/drawable-mdpi/ab_done.png b/mobile/android/base/resources/drawable-mdpi/ab_done.png
deleted file mode 100644
index b28b3b54f4c81d482f797f31936cbd4013c093b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~Ijfv1aOh{y4_S9ba-JBqkHTrZXEaifjpNYW7o
zp-Ubd&IgJo2<&v8$G35^;Tskk#t2~^NlC?&yDV(Ca&uB1b9CBkO)cqrw|D8TKToRF
zI(8j)Hm_*m)V}Gu(AmZ?>+lr!|Ew$fc6F-Mb^2PC^>5kCb?-yw@xD*CTf6%^rv51n
zu|M&RMY8TuK!x`HjjgjxbG!Ig&nSGQ(EnVUqiU&qoaH15q1mNr`vuRlFlL+adKX`+
zs(G(GZ+*g<rY^;kzjIX#S3KJO`I&`n>GNpURMpV)N-wqLW)~-JKU!1N^uTZarp(au
zRVr*pp2gnEY&GX<vUWY4_UCg-z|kh{+iO4WS+Hz{me%Yq33nI0KL63paaqKt<2$6I
zC*4|}89qT%?DoOg>I)J=?c?L+7E14!w(i?Kf2&j6te3n$Zi&Cq1Pnyg64!{5l*E!$
ztK_0oAjM#0U}&goV4-VZ9%5)_Wng4wYz$;u85o58|F#)LLvDUbW?ChR22(3jb0C6f
zur<pF25OK5*$|wcR#Ki=l*-_klAn~S;F+74o*I;zm{M7IGSvpCh{4m<&t;ucLK6VU
CG}6rg

diff --git a/mobile/android/base/resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png b/mobile/android/base/resources/drawable-mdpi/ab_stacked_transparent_light_holo.9.png
deleted file mode 100644
index 130d442b9cbc3aab9cf070078c3a99c311787004..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)H@lb>Q*`~AJfKj#r;B5V$MLt<47pkZcw8>-RNBFB
z9sT`DRqon9-aFqp)QI)>r~E3IF+piXChr2S3ClmPxY-}S``U!knZ`?kxwKX+XyVd(
z!N>IGYDfOscV~+~UGF`na`W6v>)wFN50C6*cpo5Db#1z?4A3eDPgg&ebxsLQ0CY%8
A^#A|>

diff --git a/mobile/android/base/resources/drawable-mdpi/copy.png b/mobile/android/base/resources/drawable-mdpi/copy.png
deleted file mode 100644
index 74cb920f487b60595b896c04ebc6bdf9dbd746ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3{Mxwkch)?uN#UrDDW^}xU+Kk
z+sxOm7VuB;YDqhB?1MaGoTE#FB*%y7hM7MT3eH_(u;Gy{n8|Y>KsA~%ZZ0R|J_eKb
z`?L~59+bZhIe3Pvg!>ZXxw?)yTbW}g`*|MN(%8a%;rt4o2Ml?B|4s?!&2|CW$>8bg
K=d#Wzp$P!zMLW3w

diff --git a/mobile/android/base/resources/drawable-mdpi/cut.png b/mobile/android/base/resources/drawable-mdpi/cut.png
deleted file mode 100644
index 8e6a93fe4fd079ccc034d09f86ffa37a2e9e2f5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003jNkl<ZSi@uZ
z|NlS3Kw^eb2Mjs~7#kbUq!J$b4qzY?4;}|#!z0cC0zh00<(C7oJUtu$!z@5t1;ouj
ztPOQY10@bn0AgDp79!FC{!nwWppFRx;yy|oU<mR7RIV867)~6PYXI?dv}`#Qh)pPs
z0wy4~2I5Yrnkhh>4#c`pIR<D5^&rV70<jqo^HMVrvI4Oi5Kll-53)1@h})t3IGClh
z%mtt*2!{H!8yY(8(D<fHHUv2!5bA(VBnQOP+5w;_Z~>)iB=sP66jBr<(jp4b6Co&N
zX8^H2QX=GoMhAK#<fGI9Mo8JP6q*gWNyvsEz6B)?kcV0-LSjLb1H|mqD2T`@iff=n
zu?97YVsa`Y5omP5qD^|VJusx2WFxdyJlZoFaSi|g$re{=C@D2h00000NkvXXu0mjf
DLCbr?

diff --git a/mobile/android/base/resources/drawable-mdpi/menu_light.png b/mobile/android/base/resources/drawable-mdpi/menu_light.png
deleted file mode 100644
index 01d681697f799729aa60bcc03878b8718ef5f705..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kch)?uW#gKP~c&9OkaNH
zNWhsXa}P0HP*CC8e>x;QVw%w1wevX{81fiqT9$oZHH(4a215zM2{s3I28IOo7eJ#J
d>KPlRN5&o6d@ywr|9haR44$rjF6*2UngC}HDAND{

diff --git a/mobile/android/base/resources/drawable-mdpi/paste.png b/mobile/android/base/resources/drawable-mdpi/paste.png
deleted file mode 100644
index 61fd91c8808a6cc1c8bcae5d7c5db8305c92bd44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNuDl_ArXg@fBgS%f7l_Z&G9uu
za&od$1arsig%QmYs-i3w$aZX9xMQvu-waQdu;!$utjwnjiwsry9Qgg@ZNw@Q1N}|e
z4H!2X3w(c2cz|UEb7bbjh5(@^n~7q4FO&~53THfIDEj!JkYS&KyriPRip31^TYB6W
zV;3iwi1&!OEasD#$0zZ@?d1WBgf00NNiqx!(q7A+auxiV2y`8Tr>mdKI;Vst0O;>T
A>;M1&

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
rename to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_done.png b/mobile/android/base/resources/drawable-xhdpi/ab_done.png
deleted file mode 100644
index bb19810bc2062509e4e4968099a359ad73818728..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 915
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfwTh{zxw<m0jO=Zr;B4q#=W;QPUZ_G%CyaYzuB<Wh5uO8fh&`@
zy$J2izI-%q<yN=kM|b!0c1896Q<jT~PD(bH?q61&IBkBr<c4XDGa1>0jNgl<&3j(^
zeD(x}!be9sh1LD$__>xwFX-mty1-MRJ?GVgBPRYo&#phmts!D?ltV3&FI%+a$=z1Z
zV;YH<PBRpJdOWY=H}~Y8;+6?dnBQl!E{btb^x5%)MZU5<vYKbHH8bD8#_s<|q<uo3
ziv@5bU;Q?}@^x?jD;|xOLNyIVl^=(c+RW`{v5FkZFsKn>l1iMSDgJ+|>#46F---v^
z=n46F|IdfFb=)S0I4<keb%xjdaN}<I|2F6bkFhJ~Y?jk|z8$|Ff8e{*`EQ5MBqU5;
za>Coo@!g}n4Nex)S*)#RZPN@k9D49tzo1o|L;8h-cSg(aGrNAg7qQ^lmAJNnY2BwD
zmg$yB$_Kc(9`bFT@$ln4rdg7D8~IZ-f3I60`0mq%qw5167@Xn!BqR{_Lfuy~aYE2x
zQ4_Q6{SU<tJ$yZvu~{iIXiB3F+v`#hnLl&7|2sA|Z+PFoz2Q*8Odics9L}X8K*ci-
z7k#YcW0H%CXAGF3Gr3IOMQrj`Ve|D5a&;!H*(9*9R=Kgusmmlahs`k3dRx=6XKMX-
zzO8<8lmGs{jR*E~9TEr&J$Uf^?zh)9HeC0qwr6x-=wUC(vt|`grPXH+HP34&H(!sb
zu5UcWCBBO5kk%nyIprBDH&Pn!rrl;2T(Rau_`)NW^LD&7Ke_RCP4)9{j{B77JhQxR
z;j;K(?*GX$)@!%$Z);eb5V)kDhfN_u<)+eczwEco+!p*vopyRj3Mx00&X=uzdzd36
z%)-A-Zrh2CcdLFEF!dc0()1~Mn<;O{_2MZ{?Ek|{S65tp`wg6ep4Xq2KlWMV9><2c
z;lT8&TH+c}l9E`GYL#4+3Zxi}3=9o*4J>pG%tH*#tPG5-jE#Y8D+7a&|KB#FXvob^
z$xN$6(O_z2Y7RsY4Yp<(!9Wd?ARB`7(@M${i&7aJQ}UBi6+Ckj(^G>|6H_V+Po~-c
P6)||a`njxgN@xNAiwS~-

diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png b/mobile/android/base/resources/drawable-xhdpi/ab_stacked_transparent_light_holo.9.png
deleted file mode 100644
index 28aeaa77b7fdfd3dde728b6f19956767fe230b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwYn_bLGrL)Krq^{o6#W5t~-rHLnc^eFPTrOI-9FZ&8
z^5)2%Eg=S{E~c=^EPU~wb&-1X$~P*j&XuX`{G_XXvC{VItV7>&uP$+9Vq)PCP;h8q
zV8q3!a<~<GNI=+d^;dO|{>8K8&Q2=1!@ZjI$>TXL%ryt=7@f1lSKVXJ`V4dmgQu&X
J%Q~loCIE)8Oo#vg

diff --git a/mobile/android/base/resources/drawable-xhdpi/copy.png b/mobile/android/base/resources/drawable-xhdpi/copy.png
deleted file mode 100644
index 364b1692f3eadd2b28e8dbf3d3e83aed90b7ba14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hdo^!Ln>~)y}q0GumKON!>%)S
z_d0#MdL~`7&YUlzImNCuQTc=Zp6ja?@>MXIez~`}2&5SV4m|34Y$0n?d`@=TH6V9`
zzC&Kk!*rKB3?gh1q73Q`Gx*p%fZ}tw5?;F(F@bb2Fsx(Vkm7$roAHkFqgcrYf`aQ$
zi85>udT@Qe6H@>q!&0pY3?U2-JGoRCL>UtJBO-baGwy3=4p_^?u!?bw6bI0Nr;KI1
kKx!N7kL@7yfS~m=<KvUJC#-jxwim?pboFyt=akR{00^E>i~s-t

diff --git a/mobile/android/base/resources/drawable-xhdpi/cut.png b/mobile/android/base/resources/drawable-xhdpi/cut.png
deleted file mode 100644
index d4e4d81f367d31034dc364793a430f63c7bd19db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmV<A0~`E_P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000B4Nkl<Zc-rln
zUx<ur7{GtFvu&DIlE{UQkkls9CRWaIfg}$Jkw|i(q`g8R#&O})Ij2r-=i;~$7eeIX
zMQ+3*HXb2u{<QhirfD~wPHEG$+pL>sPH$h|%+8#h-I;H^&($~Yzxm$Z`}}=pCJYY`
z^F7Oi03ZMe00MvjAOHve3QB8h>zP`5VG-F^&iHgX9RLIX0YC)-l=}js73bWU03ZMe
z00MvjpuqP#=Vk!wfEFMH^aGv1T@e|oYXHu<c|beR7&G-1@RzC%)g=JuTnhLFXtu6C
z;3KdY_`%vPtLp7U11JJ!2k^6fd?+I4Jd-#AGyxe^Jy~}EoO3gQqd<c-b%;o}*WYeF
zVNg{Mj5`45Tm!HOm;?L+bcx771pyoa=6X%nMZ{TOGjIZ!1oW%w@oE6r11$BL27xEQ
zeGz##%FQnU_QrHQ1~R}hU|JrGs=8`vzzSd!Ffr2I3*0xY$d<Wz|8z%^Uf_3C%~s6^
zn5W+8IV)eXK$mGnZ;9*e2NsSnY`_5D6p?IA<N@ZiwnyyNmv@%DJQb0_0&A=RHW!%R
zV{!j2&?6$bn#=^vem4V?i=18;&?zE)-n=$om*@5K(hXb{kx%1!Au`%9*aWNv)_4g^
zoV+$wZUS~jHlG15*ohYvRjoMyd6@=mDZ!@Wy#0BLEF>8~URr={!1PFaAMnBeP51Kq
z4j@<R;z<C2nZin7gQ@%waM*l83i!=TAZ^ti^#-8PO4`--oC6Me0RFIXr!BtM6@XTY
z3{xWQpFI<p>V>;MO+yk7U<R-Qm{;b!XTVuYq!I~WqL&>u6dBiTVXzU{6B*kFT(U8V
z0<hfFJyoFp3-HLY!p~m&k{Ag2T;WPFzfdaxW|_MGSfKx{ZTfi;`(6cXEmHWr1l|De
zee<X`fJs&nw#D>)1s<B3XG&aepIvzslPvH6xB(1Q3qU@uua7B*KLGbEqZ=$!lTyIR
z63gKX@N31(;SvGtj+}bdHr!cm9FLK>3z3|y-wXWYWsbL0^;)$|U;!{2_}5<UYXx(M
z1GfHu1tW0Xp2zk|Y>YC&|5He%y=t-}5)#MmQnW?@U=d-JJ$G4hgsJ~At0_LI>Zzmy
zDD?d)Q}xMS>fB?dk<T+Os_LD31%O?#wcBY&<t6ZU#eW*BF#vg$Ukl8)g6gA}P3DqP
z4vz*vUEBu*0ObG}X;bA$01yBq?2nQGKmZT`j4yzCmjECD2mk_r03ZPPj^!Ienu?#G
S=-;CN0000<MNUMnLSTXcoVgbO

diff --git a/mobile/android/base/resources/drawable-xhdpi/menu_light.png b/mobile/android/base/resources/drawable-xhdpi/menu_light.png
deleted file mode 100644
index 930ca8d95e8bee5a1240fba645d9dab919abd734..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^`0({Ar-gYUf;;epuoZ6aJO@&
z%&D0-IKvGL&8p&qV;O7KuliPO1yl(K>(rHwor_8Hg9|Y9Gj8!^hz0Vk4~QZ}ABcvv
nF)(akj$uTI?LshtEWgbR4Rf6*RPme*0Ev6L`njxgN@xNAEX^ml

diff --git a/mobile/android/base/resources/drawable-xhdpi/paste.png b/mobile/android/base/resources/drawable-xhdpi/paste.png
deleted file mode 100644
index 6edd4b222ef06eeb46acd9c90ff81bcee1df867f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KesaSW-r_4byb_hAQ_wvS>l
zE&_!Y7Ovi5(J_htq1K}2$+vl%c6e|%d9XXi#IRU%_~|`jFDT)+=v3g-Q|f5uP-+sm
ze}MPVlq1%Ap3G}*-?q^A<@!IDS#F)%v_|xE7BkSMrEwEfI=jEi2A|G4Ww$T<`Kzz%
zt^F>WR5W;A4OQO1ZU1WKuUASK7C*Z>ch`p7)2?jU6?WX0-6G_0miOM9xr@Ku{vRT}
zkeNqDwtkm=nw`Dco8327GWf(Y<Xu_0cmJ}qB<2sB7=ExfDCO^1Y^7>{dhsjqihBwr
z4SlRDHkEPD5oh5wSQmCB#<d~3G&4V&b;AEOYga|OFaEp6?~1c5!>8ao^JW#))cg*p
z7E{h>aNYXgr9%DEb586pZgb1Yzjn=S=POv!X2V#s^6Rd@Jip?A-eF*HWDMCEb;iHQ
zj4^?Qp`(oDlnyh4GK0fo_X7+EI2Z)3a!4>pFfv&1udq;KFkk{}0Ta6aG&q5b3bu?}
dP|=2t>*fKTPbR$5o3jk0#M9N!Wt~$(69Bzut#1GT

diff --git a/mobile/android/base/resources/layout/actionbar.xml b/mobile/android/base/resources/layout/actionbar.xml
deleted file mode 100644
index 8d2f3afbe3e..00000000000
--- a/mobile/android/base/resources/layout/actionbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<org.mozilla.gecko.ActionModeCompatView xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/actionbar"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              style="@style/GeckoActionBar">
-
-  <LinearLayout android:layout_height="fill_parent"
-                android:layout_width="fill_parent"
-                style="@style/GeckoActionBar">
-
-    <Button android:id="@+id/actionmode_title"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            style="@style/GeckoActionBar.Title"/>
-
-    <!-- Draw a separator to the left of the title -->
-    <View android:layout_height="fill_parent"
-          android:layout_width="1dp"
-          android:layout_marginTop="10dp"
-          android:layout_marginBottom="10dp"
-          android:background="@android:color/darker_gray"/>
-
-    <LinearLayout android:id="@+id/actionbar_buttons"
-                  android:layout_height="fill_parent"
-                  android:layout_width="0dip"
-                  android:layout_weight="1"
-                  style="@style/GeckoActionBar.Buttons"/>
-
-    <ImageButton android:id="@+id/actionbar_menu"
-                 android:layout_height="fill_parent"
-                 android:layout_width="@dimen/browser_toolbar_icon_width"
-                 style="@style/GeckoActionBar.Button.MenuButton"/>
-  </LinearLayout>
-
-</org.mozilla.gecko.ActionModeCompatView>
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index 25c3d82ee71..e1226b08f16 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -67,25 +67,13 @@
              view. To make sure the EditText is not the first focusable view in
              the root view, BrowserToolbar should be specified as low in the
              view hierarchy as possible. -->
-
-        <ViewFlipper android:id="@+id/browser_actionbar"
+        <org.mozilla.gecko.toolbar.BrowserToolbar
+                android:id="@id/browser_toolbar"
+                style="@style/BrowserToolbar"
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
-                android:focusable="true">
-
-            <org.mozilla.gecko.toolbar.BrowserToolbar
-                android:id="@id/browser_toolbar"
-                    style="@style/BrowserToolbar"
-                    android:layout_width="fill_parent"
-                    android:layout_height="@dimen/browser_toolbar_height"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-            <include layout="@layout/actionbar"
-                     android:id="@+id/actionbar"/>
-
-        </ViewFlipper>
+                android:focusable="true"/>
 
     </view>
 
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index 4b576ec5fbd..eb1ced1698b 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -74,20 +74,4 @@
         <item name="android:textColor">#FF000000</item>
     </style>
 
-    <style name="GeckoActionBar" parent="@android:style/Widget.Holo.Light.ActionMode">
-        <item name="android:background">@drawable/ab_stacked_transparent_light_holo</item>
-    </style>
-
-    <style name="GeckoActionBar.Title" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
-        <item name="android:drawableLeft">?android:attr/actionModeCloseDrawable</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:paddingLeft">15dp</item>
-        <item name="android:paddingRight">15dp</item>
-    </style>
-
-    <style name="GeckoActionBar.Button.MenuButton" parent="android:style/Widget.Holo.Light.ActionButton.Overflow">
-        <item name="android:scaleType">center</item>
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
 </resources>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 0557182b61e..c42102a0409 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -540,37 +540,4 @@
         <item name="android:layout_gravity">center_vertical</item>
     </style>
 
-    <style name="GeckoActionBar">
-        <item name="android:background">@drawable/ab_stacked_transparent_light_holo</item>
-    </style>
-
-    <style name="GeckoActionBar.Title">
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:minWidth">0dp</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textAppearance">@style/TextAppearance.Medium</item>
-        <item name="android:drawableLeft">@drawable/ab_done</item>
-        <item name="android:paddingLeft">15dp</item>
-        <item name="android:paddingRight">15dp</item>
-        <item name="android:contentDescription">@string/actionbar_done</item>
-    </style>
-
-    <style name="GeckoActionBar.Button" parent="Widget.MenuItemActionBar">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="GeckoActionBar.Button.MenuButton">
-        <item name="android:scaleType">center</item>
-        <item name="android:src">@drawable/menu_light</item>
-        <item name="android:contentDescription">@string/actionbar_menu</item>
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
-    <style name="GeckoActionBar.Buttons">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textColor">@color/text_color_primary</item>
-        <item name="android:gravity">right</item>
-    </style>
-
 </resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index a837b3a427c..e35ae7af892 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -82,7 +82,6 @@
         <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item>
         <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item>
         <item name="homeListViewStyle">@style/Widget.HomeListView</item>
-        <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
     </style>
 
     <style name="Gecko.Preferences" parent="GeckoPreferencesBase"/>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index a29f8a87602..a6b1d067be2 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -350,8 +350,4 @@
 
   <string name="exit_guest_session_title">&exit_guest_session_title;</string>
   <string name="exit_guest_session_text">&exit_guest_session_text;</string>
-
-  <string name="actionbar_menu">&actionbar_menu;</string>
-  <string name="actionbar_done">&actionbar_done;</string>
-
 </resources>
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 70b9f167ae7..9df27be5b7a 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -1761,9 +1761,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
     }
 
     @Override
-    public boolean addActionItem(View actionItem) {
+    public void addActionItem(View actionItem) {
         mActionItemBar.addView(actionItem);
-        return true;
     }
 
     @Override
diff --git a/mobile/android/base/widget/GeckoPopupMenu.java b/mobile/android/base/widget/GeckoPopupMenu.java
index 017c1b0f85b..a6f2e6d8a32 100644
--- a/mobile/android/base/widget/GeckoPopupMenu.java
+++ b/mobile/android/base/widget/GeckoPopupMenu.java
@@ -65,9 +65,6 @@ public class GeckoPopupMenu implements GeckoMenu.Callback,
         mMenuPopup = new MenuPopup(context);
         mMenuPanel = new MenuPanel(context, null);
 
-        mMenuPanel.addView(mMenu);
-        mMenuPopup.setPanelView(mMenuPanel);
-
         setAnchor(anchor);
     }
 
@@ -98,6 +95,8 @@ public class GeckoPopupMenu implements GeckoMenu.Callback,
         if (menuRes > 0) {
             mMenuInflater.inflate(menuRes, mMenu);
         }
+        mMenuPanel.addView(mMenu);
+        mMenuPopup.setPanelView(mMenuPanel);
     }
 
     /**
diff --git a/mobile/android/chrome/content/SelectionHandler.js b/mobile/android/chrome/content/SelectionHandler.js
index 54f4362ef25..777048e6d7d 100644
--- a/mobile/android/chrome/content/SelectionHandler.js
+++ b/mobile/android/chrome/content/SelectionHandler.js
@@ -49,23 +49,21 @@ var SelectionHandler = {
 
   _addObservers: function sh_addObservers() {
     Services.obs.addObserver(this, "Gesture:SingleTap", false);
+    Services.obs.addObserver(this, "Window:Resize", false);
     Services.obs.addObserver(this, "Tab:Selected", false);
     Services.obs.addObserver(this, "after-viewport-change", false);
     Services.obs.addObserver(this, "TextSelection:Move", false);
     Services.obs.addObserver(this, "TextSelection:Position", false);
-    Services.obs.addObserver(this, "TextSelection:End", false);
-    Services.obs.addObserver(this, "TextSelection:Action", false);
     BrowserApp.deck.addEventListener("compositionend", this, false);
   },
 
   _removeObservers: function sh_removeObservers() {
     Services.obs.removeObserver(this, "Gesture:SingleTap");
+    Services.obs.removeObserver(this, "Window:Resize");
     Services.obs.removeObserver(this, "Tab:Selected");
     Services.obs.removeObserver(this, "after-viewport-change");
     Services.obs.removeObserver(this, "TextSelection:Move");
     Services.obs.removeObserver(this, "TextSelection:Position");
-    Services.obs.removeObserver(this, "TextSelection:End");
-    Services.obs.removeObserver(this, "TextSelection:Action");
     BrowserApp.deck.removeEventListener("compositionend", this);
   },
 
@@ -86,17 +84,17 @@ var SelectionHandler = {
         break;
       }
       case "Tab:Selected":
-      case "TextSelection:End":
         this._closeSelection();
         break;
-      case "TextSelection:Action":
-        for (let type in this.actions) {
-          if (this.actions[type].id == aData) {
-            this.actions[type].action(this._targetElement);
-            break;
-          }
+
+      case "Window:Resize": {
+        if (this._activeType == this.TYPE_SELECTION) {
+          // Knowing when the page is done drawing is hard, so let's just cancel
+          // the selection when the window changes. We should fix this later.
+          this._closeSelection();
         }
         break;
+      }
       case "after-viewport-change": {
         if (this._activeType == this.TYPE_SELECTION) {
           // Update the cache after the viewport changes (e.g. panning, zooming).
@@ -231,24 +229,16 @@ var SelectionHandler = {
     // Clear any existing selection from the document
     this._contentWindow.getSelection().removeAllRanges();
 
-    // If we didn't have any coordinates to associate with this event (for instance, selectAll is chosen from
-    // the actionMode), set them to a point inside the top left corner of the target
-    if (aX == undefined || aY == undefined) {
-      let rect = this._targetElement.getBoundingClientRect();
-      aX = rect.left + 1;
-      aY = rect.top  + 1;
-    }
-
     if (!this._domWinUtils.selectAtPoint(aX, aY, Ci.nsIDOMWindowUtils.SELECT_WORDNOSPACE)) {
       this._deactivate();
-      return false;
+      return;
     }
 
     let selection = this._getSelection();
     // If the range didn't have any text, let's bail
-    if (!selection || selection.rangeCount == 0 || selection.getRangeAt(0).collapsed) {
+    if (!selection || selection.rangeCount == 0) {
       this._deactivate();
-      return false;
+      return;
     }
 
     // Add a listener to end the selection if it's removed programatically
@@ -284,135 +274,17 @@ var SelectionHandler = {
     // Do not select text far away from where the user clicked
     if (distance > maxSelectionDistance) {
       this._closeSelection();
-      return false;
+      return;
     }
 
     this._positionHandles(positions);
-    this._sendMessage("TextSelection:ShowHandles", [this.HANDLE_TYPE_START, this.HANDLE_TYPE_END], aX, aY);
-    return true;
-  },
-
-
-  /* Reads a value from an action. If the action defines the value as a function, will return the result of calling
-     the function. Otherwise, will return the value itself. If the value isn't defined for this action, will return a default */
-  _getValue: function(obj, name, defaultValue) {
-    if (!(name in obj))
-      return defaultValue;
-
-    if (typeof obj[name] == "function")
-      return obj[name](this._targetElement);
-
-    return obj[name];
-  },
-
-  _sendMessage: function(type, handles, aX, aY) {
-    let actions = [];
-    for (let type in this.actions) {
-      let action = this.actions[type];
-      if (action.selector.matches(this._targetElement, aX, aY)) {
-        let a = {
-          id: action.id,
-          label: this._getValue(action, "label", ""),
-          icon: this._getValue(action, "icon", "drawable://ic_status_logo"),
-          showAsAction: this._getValue(action, "showAsAction", true),
-        };
-        actions.push(a);
-      }
-    }
 
     sendMessageToJava({
-      type: type,
-      handles: handles,
-      actions: actions,
+      type: "TextSelection:ShowHandles",
+      handles: [this.HANDLE_TYPE_START, this.HANDLE_TYPE_END]
     });
   },
 
-  _updateMenu: function() {
-    this._sendMessage("TextSelection:Update");
-  },
-
-  actions: {
-    SELECT_ALL: {
-      label: Strings.browser.GetStringFromName("contextmenu.selectAll"),
-      id: "selectall_action",
-      icon: "drawable://select_all",
-      action: function(aElement) {
-        SelectionHandler.selectAll(aElement);
-      },
-      selector: ClipboardHelper.selectAllContext,
-    },
-
-    CUT: {
-      label: Strings.browser.GetStringFromName("contextmenu.cut"),
-      id: "cut_action",
-      icon: "drawable://cut",
-      action: function(aElement) {
-        let start = aElement.selectionStart;
-        let end   = aElement.selectionEnd;
-
-        SelectionHandler.copySelection();
-        aElement.value = aElement.value.substring(0, start) + aElement.value.substring(end)
-
-        SelectionHandler._updateMenu();
-      },
-      selector: ClipboardHelper.cutContext,
-    },
-
-    COPY: {
-      label: Strings.browser.GetStringFromName("contextmenu.copy"),
-      id: "copy_action",
-      icon: "drawable://copy",
-      action: function() {
-        SelectionHandler.copySelection();
-        SelectionHandler._updateMenu();
-      },
-      selector: ClipboardHelper.getCopyContext(false)
-    },
-
-    PASTE: {
-      label: Strings.browser.GetStringFromName("contextmenu.paste"),
-      id: "paste_action",
-      icon: "drawable://paste",
-      action: function(aElement) {
-        ClipboardHelper.paste(aElement);
-        SelectionHandler._positionHandles();
-        SelectionHandler._updateMenu();
-      },
-      selector: ClipboardHelper.pasteContext,
-    },
-
-    SHARE: {
-      label: Strings.browser.GetStringFromName("contextmenu.share"),
-      id: "share_action",
-      icon: "drawable://ic_menu_share",
-      action: function() {
-        SelectionHandler.shareSelection();
-        SelectionHandler._closeSelection();
-      },
-      showAsAction: function(aElement) {
-        return !(aElement instanceof HTMLInputElement && aElement.mozIsTextField(false))
-      },
-      selector: ClipboardHelper.shareContext,
-    },
-
-    SEARCH: {
-      label: function() {
-        return Strings.browser.formatStringFromName("contextmenu.search", [Services.search.defaultEngine.name], 1);
-      },
-      id: "search_action",
-      icon: "drawable://ic_url_bar_search",
-      showAsAction: function(aElement) {
-        return !(aElement instanceof HTMLInputElement && aElement.mozIsTextField(false))
-      },
-      action: function() {
-        SelectionHandler.searchSelection();
-        SelectionHandler._closeSelection();
-      },
-      selector: ClipboardHelper.searchWithContext,
-    },
-
-  },
-
   /*
    * Called by BrowserEventHandler when the user taps in a form input.
    * Initializes SelectionHandler and positions the caret handle.
@@ -420,12 +292,6 @@ var SelectionHandler = {
    * @param aX, aY tap location in client coordinates.
    */
   attachCaret: function sh_attachCaret(aElement) {
-    // See if its an input element, and it isn't disabled, nor handled by Android native dialog
-    if (aElement.disabled ||
-        InputWidgetHelper.hasInputWidget(aElement) ||
-        !((aElement instanceof HTMLInputElement && aElement.mozIsTextField(false)) ||
-          (aElement instanceof HTMLTextAreaElement)))
-      return;
     this._initTargetInfo(aElement);
 
     this._contentWindow.addEventListener("keydown", this, false);
@@ -434,7 +300,10 @@ var SelectionHandler = {
     this._activeType = this.TYPE_CURSOR;
     this._positionHandles();
 
-    this._sendMessage("TextSelection:ShowHandles", [this.HANDLE_TYPE_MIDDLE]);
+    sendMessageToJava({
+      type: "TextSelection:ShowHandles",
+      handles: [this.HANDLE_TYPE_MIDDLE]
+    });
   },
 
   _initTargetInfo: function sh_initTargetInfo(aElement) {
@@ -479,8 +348,8 @@ var SelectionHandler = {
   },
 
   // Used by the contextmenu "matches" functions in ClipboardHelper
-  isSelectionActive: function sh_isSelectionActive() {
-    return (this._activeType == this.TYPE_SELECTION);
+  shouldShowContextMenu: function sh_shouldShowContextMenu(aX, aY) {
+    return (this._activeType == this.TYPE_SELECTION) && this._pointInSelection(aX, aY);
   },
 
   selectAll: function sh_selectAll(aElement, aX, aY) {
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 2e997996222..31815ea9d51 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -327,6 +327,7 @@ var BrowserApp = {
     IndexedDB.init();
     HealthReportStatusListener.init();
     XPInstallObserver.init();
+    ClipboardHelper.init();
     CharacterEncoding.init();
     ActivityObserver.init();
     WebappsUI.init();
@@ -2101,11 +2102,8 @@ var NativeWindow = {
         this._target = null;
         BrowserEventHandler._cancelTapHighlight();
 
-        if (SelectionHandler.canSelect(target)) {
-          if (!SelectionHandler.startSelection(target, aX, aY)) {
-            SelectionHandler.attachCaret(target);
-          }
-        }
+        if (SelectionHandler.canSelect(target))
+          SelectionHandler.startSelection(target, aX, aY);
       }
     },
 
@@ -4390,7 +4388,12 @@ var BrowserEventHandler = {
             this._sendMouseEvent("mousedown", element, x, y);
             this._sendMouseEvent("mouseup",   element, x, y);
 
-            SelectionHandler.attachCaret(element);
+            // See if its an input element, and it isn't disabled, nor handled by Android native dialog
+            if (!element.disabled &&
+                !InputWidgetHelper.hasInputWidget(element) &&
+                ((element instanceof HTMLInputElement && element.mozIsTextField(false)) ||
+                (element instanceof HTMLTextAreaElement)))
+              SelectionHandler.attachCaret(element);
 
             // scrollToFocusedInput does its own checks to find out if an element should be zoomed into
             BrowserApp.scrollToFocusedInput(BrowserApp.selectedBrowser);
@@ -6178,6 +6181,36 @@ var ClipboardHelper = {
   // Recorded so search with option can be removed/replaced when default engine changed.
   _searchMenuItem: -1,
 
+  init: function() {
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.copy"), ClipboardHelper.getCopyContext(false), ClipboardHelper.copy.bind(ClipboardHelper));
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.copyAll"), ClipboardHelper.getCopyContext(true), ClipboardHelper.copy.bind(ClipboardHelper));
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.selectWord"), ClipboardHelper.selectWordContext, ClipboardHelper.selectWord.bind(ClipboardHelper));
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.selectAll"), ClipboardHelper.selectAllContext, ClipboardHelper.selectAll.bind(ClipboardHelper));
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.share"), ClipboardHelper.shareContext, ClipboardHelper.share.bind(ClipboardHelper));
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.paste"), ClipboardHelper.pasteContext, ClipboardHelper.paste.bind(ClipboardHelper));
+    NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.changeInputMethod"), NativeWindow.contextmenus.textContext, ClipboardHelper.inputMethod.bind(ClipboardHelper));
+
+    // We add this contextmenu item right before the menu is built to avoid having to initialise the search service early.
+    Services.obs.addObserver(this, "before-build-contextmenu", false);
+  },
+
+  uninit: function ch_uninit() {
+    Services.obs.removeObserver(this, "before-build-contextmenu");
+  },
+
+  observe: function observe(aSubject, aTopic) {
+    if (aTopic == "before-build-contextmenu") {
+      this._setSearchMenuItem();
+    }
+  },
+
+  _setSearchMenuItem: function setSearchMenuItem() {
+    if (this._searchMenuItem) {
+      NativeWindow.contextmenus.remove(this._searchMenuItem);
+    }
+    this._searchMenuItem = NativeWindow.contextmenus.add(Strings.browser.formatStringFromName("contextmenu.search", [Services.search.defaultEngine.name], 1), ClipboardHelper.searchWithContext, ClipboardHelper.searchWith.bind(ClipboardHelper));
+  },
+
   get clipboardHelper() {
     delete this.clipboardHelper;
     return this.clipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
@@ -6189,7 +6222,7 @@ var ClipboardHelper = {
   },
 
   copy: function(aElement, aX, aY) {
-    if (SelectionHandler.isSelectionActive()) {
+    if (SelectionHandler.shouldShowContextMenu(aX, aY)) {
       SelectionHandler.copySelection();
       return;
     }
@@ -6236,7 +6269,7 @@ var ClipboardHelper = {
     return {
       matches: function(aElement, aX, aY) {
         // Do not show "Copy All" for normal non-input text selection.
-        if (!isCopyAll && SelectionHandler.isSelectionActive())
+        if (!isCopyAll && SelectionHandler.shouldShowContextMenu(aX, aY))
           return true;
 
         if (NativeWindow.contextmenus.textContext.matches(aElement)) {
@@ -6269,7 +6302,7 @@ var ClipboardHelper = {
 
   selectAllContext: {
     matches: function selectAllContextMatches(aElement, aX, aY) {
-      if (SelectionHandler.isSelectionActive())
+      if (SelectionHandler.shouldShowContextMenu(aX, aY))
         return true;
 
       if (NativeWindow.contextmenus.textContext.matches(aElement))
@@ -6281,13 +6314,13 @@ var ClipboardHelper = {
 
   shareContext: {
     matches: function shareContextMatches(aElement, aX, aY) {
-      return SelectionHandler.isSelectionActive();
+      return SelectionHandler.shouldShowContextMenu(aX, aY);
     }
   },
 
   searchWithContext: {
     matches: function searchWithContextMatches(aElement, aX, aY) {
-      return SelectionHandler.isSelectionActive();
+      return SelectionHandler.shouldShowContextMenu(aX, aY);
     }
   },
 
@@ -6299,16 +6332,6 @@ var ClipboardHelper = {
       }
       return false;
     }
-  },
-
-  cutContext: {
-    matches: function(aElement) {
-      let copyctx = ClipboardHelper.getCopyContext(false);
-      if (NativeWindow.contextmenus.textContext.matches(aElement)) {
-        return copyctx.matches(aElement);
-      }
-      return false;
-    }
   }
 };
 
@@ -6615,21 +6638,13 @@ var SearchEngines = {
     Services.obs.addObserver(this, "SearchEngines:GetVisible", false);
     Services.obs.addObserver(this, "SearchEngines:SetDefault", false);
     Services.obs.addObserver(this, "SearchEngines:Remove", false);
-
+    let contextName = Strings.browser.GetStringFromName("contextmenu.addSearchEngine");
     let filter = {
       matches: function (aElement) {
         return (aElement.form && NativeWindow.contextmenus.textContext.matches(aElement));
       }
     };
-    SelectionHandler.actions.SEARCH_ADD = {
-      id: "add_search_action",
-      label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine"),
-      icon: "drawable://ic_url_bar_search",
-      selector: filter,
-      action: function(aElement) {
-        SearchEngines.addEngine(aElement);
-      }
-    }
+    this._contextMenuId = NativeWindow.contextmenus.add(contextName, filter, this.addEngine);
   },
 
   uninit: function uninit() {
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index 2de19889e09..b2a46142b87 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -193,7 +193,8 @@ contextmenu.saveAudio=Save Audio
 contextmenu.addToContacts=Add to Contacts
 
 contextmenu.copy=Copy
-contextmenu.cut=Cut
+contextmenu.copyAll=Copy All
+contextmenu.selectWord=Select Word
 contextmenu.selectAll=Select All
 contextmenu.paste=Paste
 

From 6f11b4f2fd3fc5a149e3e08c6e6074920d25092b Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Tue, 19 Nov 2013 14:37:33 -0800
Subject: [PATCH 58/92] Bug 940451 - Enable tab scrolling in Metro urlbar
 autocomplete popup [r=rsilveira]

---
 browser/metro/base/content/bindings/urlbar.xml       | 2 ++
 browser/metro/base/content/browser.xul               | 1 +
 browser/metro/base/tests/mochitest/browser_urlbar.js | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/browser/metro/base/content/bindings/urlbar.xml b/browser/metro/base/content/bindings/urlbar.xml
index 39b5ab190bc..aa11c0036aa 100644
--- a/browser/metro/base/content/bindings/urlbar.xml
+++ b/browser/metro/base/content/bindings/urlbar.xml
@@ -540,6 +540,8 @@
       <property name="matchCount" readonly="true" onget="return this.input.controller.matchCount;"/>
       <property name="popupOpen" readonly="true" onget="return !this.hidden"/>
       <property name="overrideValue" readonly="true" onget="return null;"/>
+      <!-- Alias of popupOpen, for compatibility with global/content/bindings/autocomplete.xml -->
+      <property name="mPopupOpen" readonly="true" onget="return this.popupOpen"/>
 
       <property name="selectedItem">
         <getter>
diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index af3637ccc79..43d19362f53 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -239,6 +239,7 @@
                      autocompletepopup="urlbar-autocomplete"
                      completeselectedindex="true"
                      placeholder="&urlbar.emptytext;"
+                     tabscrolling="true"
                      onclick="SelectionHelperUI.urlbarClick();"/>
 
             <toolbarbutton id="go-button" class="urlbar-button"
diff --git a/browser/metro/base/tests/mochitest/browser_urlbar.js b/browser/metro/base/tests/mochitest/browser_urlbar.js
index 0a9bc4f7968..d0a1fd12c5c 100644
--- a/browser/metro/base/tests/mochitest/browser_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_urlbar.js
@@ -337,6 +337,12 @@ gTests.push({
 
     EventUtils.synthesizeKey("VK_DOWN", {}, window);
     is(gEdit.popup._searches.selectedIndex, 0, "key select search: first search selected");
+
+    EventUtils.synthesizeKey("VK_TAB", {}, window);
+    is(gEdit.popup._searches.selectedIndex, 1, "tab key: second search selected");
+
+    EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }, window);
+    is(gEdit.popup._searches.selectedIndex, 0, "shift-tab: first search selected");
   }
 });
 

From e444dc3f1026cb488ab6572388f71a507cc1f07d Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Tue, 19 Nov 2013 14:39:02 -0800
Subject: [PATCH 59/92] Bug 940451 - Fix intermittent failure in
 browser_urlbar.js [r=rsilveira]

---
 browser/metro/base/tests/mochitest/browser_urlbar.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/metro/base/tests/mochitest/browser_urlbar.js b/browser/metro/base/tests/mochitest/browser_urlbar.js
index d0a1fd12c5c..d05e5af26a9 100644
--- a/browser/metro/base/tests/mochitest/browser_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_urlbar.js
@@ -117,6 +117,7 @@ gTests.push({
       gEdit.openPopup();
       gEdit.closePopup();
     }
+    yield waitForCondition(() => gEdit.popup._searches.itemCount);
 
     let numSearches = gEdit.popup._searches.itemCount;
     function getEngineItem() {
@@ -124,11 +125,11 @@ gTests.push({
     }
 
     yield addMockSearchDefault();
-    ok(gEdit.popup._searches.itemCount == numSearches + 1, "added search engine count");
+    is(gEdit.popup._searches.itemCount, numSearches + 1, "added search engine count");
     ok(getEngineItem(), "added search engine item");
 
     yield removeMockSearchDefault();
-    ok(gEdit.popup._searches.itemCount == numSearches, "normal search engine count");
+    is(gEdit.popup._searches.itemCount, numSearches, "normal search engine count");
     ok(!getEngineItem(), "added search engine item");
   }
 });

From 2d58b2c7aa0bdd31519fc68195448f459c7a53c4 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 19 Nov 2013 17:27:06 -0500
Subject: [PATCH 60/92] Bug 938980 - [Australis] Restore Defaults will not
 reshow the address bar if it has been hidden through channel switching.
 r=Gijs

---
 .../customizableui/src/CustomizableUI.jsm     |  6 +++++
 .../customizableui/test/browser.ini           |  1 +
 .../test/browser_938980_navbar_collapsed.js   | 26 +++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 browser/components/customizableui/test/browser_938980_navbar_collapsed.js

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index ba6380d08b4..557c3914bfb 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -359,6 +359,12 @@ let CustomizableUIInternal = {
 
     this.beginBatchUpdate();
 
+    // Restore nav-bar visibility since it may have been hidden
+    // through a migration path (bug 938980) or an add-on.
+    if (aArea == CustomizableUI.AREA_NAVBAR) {
+      aAreaNode.collapsed = false;
+    }
+
     let currentNode = container.firstChild;
     let placementsToRemove = new Set();
     for (let id of aPlacements) {
diff --git a/browser/components/customizableui/test/browser.ini b/browser/components/customizableui/test/browser.ini
index 5b05e094b06..37ffad7f2f5 100644
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -35,4 +35,5 @@ skip-if = true
 # Because this test is about the menubar, it can't be run on mac
 skip-if = os == "mac"
 
+[browser_938980_navbar_collapsed.js]
 [browser_panel_toggle.js]
diff --git a/browser/components/customizableui/test/browser_938980_navbar_collapsed.js b/browser/components/customizableui/test/browser_938980_navbar_collapsed.js
new file mode 100644
index 00000000000..d032be2c211
--- /dev/null
+++ b/browser/components/customizableui/test/browser_938980_navbar_collapsed.js
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let gTests = [
+  {
+    desc: "Customization reset should restore visibility to default-visible toolbars.",
+    setup: null,
+    run: function() {
+      let navbar = document.getElementById("nav-bar");
+      is(navbar.collapsed, false, "Test should start with navbar visible");
+      navbar.collapsed = true;
+      is(navbar.collapsed, true, "navbar should be hidden now");
+
+      yield resetCustomization();
+
+      is(navbar.collapsed, false, "Customization reset should restore visibility to the navbar");
+    },
+    teardown: null
+  },
+];
+
+function test() {
+  waitForExplicitFinish();
+  runTests(gTests);
+}

From 81ed5c9b26950548d054a78f1bd1dde871c65832 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Tue, 19 Nov 2013 14:47:43 -0800
Subject: [PATCH 61/92] Bug 937380 - Fix
 forgetaboutsite/test/browser/browser_clearplugindata.js failure when
 browser-chrome tests are split into chunks. r=bsmedberg

---
 .../test/browser/browser_clearplugindata.js         | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js b/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js
index da1be0ab232..14dd189a695 100644
--- a/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js
+++ b/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js
@@ -29,6 +29,14 @@ function stored(needles) {
   return true;
 }
 
+function setTestPluginEnabledState(newEnabledState, plugin) {
+  var oldEnabledState = plugin.enabledState;
+  plugin.enabledState = newEnabledState;
+  SimpleTest.registerCleanupFunction(function() {
+    plugin.enabledState = oldEnabledState;
+  });
+}
+
 function test() {
   waitForExplicitFinish();
 
@@ -42,6 +50,11 @@ function test() {
       pluginTag = tags[i];
     }
   }
+  if (!pluginTag) {
+    ok(false, "Test Plug-in not available, can't run test");
+    finish();
+  }
+  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, pluginTag);
 
   executeSoon(do_test);
 }

From 8419732291773f8ac5b4345d20e179f2253d9ca3 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 15 Nov 2013 13:38:21 +0100
Subject: [PATCH 62/92] Bug 934532 - [Australis] clicking in a blank area of
 the panel shouldn't close it, r=jaws

---
 .../customizableui/src/CustomizableUI.jsm          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 557c3914bfb..995597607eb 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1084,19 +1084,23 @@ let CustomizableUIInternal = {
   /*
    * If people put things in the panel which need more than single-click interaction,
    * we don't want to close it. Right now we check for text inputs and menu buttons.
-   * Anything else we should take care of?
+   * We also check for being outside of any toolbaritem/toolbarbutton, ie on a blank
+   * part of the menu.
    */
   _isOnInteractiveElement: function(aEvent) {
     let target = aEvent.originalTarget;
-    let panel = aEvent.currentTarget;
+    let panel = this._getPanelForNode(aEvent.currentTarget);
     let inInput = false;
     let inMenu = false;
-    while (!inInput && !inMenu && target != aEvent.currentTarget) {
-      inInput = target.localName == "input";
+    let inItem = false;
+    while (!inInput && !inMenu && !inItem && target != panel) {
+      let tagName = target.localName;
+      inInput = tagName == "input";
       inMenu = target.type == "menu";
+      inItem = tagName == "toolbaritem" || tagName == "toolbarbutton";
       target = target.parentNode;
     }
-    return inMenu || inInput;
+    return inMenu || inInput || !inItem;
   },
 
   hidePanelForNode: function(aNode) {

From 0bec83eec7fc2a76502ac8401660817cbfb58afc Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 18 Nov 2013 09:31:55 -0800
Subject: [PATCH 63/92] Bug 934646 - Declare Android resource directories
 relative to $SRCDIR. r=glandium,gps,mfinkle

--HG--
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
---
 build/mobile/robocop/moz.build                |   4 -
 build/mobile/sutagent/android/fencp/moz.build |   8 -
 build/mobile/sutagent/android/ffxcp/moz.build |   8 -
 build/mobile/sutagent/android/moz.build       |  10 -
 .../mobile/sutagent/android/watcher/moz.build |  11 -
 config/config.mk                              |   3 +-
 config/makefiles/java-build.mk                |  32 +-
 js/src/config/config.mk                       |   3 +-
 js/src/config/makefiles/java-build.mk         |  32 +-
 mobile/android/base/Makefile.in               |  63 +-
 mobile/android/base/android-services.mozbuild |  23 -
 .../res}/drawable-mdpi/crash_reporter.png     | Bin
 .../res}/layout/crash_reporter.xml            |   0
 mobile/android/base/moz.build                 | 609 +-----------------
 .../drawable-hdpi/icon.png}                   | Bin
 .../drawable-mdpi/icon.png}                   | Bin
 .../drawable-xhdpi/icon.png}                  | Bin
 .../drawable-xxhdpi/icon.png}                 | Bin
 .../drawable-hdpi/icon.png}                   | Bin
 .../drawable-mdpi/icon.png}                   | Bin
 .../drawable-xhdpi/icon.png}                  | Bin
 .../drawable-xxhdpi/icon.png}                 | Bin
 .../drawable-hdpi/icon.png}                   | Bin
 .../drawable-mdpi/icon.png}                   | Bin
 .../drawable-xhdpi/icon.png}                  | Bin
 .../drawable-xxhdpi/icon.png}                 | Bin
 .../drawable-hdpi/icon.png}                   | Bin
 .../drawable-mdpi/icon.png}                   | Bin
 .../drawable-xhdpi/icon.png}                  | Bin
 .../drawable-xxhdpi/icon.png}                 | Bin
 .../drawable-hdpi/icon.png}                   | Bin
 .../drawable-mdpi/icon.png}                   | Bin
 .../drawable-xhdpi/icon.png}                  | Bin
 .../drawable-xxhdpi/icon.png}                 | Bin
 .../junit3/android-services.mozbuild          |   7 -
 python/mozbuild/mozbuild/frontend/emitter.py  |   2 +-
 .../mozbuild/frontend/sandbox_symbols.py      |   7 +-
 37 files changed, 49 insertions(+), 773 deletions(-)
 rename mobile/android/base/{resources => crashreporter/res}/drawable-mdpi/crash_reporter.png (100%)
 rename mobile/android/base/{resources => crashreporter/res}/layout/crash_reporter.xml (100%)
 rename mobile/android/branding/aurora/{content/fennec_72x72.png => res/drawable-hdpi/icon.png} (100%)
 rename mobile/android/branding/aurora/{content/fennec_48x48.png => res/drawable-mdpi/icon.png} (100%)
 rename mobile/android/branding/aurora/{content/fennec_96x96.png => res/drawable-xhdpi/icon.png} (100%)
 rename mobile/android/branding/aurora/{content/fennec_144x144.png => res/drawable-xxhdpi/icon.png} (100%)
 rename mobile/android/branding/beta/{content/fennec_72x72.png => res/drawable-hdpi/icon.png} (100%)
 rename mobile/android/branding/beta/{content/fennec_48x48.png => res/drawable-mdpi/icon.png} (100%)
 rename mobile/android/branding/beta/{content/fennec_96x96.png => res/drawable-xhdpi/icon.png} (100%)
 rename mobile/android/branding/beta/{content/fennec_144x144.png => res/drawable-xxhdpi/icon.png} (100%)
 rename mobile/android/branding/nightly/{content/fennec_72x72.png => res/drawable-hdpi/icon.png} (100%)
 rename mobile/android/branding/nightly/{content/fennec_48x48.png => res/drawable-mdpi/icon.png} (100%)
 rename mobile/android/branding/nightly/{content/fennec_96x96.png => res/drawable-xhdpi/icon.png} (100%)
 rename mobile/android/branding/nightly/{content/fennec_144x144.png => res/drawable-xxhdpi/icon.png} (100%)
 rename mobile/android/branding/official/{content/fennec_72x72.png => res/drawable-hdpi/icon.png} (100%)
 rename mobile/android/branding/official/{content/fennec_48x48.png => res/drawable-mdpi/icon.png} (100%)
 rename mobile/android/branding/official/{content/fennec_96x96.png => res/drawable-xhdpi/icon.png} (100%)
 rename mobile/android/branding/official/{content/fennec_144x144.png => res/drawable-xxhdpi/icon.png} (100%)
 rename mobile/android/branding/unofficial/{content/fennec_72x72.png => res/drawable-hdpi/icon.png} (100%)
 rename mobile/android/branding/unofficial/{content/fennec_48x48.png => res/drawable-mdpi/icon.png} (100%)
 rename mobile/android/branding/unofficial/{content/fennec_96x96.png => res/drawable-xhdpi/icon.png} (100%)
 rename mobile/android/branding/unofficial/{content/fennec_144x144.png => res/drawable-xxhdpi/icon.png} (100%)

diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build
index c9ab6ecd17d..c271ec3908c 100644
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -3,7 +3,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ANDROID_RESFILES = [
-    'res/values/strings.xml',
-]
diff --git a/build/mobile/sutagent/android/fencp/moz.build b/build/mobile/sutagent/android/fencp/moz.build
index 835e25a84c1..c271ec3908c 100644
--- a/build/mobile/sutagent/android/fencp/moz.build
+++ b/build/mobile/sutagent/android/fencp/moz.build
@@ -3,11 +3,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ANDROID_RESFILES = [
-    'res/drawable-hdpi/icon.png',
-    'res/drawable-ldpi/icon.png',
-    'res/drawable-mdpi/icon.png',
-    'res/layout/main.xml',
-    'res/values/strings.xml',
-]
diff --git a/build/mobile/sutagent/android/ffxcp/moz.build b/build/mobile/sutagent/android/ffxcp/moz.build
index 835e25a84c1..c271ec3908c 100644
--- a/build/mobile/sutagent/android/ffxcp/moz.build
+++ b/build/mobile/sutagent/android/ffxcp/moz.build
@@ -3,11 +3,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ANDROID_RESFILES = [
-    'res/drawable-hdpi/icon.png',
-    'res/drawable-ldpi/icon.png',
-    'res/drawable-mdpi/icon.png',
-    'res/layout/main.xml',
-    'res/values/strings.xml',
-]
diff --git a/build/mobile/sutagent/android/moz.build b/build/mobile/sutagent/android/moz.build
index 27426490f46..c271ec3908c 100644
--- a/build/mobile/sutagent/android/moz.build
+++ b/build/mobile/sutagent/android/moz.build
@@ -3,13 +3,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ANDROID_RESFILES = [
-    'res/drawable/ateamlogo.png',
-    'res/drawable/ic_stat_first.png',
-    'res/drawable/ic_stat_neterror.png',
-    'res/drawable/ic_stat_warning.png',
-    'res/drawable/icon.png',
-    'res/layout/main.xml',
-    'res/values/strings.xml',
-]
diff --git a/build/mobile/sutagent/android/watcher/moz.build b/build/mobile/sutagent/android/watcher/moz.build
index 1794b48751c..c271ec3908c 100644
--- a/build/mobile/sutagent/android/watcher/moz.build
+++ b/build/mobile/sutagent/android/watcher/moz.build
@@ -3,14 +3,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ANDROID_RESFILES = [
-    'res/drawable-hdpi/ateamlogo.png',
-    'res/drawable-hdpi/icon.png',
-    'res/drawable-ldpi/ateamlogo.png',
-    'res/drawable-ldpi/icon.png',
-    'res/drawable-mdpi/ateamlogo.png',
-    'res/drawable-mdpi/icon.png',
-    'res/layout/main.xml',
-    'res/values/strings.xml',
-]
diff --git a/config/config.mk b/config/config.mk
index 2f03e336e25..645bf6c47fd 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -35,7 +35,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
-  ANDROID_RESFILES \
+  ANDROID_RES_DIRS \
   CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
@@ -73,6 +73,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
+  ANDROID_RESFILES \
   MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
   SHORT_LIBNAME \
diff --git a/config/makefiles/java-build.mk b/config/makefiles/java-build.mk
index 179063b8fd5..b3f34ab1d03 100644
--- a/config/makefiles/java-build.mk
+++ b/config/makefiles/java-build.mk
@@ -7,29 +7,6 @@
 
 ifndef INCLUDED_JAVA_BUILD_MK #{
 
-ifdef ANDROID_RESFILES #{
-ifndef IGNORE_ANDROID_RESFILES #{
-res-dep := .deps-copy-java-res
-
-GENERATED_DIRS += res
-GARBAGE        += $(res-dep)
-
-export:: $(res-dep)
-
-res-dep-preqs := \
-  $(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \
-  $(call mkdir_deps,res) \
-  $(if $(IS_LANGUAGE_REPACK),FORCE) \
-  $(NULL)
-
-# nop-build: only copy res/ files when needed
-$(res-dep): $(res-dep-preqs)
-	$(call copy_dir,$(srcdir)/res,$(CURDIR)/res)
-	@$(TOUCH) $@
-endif #} IGNORE_ANDROID_RESFILES
-endif #} ANDROID_RESFILES
-
-
 ifdef JAVAFILES #{
 GENERATED_DIRS += classes
 
@@ -39,7 +16,8 @@ endif #} JAVAFILES
 
 
 ifdef ANDROID_APK_NAME #{
-_ANDROID_RES_FLAG := -S $(or $(ANDROID_RES_DIR),res)
+android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res))
+_ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs))
 _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR))
 
 GENERATED_DIRS += classes
@@ -57,7 +35,11 @@ classes.dex: $(JAVAFILES)
 R.java: .aapt.deps
 $(ANDROID_APK_NAME).ap_: .aapt.deps
 
-.aapt.deps: AndroidManifest.xml $(wildcard $(ANDROID_RES_DIR)) $(wildcard $(ANDROID_ASSETS_DIR))
+# This uses the fact that Android resource directories list all
+# resource files one subdirectory below the parent resource directory.
+android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs)))))
+
+.aapt.deps: AndroidManifest.xml $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR))
 	$(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \
 		-J ${@D} \
 		-F $(ANDROID_APK_NAME).ap_
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 2f03e336e25..645bf6c47fd 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -35,7 +35,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
-  ANDROID_RESFILES \
+  ANDROID_RES_DIRS \
   CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
@@ -73,6 +73,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
+  ANDROID_RESFILES \
   MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
   SHORT_LIBNAME \
diff --git a/js/src/config/makefiles/java-build.mk b/js/src/config/makefiles/java-build.mk
index 179063b8fd5..b3f34ab1d03 100644
--- a/js/src/config/makefiles/java-build.mk
+++ b/js/src/config/makefiles/java-build.mk
@@ -7,29 +7,6 @@
 
 ifndef INCLUDED_JAVA_BUILD_MK #{
 
-ifdef ANDROID_RESFILES #{
-ifndef IGNORE_ANDROID_RESFILES #{
-res-dep := .deps-copy-java-res
-
-GENERATED_DIRS += res
-GARBAGE        += $(res-dep)
-
-export:: $(res-dep)
-
-res-dep-preqs := \
-  $(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \
-  $(call mkdir_deps,res) \
-  $(if $(IS_LANGUAGE_REPACK),FORCE) \
-  $(NULL)
-
-# nop-build: only copy res/ files when needed
-$(res-dep): $(res-dep-preqs)
-	$(call copy_dir,$(srcdir)/res,$(CURDIR)/res)
-	@$(TOUCH) $@
-endif #} IGNORE_ANDROID_RESFILES
-endif #} ANDROID_RESFILES
-
-
 ifdef JAVAFILES #{
 GENERATED_DIRS += classes
 
@@ -39,7 +16,8 @@ endif #} JAVAFILES
 
 
 ifdef ANDROID_APK_NAME #{
-_ANDROID_RES_FLAG := -S $(or $(ANDROID_RES_DIR),res)
+android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res))
+_ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs))
 _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR))
 
 GENERATED_DIRS += classes
@@ -57,7 +35,11 @@ classes.dex: $(JAVAFILES)
 R.java: .aapt.deps
 $(ANDROID_APK_NAME).ap_: .aapt.deps
 
-.aapt.deps: AndroidManifest.xml $(wildcard $(ANDROID_RES_DIR)) $(wildcard $(ANDROID_ASSETS_DIR))
+# This uses the fact that Android resource directories list all
+# resource files one subdirectory below the parent resource directory.
+android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs)))))
+
+.aapt.deps: AndroidManifest.xml $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR))
 	$(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \
 		-J ${@D} \
 		-F $(ANDROID_APK_NAME).ap_
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 392e4005cdb..1ee45d8915f 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -91,17 +91,6 @@ GARBAGE += \
 
 GARBAGE_DIRS += classes db jars res sync services generated
 
-# Bug 567884 - Need a way to find appropriate icons during packaging
-ifeq ($(MOZ_APP_NAME),fennec)
-ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_48x48.png
-ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_72x72.png
-ICON_PATH_XHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_96x96.png
-ICON_PATH_XXHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_144x144.png
-else
-ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon48.png
-ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon64.png
-endif
-
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 
 ALL_JARS = \
@@ -192,34 +181,16 @@ preprocessed_package_KEEP_PATH := 1
 
 PP_TARGETS += preprocessed_package
 
-res/drawable-mdpi/icon.png: $(ICON_PATH)
-	$(NSINSTALL) -D res/drawable-mdpi
-	cp $(ICON_PATH) $@
+# This uses the fact that Android resource directories list all
+# resource files one subdirectory below the parent resource directory.
+android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(ANDROID_RES_DIRS)))))
 
-res/drawable-hdpi/icon.png: $(ICON_PATH_HDPI)
-	$(NSINSTALL) -D res/drawable-hdpi
-	cp $(ICON_PATH_HDPI) $@
+$(ANDROID_GENERATED_RESFILES): $(call mkdir_deps,$(sort $(dir $(ANDROID_GENERATED_RESFILES))))
 
-res/drawable-xhdpi/icon.png: $(ICON_PATH_XHDPI)
-	$(NSINSTALL) -D res/drawable-xhdpi
-	cp $(ICON_PATH_XHDPI) $@
-
-res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI)
-	$(NSINSTALL) -D res/drawable-xxhdpi
-	cp $(ICON_PATH_XXHDPI) $@
-
-ANDROID_RESDIRS := $(subst resources/,res/,$(sort $(dir $(ANDROID_RESFILES))))
-
-$(call mkdir_deps,$(ANDROID_RESDIRS)): $(ANDROID_RESFILES) Makefile
-	$(RM) -r $(@D)
-	$(NSINSTALL) -D $(@D)
-	$(TOUCH) $@
-
-$(subst resources/,res/,$(ANDROID_RESFILES)): $(call mkdir_deps,$(ANDROID_RESDIRS)) $(ANDROID_RESFILES)
-	@echo "creating $@"
-	$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
-
-res/values/strings.xml: $(call mkdir_deps,res/values)
+# We don't have correct dependencies for strings.xml at this point, so
+# we always recursively invoke the submake to check the dependencies.
+# Sigh.
+res/values/strings.xml: FORCE
 	$(MAKE) -C locales
 
 # With multilocale builds, there will be multiple strings.xml files. We need to
@@ -228,18 +199,22 @@ MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml)
 all_resources = \
   $(MULTILOCALE_STRINGS_XML_FILES) \
   AndroidManifest.xml \
-  $(subst resources/,res/,$(ANDROID_RESFILES)) \
+  $(android_res_files) \
   $(ANDROID_GENERATED_RESFILES) \
   $(NULL)
 
-# generated/org/mozilla/gecko/R.java and gecko.ap_ are both produced
-# by aapt; this saves an aapt invocation.
-
+$(gecko_package_dir)/R.txt: .aapt.deps
 $(gecko_package_dir)/R.java: .aapt.deps
 gecko.ap_: .aapt.deps
 
+# All of generated/org/mozilla/gecko/R.java, R.txt, and gecko.ap_ are
+# produced by aapt; this saves aapt invocations.
 .aapt.deps: $(all_resources)
-	$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res --custom-package org.mozilla.gecko --non-constant-id \
+	$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar \
+		--auto-add-overlay \
+		$(addprefix -S ,$(ANDROID_RES_DIRS)) \
+		--custom-package org.mozilla.gecko --non-constant-id \
+		--output-text-symbols $(gecko_package_dir) \
 		-J $(gecko_package_dir)/ \
 		-F gecko.ap_
 	@$(TOUCH) $@
@@ -247,10 +222,6 @@ gecko.ap_: .aapt.deps
 fennec_ids.txt: $(gecko_package_dir)/R.java fennec-ids-generator.py
 	$(PYTHON) $(topsrcdir)/mobile/android/base/fennec-ids-generator.py -i $< -o $@
 
-# We process ANDROID_RESFILES specially for now; the following flag
-# disables the default processing.
-IGNORE_ANDROID_RESFILES=1
-
 include $(topsrcdir)/config/rules.mk
 
 # Override the Java settings with some specific android settings
diff --git a/mobile/android/base/android-services.mozbuild b/mobile/android/base/android-services.mozbuild
index bc575a8a8c3..91ecd0389e0 100644
--- a/mobile/android/base/android-services.mozbuild
+++ b/mobile/android/base/android-services.mozbuild
@@ -4,29 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ANDROID_RESFILES += [
-    'resources/drawable-mdpi/sync_desktop.png',
-    'resources/drawable-mdpi/sync_mobile.png',
-    'resources/drawable/sync_pin_background.xml',
-    'resources/layout/sync_account.xml',
-    'resources/layout/sync_list_item.xml',
-    'resources/layout/sync_redirect_to_setup.xml',
-    'resources/layout/sync_send_tab.xml',
-    'resources/layout/sync_setup.xml',
-    'resources/layout/sync_setup_failure.xml',
-    'resources/layout/sync_setup_jpake_waiting.xml',
-    'resources/layout/sync_setup_nointernet.xml',
-    'resources/layout/sync_setup_pair.xml',
-    'resources/layout/sync_setup_success.xml',
-    'resources/layout/sync_setup_webview.xml',
-    'resources/values-large-v11/sync_styles.xml',
-    'resources/values-v11/sync_styles.xml',
-    'resources/values/sync_styles.xml',
-    'resources/xml/sync_authenticator.xml',
-    'resources/xml/sync_options.xml',
-    'resources/xml/sync_syncadapter.xml',
-]
-
 sync_thirdparty_java_files = [
     'ch/boye/httpclientandroidlib/androidextra/HttpClientAndroidLog.java',
     'ch/boye/httpclientandroidlib/annotation/GuardedBy.java',
diff --git a/mobile/android/base/resources/drawable-mdpi/crash_reporter.png b/mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
similarity index 100%
rename from mobile/android/base/resources/drawable-mdpi/crash_reporter.png
rename to mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
diff --git a/mobile/android/base/resources/layout/crash_reporter.xml b/mobile/android/base/crashreporter/res/layout/crash_reporter.xml
similarity index 100%
rename from mobile/android/base/resources/layout/crash_reporter.xml
rename to mobile/android/base/crashreporter/res/layout/crash_reporter.xml
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 16d0f461d1e..d0378415d27 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -342,7 +342,9 @@ gbjar.generated_sources += [
     'org/mozilla/gecko/widget/GeckoTextView.java',
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
-    gbjar.sources += [ 'CrashReporter.java ']
+    gbjar.sources += [ 'CrashReporter.java' ]
+    ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ]
+
 gbjar.sources += sync_java_files
 gbjar.generated_sources += sync_generated_java_files
 gbjar.extra_jars = [
@@ -353,605 +355,12 @@ gbjar.extra_jars = [
 ]
 gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough']
 
+ANDROID_RES_DIRS += [
+    SRCDIR + '/resources',
+    TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
+    OBJDIR + '/res',
+]
+
 ANDROID_GENERATED_RESFILES += [
-    'res/drawable-hdpi/icon.png',
-    'res/drawable-mdpi/icon.png',
-    'res/drawable-xhdpi/icon.png',
-    'res/drawable-xxhdpi/icon.png',
     'res/values/strings.xml',
 ]
-
-ANDROID_RESFILES += [
-    'resources/anim/grow_fade_in.xml',
-    'resources/anim/grow_fade_in_center.xml',
-    'resources/anim/popup_hide.xml',
-    'resources/anim/popup_show.xml',
-    'resources/anim/progress_spinner.xml',
-    'resources/anim/shrink_fade_out.xml',
-    'resources/color/primary_text.xml',
-    'resources/color/primary_text_inverse.xml',
-    'resources/color/secondary_text.xml',
-    'resources/color/secondary_text_inverse.xml',
-    'resources/color/select_item_multichoice.xml',
-    'resources/color/tertiary_text.xml',
-    'resources/color/tertiary_text_inverse.xml',
-    'resources/color/top_sites_grid_item_title.xml',
-    'resources/color/url_bar_title.xml',
-    'resources/color/url_bar_title_hint.xml',
-    'resources/drawable-hdpi-v11/alert_addon.png',
-    'resources/drawable-hdpi-v11/alert_app.png',
-    'resources/drawable-hdpi-v11/alert_camera.png',
-    'resources/drawable-hdpi-v11/alert_download.png',
-    'resources/drawable-hdpi-v11/alert_mic.png',
-    'resources/drawable-hdpi-v11/alert_mic_camera.png',
-    'resources/drawable-hdpi-v11/firefox_settings_alert.png',
-    'resources/drawable-hdpi-v11/ic_menu_addons.png',
-    'resources/drawable-hdpi-v11/ic_menu_apps.png',
-    'resources/drawable-hdpi-v11/ic_menu_back.png',
-    'resources/drawable-hdpi-v11/ic_menu_bookmark_add.png',
-    'resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png',
-    'resources/drawable-hdpi-v11/ic_menu_desktop_mode_off.png',
-    'resources/drawable-hdpi-v11/ic_menu_desktop_mode_on.png',
-    'resources/drawable-hdpi-v11/ic_menu_downloads.png',
-    'resources/drawable-hdpi-v11/ic_menu_find_in_page.png',
-    'resources/drawable-hdpi-v11/ic_menu_forward.png',
-    'resources/drawable-hdpi-v11/ic_menu_new_private_tab.png',
-    'resources/drawable-hdpi-v11/ic_menu_new_tab.png',
-    'resources/drawable-hdpi-v11/ic_menu_quit.png',
-    'resources/drawable-hdpi-v11/ic_menu_reload.png',
-    'resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png',
-    'resources/drawable-hdpi-v11/ic_menu_settings.png',
-    'resources/drawable-hdpi-v11/ic_menu_share.png',
-    'resources/drawable-hdpi-v11/ic_menu_tools.png',
-    'resources/drawable-hdpi-v11/ic_status_logo.png',
-    'resources/drawable-hdpi/abouthome_thumbnail.png',
-    'resources/drawable-hdpi/alert_addon.png',
-    'resources/drawable-hdpi/alert_app.png',
-    'resources/drawable-hdpi/alert_camera.png',
-    'resources/drawable-hdpi/alert_download.png',
-    'resources/drawable-hdpi/alert_mic.png',
-    'resources/drawable-hdpi/alert_mic_camera.png',
-    'resources/drawable-hdpi/arrow_popup_bg.9.png',
-    'resources/drawable-hdpi/blank.png',
-    'resources/drawable-hdpi/bookmark_folder_closed.png',
-    'resources/drawable-hdpi/bookmark_folder_opened.png',
-    'resources/drawable-hdpi/close.png',
-    'resources/drawable-hdpi/favicon.png',
-    'resources/drawable-hdpi/find_close.png',
-    'resources/drawable-hdpi/find_next.png',
-    'resources/drawable-hdpi/find_prev.png',
-    'resources/drawable-hdpi/folder.png',
-    'resources/drawable-hdpi/grid_icon_bg_activated.9.png',
-    'resources/drawable-hdpi/grid_icon_bg_focused.9.png',
-    'resources/drawable-hdpi/handle_end.png',
-    'resources/drawable-hdpi/handle_middle.png',
-    'resources/drawable-hdpi/handle_start.png',
-    'resources/drawable-hdpi/history_tabs_indicator_selected.9.png',
-    'resources/drawable-hdpi/home_bg.png',
-    'resources/drawable-hdpi/home_star.png',
-    'resources/drawable-hdpi/home_tab_menu_strip.9.png',
-    'resources/drawable-hdpi/ic_menu_addons_filler.png',
-    'resources/drawable-hdpi/ic_menu_bookmark_add.png',
-    'resources/drawable-hdpi/ic_menu_bookmark_remove.png',
-    'resources/drawable-hdpi/ic_menu_character_encoding.png',
-    'resources/drawable-hdpi/ic_menu_forward.png',
-    'resources/drawable-hdpi/ic_menu_guest.png',
-    'resources/drawable-hdpi/ic_menu_new_private_tab.png',
-    'resources/drawable-hdpi/ic_menu_new_tab.png',
-    'resources/drawable-hdpi/ic_menu_reload.png',
-    'resources/drawable-hdpi/ic_status_logo.png',
-    'resources/drawable-hdpi/ic_url_bar_go.png',
-    'resources/drawable-hdpi/ic_url_bar_reader.png',
-    'resources/drawable-hdpi/ic_url_bar_search.png',
-    'resources/drawable-hdpi/ic_url_bar_star.png',
-    'resources/drawable-hdpi/ic_url_bar_tab.png',
-    'resources/drawable-hdpi/icon_bookmarks_empty.png',
-    'resources/drawable-hdpi/icon_last_tabs.png',
-    'resources/drawable-hdpi/icon_last_tabs_empty.png',
-    'resources/drawable-hdpi/icon_most_recent.png',
-    'resources/drawable-hdpi/icon_most_recent_empty.png',
-    'resources/drawable-hdpi/icon_most_visited.png',
-    'resources/drawable-hdpi/icon_openinapp.png',
-    'resources/drawable-hdpi/icon_pageaction.png',
-    'resources/drawable-hdpi/icon_reading_list_empty.png',
-    'resources/drawable-hdpi/larry.png',
-    'resources/drawable-hdpi/lock_identified.png',
-    'resources/drawable-hdpi/lock_verified.png',
-    'resources/drawable-hdpi/menu.png',
-    'resources/drawable-hdpi/menu_item_check.png',
-    'resources/drawable-hdpi/menu_item_more.png',
-    'resources/drawable-hdpi/menu_item_uncheck.png',
-    'resources/drawable-hdpi/menu_panel_bg.9.png',
-    'resources/drawable-hdpi/menu_pb.png',
-    'resources/drawable-hdpi/menu_popup_arrow_bottom.png',
-    'resources/drawable-hdpi/menu_popup_arrow_top.png',
-    'resources/drawable-hdpi/menu_popup_bg.9.png',
-    'resources/drawable-hdpi/pause.png',
-    'resources/drawable-hdpi/pin.png',
-    'resources/drawable-hdpi/play.png',
-    'resources/drawable-hdpi/reader.png',
-    'resources/drawable-hdpi/reader_active.png',
-    'resources/drawable-hdpi/reader_cropped.png',
-    'resources/drawable-hdpi/reading_list.png',
-    'resources/drawable-hdpi/shield.png',
-    'resources/drawable-hdpi/shield_doorhanger.png',
-    'resources/drawable-hdpi/spinner_default.9.png',
-    'resources/drawable-hdpi/spinner_focused.9.png',
-    'resources/drawable-hdpi/spinner_pressed.9.png',
-    'resources/drawable-hdpi/tab_close.png',
-    'resources/drawable-hdpi/tab_indicator_divider.9.png',
-    'resources/drawable-hdpi/tab_indicator_selected.9.png',
-    'resources/drawable-hdpi/tab_indicator_selected_focused.9.png',
-    'resources/drawable-hdpi/tab_new.png',
-    'resources/drawable-hdpi/tab_new_pb.png',
-    'resources/drawable-hdpi/tab_thumbnail_default.png',
-    'resources/drawable-hdpi/tab_thumbnail_shadow.png',
-    'resources/drawable-hdpi/tabs_count.png',
-    'resources/drawable-hdpi/tabs_count_foreground.png',
-    'resources/drawable-hdpi/tabs_normal.png',
-    'resources/drawable-hdpi/tabs_private.png',
-    'resources/drawable-hdpi/tabs_synced.png',
-    'resources/drawable-hdpi/tip_addsearch.png',
-    'resources/drawable-hdpi/top_site_add.png',
-    'resources/drawable-hdpi/url_bar_entry_default.9.png',
-    'resources/drawable-hdpi/url_bar_entry_default_pb.9.png',
-    'resources/drawable-hdpi/url_bar_entry_pressed.9.png',
-    'resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png',
-    'resources/drawable-hdpi/urlbar_stop.png',
-    'resources/drawable-hdpi/validation_arrow.png',
-    'resources/drawable-hdpi/validation_arrow_inverted.png',
-    'resources/drawable-hdpi/validation_bg.9.png',
-    'resources/drawable-hdpi/warning.png',
-    'resources/drawable-hdpi/warning_doorhanger.png',
-    'resources/drawable-large-hdpi-v11/arrow_popup_bg.9.png',
-    'resources/drawable-large-hdpi-v11/ic_menu_forward.png',
-    'resources/drawable-large-hdpi-v11/ic_menu_reload.png',
-    'resources/drawable-large-hdpi-v11/menu.png',
-    'resources/drawable-large-land-v11/home_history_tabs_indicator.xml',
-    'resources/drawable-large-mdpi-v11/arrow_popup_bg.9.png',
-    'resources/drawable-large-mdpi-v11/ic_menu_forward.png',
-    'resources/drawable-large-mdpi-v11/ic_menu_reload.png',
-    'resources/drawable-large-mdpi-v11/menu.png',
-    'resources/drawable-large-xhdpi-v11/arrow_popup_bg.9.png',
-    'resources/drawable-large-xhdpi-v11/ic_menu_forward.png',
-    'resources/drawable-large-xhdpi-v11/ic_menu_reload.png',
-    'resources/drawable-large-xhdpi-v11/menu.png',
-    'resources/drawable-mdpi-v11/alert_addon.png',
-    'resources/drawable-mdpi-v11/alert_app.png',
-    'resources/drawable-mdpi-v11/alert_camera.png',
-    'resources/drawable-mdpi-v11/alert_download.png',
-    'resources/drawable-mdpi-v11/alert_mic.png',
-    'resources/drawable-mdpi-v11/alert_mic_camera.png',
-    'resources/drawable-mdpi-v11/firefox_settings_alert.png',
-    'resources/drawable-mdpi-v11/ic_menu_addons.png',
-    'resources/drawable-mdpi-v11/ic_menu_apps.png',
-    'resources/drawable-mdpi-v11/ic_menu_back.png',
-    'resources/drawable-mdpi-v11/ic_menu_bookmark_add.png',
-    'resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png',
-    'resources/drawable-mdpi-v11/ic_menu_desktop_mode_off.png',
-    'resources/drawable-mdpi-v11/ic_menu_desktop_mode_on.png',
-    'resources/drawable-mdpi-v11/ic_menu_downloads.png',
-    'resources/drawable-mdpi-v11/ic_menu_find_in_page.png',
-    'resources/drawable-mdpi-v11/ic_menu_forward.png',
-    'resources/drawable-mdpi-v11/ic_menu_new_private_tab.png',
-    'resources/drawable-mdpi-v11/ic_menu_new_tab.png',
-    'resources/drawable-mdpi-v11/ic_menu_quit.png',
-    'resources/drawable-mdpi-v11/ic_menu_reload.png',
-    'resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png',
-    'resources/drawable-mdpi-v11/ic_menu_settings.png',
-    'resources/drawable-mdpi-v11/ic_menu_share.png',
-    'resources/drawable-mdpi-v11/ic_menu_tools.png',
-    'resources/drawable-mdpi-v11/ic_status_logo.png',
-    'resources/drawable-mdpi/abouthome_thumbnail.png',
-    'resources/drawable-mdpi/alert_addon.png',
-    'resources/drawable-mdpi/alert_app.png',
-    'resources/drawable-mdpi/alert_camera.png',
-    'resources/drawable-mdpi/alert_download.png',
-    'resources/drawable-mdpi/alert_mic.png',
-    'resources/drawable-mdpi/alert_mic_camera.png',
-    'resources/drawable-mdpi/arrow_popup_bg.9.png',
-    'resources/drawable-mdpi/autocomplete_list_bg.9.png',
-    'resources/drawable-mdpi/blank.png',
-    'resources/drawable-mdpi/bookmark_folder_closed.png',
-    'resources/drawable-mdpi/bookmark_folder_opened.png',
-    'resources/drawable-mdpi/bookmarkdefaults_favicon_addons.png',
-    'resources/drawable-mdpi/bookmarkdefaults_favicon_support.png',
-    'resources/drawable-mdpi/close.png',
-    'resources/drawable-mdpi/desktop_notification.png',
-    'resources/drawable-mdpi/favicon.png',
-    'resources/drawable-mdpi/find_close.png',
-    'resources/drawable-mdpi/find_next.png',
-    'resources/drawable-mdpi/find_prev.png',
-    'resources/drawable-mdpi/folder.png',
-    'resources/drawable-mdpi/grid_icon_bg_activated.9.png',
-    'resources/drawable-mdpi/grid_icon_bg_focused.9.png',
-    'resources/drawable-mdpi/handle_end.png',
-    'resources/drawable-mdpi/handle_middle.png',
-    'resources/drawable-mdpi/handle_start.png',
-    'resources/drawable-mdpi/history_tabs_indicator_selected.9.png',
-    'resources/drawable-mdpi/home_tab_menu_strip.9.png',
-    'resources/drawable-mdpi/ic_menu_addons_filler.png',
-    'resources/drawable-mdpi/ic_menu_bookmark_add.png',
-    'resources/drawable-mdpi/ic_menu_bookmark_remove.png',
-    'resources/drawable-mdpi/ic_menu_character_encoding.png',
-    'resources/drawable-mdpi/ic_menu_forward.png',
-    'resources/drawable-mdpi/ic_menu_guest.png',
-    'resources/drawable-mdpi/ic_menu_new_private_tab.png',
-    'resources/drawable-mdpi/ic_menu_new_tab.png',
-    'resources/drawable-mdpi/ic_menu_reload.png',
-    'resources/drawable-mdpi/ic_status_logo.png',
-    'resources/drawable-mdpi/ic_url_bar_go.png',
-    'resources/drawable-mdpi/ic_url_bar_reader.png',
-    'resources/drawable-mdpi/ic_url_bar_search.png',
-    'resources/drawable-mdpi/ic_url_bar_star.png',
-    'resources/drawable-mdpi/ic_url_bar_tab.png',
-    'resources/drawable-mdpi/icon_bookmarks_empty.png',
-    'resources/drawable-mdpi/icon_last_tabs.png',
-    'resources/drawable-mdpi/icon_last_tabs_empty.png',
-    'resources/drawable-mdpi/icon_most_recent.png',
-    'resources/drawable-mdpi/icon_most_recent_empty.png',
-    'resources/drawable-mdpi/icon_most_visited.png',
-    'resources/drawable-mdpi/icon_openinapp.png',
-    'resources/drawable-mdpi/icon_pageaction.png',
-    'resources/drawable-mdpi/icon_reading_list_empty.png',
-    'resources/drawable-mdpi/larry.png',
-    'resources/drawable-mdpi/lock_identified.png',
-    'resources/drawable-mdpi/lock_verified.png',
-    'resources/drawable-mdpi/marketplace.png',
-    'resources/drawable-mdpi/menu.png',
-    'resources/drawable-mdpi/menu_item_check.png',
-    'resources/drawable-mdpi/menu_item_more.png',
-    'resources/drawable-mdpi/menu_item_uncheck.png',
-    'resources/drawable-mdpi/menu_panel_bg.9.png',
-    'resources/drawable-mdpi/menu_pb.png',
-    'resources/drawable-mdpi/menu_popup_arrow_bottom.png',
-    'resources/drawable-mdpi/menu_popup_arrow_top.png',
-    'resources/drawable-mdpi/menu_popup_bg.9.png',
-    'resources/drawable-mdpi/pause.png',
-    'resources/drawable-mdpi/pin.png',
-    'resources/drawable-mdpi/play.png',
-    'resources/drawable-mdpi/progress_spinner.png',
-    'resources/drawable-mdpi/reader.png',
-    'resources/drawable-mdpi/reader_active.png',
-    'resources/drawable-mdpi/reader_cropped.png',
-    'resources/drawable-mdpi/reading_list.png',
-    'resources/drawable-mdpi/scrollbar.png',
-    'resources/drawable-mdpi/shadow.png',
-    'resources/drawable-mdpi/shield.png',
-    'resources/drawable-mdpi/shield_doorhanger.png',
-    'resources/drawable-mdpi/spinner_default.9.png',
-    'resources/drawable-mdpi/spinner_focused.9.png',
-    'resources/drawable-mdpi/spinner_pressed.9.png',
-    'resources/drawable-mdpi/start.png',
-    'resources/drawable-mdpi/tab_close.png',
-    'resources/drawable-mdpi/tab_indicator_divider.9.png',
-    'resources/drawable-mdpi/tab_indicator_selected.9.png',
-    'resources/drawable-mdpi/tab_indicator_selected_focused.9.png',
-    'resources/drawable-mdpi/tab_new.png',
-    'resources/drawable-mdpi/tab_new_pb.png',
-    'resources/drawable-mdpi/tab_thumbnail_default.png',
-    'resources/drawable-mdpi/tab_thumbnail_shadow.png',
-    'resources/drawable-mdpi/tabs_count.png',
-    'resources/drawable-mdpi/tabs_count_foreground.png',
-    'resources/drawable-mdpi/tabs_normal.png',
-    'resources/drawable-mdpi/tabs_private.png',
-    'resources/drawable-mdpi/tabs_synced.png',
-    'resources/drawable-mdpi/tip_addsearch.png',
-    'resources/drawable-mdpi/toast.9.png',
-    'resources/drawable-mdpi/toast_button_focused.9.png',
-    'resources/drawable-mdpi/toast_button_pressed.9.png',
-    'resources/drawable-mdpi/toast_divider.9.png',
-    'resources/drawable-mdpi/top_site_add.png',
-    'resources/drawable-mdpi/url_bar_entry_default.9.png',
-    'resources/drawable-mdpi/url_bar_entry_default_pb.9.png',
-    'resources/drawable-mdpi/url_bar_entry_pressed.9.png',
-    'resources/drawable-mdpi/url_bar_entry_pressed_pb.9.png',
-    'resources/drawable-mdpi/urlbar_stop.png',
-    'resources/drawable-mdpi/validation_arrow.png',
-    'resources/drawable-mdpi/validation_arrow_inverted.png',
-    'resources/drawable-mdpi/validation_bg.9.png',
-    'resources/drawable-mdpi/warning.png',
-    'resources/drawable-mdpi/warning_doorhanger.png',
-    'resources/drawable-xhdpi-v11/alert_addon.png',
-    'resources/drawable-xhdpi-v11/alert_app.png',
-    'resources/drawable-xhdpi-v11/alert_camera.png',
-    'resources/drawable-xhdpi-v11/alert_download.png',
-    'resources/drawable-xhdpi-v11/alert_mic.png',
-    'resources/drawable-xhdpi-v11/alert_mic_camera.png',
-    'resources/drawable-xhdpi-v11/firefox_settings_alert.png',
-    'resources/drawable-xhdpi-v11/ic_menu_addons.png',
-    'resources/drawable-xhdpi-v11/ic_menu_apps.png',
-    'resources/drawable-xhdpi-v11/ic_menu_back.png',
-    'resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png',
-    'resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png',
-    'resources/drawable-xhdpi-v11/ic_menu_desktop_mode_off.png',
-    'resources/drawable-xhdpi-v11/ic_menu_desktop_mode_on.png',
-    'resources/drawable-xhdpi-v11/ic_menu_downloads.png',
-    'resources/drawable-xhdpi-v11/ic_menu_find_in_page.png',
-    'resources/drawable-xhdpi-v11/ic_menu_forward.png',
-    'resources/drawable-xhdpi-v11/ic_menu_new_private_tab.png',
-    'resources/drawable-xhdpi-v11/ic_menu_new_tab.png',
-    'resources/drawable-xhdpi-v11/ic_menu_quit.png',
-    'resources/drawable-xhdpi-v11/ic_menu_reload.png',
-    'resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png',
-    'resources/drawable-xhdpi-v11/ic_menu_settings.png',
-    'resources/drawable-xhdpi-v11/ic_menu_share.png',
-    'resources/drawable-xhdpi-v11/ic_menu_tools.png',
-    'resources/drawable-xhdpi-v11/ic_status_logo.png',
-    'resources/drawable-xhdpi/abouthome_thumbnail.png',
-    'resources/drawable-xhdpi/alert_addon.png',
-    'resources/drawable-xhdpi/alert_app.png',
-    'resources/drawable-xhdpi/alert_camera.png',
-    'resources/drawable-xhdpi/alert_download.png',
-    'resources/drawable-xhdpi/alert_mic.png',
-    'resources/drawable-xhdpi/alert_mic_camera.png',
-    'resources/drawable-xhdpi/arrow_popup_bg.9.png',
-    'resources/drawable-xhdpi/blank.png',
-    'resources/drawable-xhdpi/bookmark_folder_closed.png',
-    'resources/drawable-xhdpi/bookmark_folder_opened.png',
-    'resources/drawable-xhdpi/close.png',
-    'resources/drawable-xhdpi/favicon.png',
-    'resources/drawable-xhdpi/find_close.png',
-    'resources/drawable-xhdpi/find_next.png',
-    'resources/drawable-xhdpi/find_prev.png',
-    'resources/drawable-xhdpi/folder.png',
-    'resources/drawable-xhdpi/grid_icon_bg_activated.9.png',
-    'resources/drawable-xhdpi/grid_icon_bg_focused.9.png',
-    'resources/drawable-xhdpi/handle_end.png',
-    'resources/drawable-xhdpi/handle_middle.png',
-    'resources/drawable-xhdpi/handle_start.png',
-    'resources/drawable-xhdpi/history_tabs_indicator_selected.9.png',
-    'resources/drawable-xhdpi/home_tab_menu_strip.9.png',
-    'resources/drawable-xhdpi/ic_menu_addons_filler.png',
-    'resources/drawable-xhdpi/ic_menu_bookmark_add.png',
-    'resources/drawable-xhdpi/ic_menu_bookmark_remove.png',
-    'resources/drawable-xhdpi/ic_menu_character_encoding.png',
-    'resources/drawable-xhdpi/ic_menu_forward.png',
-    'resources/drawable-xhdpi/ic_menu_guest.png',
-    'resources/drawable-xhdpi/ic_menu_new_private_tab.png',
-    'resources/drawable-xhdpi/ic_menu_new_tab.png',
-    'resources/drawable-xhdpi/ic_menu_reload.png',
-    'resources/drawable-xhdpi/ic_status_logo.png',
-    'resources/drawable-xhdpi/ic_url_bar_go.png',
-    'resources/drawable-xhdpi/ic_url_bar_reader.png',
-    'resources/drawable-xhdpi/ic_url_bar_search.png',
-    'resources/drawable-xhdpi/ic_url_bar_star.png',
-    'resources/drawable-xhdpi/ic_url_bar_tab.png',
-    'resources/drawable-xhdpi/icon_bookmarks_empty.png',
-    'resources/drawable-xhdpi/icon_last_tabs.png',
-    'resources/drawable-xhdpi/icon_last_tabs_empty.png',
-    'resources/drawable-xhdpi/icon_most_recent.png',
-    'resources/drawable-xhdpi/icon_most_recent_empty.png',
-    'resources/drawable-xhdpi/icon_most_visited.png',
-    'resources/drawable-xhdpi/icon_openinapp.png',
-    'resources/drawable-xhdpi/icon_pageaction.png',
-    'resources/drawable-xhdpi/icon_reading_list_empty.png',
-    'resources/drawable-xhdpi/larry.png',
-    'resources/drawable-xhdpi/lock_identified.png',
-    'resources/drawable-xhdpi/lock_verified.png',
-    'resources/drawable-xhdpi/menu.png',
-    'resources/drawable-xhdpi/menu_item_check.png',
-    'resources/drawable-xhdpi/menu_item_more.png',
-    'resources/drawable-xhdpi/menu_item_uncheck.png',
-    'resources/drawable-xhdpi/menu_panel_bg.9.png',
-    'resources/drawable-xhdpi/menu_pb.png',
-    'resources/drawable-xhdpi/menu_popup_arrow_bottom.png',
-    'resources/drawable-xhdpi/menu_popup_arrow_top.png',
-    'resources/drawable-xhdpi/menu_popup_bg.9.png',
-    'resources/drawable-xhdpi/pause.png',
-    'resources/drawable-xhdpi/pin.png',
-    'resources/drawable-xhdpi/play.png',
-    'resources/drawable-xhdpi/reader.png',
-    'resources/drawable-xhdpi/reader_active.png',
-    'resources/drawable-xhdpi/reader_cropped.png',
-    'resources/drawable-xhdpi/reading_list.png',
-    'resources/drawable-xhdpi/shield.png',
-    'resources/drawable-xhdpi/shield_doorhanger.png',
-    'resources/drawable-xhdpi/spinner_default.9.png',
-    'resources/drawable-xhdpi/spinner_focused.9.png',
-    'resources/drawable-xhdpi/spinner_pressed.9.png',
-    'resources/drawable-xhdpi/tab_close.png',
-    'resources/drawable-xhdpi/tab_indicator_divider.9.png',
-    'resources/drawable-xhdpi/tab_indicator_selected.9.png',
-    'resources/drawable-xhdpi/tab_indicator_selected_focused.9.png',
-    'resources/drawable-xhdpi/tab_new.png',
-    'resources/drawable-xhdpi/tab_new_pb.png',
-    'resources/drawable-xhdpi/tab_thumbnail_default.png',
-    'resources/drawable-xhdpi/tab_thumbnail_shadow.png',
-    'resources/drawable-xhdpi/tabs_count.png',
-    'resources/drawable-xhdpi/tabs_count_foreground.png',
-    'resources/drawable-xhdpi/tabs_normal.png',
-    'resources/drawable-xhdpi/tabs_private.png',
-    'resources/drawable-xhdpi/tabs_synced.png',
-    'resources/drawable-xhdpi/tip_addsearch.png',
-    'resources/drawable-xhdpi/top_site_add.png',
-    'resources/drawable-xhdpi/url_bar_entry_default.9.png',
-    'resources/drawable-xhdpi/url_bar_entry_default_pb.9.png',
-    'resources/drawable-xhdpi/url_bar_entry_pressed.9.png',
-    'resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png',
-    'resources/drawable-xhdpi/urlbar_stop.png',
-    'resources/drawable-xhdpi/validation_arrow.png',
-    'resources/drawable-xhdpi/validation_arrow_inverted.png',
-    'resources/drawable-xhdpi/validation_bg.9.png',
-    'resources/drawable-xhdpi/warning.png',
-    'resources/drawable-xhdpi/warning_doorhanger.png',
-    'resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png',
-    'resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png',
-    'resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png',
-    'resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png',
-    'resources/drawable-xlarge-v11/home_history_tabs_indicator.xml',
-    'resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png',
-    'resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png',
-    'resources/drawable/action_bar_button.xml',
-    'resources/drawable/action_bar_button_inverse.xml',
-    'resources/drawable/bookmark_folder.xml',
-    'resources/drawable/divider_horizontal.xml',
-    'resources/drawable/divider_vertical.xml',
-    'resources/drawable/handle_end_level.xml',
-    'resources/drawable/handle_start_level.xml',
-    'resources/drawable/home_banner.xml',
-    'resources/drawable/home_history_tabs_indicator.xml',
-    'resources/drawable/home_page_title_background.xml',
-    'resources/drawable/ic_menu_back.xml',
-    'resources/drawable/ic_menu_desktop_mode_off.xml',
-    'resources/drawable/ic_menu_desktop_mode_on.xml',
-    'resources/drawable/ic_menu_quit.xml',
-    'resources/drawable/icon_grid_item_bg.xml',
-    'resources/drawable/menu_item_state.xml',
-    'resources/drawable/menu_level.xml',
-    'resources/drawable/remote_tabs_child_divider.xml',
-    'resources/drawable/shaped_button.xml',
-    'resources/drawable/site_security_level.xml',
-    'resources/drawable/spinner.xml',
-    'resources/drawable/suggestion_selector.xml',
-    'resources/drawable/tab_new_level.xml',
-    'resources/drawable/tab_row.xml',
-    'resources/drawable/tab_thumbnail.xml',
-    'resources/drawable/tabs_panel_indicator.xml',
-    'resources/drawable/textbox_bg.xml',
-    'resources/drawable/toast_button.xml',
-    'resources/drawable/top_sites_thumbnail_bg.xml',
-    'resources/drawable/url_bar_bg.xml',
-    'resources/drawable/url_bar_entry.xml',
-    'resources/drawable/url_bar_nav_button.xml',
-    'resources/drawable/url_bar_right_edge.xml',
-    'resources/drawable/webapp_titlebar_bg.xml',
-    'resources/layout-large-land-v11/home_history_list.xml',
-    'resources/layout-large-land-v11/home_history_page.xml',
-    'resources/layout-large-land-v11/home_history_tabs_indicator.xml',
-    'resources/layout-large-land-v11/tabs_panel.xml',
-    'resources/layout-large-land-v11/tabs_panel_footer.xml',
-    'resources/layout-large-land-v11/tabs_panel_header.xml',
-    'resources/layout-large-v11/browser_toolbar.xml',
-    'resources/layout-large-v11/home_pager.xml',
-    'resources/layout-xlarge-v11/font_size_preference.xml',
-    'resources/layout-xlarge-v11/home_history_list.xml',
-    'resources/layout-xlarge-v11/home_history_page.xml',
-    'resources/layout-xlarge-v11/home_history_tabs_indicator.xml',
-    'resources/layout-xlarge-v11/remote_tabs_child.xml',
-    'resources/layout-xlarge-v11/remote_tabs_group.xml',
-    'resources/layout/arrow_popup.xml',
-    'resources/layout/autocomplete_list.xml',
-    'resources/layout/autocomplete_list_item.xml',
-    'resources/layout/bookmark_edit.xml',
-    'resources/layout/bookmark_folder_row.xml',
-    'resources/layout/bookmark_item_row.xml',
-    'resources/layout/browser_search.xml',
-    'resources/layout/browser_toolbar.xml',
-    'resources/layout/datetime_picker.xml',
-    'resources/layout/doorhanger.xml',
-    'resources/layout/doorhanger_button.xml',
-    'resources/layout/find_in_page_content.xml',
-    'resources/layout/font_size_preference.xml',
-    'resources/layout/gecko_app.xml',
-    'resources/layout/home_banner.xml',
-    'resources/layout/home_bookmarks_page.xml',
-    'resources/layout/home_empty_page.xml',
-    'resources/layout/home_empty_reading_page.xml',
-    'resources/layout/home_header_row.xml',
-    'resources/layout/home_history_list.xml',
-    'resources/layout/home_history_page.xml',
-    'resources/layout/home_history_tabs_indicator.xml',
-    'resources/layout/home_item_row.xml',
-    'resources/layout/home_last_tabs_page.xml',
-    'resources/layout/home_most_recent_page.xml',
-    'resources/layout/home_pager.xml',
-    'resources/layout/home_reading_list_page.xml',
-    'resources/layout/home_search_item_row.xml',
-    'resources/layout/home_suggestion_prompt.xml',
-    'resources/layout/home_top_sites_page.xml',
-    'resources/layout/icon_grid.xml',
-    'resources/layout/icon_grid_item.xml',
-    'resources/layout/launch_app_list.xml',
-    'resources/layout/launch_app_listitem.xml',
-    'resources/layout/list_item_header.xml',
-    'resources/layout/menu_action_bar.xml',
-    'resources/layout/menu_item_action_view.xml',
-    'resources/layout/menu_popup.xml',
-    'resources/layout/notification_icon_text.xml',
-    'resources/layout/notification_progress.xml',
-    'resources/layout/notification_progress_text.xml',
-    'resources/layout/pin_site_dialog.xml',
-    'resources/layout/preference_rightalign_icon.xml',
-    'resources/layout/preference_search_engine.xml',
-    'resources/layout/preference_search_tip.xml',
-    'resources/layout/remote_tabs_child.xml',
-    'resources/layout/remote_tabs_group.xml',
-    'resources/layout/search_engine_row.xml',
-    'resources/layout/select_dialog_list.xml',
-    'resources/layout/select_dialog_multichoice.xml',
-    'resources/layout/select_dialog_singlechoice.xml',
-    'resources/layout/shared_ui_components.xml',
-    'resources/layout/simple_dropdown_item_1line.xml',
-    'resources/layout/site_identity.xml',
-    'resources/layout/site_setting_item.xml',
-    'resources/layout/site_setting_title.xml',
-    'resources/layout/suggestion_item.xml',
-    'resources/layout/tab_menu_strip.xml',
-    'resources/layout/tabs_counter.xml',
-    'resources/layout/tabs_item_cell.xml',
-    'resources/layout/tabs_item_row.xml',
-    'resources/layout/tabs_panel.xml',
-    'resources/layout/tabs_panel_header.xml',
-    'resources/layout/tabs_panel_indicator.xml',
-    'resources/layout/text_selection_handles.xml',
-    'resources/layout/top_sites_grid_item_view.xml',
-    'resources/layout/two_line_page_row.xml',
-    'resources/layout/validation_message.xml',
-    'resources/layout/videoplayer.xml',
-    'resources/layout/web_app.xml',
-    'resources/menu-large-v11/browser_app_menu.xml',
-    'resources/menu-v11/browser_app_menu.xml',
-    'resources/menu-xlarge-v11/browser_app_menu.xml',
-    'resources/menu/browser_app_menu.xml',
-    'resources/menu/gecko_app_menu.xml',
-    'resources/menu/home_contextmenu.xml',
-    'resources/menu/titlebar_contextmenu.xml',
-    'resources/menu/top_sites_contextmenu.xml',
-    'resources/values-land/integers.xml',
-    'resources/values-land/layout.xml',
-    'resources/values-land/styles.xml',
-    'resources/values-large-land-v11/dimens.xml',
-    'resources/values-large-land-v11/styles.xml',
-    'resources/values-large-v11/dimens.xml',
-    'resources/values-large-v11/layout.xml',
-    'resources/values-large-v11/styles.xml',
-    'resources/values-large-v11/themes.xml',
-    'resources/values-v11/colors.xml',
-    'resources/values-v11/dimens.xml',
-    'resources/values-v11/styles.xml',
-    'resources/values-v11/themes.xml',
-    'resources/values-v14/styles.xml',
-    'resources/values-v16/styles.xml',
-    'resources/values-xlarge-land-v11/dimens.xml',
-    'resources/values-xlarge-land-v11/styles.xml',
-    'resources/values-xlarge-v11/dimens.xml',
-    'resources/values-xlarge-v11/integers.xml',
-    'resources/values-xlarge-v11/styles.xml',
-    'resources/values/arrays.xml',
-    'resources/values/attrs.xml',
-    'resources/values/colors.xml',
-    'resources/values/dimens.xml',
-    'resources/values/integers.xml',
-    'resources/values/layout.xml',
-    'resources/values/styles.xml',
-    'resources/values/themes.xml',
-    'resources/xml-v11/preference_headers.xml',
-    'resources/xml-v11/preferences.xml',
-    'resources/xml-v11/preferences_customize.xml',
-    'resources/xml-v11/preferences_customize_tablet.xml',
-    'resources/xml/preferences.xml',
-    'resources/xml/preferences_customize.xml',
-    'resources/xml/preferences_devtools.xml',
-    'resources/xml/preferences_display.xml',
-    'resources/xml/preferences_privacy.xml',
-    'resources/xml/preferences_search.xml',
-    'resources/xml/preferences_vendor.xml',
-    'resources/xml/searchable.xml',
-]
-
-if CONFIG['MOZ_CRASHREPORTER']:
-    ANDROID_RESFILES += [
-        'resources/drawable-mdpi/crash_reporter.png',
-        'resources/layout/crash_reporter.xml',
-    ]
diff --git a/mobile/android/branding/aurora/content/fennec_72x72.png b/mobile/android/branding/aurora/res/drawable-hdpi/icon.png
similarity index 100%
rename from mobile/android/branding/aurora/content/fennec_72x72.png
rename to mobile/android/branding/aurora/res/drawable-hdpi/icon.png
diff --git a/mobile/android/branding/aurora/content/fennec_48x48.png b/mobile/android/branding/aurora/res/drawable-mdpi/icon.png
similarity index 100%
rename from mobile/android/branding/aurora/content/fennec_48x48.png
rename to mobile/android/branding/aurora/res/drawable-mdpi/icon.png
diff --git a/mobile/android/branding/aurora/content/fennec_96x96.png b/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/aurora/content/fennec_96x96.png
rename to mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
diff --git a/mobile/android/branding/aurora/content/fennec_144x144.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/aurora/content/fennec_144x144.png
rename to mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
diff --git a/mobile/android/branding/beta/content/fennec_72x72.png b/mobile/android/branding/beta/res/drawable-hdpi/icon.png
similarity index 100%
rename from mobile/android/branding/beta/content/fennec_72x72.png
rename to mobile/android/branding/beta/res/drawable-hdpi/icon.png
diff --git a/mobile/android/branding/beta/content/fennec_48x48.png b/mobile/android/branding/beta/res/drawable-mdpi/icon.png
similarity index 100%
rename from mobile/android/branding/beta/content/fennec_48x48.png
rename to mobile/android/branding/beta/res/drawable-mdpi/icon.png
diff --git a/mobile/android/branding/beta/content/fennec_96x96.png b/mobile/android/branding/beta/res/drawable-xhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/beta/content/fennec_96x96.png
rename to mobile/android/branding/beta/res/drawable-xhdpi/icon.png
diff --git a/mobile/android/branding/beta/content/fennec_144x144.png b/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/beta/content/fennec_144x144.png
rename to mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
diff --git a/mobile/android/branding/nightly/content/fennec_72x72.png b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png
similarity index 100%
rename from mobile/android/branding/nightly/content/fennec_72x72.png
rename to mobile/android/branding/nightly/res/drawable-hdpi/icon.png
diff --git a/mobile/android/branding/nightly/content/fennec_48x48.png b/mobile/android/branding/nightly/res/drawable-mdpi/icon.png
similarity index 100%
rename from mobile/android/branding/nightly/content/fennec_48x48.png
rename to mobile/android/branding/nightly/res/drawable-mdpi/icon.png
diff --git a/mobile/android/branding/nightly/content/fennec_96x96.png b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/nightly/content/fennec_96x96.png
rename to mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
diff --git a/mobile/android/branding/nightly/content/fennec_144x144.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/nightly/content/fennec_144x144.png
rename to mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
diff --git a/mobile/android/branding/official/content/fennec_72x72.png b/mobile/android/branding/official/res/drawable-hdpi/icon.png
similarity index 100%
rename from mobile/android/branding/official/content/fennec_72x72.png
rename to mobile/android/branding/official/res/drawable-hdpi/icon.png
diff --git a/mobile/android/branding/official/content/fennec_48x48.png b/mobile/android/branding/official/res/drawable-mdpi/icon.png
similarity index 100%
rename from mobile/android/branding/official/content/fennec_48x48.png
rename to mobile/android/branding/official/res/drawable-mdpi/icon.png
diff --git a/mobile/android/branding/official/content/fennec_96x96.png b/mobile/android/branding/official/res/drawable-xhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/official/content/fennec_96x96.png
rename to mobile/android/branding/official/res/drawable-xhdpi/icon.png
diff --git a/mobile/android/branding/official/content/fennec_144x144.png b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/official/content/fennec_144x144.png
rename to mobile/android/branding/official/res/drawable-xxhdpi/icon.png
diff --git a/mobile/android/branding/unofficial/content/fennec_72x72.png b/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
similarity index 100%
rename from mobile/android/branding/unofficial/content/fennec_72x72.png
rename to mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
diff --git a/mobile/android/branding/unofficial/content/fennec_48x48.png b/mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
similarity index 100%
rename from mobile/android/branding/unofficial/content/fennec_48x48.png
rename to mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
diff --git a/mobile/android/branding/unofficial/content/fennec_96x96.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/unofficial/content/fennec_96x96.png
rename to mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
diff --git a/mobile/android/branding/unofficial/content/fennec_144x144.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from mobile/android/branding/unofficial/content/fennec_144x144.png
rename to mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
diff --git a/mobile/android/tests/background/junit3/android-services.mozbuild b/mobile/android/tests/background/junit3/android-services.mozbuild
index 514869f1b92..895d11993cf 100644
--- a/mobile/android/tests/background/junit3/android-services.mozbuild
+++ b/mobile/android/tests/background/junit3/android-services.mozbuild
@@ -4,10 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ANDROID_RESFILES += [
-    'res/drawable-hdpi/icon.png',
-    'res/drawable-ldpi/icon.png',
-    'res/drawable-mdpi/icon.png',
-    'res/layout/main.xml',
-    'res/values/strings.xml',
-]
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 0c99f072912..7d7c1418de2 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -191,7 +191,7 @@ class TreeMetadataEmitter(LoggingMixin):
         varmap = dict(
             # Makefile.in : moz.build
             ANDROID_GENERATED_RESFILES='ANDROID_GENERATED_RESFILES',
-            ANDROID_RESFILES='ANDROID_RESFILES',
+            ANDROID_RES_DIRS='ANDROID_RES_DIRS',
             CPP_UNIT_TESTS='CPP_UNIT_TESTS',
             EXPORT_LIBRARY='EXPORT_LIBRARY',
             EXTRA_COMPONENTS='EXTRA_COMPONENTS',
diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
index 2a5ea2e6718..67214e6e50b 100644
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -64,10 +64,11 @@ VARIABLES = {
         file.
         """, 'export'),
 
-    'ANDROID_RESFILES': (StrictOrderingOnAppendList, list, [],
-        """Android resource files.
+    'ANDROID_RES_DIRS': (list, list, [],
+        """Android resource directories.
 
-        This variable contains a list of files to package into a 'res'
+        This variable contains a list of directories, each relative to
+        the srcdir, containing static files to package into a 'res'
         directory and merge into an APK file.
         """, 'export'),
 

From af33661a5980f093d07c99867a8cfe9f870c00f5 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 19 Nov 2013 11:16:31 -0800
Subject: [PATCH 64/92] Backed out changeset 594c44cf5a05 (bug 939080) for
 breaking buildconfig

--HG--
extra : rebase_source : f526819fa1ad686d9d30f32311c8db037859d178
---
 build/docs/test_manifests.rst                    |  3 +++
 python/mozbuild/mozbuild/frontend/emitter.py     |  8 ++++++--
 .../child/mochitest.ini                          |  4 ----
 .../child/test_foo.js                            |  0
 .../moz.build                                    |  4 ----
 .../support-file.txt                             |  0
 .../mozbuild/test/frontend/test_emitter.py       | 16 ----------------
 7 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini
 delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/test_foo.js
 delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build
 delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/support-file.txt

diff --git a/build/docs/test_manifests.rst b/build/docs/test_manifests.rst
index 802fb68c2cc..cab4a1a5ab9 100644
--- a/build/docs/test_manifests.rst
+++ b/build/docs/test_manifests.rst
@@ -176,6 +176,9 @@ Files referenced by manifests are automatically installed into the object
 directory into paths defined in
 :py:func:`mozbuild.frontend.emitter.TreeMetadataEmitter._process_test_manifest`.
 
+Referenced files in the manifest not in the same directory tree as the manifest
+file are **not** installed.
+
 .. _reftest_manifests:
 
 Reftest Manifests
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 7d7c1418de2..6c9115f32d7 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -444,8 +444,12 @@ class TreeMetadataEmitter(LoggingMixin):
                         else:
                             full = mozpath.normpath(mozpath.join(manifest_dir,
                                 pattern))
-                            obj.installs[full] = mozpath.normpath(
-                                mozpath.join(out_dir, pattern))
+                            # Only install paths in our directory. This
+                            # rule is somewhat arbitrary and could be lifted.
+                            if not full.startswith(manifest_dir):
+                                continue
+
+                            obj.installs[full] = mozpath.join(out_dir, pattern)
 
             # We also copy the manifest into the output directory.
             out_path = mozpath.join(out_dir, os.path.basename(manifest_path))
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini
deleted file mode 100644
index c7882242916..00000000000
--- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/mochitest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-support-files = ../support-file.txt
-
-[test_foo.js]
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/test_foo.js b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/child/test_foo.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build
deleted file mode 100644
index a40e2562504..00000000000
--- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-MOCHITEST_MANIFESTS += ['child/mochitest.ini']
diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/support-file.txt b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-parent-support-files-dir/support-file.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
index cbad40fd3b0..4bb9adea3f7 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -346,22 +346,6 @@ class TestEmitterBasic(unittest.TestCase):
         basenames = set(os.path.basename(k) for k in o.installs.keys())
         self.assertEqual(basenames, {'mochitest.ini', 'test_active.html'})
 
-    def test_test_manifest_parent_support_files_dir(self):
-        """support-files referencing a file in a parent directory works."""
-        reader = self.reader('test-manifest-parent-support-files-dir')
-
-        objs = [o for o in self.read_topsrcdir(reader)
-                if isinstance(o, TestManifest)]
-
-        self.assertEqual(len(objs), 1)
-
-        o = objs[0]
-
-        expected = os.path.join(o.srcdir, 'support-file.txt')
-        self.assertIn(expected, o.installs)
-        self.assertEqual(o.installs[expected],
-            'testing/mochitest/tests/support-file.txt')
-
     def test_ipdl_sources(self):
         reader = self.reader('ipdl_sources')
         objs = self.read_topsrcdir(reader)

From 58f5585ce387845b09ddaa582d993714b1875ae7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 14:18:00 -0500
Subject: [PATCH 65/92] Add some comments about angle-build-unified.patch, no
 bug

DONTBUILD

--HG--
extra : rebase_source : 983dd29d0b8c254aeaa9dd8367accd34d0bd695d
---
 gfx/angle/README.mozilla | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gfx/angle/README.mozilla b/gfx/angle/README.mozilla
index a4251d7ce5f..92dc793086f 100644
--- a/gfx/angle/README.mozilla
+++ b/gfx/angle/README.mozilla
@@ -49,6 +49,10 @@ In this order:
 
   angle-build-unified.patch:
     Fixes required to make angle compile in unified mode
+    Note that a different version of this patch was upstreamed, so the next time that
+    Angle is updated this patch can be discarded.  See:
+    https://chromium.googlesource.com/angle/angle/+/0dd3b3ff66cdc50882125d21e60112d5161279b4
+    https://chromium.googlesource.com/angle/angle/+/0685fbde65a3e90d8d4d4a6c72f2cc1771617fd0
 
 In addition to these patches, the Makefile.in and moz.build build files are ours,
 they're not present in upsteam ANGLE. Therefore, changes made to the build files

From 3f8b703af9bee14a6dab11e3cac1336d065bcd90 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 19 Nov 2013 11:20:48 -0800
Subject: [PATCH 66/92] Bug 934646 - Clobber. r=me

---
 CLOBBER | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index 7c97389909f..7cd214d75ce 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,4 +18,6 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 938950 needs a clobber.
+Bug 934646 needs a clobber -- the icon resources previously copied
+into $OBJDIR/mobile/android/base/res will conflict with those in
+$BRANDING_DIRECTORY/res.

From f7daa4eb4d815a81271d428c6709a0b01c7794f9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 14:21:29 -0500
Subject: [PATCH 67/92] Bug 939296 - Build content/html in unified mode;
 r=jst,bzbarsky

--HG--
extra : rebase_source : e8cf6dfa1b5fc1b3a3db8742e4010fc2479740ed
---
 .../html/content/public/HTMLVideoElement.h    |  4 +++
 content/html/content/src/HTMLBRElement.cpp    |  6 ++--
 content/html/content/src/HTMLBRElement.h      |  4 +++
 content/html/content/src/HTMLBodyElement.cpp  |  5 +--
 content/html/content/src/HTMLBodyElement.h    |  4 +++
 content/html/content/src/HTMLDivElement.cpp   |  5 +--
 content/html/content/src/HTMLDivElement.h     |  4 +++
 content/html/content/src/HTMLFontElement.cpp  |  6 ++--
 content/html/content/src/HTMLFontElement.h    |  4 +++
 content/html/content/src/HTMLFrameElement.cpp |  6 ++--
 content/html/content/src/HTMLFrameElement.h   |  4 +++
 content/html/content/src/HTMLHRElement.cpp    | 20 +++++------
 content/html/content/src/HTMLHRElement.h      |  4 +++
 .../html/content/src/HTMLHeadingElement.cpp   |  5 +--
 content/html/content/src/HTMLHeadingElement.h |  4 +++
 .../html/content/src/HTMLIFrameElement.cpp    |  6 ++--
 content/html/content/src/HTMLIFrameElement.h  |  4 +++
 content/html/content/src/HTMLImageElement.cpp |  6 ++--
 content/html/content/src/HTMLImageElement.h   |  4 +++
 content/html/content/src/HTMLInputElement.cpp |  8 +++--
 content/html/content/src/HTMLInputElement.h   |  2 ++
 content/html/content/src/HTMLLIElement.cpp    |  6 ++--
 content/html/content/src/HTMLLIElement.h      |  4 +++
 .../html/content/src/HTMLLegendElement.cpp    | 20 +++++------
 .../html/content/src/HTMLMenuItemElement.cpp  |  2 ++
 .../html/content/src/HTMLObjectElement.cpp    |  6 ++--
 content/html/content/src/HTMLObjectElement.h  |  3 ++
 .../html/content/src/HTMLParagraphElement.cpp |  5 +--
 .../html/content/src/HTMLParagraphElement.h   |  4 +++
 content/html/content/src/HTMLPreElement.cpp   |  6 ++--
 content/html/content/src/HTMLPreElement.h     |  4 +++
 .../html/content/src/HTMLSelectElement.cpp    |  6 ++--
 content/html/content/src/HTMLSelectElement.h  |  4 +++
 .../content/src/HTMLSharedListElement.cpp     |  5 +--
 .../html/content/src/HTMLSharedListElement.h  |  4 +++
 .../content/src/HTMLSharedObjectElement.cpp   |  6 ++--
 .../content/src/HTMLSharedObjectElement.h     |  3 ++
 .../content/src/HTMLTableCaptionElement.cpp   |  5 +--
 .../content/src/HTMLTableCaptionElement.h     |  4 +++
 .../html/content/src/HTMLTableCellElement.cpp |  6 ++--
 .../html/content/src/HTMLTableCellElement.h   |  4 +++
 .../html/content/src/HTMLTableColElement.cpp  |  5 +--
 .../html/content/src/HTMLTableColElement.h    |  4 +++
 content/html/content/src/HTMLTableElement.cpp |  6 ++--
 content/html/content/src/HTMLTableElement.h   |  4 +++
 .../html/content/src/HTMLTableRowElement.cpp  |  5 +--
 .../html/content/src/HTMLTableRowElement.h    |  4 +++
 .../content/src/HTMLTableSectionElement.cpp   |  5 +--
 .../content/src/HTMLTableSectionElement.h     |  4 +++
 .../html/content/src/HTMLTextAreaElement.cpp  |  6 ++--
 .../html/content/src/HTMLTextAreaElement.h    |  4 +++
 content/html/content/src/HTMLVideoElement.cpp |  6 ++--
 content/html/content/src/moz.build            |  2 +-
 .../html/content/src/nsGenericHTMLElement.cpp | 36 +++++++++----------
 content/html/document/src/moz.build           |  2 +-
 55 files changed, 212 insertions(+), 103 deletions(-)

diff --git a/content/html/content/public/HTMLVideoElement.h b/content/html/content/public/HTMLVideoElement.h
index e0ae9ab19ca..283e08e6f0a 100644
--- a/content/html/content/public/HTMLVideoElement.h
+++ b/content/html/content/public/HTMLVideoElement.h
@@ -116,6 +116,10 @@ protected:
   void WakeLockUpdate();
 
   nsCOMPtr<nsIDOMMozWakeLock> mScreenWakeLock;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLBRElement.cpp b/content/html/content/src/HTMLBRElement.cpp
index 0bdfe5ef6cb..4ab581268d1 100644
--- a/content/html/content/src/HTMLBRElement.cpp
+++ b/content/html/content/src/HTMLBRElement.cpp
@@ -57,9 +57,9 @@ HTMLBRElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLBRElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                     nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Display)) {
     nsCSSValue* clear = aData->ValueForClear();
diff --git a/content/html/content/src/HTMLBRElement.h b/content/html/content/src/HTMLBRElement.h
index 8cf718ff8b2..e428e609497 100644
--- a/content/html/content/src/HTMLBRElement.h
+++ b/content/html/content/src/HTMLBRElement.h
@@ -46,6 +46,10 @@ public:
 
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLBodyElement.cpp b/content/html/content/src/HTMLBodyElement.cpp
index e555b934c52..3b26f832c7e 100644
--- a/content/html/content/src/HTMLBodyElement.cpp
+++ b/content/html/content/src/HTMLBodyElement.cpp
@@ -348,8 +348,9 @@ HTMLBodyElement::UnbindFromTree(bool aDeep, bool aNullParent)
   nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent);  
 }
 
-static 
-void MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLBodyElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                       nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Display)) {
     // When display if first asked for, go ahead and get our colors set up.
diff --git a/content/html/content/src/HTMLBodyElement.h b/content/html/content/src/HTMLBodyElement.h
index 4c0b43a1cf7..8ac69222654 100644
--- a/content/html/content/src/HTMLBodyElement.h
+++ b/content/html/content/src/HTMLBodyElement.h
@@ -136,6 +136,10 @@ protected:
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
 
   nsRefPtr<BodyRule> mContentStyleRule;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLDivElement.cpp b/content/html/content/src/HTMLDivElement.cpp
index 1477cd53d9b..73f1e349fd2 100644
--- a/content/html/content/src/HTMLDivElement.cpp
+++ b/content/html/content/src/HTMLDivElement.cpp
@@ -62,8 +62,9 @@ HTMLDivElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLDivElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                      nsRuleData* aData)
 {
   nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLDivElement.h b/content/html/content/src/HTMLDivElement.h
index 6e3fbbbdf9a..124864dac8f 100644
--- a/content/html/content/src/HTMLDivElement.h
+++ b/content/html/content/src/HTMLDivElement.h
@@ -60,6 +60,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLFontElement.cpp b/content/html/content/src/HTMLFontElement.cpp
index dd104d14b5f..1a8dc426ce1 100644
--- a/content/html/content/src/HTMLFontElement.cpp
+++ b/content/html/content/src/HTMLFontElement.cpp
@@ -53,9 +53,9 @@ HTMLFontElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLFontElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                       nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Font)) {
     // face: string list
diff --git a/content/html/content/src/HTMLFontElement.h b/content/html/content/src/HTMLFontElement.h
index 814448efdfb..750c29d4bfb 100644
--- a/content/html/content/src/HTMLFontElement.h
+++ b/content/html/content/src/HTMLFontElement.h
@@ -56,6 +56,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLFrameElement.cpp b/content/html/content/src/HTMLFrameElement.cpp
index 6b29f90cc27..b7799ba4c8d 100644
--- a/content/html/content/src/HTMLFrameElement.cpp
+++ b/content/html/content/src/HTMLFrameElement.cpp
@@ -81,9 +81,9 @@ HTMLFrameElement::ParseAttribute(int32_t aNamespaceID,
                                                    aValue, aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLFrameElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                        nsRuleData* aData)
 {
   nsGenericHTMLElement::MapScrollingAttributeInto(aAttributes, aData);
   nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLFrameElement.h b/content/html/content/src/HTMLFrameElement.h
index ef2dfeebd6e..02f57c90880 100644
--- a/content/html/content/src/HTMLFrameElement.h
+++ b/content/html/content/src/HTMLFrameElement.h
@@ -99,6 +99,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext* aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLHRElement.cpp b/content/html/content/src/HTMLHRElement.cpp
index 5dfa46b30fb..55276389f33 100644
--- a/content/html/content/src/HTMLHRElement.cpp
+++ b/content/html/content/src/HTMLHRElement.cpp
@@ -32,19 +32,19 @@ NS_IMPL_STRING_ATTR(HTMLHRElement, Size, size)
 NS_IMPL_STRING_ATTR(HTMLHRElement, Width, width)
 NS_IMPL_STRING_ATTR(HTMLHRElement, Color, color)
 
-static const nsAttrValue::EnumTable kAlignTable[] = {
-  { "left", NS_STYLE_TEXT_ALIGN_LEFT },
-  { "right", NS_STYLE_TEXT_ALIGN_RIGHT },
-  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
-  { 0 }
-};
-
 bool
 HTMLHRElement::ParseAttribute(int32_t aNamespaceID,
                               nsIAtom* aAttribute,
                               const nsAString& aValue,
                               nsAttrValue& aResult)
 {
+  static const nsAttrValue::EnumTable kAlignTable[] = {
+    { "left", NS_STYLE_TEXT_ALIGN_LEFT },
+    { "right", NS_STYLE_TEXT_ALIGN_RIGHT },
+    { "center", NS_STYLE_TEXT_ALIGN_CENTER },
+    { 0 }
+  };
+
   if (aNamespaceID == kNameSpaceID_None) {
     if (aAttribute == nsGkAtoms::width) {
       return aResult.ParseSpecialIntValue(aValue);
@@ -64,9 +64,9 @@ HTMLHRElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLHRElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                     nsRuleData* aData)
 {
   bool noshade = false;
 
diff --git a/content/html/content/src/HTMLHRElement.h b/content/html/content/src/HTMLHRElement.h
index 948a23ae7de..cbb68a1125f 100644
--- a/content/html/content/src/HTMLHRElement.h
+++ b/content/html/content/src/HTMLHRElement.h
@@ -73,6 +73,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext* aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLHeadingElement.cpp b/content/html/content/src/HTMLHeadingElement.cpp
index 09c56998cf0..13d3c6b3d52 100644
--- a/content/html/content/src/HTMLHeadingElement.cpp
+++ b/content/html/content/src/HTMLHeadingElement.cpp
@@ -50,8 +50,9 @@ HTMLHeadingElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLHeadingElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                          nsRuleData* aData)
 {
   nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLHeadingElement.h b/content/html/content/src/HTMLHeadingElement.h
index 1915b52b3b9..6de080d14aa 100644
--- a/content/html/content/src/HTMLHeadingElement.h
+++ b/content/html/content/src/HTMLHeadingElement.h
@@ -43,6 +43,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace mozilla
diff --git a/content/html/content/src/HTMLIFrameElement.cpp b/content/html/content/src/HTMLIFrameElement.cpp
index a116f5c394c..4d76ec059bd 100644
--- a/content/html/content/src/HTMLIFrameElement.cpp
+++ b/content/html/content/src/HTMLIFrameElement.cpp
@@ -106,9 +106,9 @@ HTMLIFrameElement::ParseAttribute(int32_t aNamespaceID,
                                                    aValue, aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLIFrameElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                         nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Border)) {
     // frameborder: 0 | 1 (| NO | YES in quirks mode)
diff --git a/content/html/content/src/HTMLIFrameElement.h b/content/html/content/src/HTMLIFrameElement.h
index e9450379aaf..54884319b75 100644
--- a/content/html/content/src/HTMLIFrameElement.h
+++ b/content/html/content/src/HTMLIFrameElement.h
@@ -174,6 +174,10 @@ protected:
 
   virtual JSObject* WrapNode(JSContext* aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLImageElement.cpp b/content/html/content/src/HTMLImageElement.cpp
index fc21041c0b2..a5968e1b88a 100644
--- a/content/html/content/src/HTMLImageElement.cpp
+++ b/content/html/content/src/HTMLImageElement.cpp
@@ -232,9 +232,9 @@ HTMLImageElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLImageElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                        nsRuleData* aData)
 {
   nsGenericHTMLElement::MapImageAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLElement::MapImageBorderAttributeInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLImageElement.h b/content/html/content/src/HTMLImageElement.h
index 1973462d947..9c32e8eac89 100644
--- a/content/html/content/src/HTMLImageElement.h
+++ b/content/html/content/src/HTMLImageElement.h
@@ -190,6 +190,10 @@ protected:
   // This is a weak reference that this element and the HTMLFormElement
   // cooperate in maintaining.
   HTMLFormElement* mForm;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
index c1033db7152..bed1f3f5242 100644
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -4456,9 +4456,9 @@ HTMLInputElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLInputElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                        nsRuleData* aData)
 {
   const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::type);
   if (value && value->Type() == nsAttrValue::eEnum &&
@@ -6822,3 +6822,5 @@ HTMLInputElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 
 } // namespace dom
 } // namespace mozilla
+
+#undef NS_ORIGINAL_CHECKED_VALUE
diff --git a/content/html/content/src/HTMLInputElement.h b/content/html/content/src/HTMLInputElement.h
index 713cdb40819..bf2241d6424 100644
--- a/content/html/content/src/HTMLInputElement.h
+++ b/content/html/content/src/HTMLInputElement.h
@@ -1219,6 +1219,8 @@ protected:
   bool                     mProgressTimerIsActive : 1;
 
 private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 
   /**
    * Returns true if this input's type will fire a DOM "change" event when it
diff --git a/content/html/content/src/HTMLLIElement.cpp b/content/html/content/src/HTMLLIElement.cpp
index 5a064467917..bc51e67ca1a 100644
--- a/content/html/content/src/HTMLLIElement.cpp
+++ b/content/html/content/src/HTMLLIElement.cpp
@@ -69,9 +69,9 @@ HTMLLIElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLLIElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                     nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(List)) {
     nsCSSValue* listStyleType = aData->ValueForListStyleType();
diff --git a/content/html/content/src/HTMLLIElement.h b/content/html/content/src/HTMLLIElement.h
index 582810a1dd1..45ae622ca61 100644
--- a/content/html/content/src/HTMLLIElement.h
+++ b/content/html/content/src/HTMLLIElement.h
@@ -59,6 +59,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLLegendElement.cpp b/content/html/content/src/HTMLLegendElement.cpp
index c40a01bf05f..a3756aee90e 100644
--- a/content/html/content/src/HTMLLegendElement.cpp
+++ b/content/html/content/src/HTMLLegendElement.cpp
@@ -21,16 +21,6 @@ HTMLLegendElement::~HTMLLegendElement()
 
 NS_IMPL_ELEMENT_CLONE(HTMLLegendElement)
 
-// this contains center, because IE4 does
-static const nsAttrValue::EnumTable kAlignTable[] = {
-  { "left", NS_STYLE_TEXT_ALIGN_LEFT },
-  { "right", NS_STYLE_TEXT_ALIGN_RIGHT },
-  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
-  { "bottom", NS_STYLE_VERTICAL_ALIGN_BOTTOM },
-  { "top", NS_STYLE_VERTICAL_ALIGN_TOP },
-  { 0 }
-};
-
 nsIContent*
 HTMLLegendElement::GetFieldSet()
 {
@@ -49,6 +39,16 @@ HTMLLegendElement::ParseAttribute(int32_t aNamespaceID,
                                   const nsAString& aValue,
                                   nsAttrValue& aResult)
 {
+  // this contains center, because IE4 does
+  static const nsAttrValue::EnumTable kAlignTable[] = {
+    { "left", NS_STYLE_TEXT_ALIGN_LEFT },
+    { "right", NS_STYLE_TEXT_ALIGN_RIGHT },
+    { "center", NS_STYLE_TEXT_ALIGN_CENTER },
+    { "bottom", NS_STYLE_VERTICAL_ALIGN_BOTTOM },
+    { "top", NS_STYLE_VERTICAL_ALIGN_TOP },
+    { 0 }
+  };
+
   if (aAttribute == nsGkAtoms::align && aNamespaceID == kNameSpaceID_None) {
     return aResult.ParseEnumValue(aValue, kAlignTable, false);
   }
diff --git a/content/html/content/src/HTMLMenuItemElement.cpp b/content/html/content/src/HTMLMenuItemElement.cpp
index 698f2fd7a5f..80d517125e8 100644
--- a/content/html/content/src/HTMLMenuItemElement.cpp
+++ b/content/html/content/src/HTMLMenuItemElement.cpp
@@ -490,3 +490,5 @@ HTMLMenuItemElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)
 
 } // namespace dom
 } // namespace mozilla
+
+#undef NS_ORIGINAL_CHECKED_VALUE
diff --git a/content/html/content/src/HTMLObjectElement.cpp b/content/html/content/src/HTMLObjectElement.cpp
index 549ddf87aaf..5109fa7237f 100644
--- a/content/html/content/src/HTMLObjectElement.cpp
+++ b/content/html/content/src/HTMLObjectElement.cpp
@@ -366,9 +366,9 @@ HTMLObjectElement::ParseAttribute(int32_t aNamespaceID,
                                                   aValue, aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes *aAttributes,
-                      nsRuleData *aData)
+void
+HTMLObjectElement::MapAttributesIntoRule(const nsMappedAttributes *aAttributes,
+                                         nsRuleData *aData)
 {
   nsGenericHTMLFormElement::MapImageAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLFormElement::MapImageBorderAttributeInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLObjectElement.h b/content/html/content/src/HTMLObjectElement.h
index df2006f6b06..56842db260e 100644
--- a/content/html/content/src/HTMLObjectElement.h
+++ b/content/html/content/src/HTMLObjectElement.h
@@ -239,6 +239,9 @@ private:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
 
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
+
   bool mIsDoneAddingChildren;
 };
 
diff --git a/content/html/content/src/HTMLParagraphElement.cpp b/content/html/content/src/HTMLParagraphElement.cpp
index 9fe10c9c9fb..7d54200eaad 100644
--- a/content/html/content/src/HTMLParagraphElement.cpp
+++ b/content/html/content/src/HTMLParagraphElement.cpp
@@ -41,8 +41,9 @@ HTMLParagraphElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLParagraphElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                            nsRuleData* aData)
 {
   nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLParagraphElement.h b/content/html/content/src/HTMLParagraphElement.h
index 14a85e44a49..fecfc845c9a 100644
--- a/content/html/content/src/HTMLParagraphElement.h
+++ b/content/html/content/src/HTMLParagraphElement.h
@@ -50,6 +50,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLPreElement.cpp b/content/html/content/src/HTMLPreElement.cpp
index 5cee51a3d78..409a07741c6 100644
--- a/content/html/content/src/HTMLPreElement.cpp
+++ b/content/html/content/src/HTMLPreElement.cpp
@@ -47,9 +47,9 @@ HTMLPreElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLPreElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                      nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Position)) {
     nsCSSValue* width = aData->ValueForWidth();
diff --git a/content/html/content/src/HTMLPreElement.h b/content/html/content/src/HTMLPreElement.h
index 581026a2b67..831a0d131ad 100644
--- a/content/html/content/src/HTMLPreElement.h
+++ b/content/html/content/src/HTMLPreElement.h
@@ -54,6 +54,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLSelectElement.cpp b/content/html/content/src/HTMLSelectElement.cpp
index f31dda4a014..ef409cb5603 100644
--- a/content/html/content/src/HTMLSelectElement.cpp
+++ b/content/html/content/src/HTMLSelectElement.cpp
@@ -1426,9 +1426,9 @@ HTMLSelectElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLSelectElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                         nsRuleData* aData)
 {
   nsGenericHTMLFormElementWithState::MapImageAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLFormElementWithState::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLSelectElement.h b/content/html/content/src/HTMLSelectElement.h
index 3cd772ce0a7..f259ffebd8b 100644
--- a/content/html/content/src/HTMLSelectElement.h
+++ b/content/html/content/src/HTMLSelectElement.h
@@ -647,6 +647,10 @@ protected:
    * The live list of selected options.
   */
   nsRefPtr<nsContentList> mSelectedOptions;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLSharedListElement.cpp b/content/html/content/src/HTMLSharedListElement.cpp
index a0ed1a74334..022a18a388e 100644
--- a/content/html/content/src/HTMLSharedListElement.cpp
+++ b/content/html/content/src/HTMLSharedListElement.cpp
@@ -89,8 +89,9 @@ HTMLSharedListElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLSharedListElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                             nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(List)) {
     nsCSSValue* listStyleType = aData->ValueForListStyleType();
diff --git a/content/html/content/src/HTMLSharedListElement.h b/content/html/content/src/HTMLSharedListElement.h
index 5f2c872071e..71123998a3d 100644
--- a/content/html/content/src/HTMLSharedListElement.h
+++ b/content/html/content/src/HTMLSharedListElement.h
@@ -79,6 +79,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLSharedObjectElement.cpp b/content/html/content/src/HTMLSharedObjectElement.cpp
index e456b759955..925d37c3eeb 100644
--- a/content/html/content/src/HTMLSharedObjectElement.cpp
+++ b/content/html/content/src/HTMLSharedObjectElement.cpp
@@ -260,9 +260,9 @@ MapAttributesIntoRuleExceptHidden(const nsMappedAttributes *aAttributes,
   nsGenericHTMLElement::MapCommonAttributesIntoExceptHidden(aAttributes, aData);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes *aAttributes,
-                      nsRuleData *aData)
+void
+HTMLSharedObjectElement::MapAttributesIntoRule(const nsMappedAttributes *aAttributes,
+                                               nsRuleData *aData)
 {
   MapAttributesIntoRuleBase(aAttributes, aData);
   nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLSharedObjectElement.h b/content/html/content/src/HTMLSharedObjectElement.h
index 0573e727433..ce7e38265e0 100644
--- a/content/html/content/src/HTMLSharedObjectElement.h
+++ b/content/html/content/src/HTMLSharedObjectElement.h
@@ -223,6 +223,9 @@ private:
 
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTableCaptionElement.cpp b/content/html/content/src/HTMLTableCaptionElement.cpp
index 78ebe7c919b..07330cba30b 100644
--- a/content/html/content/src/HTMLTableCaptionElement.cpp
+++ b/content/html/content/src/HTMLTableCaptionElement.cpp
@@ -55,8 +55,9 @@ HTMLTableCaptionElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static 
-void MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLTableCaptionElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                               nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(TableBorder)) {
     nsCSSValue* captionSide = aData->ValueForCaptionSide();
diff --git a/content/html/content/src/HTMLTableCaptionElement.h b/content/html/content/src/HTMLTableCaptionElement.h
index 19bf63abded..5103c5e8a80 100644
--- a/content/html/content/src/HTMLTableCaptionElement.h
+++ b/content/html/content/src/HTMLTableCaptionElement.h
@@ -49,6 +49,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTableCellElement.cpp b/content/html/content/src/HTMLTableCellElement.cpp
index 3cf8ec9f5f8..97235acc22b 100644
--- a/content/html/content/src/HTMLTableCellElement.cpp
+++ b/content/html/content/src/HTMLTableCellElement.cpp
@@ -435,9 +435,9 @@ HTMLTableCellElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static 
-void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                           nsRuleData* aData)
+void
+HTMLTableCellElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                            nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Position)) {
     // width: value
diff --git a/content/html/content/src/HTMLTableCellElement.h b/content/html/content/src/HTMLTableCellElement.h
index 062f9d907c6..a0437c3ac11 100644
--- a/content/html/content/src/HTMLTableCellElement.h
+++ b/content/html/content/src/HTMLTableCellElement.h
@@ -162,6 +162,10 @@ protected:
   HTMLTableElement* GetTable() const;
 
   HTMLTableRowElement* GetRow() const;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTableColElement.cpp b/content/html/content/src/HTMLTableColElement.cpp
index 45fb6423eed..450f07a7439 100644
--- a/content/html/content/src/HTMLTableColElement.cpp
+++ b/content/html/content/src/HTMLTableColElement.cpp
@@ -62,8 +62,9 @@ HTMLTableColElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static 
-void MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLTableColElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                           nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Table)) {
     nsCSSValue *span = aData->ValueForSpan();
diff --git a/content/html/content/src/HTMLTableColElement.h b/content/html/content/src/HTMLTableColElement.h
index 1cdae34e124..99ec7513b28 100644
--- a/content/html/content/src/HTMLTableColElement.h
+++ b/content/html/content/src/HTMLTableColElement.h
@@ -82,6 +82,10 @@ public:
 protected:
   virtual JSObject* WrapNode(JSContext *aCx,
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp
index 49661587b2d..1296bc42db2 100644
--- a/content/html/content/src/HTMLTableElement.cpp
+++ b/content/html/content/src/HTMLTableElement.cpp
@@ -701,9 +701,9 @@ HTMLTableElement::ParseAttribute(int32_t aNamespaceID,
 
 
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLTableElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                        nsRuleData* aData)
 {
   // XXX Bug 211636:  This function is used by a single style rule
   // that's used to match two different type of elements -- tables, and
diff --git a/content/html/content/src/HTMLTableElement.h b/content/html/content/src/HTMLTableElement.h
index 117e016611a..4f0930bea52 100644
--- a/content/html/content/src/HTMLTableElement.h
+++ b/content/html/content/src/HTMLTableElement.h
@@ -222,6 +222,10 @@ protected:
   nsMappedAttributes *mTableInheritedAttributes;
   void BuildInheritedAttributes();
   void ReleaseInheritedAttributes();
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTableRowElement.cpp b/content/html/content/src/HTMLTableRowElement.cpp
index 337c7e4f94d..584636ad058 100644
--- a/content/html/content/src/HTMLTableRowElement.cpp
+++ b/content/html/content/src/HTMLTableRowElement.cpp
@@ -261,8 +261,9 @@ HTMLTableRowElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static 
-void MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLTableRowElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                           nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Position)) {
     // height: value
diff --git a/content/html/content/src/HTMLTableRowElement.h b/content/html/content/src/HTMLTableRowElement.h
index ce55a77c7fc..292b5d732e3 100644
--- a/content/html/content/src/HTMLTableRowElement.h
+++ b/content/html/content/src/HTMLTableRowElement.h
@@ -96,6 +96,10 @@ protected:
   HTMLTableSectionElement* GetSection() const;
   HTMLTableElement* GetTable() const;
   nsRefPtr<nsContentList> mCells;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTableSectionElement.cpp b/content/html/content/src/HTMLTableSectionElement.cpp
index 39a5591c45e..572e0ab4618 100644
--- a/content/html/content/src/HTMLTableSectionElement.cpp
+++ b/content/html/content/src/HTMLTableSectionElement.cpp
@@ -161,8 +161,9 @@ HTMLTableSectionElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static
-void MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData)
+void
+HTMLTableSectionElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                               nsRuleData* aData)
 {
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Position)) {
     // height: value
diff --git a/content/html/content/src/HTMLTableSectionElement.h b/content/html/content/src/HTMLTableSectionElement.h
index 089d56f5933..0fea6591a67 100644
--- a/content/html/content/src/HTMLTableSectionElement.h
+++ b/content/html/content/src/HTMLTableSectionElement.h
@@ -77,6 +77,10 @@ protected:
                              JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
 
   nsRefPtr<nsContentList> mRows;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLTextAreaElement.cpp b/content/html/content/src/HTMLTextAreaElement.cpp
index 26188506a5a..2032e49c50b 100644
--- a/content/html/content/src/HTMLTextAreaElement.cpp
+++ b/content/html/content/src/HTMLTextAreaElement.cpp
@@ -400,9 +400,9 @@ HTMLTextAreaElement::ParseAttribute(int32_t aNamespaceID,
                                               aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLTextAreaElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                           nsRuleData* aData)
 {
   nsGenericHTMLFormElementWithState::MapDivAlignAttributeInto(aAttributes, aData);
   nsGenericHTMLFormElementWithState::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/HTMLTextAreaElement.h b/content/html/content/src/HTMLTextAreaElement.h
index 6d43036a82e..a14227409e3 100644
--- a/content/html/content/src/HTMLTextAreaElement.h
+++ b/content/html/content/src/HTMLTextAreaElement.h
@@ -356,6 +356,10 @@ protected:
    * @return whether the current value is the empty string.
    */
   bool IsValueEmpty() const;
+
+private:
+  static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                    nsRuleData* aData);
 };
 
 } // namespace dom
diff --git a/content/html/content/src/HTMLVideoElement.cpp b/content/html/content/src/HTMLVideoElement.cpp
index e447eeb6091..491668ce71e 100644
--- a/content/html/content/src/HTMLVideoElement.cpp
+++ b/content/html/content/src/HTMLVideoElement.cpp
@@ -102,9 +102,9 @@ HTMLVideoElement::ParseAttribute(int32_t aNamespaceID,
                                            aResult);
 }
 
-static void
-MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
-                      nsRuleData* aData)
+void
+HTMLVideoElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                        nsRuleData* aData)
 {
   nsGenericHTMLElement::MapImageSizeAttributesInto(aAttributes, aData);
   nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index 0860e5e09b5..b79a3c88a81 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -75,7 +75,7 @@ EXPORTS.mozilla.dom += [
     'ValidityState.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'HTMLAnchorElement.cpp',
     'HTMLAreaElement.cpp',
     'HTMLAudioElement.cpp',
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 5e75d83b98c..722ad313f15 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -1182,24 +1182,6 @@ nsGenericHTMLElement::GetPresContext()
   return nullptr;
 }
 
-static const nsAttrValue::EnumTable kAlignTable[] = {
-  { "left",      NS_STYLE_TEXT_ALIGN_LEFT },
-  { "right",     NS_STYLE_TEXT_ALIGN_RIGHT },
-
-  { "top",       NS_STYLE_VERTICAL_ALIGN_TOP },
-  { "middle",    NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE },
-  { "bottom",    NS_STYLE_VERTICAL_ALIGN_BASELINE },
-
-  { "center",    NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE },
-  { "baseline",  NS_STYLE_VERTICAL_ALIGN_BASELINE },
-
-  { "texttop",   NS_STYLE_VERTICAL_ALIGN_TEXT_TOP },
-  { "absmiddle", NS_STYLE_VERTICAL_ALIGN_MIDDLE },
-  { "abscenter", NS_STYLE_VERTICAL_ALIGN_MIDDLE },
-  { "absbottom", NS_STYLE_VERTICAL_ALIGN_BOTTOM },
-  { 0 }
-};
-
 static const nsAttrValue::EnumTable kDivAlignTable[] = {
   { "left", NS_STYLE_TEXT_ALIGN_MOZ_LEFT },
   { "right", NS_STYLE_TEXT_ALIGN_MOZ_RIGHT },
@@ -1240,6 +1222,24 @@ bool
 nsGenericHTMLElement::ParseAlignValue(const nsAString& aString,
                                       nsAttrValue& aResult)
 {
+  static const nsAttrValue::EnumTable kAlignTable[] = {
+    { "left",      NS_STYLE_TEXT_ALIGN_LEFT },
+    { "right",     NS_STYLE_TEXT_ALIGN_RIGHT },
+
+    { "top",       NS_STYLE_VERTICAL_ALIGN_TOP },
+    { "middle",    NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE },
+    { "bottom",    NS_STYLE_VERTICAL_ALIGN_BASELINE },
+
+    { "center",    NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE },
+    { "baseline",  NS_STYLE_VERTICAL_ALIGN_BASELINE },
+
+    { "texttop",   NS_STYLE_VERTICAL_ALIGN_TEXT_TOP },
+    { "absmiddle", NS_STYLE_VERTICAL_ALIGN_MIDDLE },
+    { "abscenter", NS_STYLE_VERTICAL_ALIGN_MIDDLE },
+    { "absbottom", NS_STYLE_VERTICAL_ALIGN_BOTTOM },
+    { 0 }
+  };
+
   return aResult.ParseEnumValue(aString, kAlignTable, false);
 }
 
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index 2b3daa07843..07692ca68e2 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -13,7 +13,7 @@ EXPORTS.mozilla.dom += [
     'ImageDocument.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'HTMLAllCollection.cpp',
     'ImageDocument.cpp',
     'MediaDocument.cpp',

From 2da6d31b0682c666e03bcec5679143cd402db7b7 Mon Sep 17 00:00:00 2001
From: Steve Workman <sworkman@mozilla.com>
Date: Tue, 19 Nov 2013 11:22:01 -0800
Subject: [PATCH 68/92] Bug 923458 - ProxyAutoConfig::ResolveAddress should
 make medium priority DNS requests to use negative cache entries r=mcmanus

---
 netwerk/base/src/ProxyAutoConfig.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netwerk/base/src/ProxyAutoConfig.cpp b/netwerk/base/src/ProxyAutoConfig.cpp
index 414f320dad2..b67e55d1a3d 100644
--- a/netwerk/base/src/ProxyAutoConfig.cpp
+++ b/netwerk/base/src/ProxyAutoConfig.cpp
@@ -346,7 +346,9 @@ ProxyAutoConfig::ResolveAddress(const nsCString &aHostName,
 
   nsRefPtr<PACResolver> helper = new PACResolver();
 
-  if (NS_FAILED(dns->AsyncResolve(aHostName, 0, helper,
+  if (NS_FAILED(dns->AsyncResolve(aHostName,
+                                  nsIDNSService::RESOLVE_PRIORITY_MEDIUM,
+                                  helper,
                                   NS_GetCurrentThread(),
                                   getter_AddRefs(helper->mRequest))))
     return false;

From 391179cd80a704ae476b200347ac7a14d905c702 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Tue, 19 Nov 2013 11:09:33 -0800
Subject: [PATCH 69/92] Bug 940558 - Fix an exact rooting hazard false positive
 in replaceLastProperty; r=sfink

--HG--
extra : rebase_source : 65d3779ba2e233c14c6b558320cfd0861140d082
---
 js/src/vm/Shape.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp
index da4708346e2..6b2313b7462 100644
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -330,15 +330,12 @@ Shape::replaceLastProperty(ExclusiveContext *cx, const StackBaseShape &base,
                                            base.flags & BaseShape::OBJECT_FLAG_MASK);
     }
 
-    StackShape child(shape);
-    StackShape::AutoRooter childRoot(cx, &child);
-    {
-        UnownedBaseShape *nbase = BaseShape::getUnowned(cx, base);
-        if (!nbase)
-            return nullptr;
+    UnownedBaseShape *nbase = BaseShape::getUnowned(cx, base);
+    if (!nbase)
+        return nullptr;
 
-        child.base = nbase;
-    }
+    StackShape child(shape);
+    child.base = nbase;
 
     return cx->compartment()->propertyTree.getChild(cx, shape->parent,
                                                     shape->numFixedSlots(), child);

From 8e4c8868921166da5e904301d0628352f62d9532 Mon Sep 17 00:00:00 2001
From: Dan Minor <dminor@mozilla.com>
Date: Tue, 19 Nov 2013 12:52:58 -0500
Subject: [PATCH 70/92] Bug 939262 - Add new jit-test dependencies to test
 package; r=ted

---
 testing/testsuite-targets.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 08ad4c665f3..5992140f836 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -535,6 +535,7 @@ stage-jittest:
 	cp -RL $(topsrcdir)/js/src/jsapi.h $(PKG_STAGE)/jit-test
 	cp -RL $(topsrcdir)/js/src/jit-test $(PKG_STAGE)/jit-test/jit-test
 	cp -RL $(topsrcdir)/js/src/tests/ecma_6 $(PKG_STAGE)/jit-test/tests/ecma_6
+	cp -RL $(topsrcdir)/js/src/tests/js1_8_5 $(PKG_STAGE)/jit-test/tests/js1_8_5
 	cp -RL $(topsrcdir)/js/src/tests/lib $(PKG_STAGE)/jit-test/tests/lib
 
 stage-steeplechase:

From 59b8e9d9a90a4714d2c5bc1e84620d9a2294b9eb Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 14:49:52 -0500
Subject: [PATCH 71/92] Bug 939303 - Build content/base in unified mode;
 r=jst,bzbarsky

--HG--
extra : rebase_source : 93bcb48cd6f8cdeab5aa2cd79f95aaba4790d521
---
 content/base/src/DirectionalityUtils.cpp |  2 +-
 content/base/src/moz.build               | 18 +++++++++++++-----
 content/base/src/nsStyledElement.cpp     |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/content/base/src/DirectionalityUtils.cpp b/content/base/src/DirectionalityUtils.cpp
index f1530673930..e9f8841724e 100644
--- a/content/base/src/DirectionalityUtils.cpp
+++ b/content/base/src/DirectionalityUtils.cpp
@@ -220,7 +220,7 @@
 
 namespace mozilla {
 
-typedef mozilla::dom::Element Element;
+using mozilla::dom::Element;
 
 /**
  * Returns true if aElement is one of the elements whose text content should not
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 8b46268ee07..1de7ffd911e 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -67,7 +67,7 @@ EXPORTS.mozilla.dom += [
     'TreeWalker.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'Attr.cpp',
     'ChildIterator.cpp',
     'Comment.cpp',
@@ -94,12 +94,10 @@ SOURCES += [
     'nsContentList.cpp',
     'nsContentPolicy.cpp',
     'nsContentSink.cpp',
-    'nsContentUtils.cpp',
     'nsCopySupport.cpp',
     'nsCrossSiteListenerProxy.cpp',
     'nsCSPService.cpp',
     'nsDataDocumentContentPolicy.cpp',
-    'nsDocument.cpp',
     'nsDocumentEncoder.cpp',
     'nsDOMAttributeMap.cpp',
     'nsDOMBlobBuilder.cpp',
@@ -130,9 +128,7 @@ SOURCES += [
     'nsNameSpaceManager.cpp',
     'nsNoDataProtocolContentPolicy.cpp',
     'nsNodeInfo.cpp',
-    'nsNodeInfoManager.cpp',
     'nsNodeUtils.cpp',
-    'nsObjectLoadingContent.cpp',
     'nsPlainTextSerializer.cpp',
     'nsPropertyTable.cpp',
     'nsRange.cpp',
@@ -159,6 +155,18 @@ SOURCES += [
     'WebSocket.cpp',
 ]
 
+# These files cannot be built in unified mode because they use FORCE_PR_LOG
+SOURCES += [
+    'nsDocument.cpp',
+    'nsNodeInfoManager.cpp',
+]
+
+# These files cannot be built in unified mode because of OS X headers.
+SOURCES += [
+    'nsContentUtils.cpp',
+    'nsObjectLoadingContent.cpp',
+]
+
 EXTRA_COMPONENTS += [
     'contentAreaDropListener.js',
     'contentAreaDropListener.manifest',
diff --git a/content/base/src/nsStyledElement.cpp b/content/base/src/nsStyledElement.cpp
index 5b5c91fc73e..601cd19731d 100644
--- a/content/base/src/nsStyledElement.cpp
+++ b/content/base/src/nsStyledElement.cpp
@@ -22,7 +22,7 @@
 #include "nsContentUtils.h"
 #include "nsStyleUtil.h"
 
-namespace css = mozilla::css;
+using namespace mozilla;
 using namespace mozilla::dom;
 
 //----------------------------------------------------------------------

From 7c9dcf68ddf2d5bf8a89c3a5e9215c6723c2ed92 Mon Sep 17 00:00:00 2001
From: Simone Carletti <weppos@weppos.net>
Date: Tue, 19 Nov 2013 14:56:57 -0500
Subject: [PATCH 72/92] Bug 940478 - Remove nt.gov.au from PSL. r=gerv

---
 netwerk/dns/effective_tld_names.dat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index b6376b7cded..9edf4084021 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -246,7 +246,7 @@ wa.edu.au
 act.gov.au
 // Removed at request of Shae.Donelan@services.nsw.gov.au, 2010-03-04
 // nsw.gov.au
-nt.gov.au
+// nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au
 tas.gov.au

From 4076f876b1b71d50a33e9475c97da8512107985b Mon Sep 17 00:00:00 2001
From: Simone Carletti <weppos@weppos.net>
Date: Tue, 19 Nov 2013 14:56:57 -0500
Subject: [PATCH 73/92] Bug 940478 - Format comment for Bug 547985 according to
 the conventions adopted by the recent similar patches. r=gerv

---
 netwerk/dns/effective_tld_names.dat | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index 9edf4084021..49ae5920030 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -244,8 +244,7 @@ tas.edu.au
 vic.edu.au
 wa.edu.au
 act.gov.au
-// Removed at request of Shae.Donelan@services.nsw.gov.au, 2010-03-04
-// nsw.gov.au
+// nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
 // nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au

From 984f0e848697ad4ea415f295f62a4a0c6cb312c2 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Tue, 19 Nov 2013 14:56:57 -0500
Subject: [PATCH 74/92] Bug 940488 - Initalize RotatedBuffer::mDidSelfCopy.
 r=BenWa

---
 gfx/layers/ThebesLayerBuffer.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gfx/layers/ThebesLayerBuffer.h b/gfx/layers/ThebesLayerBuffer.h
index 1df643c65e4..e07eb3919e5 100644
--- a/gfx/layers/ThebesLayerBuffer.h
+++ b/gfx/layers/ThebesLayerBuffer.h
@@ -62,6 +62,7 @@ public:
     , mBufferOnWhite(aBufferOnWhite)
     , mBufferRect(aBufferRect)
     , mBufferRotation(aBufferRotation)
+    , mDidSelfCopy(false)
   { }
   RotatedBuffer(gfx::DrawTarget* aDTBuffer, gfx::DrawTarget* aDTBufferOnWhite,
                 const nsIntRect& aBufferRect,
@@ -70,8 +71,11 @@ public:
     , mDTBufferOnWhite(aDTBufferOnWhite)
     , mBufferRect(aBufferRect)
     , mBufferRotation(aBufferRotation)
+    , mDidSelfCopy(false)
+  { }
+  RotatedBuffer()
+    : mDidSelfCopy(false)
   { }
-  RotatedBuffer() { }
 
   /*
    * Which buffer should be drawn to/read from.

From f4e80246c74479b3a2f3b0859f4672acacdacfc9 Mon Sep 17 00:00:00 2001
From: "ISHIKAWA, Chiaki" <ishikawa@yk.rim.or.jp>
Date: Tue, 19 Nov 2013 14:56:58 -0500
Subject: [PATCH 75/92] Bug 936987 - Propagate the error code of PR_Close()
 against a file under CIFS-share under Linux. r=froydnj

(Network error causes the file share to fail, and read()/close() and possibly write() can return network-related error. close() error was not caught before.)
---
 xpcom/io/nsLocalFileUnix.cpp | 45 ++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index 09407c8008d..099bcea9028 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ 
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -816,10 +816,12 @@ nsLocalFile::CopyToNative(nsIFile *newParent, const nsACString &newName)
 #endif
         char buf[BUFSIZ];
         int32_t bytesRead;
-        
+
         // record PR_Write() error for better error message later.
-        nsresult saved_write_error = NS_OK;    
+        nsresult saved_write_error = NS_OK;
         nsresult saved_read_error = NS_OK;
+        nsresult saved_read_close_error = NS_OK;
+        nsresult saved_write_close_error = NS_OK;
 
         // DONE: Does PR_Read() return bytesRead < 0 for error?
         // Yes., The errors from PR_Read are not so common and
@@ -848,6 +850,10 @@ nsLocalFile::CopyToNative(nsIFile *newParent, const nsACString &newName)
 #endif
         }
 
+        // TODO/FIXME: If CIFS (and NFS?) may force read/write to return EINTR,
+        // we are better off to prepare for retrying. But we need confirmation if
+        // EINTR is returned.
+
         // Record error if PR_Read() failed.
         // Must be done before any other I/O which may reset errno.
         if ( (bytesRead < 0) && (saved_write_error == NS_OK)) {
@@ -859,15 +865,29 @@ nsLocalFile::CopyToNative(nsIFile *newParent, const nsACString &newName)
                  totalRead, totalWritten);
 #endif
 
-        // TODO/FIXME: better find out how to propagate errors of
-        // close.  Errors of close can occur.  Read man page of
-        // close(2); At least, we should tell the user that
-        // filesystem/disk is hosed so that users can take remedial
-        // action.
+        // DONE: Errors of close can occur.  Read man page of
+        // close(2);
+        // This is likely to happen if the file system is remote file
+        // system (NFS, CIFS, etc.) and network outage occurs.
+        // At least, we should tell the user that filesystem/disk is
+        // hosed (possibly due to network error, hard disk failure,
+        // etc.) so that users can take remedial action.
 
         // close the files
-        PR_Close(newFD);
-        PR_Close(oldFD);
+        if (PR_Close(newFD) < 0) {
+            saved_write_close_error = NSRESULT_FOR_ERRNO();
+#if DEBUG
+            // This error merits printing.
+            fprintf(stderr, "ERROR: PR_Close(newFD) returned error. errno = %d\n", errno);
+#endif
+        }
+
+        if (PR_Close(oldFD) < 0) {
+            saved_read_close_error = NSRESULT_FOR_ERRNO();
+#if DEBUG
+            fprintf(stderr, "ERROR: PR_Close(oldFD) returned error. errno = %d\n", errno);
+#endif
+        }
 
         // Let us report the failure to write and read.
         // check for write/read error after cleaning up
@@ -881,6 +901,11 @@ nsLocalFile::CopyToNative(nsIFile *newParent, const nsACString &newName)
                 MOZ_ASSERT(0);
 #endif
         }
+
+        if (saved_write_close_error != NS_OK)
+            return saved_write_close_error;
+        if (saved_read_close_error != NS_OK)
+            return saved_read_close_error;
     }
     return rv;
 }

From f0a0296f9158e6b0d1046aed4ae4339f49f2a40e Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Tue, 19 Nov 2013 09:05:36 -0800
Subject: [PATCH 76/92] Bug 896100: Convert all uses of OldMove and MoveRef to
 true rvalue references and the modern Move and Forward. r=luke, r=waldo

---
 js/public/HashTable.h        | 128 ++++++++++++---------
 js/public/MemoryMetrics.h    |  12 +-
 js/public/Vector.h           |   6 +-
 js/src/builtin/MapObject.cpp |  26 +++--
 js/src/jit/AliasAnalysis.cpp |   2 +-
 js/src/jit/AsmJS.cpp         |  79 +++++++------
 js/src/jit/AsmJSModule.h     |  25 +++--
 js/src/shell/jsheaptools.cpp |  25 +++--
 js/src/vm/MemoryMetrics.cpp  |  28 ++---
 mfbt/Move.h                  | 211 ++++++++++++++++++-----------------
 mfbt/Vector.h                |  95 ++++++++--------
 xpcom/glue/nsHashKeys.h      |  12 +-
 12 files changed, 344 insertions(+), 305 deletions(-)

diff --git a/js/public/HashTable.h b/js/public/HashTable.h
index 2f671f4e06e..03265f5d1b8 100644
--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -137,20 +137,21 @@ class HashMap
     }
 
     template<typename KeyInput, typename ValueInput>
-    bool add(AddPtr &p, const KeyInput &k, const ValueInput &v) {
-        Entry e(k, v);
-        return impl.add(p, mozilla::OldMove(e));
+    bool add(AddPtr &p, KeyInput &&k, ValueInput &&v) {
+        Entry e(mozilla::Forward<KeyInput>(k), mozilla::Forward<ValueInput>(v));
+        return impl.add(p, mozilla::Move(e));
     }
 
-    bool add(AddPtr &p, const Key &k) {
-        Entry e(k, Value());
-        return impl.add(p, mozilla::OldMove(e));
+    template<typename KeyInput>
+    bool add(AddPtr &p, KeyInput &&k) {
+        Entry e(mozilla::Forward<KeyInput>(k), Value());
+        return impl.add(p, mozilla::Move(e));
     }
 
     template<typename KeyInput, typename ValueInput>
-    bool relookupOrAdd(AddPtr &p, const KeyInput &k, const ValueInput &v) {
-        Entry e(k, v);
-        return impl.relookupOrAdd(p, k, mozilla::OldMove(e));
+    bool relookupOrAdd(AddPtr &p, KeyInput &&k, ValueInput &&v) {
+        Entry e(mozilla::Forward<KeyInput>(k), mozilla::Forward<ValueInput>(v));
+        return impl.relookupOrAdd(p, e.key, mozilla::Move(e));
     }
 
     // |all()| returns a Range containing |count()| elements. E.g.:
@@ -219,20 +220,20 @@ class HashMap
 
     // Overwrite existing value with v. Return false on oom.
     template<typename KeyInput, typename ValueInput>
-    bool put(const KeyInput &k, const ValueInput &v) {
+    bool put(KeyInput &&k, ValueInput &&v) {
         AddPtr p = lookupForAdd(k);
         if (p) {
-            p->value = v;
+            p->value = mozilla::Forward<ValueInput>(v);
             return true;
         }
-        return add(p, k, v);
+        return add(p, mozilla::Forward<KeyInput>(k), mozilla::Forward<ValueInput>(v));
     }
 
     // Like put, but assert that the given key is not already present.
     template<typename KeyInput, typename ValueInput>
-    bool putNew(const KeyInput &k, const ValueInput &v) {
-        Entry e(k, v);
-        return impl.putNew(k, mozilla::OldMove(e));
+    bool putNew(KeyInput &&k, ValueInput &&v) {
+        Entry e(mozilla::Forward<KeyInput>(k), mozilla::Forward<ValueInput>(v));
+        return impl.putNew(e.key, mozilla::Move(e));
     }
 
     // Add (k,defaultValue) if |k| is not found. Return a false-y Ptr on oom.
@@ -264,8 +265,11 @@ class HashMap
     }
 
     // HashMap is movable
-    HashMap(mozilla::MoveRef<HashMap> rhs) : impl(mozilla::OldMove(rhs->impl)) {}
-    void operator=(mozilla::MoveRef<HashMap> rhs) { impl = mozilla::OldMove(rhs->impl); }
+    HashMap(HashMap &&rhs) : impl(mozilla::Move(rhs.impl)) {}
+    void operator=(HashMap &&rhs) {
+        MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
+        impl = mozilla::Move(rhs.impl);
+    }
 
   private:
     // HashMap is not copyable or assignable
@@ -371,10 +375,14 @@ class HashSet
     typedef typename Impl::AddPtr AddPtr;
     AddPtr lookupForAdd(const Lookup &l) const        { return impl.lookupForAdd(l); }
 
-    bool add(AddPtr &p, const T &t)                   { return impl.add(p, t); }
+    template <typename U>
+    bool add(AddPtr &p, U &&u) {
+        return impl.add(p, mozilla::Forward<U>(u));
+    }
 
-    bool relookupOrAdd(AddPtr &p, const Lookup &l, const T &t) {
-        return impl.relookupOrAdd(p, l, t);
+    template <typename U>
+    bool relookupOrAdd(AddPtr &p, const Lookup &l, U &&u) {
+        return impl.relookupOrAdd(p, l, mozilla::Forward<U>(u));
     }
 
     // |all()| returns a Range containing |count()| elements:
@@ -438,19 +446,22 @@ class HashSet
         return impl.lookup(l) != nullptr;
     }
 
-    // Overwrite existing value with v. Return false on oom.
-    bool put(const T &t) {
-        AddPtr p = lookupForAdd(t);
-        return p ? true : add(p, t);
+    // Add |u| if it is not present already. Return false on oom.
+    template <typename U>
+    bool put(U &&u) {
+        AddPtr p = lookupForAdd(u);
+        return p ? true : add(p, mozilla::Forward<U>(u));
     }
 
     // Like put, but assert that the given key is not already present.
-    bool putNew(const T &t) {
-        return impl.putNew(t, t);
+    template <typename U>
+    bool putNew(U &&u) {
+        return impl.putNew(u, mozilla::Forward<U>(u));
     }
 
-    bool putNew(const Lookup &l, const T &t) {
-        return impl.putNew(l, t);
+    template <typename U>
+    bool putNew(const Lookup &l, U &&u) {
+        return impl.putNew(l, mozilla::Forward<U>(u));
     }
 
     void remove(const Lookup &l) {
@@ -472,8 +483,11 @@ class HashSet
     }
 
     // HashSet is movable
-    HashSet(mozilla::MoveRef<HashSet> rhs) : impl(mozilla::OldMove(rhs->impl)) {}
-    void operator=(mozilla::MoveRef<HashSet> rhs) { impl = mozilla::OldMove(rhs->impl); }
+    HashSet(HashSet &&rhs) : impl(mozilla::Move(rhs.impl)) {}
+    void operator=(HashSet &&rhs) {
+        MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
+        impl = mozilla::Move(rhs.impl);
+    }
 
   private:
     // HashSet is not copyable or assignable
@@ -610,10 +624,11 @@ class HashMapEntry
 
   public:
     template<typename KeyInput, typename ValueInput>
-    HashMapEntry(const KeyInput &k, const ValueInput &v) : key(k), value(v) {}
+    HashMapEntry(KeyInput &&k, ValueInput &&v)
+      : key(mozilla::Forward<KeyInput>(k)), value(mozilla::Forward<ValueInput>(v)) { }
 
-    HashMapEntry(mozilla::MoveRef<HashMapEntry> rhs)
-      : key(mozilla::OldMove(rhs->key)), value(mozilla::OldMove(rhs->value)) { }
+    HashMapEntry(HashMapEntry &&rhs)
+      : key(mozilla::Move(const_cast<Key &>(rhs.key))), value(mozilla::Move(rhs.value)) { }
 
     typedef Key KeyType;
     typedef Value ValueType;
@@ -699,11 +714,11 @@ class HashTableEntry
     HashNumber getKeyHash() const     { return keyHash & ~sCollisionBit; }
 
     template <class U>
-    void setLive(HashNumber hn, const U &u)
+    void setLive(HashNumber hn, U &&u)
     {
         JS_ASSERT(!isLive());
         keyHash = hn;
-        new(mem.addr()) T(u);
+        new(mem.addr()) T(mozilla::Forward<U>(u));
         JS_ASSERT(isLive());
     }
 };
@@ -861,17 +876,18 @@ class HashTable : private AllocPolicy
     };
 
     // HashTable is movable
-    HashTable(mozilla::MoveRef<HashTable> rhs)
-      : AllocPolicy(*rhs)
+    HashTable(HashTable &&rhs)
+      : AllocPolicy(rhs)
     {
-        mozilla::PodAssign(this, &*rhs);
-        rhs->table = nullptr;
+        mozilla::PodAssign(this, &rhs);
+        rhs.table = nullptr;
     }
-    void operator=(mozilla::MoveRef<HashTable> rhs) {
+    void operator=(HashTable &&rhs) {
+        MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
         if (table)
             destroyTable(*this, table, capacity());
-        mozilla::PodAssign(this, &*rhs);
-        rhs->table = nullptr;
+        mozilla::PodAssign(this, &rhs);
+        rhs.table = nullptr;
     }
 
   private:
@@ -1210,7 +1226,7 @@ class HashTable : private AllocPolicy
         for (Entry *src = oldTable, *end = src + oldCap; src < end; ++src) {
             if (src->isLive()) {
                 HashNumber hn = src->getKeyHash();
-                findFreeEntry(hn).setLive(hn, mozilla::OldMove(src->get()));
+                findFreeEntry(hn).setLive(hn, mozilla::Move(src->get()));
                 src->destroy();
             }
         }
@@ -1425,7 +1441,7 @@ class HashTable : private AllocPolicy
     }
 
     template <class U>
-    bool add(AddPtr &p, const U &rhs)
+    bool add(AddPtr &p, U &&u)
     {
         mozilla::ReentrancyGuard g(*this);
         JS_ASSERT(mutationCount == p.mutationCount);
@@ -1448,14 +1464,16 @@ class HashTable : private AllocPolicy
                 p.entry_ = &findFreeEntry(p.keyHash);
         }
 
-        p.entry_->setLive(p.keyHash, rhs);
+        p.entry_->setLive(p.keyHash, mozilla::Forward<U>(u));
         entryCount++;
         mutationCount++;
         return true;
     }
 
+    // Note: |l| may be a reference to a piece of |u|, so this function
+    // must take care not to use |l| after moving |u|.
     template <class U>
-    void putNewInfallible(const Lookup &l, const U &u)
+    void putNewInfallible(const Lookup &l, U &&u)
     {
         JS_ASSERT(table);
 
@@ -1468,30 +1486,34 @@ class HashTable : private AllocPolicy
             keyHash |= sCollisionBit;
         }
 
-        entry->setLive(keyHash, u);
+        entry->setLive(keyHash, mozilla::Forward<U>(u));
         entryCount++;
         mutationCount++;
     }
 
+    // Note: |l| may be a reference to a piece of |u|, so this function
+    // must take care not to use |l| after moving |u|.
     template <class U>
-    bool putNew(const Lookup &l, const U &u)
+    bool putNew(const Lookup &l, U &&u)
     {
         if (checkOverloaded() == RehashFailed)
             return false;
 
-        putNewInfallible(l, u);
+        putNewInfallible(l, mozilla::Forward<U>(u));
         return true;
     }
 
+    // Note: |l| may be a reference to a piece of |u|, so this function
+    // must take care not to use |l| after moving |u|.
     template <class U>
-    bool relookupOrAdd(AddPtr& p, const Lookup &l, const U &u)
+    bool relookupOrAdd(AddPtr& p, const Lookup &l, U &&u)
     {
         p.mutationCount = mutationCount;
         {
             mozilla::ReentrancyGuard g(*this);
             p.entry_ = &lookup(l, p.keyHash, sCollisionBit);
         }
-        return p.found() || add(p, u);
+        return p.found() || add(p, mozilla::Forward<U>(u));
     }
 
     void remove(Ptr p)
@@ -1508,10 +1530,10 @@ class HashTable : private AllocPolicy
         JS_ASSERT(table);
         mozilla::ReentrancyGuard g(*this);
         JS_ASSERT(p.found());
-        typename HashTableEntry<T>::NonConstT t(mozilla::OldMove(*p));
+        typename HashTableEntry<T>::NonConstT t(mozilla::Move(*p));
         HashPolicy::setKey(t, const_cast<Key &>(k));
         remove(*p.entry_);
-        putNewInfallible(l, mozilla::OldMove(t));
+        putNewInfallible(l, mozilla::Move(t));
     }
 
     void rekeyAndMaybeRehash(Ptr p, const Lookup &l, const Key &k)
diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h
index 3c0edeca533..f8782a41df3 100644
--- a/js/public/MemoryMetrics.h
+++ b/js/public/MemoryMetrics.h
@@ -273,8 +273,8 @@ struct NotableStringInfo : public StringInfo
     NotableStringInfo();
     NotableStringInfo(JSString *str, const StringInfo &info);
     NotableStringInfo(const NotableStringInfo& info);
-    NotableStringInfo(mozilla::MoveRef<NotableStringInfo> info);
-    NotableStringInfo &operator=(mozilla::MoveRef<NotableStringInfo> info);
+    NotableStringInfo(NotableStringInfo &&info);
+    NotableStringInfo &operator=(NotableStringInfo &&info);
 
     ~NotableStringInfo() {
         js_free(buffer);
@@ -326,10 +326,10 @@ struct ZoneStats : js::ZoneStatsPod
         strings.init();
     }
 
-    ZoneStats(mozilla::MoveRef<ZoneStats> other)
-        : ZoneStatsPod(other),
-          strings(mozilla::OldMove(other->strings)),
-          notableStrings(mozilla::OldMove(other->notableStrings))
+    ZoneStats(ZoneStats &&other)
+      : ZoneStatsPod(mozilla::Move(other)),
+        strings(mozilla::Move(other.strings)),
+        notableStrings(mozilla::Move(other.notableStrings))
     {}
 
     // Add other's numbers to this object's numbers.  Both objects'
diff --git a/js/public/Vector.h b/js/public/Vector.h
index b14d75c758b..e8aef1713da 100644
--- a/js/public/Vector.h
+++ b/js/public/Vector.h
@@ -55,9 +55,9 @@ class Vector
 
   public:
     Vector(AllocPolicy alloc = AllocPolicy()) : Base(alloc) {}
-    Vector(mozilla::MoveRef<Vector> vec) : Base(vec) {}
-    Vector &operator=(mozilla::MoveRef<Vector> vec) {
-        return Base::operator=(vec);
+    Vector(Vector &&vec) : Base(mozilla::Move(vec)) {}
+    Vector &operator=(Vector &&vec) {
+        return Base::operator=(mozilla::Move(vec));
     }
 };
 
diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index 0314d2435c4..d598d18b83f 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -22,9 +22,9 @@
 using namespace js;
 
 using mozilla::DoubleIsInt32;
+using mozilla::Forward;
 using mozilla::IsNaN;
-using mozilla::OldMove;
-using mozilla::MoveRef;
+using mozilla::Move;
 using mozilla::ArrayLength;
 using JS::DoubleNaNValue;
 
@@ -81,7 +81,7 @@ class OrderedHashTable
         Data *chain;
 
         Data(const T &e, Data *c) : element(e), chain(c) {}
-        Data(MoveRef<T> e, Data *c) : element(e), chain(c) {}
+        Data(T &&e, Data *c) : element(Move(e)), chain(c) {}
     };
 
     class Range;
@@ -167,10 +167,11 @@ class OrderedHashTable
      * not. On allocation failure, return false. If this returns false, it
      * means the element was not added to the table.
      */
-    bool put(const T &element) {
+    template <typename ElementInput>
+    bool put(ElementInput &&element) {
         HashNumber h = prepareHash(Ops::getKey(element));
         if (Data *e = lookup(Ops::getKey(element), h)) {
-            e->element = element;
+            e->element = Forward<ElementInput>(element);
             return true;
         }
 
@@ -185,7 +186,7 @@ class OrderedHashTable
         h >>= hashShift;
         liveCount++;
         Data *e = &data[dataLength++];
-        new (e) Data(element, hashTable[h]);
+        new (e) Data(Forward<ElementInput>(element), hashTable[h]);
         hashTable[h] = e;
         return true;
     }
@@ -592,7 +593,7 @@ class OrderedHashTable
             if (!Ops::isEmpty(Ops::getKey(rp->element))) {
                 HashNumber h = prepareHash(Ops::getKey(rp->element)) >> hashShift;
                 if (rp != wp)
-                    wp->element = OldMove(rp->element);
+                    wp->element = Move(rp->element);
                 wp->chain = hashTable[h];
                 hashTable[h] = wp;
                 wp++;
@@ -639,7 +640,7 @@ class OrderedHashTable
         for (Data *p = data, *end = data + dataLength; p != end; p++) {
             if (!Ops::isEmpty(Ops::getKey(p->element))) {
                 HashNumber h = prepareHash(Ops::getKey(p->element)) >> newHashShift;
-                new (wp) Data(OldMove(p->element), newHashTable[h]);
+                new (wp) Data(Move(p->element), newHashTable[h]);
                 newHashTable[h] = wp;
                 wp++;
             }
@@ -679,15 +680,16 @@ class OrderedHashMap
             value = rhs.value;
         }
 
-        void operator=(MoveRef<Entry> rhs) {
-            const_cast<Key &>(key) = OldMove(rhs->key);
-            value = OldMove(rhs->value);
+        void operator=(Entry &&rhs) {
+            MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
+            const_cast<Key &>(key) = Move(rhs.key);
+            value = Move(rhs.value);
         }
 
       public:
         Entry() : key(), value() {}
         Entry(const Key &k, const Value &v) : key(k), value(v) {}
-        Entry(MoveRef<Entry> rhs) : key(OldMove(rhs->key)), value(OldMove(rhs->value)) {}
+        Entry(Entry &&rhs) : key(Move(rhs.key)), value(Move(rhs.value)) {}
 
         const Key key;
         Value value;
diff --git a/js/src/jit/AliasAnalysis.cpp b/js/src/jit/AliasAnalysis.cpp
index a3ba7ebf9ec..518c5ce81df 100644
--- a/js/src/jit/AliasAnalysis.cpp
+++ b/js/src/jit/AliasAnalysis.cpp
@@ -171,7 +171,7 @@ AliasAnalysis::analyze()
         MDefinitionVector defs(alloc());
         if (!defs.append(firstIns))
             return false;
-        if (!stores.append(OldMove(defs)))
+        if (!stores.append(Move(defs)))
             return false;
     }
 
diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp
index 30ff4877238..de05a9c5602 100644
--- a/js/src/jit/AsmJS.cpp
+++ b/js/src/jit/AsmJS.cpp
@@ -47,8 +47,7 @@ using mozilla::HashGeneric;
 using mozilla::IsNaN;
 using mozilla::IsNegativeZero;
 using mozilla::Maybe;
-using mozilla::OldMove;
-using mozilla::MoveRef;
+using mozilla::Move;
 using mozilla::PositiveInfinity;
 using JS::GenericNaN;
 
@@ -634,10 +633,10 @@ class Signature
       : argTypes_(cx) {}
     Signature(ExclusiveContext *cx, RetType retType)
       : argTypes_(cx), retType_(retType) {}
-    Signature(MoveRef<VarTypeVector> argTypes, RetType retType)
-      : argTypes_(argTypes), retType_(retType) {}
-    Signature(MoveRef<Signature> rhs)
-      : argTypes_(OldMove(rhs->argTypes_)), retType_(rhs->retType_) {}
+    Signature(VarTypeVector &&argTypes, RetType retType)
+      : argTypes_(Move(argTypes)), retType_(Move(retType)) {}
+    Signature(Signature &&rhs)
+      : argTypes_(Move(rhs.argTypes_)), retType_(Move(rhs.retType_)) {}
 
     bool copy(const Signature &rhs) {
         if (!argTypes_.resize(rhs.argTypes_.length()))
@@ -651,7 +650,7 @@ class Signature
     bool appendArg(VarType type) { return argTypes_.append(type); }
     VarType arg(unsigned i) const { return argTypes_[i]; }
     const VarTypeVector &args() const { return argTypes_; }
-    MoveRef<VarTypeVector> extractArgs() { return OldMove(argTypes_); }
+    VarTypeVector &&extractArgs() { return Move(argTypes_); }
 
     RetType retType() const { return retType_; }
 };
@@ -1039,8 +1038,8 @@ class MOZ_STACK_CLASS ModuleCompiler
         unsigned compileTime_;
 
       public:
-        Func(PropertyName *name, MoveRef<Signature> sig, Label *code)
-          : name_(name), defined_(false), srcOffset_(0), sig_(sig), code_(code), compileTime_(0)
+        Func(PropertyName *name, Signature &&sig, Label *code)
+          : name_(name), defined_(false), srcOffset_(0), sig_(Move(sig)), code_(code), compileTime_(0)
         {}
 
         PropertyName *name() const { return name_; }
@@ -1143,13 +1142,13 @@ class MOZ_STACK_CLASS ModuleCompiler
         FuncPtrVector elems_;
 
       public:
-        FuncPtrTable(ExclusiveContext *cx, MoveRef<Signature> sig, uint32_t mask, uint32_t gdo)
-          : sig_(sig), mask_(mask), globalDataOffset_(gdo), elems_(cx)
+        FuncPtrTable(ExclusiveContext *cx, Signature &&sig, uint32_t mask, uint32_t gdo)
+          : sig_(Move(sig)), mask_(mask), globalDataOffset_(gdo), elems_(cx)
         {}
 
-        FuncPtrTable(MoveRef<FuncPtrTable> rhs)
-          : sig_(OldMove(rhs->sig_)), mask_(rhs->mask_), globalDataOffset_(rhs->globalDataOffset_),
-            elems_(OldMove(rhs->elems_))
+        FuncPtrTable(FuncPtrTable &&rhs)
+          : sig_(Move(rhs.sig_)), mask_(rhs.mask_), globalDataOffset_(rhs.globalDataOffset_),
+            elems_(Move(rhs.elems_))
         {}
 
         Signature &sig() { return sig_; }
@@ -1157,7 +1156,7 @@ class MOZ_STACK_CLASS ModuleCompiler
         unsigned mask() const { return mask_; }
         unsigned globalDataOffset() const { return globalDataOffset_; }
 
-        void initElems(MoveRef<FuncPtrVector> elems) { elems_ = elems; JS_ASSERT(!elems_.empty()); }
+        void initElems(FuncPtrVector &&elems) { elems_ = Move(elems); JS_ASSERT(!elems_.empty()); }
         unsigned numElems() const { JS_ASSERT(!elems_.empty()); return elems_.length(); }
         const Func &elem(unsigned i) const { return *elems_[i]; }
     };
@@ -1170,10 +1169,10 @@ class MOZ_STACK_CLASS ModuleCompiler
         Signature sig_;
 
       public:
-        ExitDescriptor(PropertyName *name, MoveRef<Signature> sig)
-          : name_(name), sig_(sig) {}
-        ExitDescriptor(MoveRef<ExitDescriptor> rhs)
-          : name_(rhs->name_), sig_(OldMove(rhs->sig_))
+        ExitDescriptor(PropertyName *name, Signature &&sig)
+          : name_(name), sig_(Move(sig)) {}
+        ExitDescriptor(ExitDescriptor &&rhs)
+          : name_(rhs.name_), sig_(Move(rhs.sig_))
         {}
         const Signature &sig() const {
             return sig_;
@@ -1468,7 +1467,7 @@ class MOZ_STACK_CLASS ModuleCompiler
         global->u.var.isLitConst_ = false;
         return globals_.putNew(varName, global);
     }
-    bool addFunction(PropertyName *name, MoveRef<Signature> sig, Func **func) {
+    bool addFunction(PropertyName *name, Signature &&sig, Func **func) {
         JS_ASSERT(!finishedFunctionBodies_);
         Global *global = moduleLifo_.new_<Global>(Global::Function);
         if (!global)
@@ -1479,12 +1478,12 @@ class MOZ_STACK_CLASS ModuleCompiler
         Label *code = moduleLifo_.new_<Label>();
         if (!code)
             return false;
-        *func = moduleLifo_.new_<Func>(name, sig, code);
+        *func = moduleLifo_.new_<Func>(name, Move(sig), code);
         if (!*func)
             return false;
         return functions_.append(*func);
     }
-    bool addFuncPtrTable(PropertyName *name, MoveRef<Signature> sig, uint32_t mask, FuncPtrTable **table) {
+    bool addFuncPtrTable(PropertyName *name, Signature &&sig, uint32_t mask, FuncPtrTable **table) {
         Global *global = moduleLifo_.new_<Global>(Global::FuncPtrTable);
         if (!global)
             return false;
@@ -1494,8 +1493,8 @@ class MOZ_STACK_CLASS ModuleCompiler
         uint32_t globalDataOffset;
         if (!module_->addFuncPtrTable(/* numElems = */ mask + 1, &globalDataOffset))
             return false;
-        FuncPtrTable tmpTable(cx_, sig, mask, globalDataOffset);
-        if (!funcPtrTables_.append(OldMove(tmpTable)))
+        FuncPtrTable tmpTable(cx_, Move(sig), mask, globalDataOffset);
+        if (!funcPtrTables_.append(Move(tmpTable)))
             return false;
         *table = &funcPtrTables_.back();
         return true;
@@ -1546,10 +1545,10 @@ class MOZ_STACK_CLASS ModuleCompiler
             argCoercions[i] = args[i].toCoercion();
         AsmJSModule::ReturnType retType = func->sig().retType().toModuleReturnType();
         return module_->addExportedFunction(func->name(), maybeFieldName,
-                                            OldMove(argCoercions), retType);
+                                            Move(argCoercions), retType);
     }
-    bool addExit(unsigned ffiIndex, PropertyName *name, MoveRef<Signature> sig, unsigned *exitIndex) {
-        ExitDescriptor exitDescriptor(name, sig);
+    bool addExit(unsigned ffiIndex, PropertyName *name, Signature &&sig, unsigned *exitIndex) {
+        ExitDescriptor exitDescriptor(name, Move(sig));
         ExitMap::AddPtr p = exits_.lookupForAdd(exitDescriptor);
         if (p) {
             *exitIndex = p->value;
@@ -1557,7 +1556,7 @@ class MOZ_STACK_CLASS ModuleCompiler
         }
         if (!module_->addExit(ffiIndex, exitIndex))
             return false;
-        return exits_.add(p, OldMove(exitDescriptor), *exitIndex);
+        return exits_.add(p, Move(exitDescriptor), *exitIndex);
     }
     bool addGlobalAccess(AsmJSGlobalAccess access) {
         return globalAccesses_.append(access);
@@ -2695,7 +2694,7 @@ class FunctionCompiler
         typename Map::AddPtr p = map->lookupForAdd(key);
         if (!p) {
             BlockVector empty(m().cx());
-            if (!map->add(p, key, OldMove(empty)))
+            if (!map->add(p, key, Move(empty)))
                 return false;
         }
         if (!p->value.append(curBlock_))
@@ -3631,14 +3630,14 @@ CheckSignatureAgainstExisting(ModuleCompiler &m, ParseNode *usepn, const Signatu
 }
 
 static bool
-CheckFunctionSignature(ModuleCompiler &m, ParseNode *usepn, MoveRef<Signature> sig, PropertyName *name,
+CheckFunctionSignature(ModuleCompiler &m, ParseNode *usepn, Signature &&sig, PropertyName *name,
                        ModuleCompiler::Func **func)
 {
     ModuleCompiler::Func *existing = m.lookupFunction(name);
     if (!existing) {
         if (!CheckModuleLevelName(m, usepn, name))
             return false;
-        return m.addFunction(name, sig, func);
+        return m.addFunction(name, Move(sig), func);
     }
 
     if (!CheckSignatureAgainstExisting(m, usepn, sig, existing->sig()))
@@ -3666,7 +3665,7 @@ CheckInternalCall(FunctionCompiler &f, ParseNode *callNode, PropertyName *callee
         return false;
 
     ModuleCompiler::Func *callee;
-    if (!CheckFunctionSignature(f.m(), callNode, OldMove(call.sig()), calleeName, &callee))
+    if (!CheckFunctionSignature(f.m(), callNode, Move(call.sig()), calleeName, &callee))
         return false;
 
     if (!f.internalCall(*callee, call, def))
@@ -3678,7 +3677,7 @@ CheckInternalCall(FunctionCompiler &f, ParseNode *callNode, PropertyName *callee
 
 static bool
 CheckFuncPtrTableAgainstExisting(ModuleCompiler &m, ParseNode *usepn,
-                                 PropertyName *name, MoveRef<Signature> sig, unsigned mask,
+                                 PropertyName *name, Signature &&sig, unsigned mask,
                                  ModuleCompiler::FuncPtrTable **tableOut)
 {
     if (const ModuleCompiler::Global *existing = m.lookupGlobal(name)) {
@@ -3699,7 +3698,7 @@ CheckFuncPtrTableAgainstExisting(ModuleCompiler &m, ParseNode *usepn,
     if (!CheckModuleLevelName(m, usepn, name))
         return false;
 
-    return m.addFuncPtrTable(name, sig, mask, tableOut);
+    return m.addFuncPtrTable(name, Move(sig), mask, tableOut);
 }
 
 static bool
@@ -3742,7 +3741,7 @@ CheckFuncPtrCall(FunctionCompiler &f, ParseNode *callNode, RetType retType, MDef
         return false;
 
     ModuleCompiler::FuncPtrTable *table;
-    if (!CheckFuncPtrTableAgainstExisting(f.m(), tableNode, name, OldMove(call.sig()), mask, &table))
+    if (!CheckFuncPtrTableAgainstExisting(f.m(), tableNode, name, Move(call.sig()), mask, &table))
         return false;
 
     if (!f.funcPtrCall(*table, indexDef, call, def))
@@ -3771,7 +3770,7 @@ CheckFFICall(FunctionCompiler &f, ParseNode *callNode, unsigned ffiIndex, RetTyp
         return false;
 
     unsigned exitIndex;
-    if (!f.m().addExit(ffiIndex, calleeName, OldMove(call.sig()), &exitIndex))
+    if (!f.m().addExit(ffiIndex, calleeName, Move(call.sig()), &exitIndex))
         return false;
 
     if (!f.ffiCall(exitIndex, call, retType.toMIRType(), def))
@@ -4929,9 +4928,9 @@ CheckFunction(ModuleCompiler &m, LifoAlloc &lifo, MIRGenerator **mir, ModuleComp
     if (!CheckReturnType(f, lastNonEmptyStmt, retType))
         return false;
 
-    Signature sig(OldMove(argTypes), retType);
+    Signature sig(Move(argTypes), retType);
     ModuleCompiler::Func *func;
-    if (!CheckFunctionSignature(m, fn, OldMove(sig), FunctionName(fn), &func))
+    if (!CheckFunctionSignature(m, fn, Move(sig), FunctionName(fn), &func))
         return false;
 
     if (func->defined())
@@ -5351,10 +5350,10 @@ CheckFuncPtrTable(ModuleCompiler &m, ParseNode *var)
         return false;
 
     ModuleCompiler::FuncPtrTable *table;
-    if (!CheckFuncPtrTableAgainstExisting(m, var, var->name(), OldMove(sig), mask, &table))
+    if (!CheckFuncPtrTableAgainstExisting(m, var, var->name(), Move(sig), mask, &table))
         return false;
 
-    table->initElems(OldMove(elems));
+    table->initElems(Move(elems));
     return true;
 }
 
diff --git a/js/src/jit/AsmJSModule.h b/js/src/jit/AsmJSModule.h
index 9b8284b3d22..92ad9936629 100644
--- a/js/src/jit/AsmJSModule.h
+++ b/js/src/jit/AsmJSModule.h
@@ -9,6 +9,7 @@
 
 #ifdef JS_ION
 
+#include "mozilla/Move.h"
 #include "mozilla/PodOperations.h"
 
 #include "jsscript.h"
@@ -252,12 +253,12 @@ class AsmJSModule
 
         ExportedFunction(PropertyName *name,
                          PropertyName *maybeFieldName,
-                         mozilla::MoveRef<ArgCoercionVector> argCoercions,
+                         ArgCoercionVector &&argCoercions,
                          ReturnType returnType)
         {
             name_ = name;
             maybeFieldName_ = maybeFieldName;
-            argCoercions_ = argCoercions;
+            argCoercions_ = mozilla::Move(argCoercions);
             pod.returnType_ = returnType;
             pod.codeOffset_ = UINT32_MAX;
             JS_ASSERT_IF(maybeFieldName_, name_->isTenured());
@@ -271,11 +272,11 @@ class AsmJSModule
 
       public:
         ExportedFunction() {}
-        ExportedFunction(mozilla::MoveRef<ExportedFunction> rhs) {
-            name_ = rhs->name_;
-            maybeFieldName_ = rhs->maybeFieldName_;
-            argCoercions_ = mozilla::OldMove(rhs->argCoercions_);
-            pod = rhs->pod;
+        ExportedFunction(ExportedFunction &&rhs) {
+            name_ = rhs.name_;
+            maybeFieldName_ = rhs.maybeFieldName_;
+            argCoercions_ = mozilla::Move(rhs.argCoercions_);
+            pod = rhs.pod;
         }
 
         void initCodeOffset(unsigned off) {
@@ -340,14 +341,14 @@ class AsmJSModule
         ProfiledBlocksFunction(JSAtom *name, unsigned start, unsigned endInline, unsigned end,
                                jit::BasicBlocksVector &blocksVector)
           : ProfiledFunction(name, start, end), endInlineCodeOffset(endInline),
-            blocks(mozilla::OldMove(blocksVector))
+            blocks(mozilla::Move(blocksVector))
         {
             JS_ASSERT(name->isTenured());
         }
 
         ProfiledBlocksFunction(const ProfiledBlocksFunction &copy)
           : ProfiledFunction(copy.name, copy.startCodeOffset, copy.endCodeOffset),
-            endInlineCodeOffset(copy.endInlineCodeOffset), blocks(mozilla::OldMove(copy.blocks))
+            endInlineCodeOffset(copy.endInlineCodeOffset), blocks(mozilla::Move(copy.blocks))
         { }
     };
 #endif
@@ -517,11 +518,11 @@ class AsmJSModule
     }
 
     bool addExportedFunction(PropertyName *name, PropertyName *maybeFieldName,
-                             mozilla::MoveRef<ArgCoercionVector> argCoercions,
+                             ArgCoercionVector &&argCoercions,
                              ReturnType returnType)
     {
-        ExportedFunction func(name, maybeFieldName, argCoercions, returnType);
-        return exports_.append(mozilla::OldMove(func));
+        ExportedFunction func(name, maybeFieldName, mozilla::Move(argCoercions), returnType);
+        return exports_.append(mozilla::Move(func));
     }
     unsigned numExportedFunctions() const {
         return exports_.length();
diff --git a/js/src/shell/jsheaptools.cpp b/js/src/shell/jsheaptools.cpp
index e8605373769..ded94ab193b 100644
--- a/js/src/shell/jsheaptools.cpp
+++ b/js/src/shell/jsheaptools.cpp
@@ -21,8 +21,7 @@
 
 using namespace js;
 
-using mozilla::OldMove;
-using mozilla::MoveRef;
+using mozilla::Move;
 
 #ifdef DEBUG
 
@@ -74,11 +73,12 @@ class HeapReverser : public JSTracer, public JS::CustomAutoRooter
          * incoming edge Vector in the hash table: Vectors support moves, but
          * not assignments or copy construction.
          */
-        Node(MoveRef<Node> rhs)
-          : kind(rhs->kind), incoming(OldMove(rhs->incoming)), marked(rhs->marked) { }
-        Node &operator=(MoveRef<Node> rhs) {
+        Node(Node &&rhs)
+          : kind(rhs.kind), incoming(Move(rhs.incoming)), marked(rhs.marked) { }
+        Node &operator=(Node &&rhs) {
+            MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
             this->~Node();
-            new(this) Node(rhs);
+            new(this) Node(Move(rhs));
             return *this;
         }
 
@@ -116,12 +116,13 @@ class HeapReverser : public JSTracer, public JS::CustomAutoRooter
          * Vectors without needing to copy our name string when the vector is
          * resized.
          */
-        Edge(MoveRef<Edge> rhs) : name(rhs->name), origin(rhs->origin) {
-            rhs->name = nullptr;
+        Edge(Edge &&rhs) : name(rhs.name), origin(rhs.origin) {
+            rhs.name = nullptr;
         }
-        Edge &operator=(MoveRef<Edge> rhs) {
+        Edge &operator=(Edge &&rhs) {
+            MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
             this->~Edge();
-            new(this) Edge(rhs);
+            new(this) Edge(Move(rhs));
             return *this;
         }
 
@@ -271,7 +272,7 @@ HeapReverser::traverseEdge(void *cell, JSGCTraceKind kind)
          */
         Node n(kind);
         uint32_t generation = map.generation();
-        if (!map.add(a, cell, OldMove(n)) ||
+        if (!map.add(a, cell, Move(n)) ||
             !work.append(Child(cell, kind)))
             return false;
         /* If the map has been resized, re-check the pointer. */
@@ -280,7 +281,7 @@ HeapReverser::traverseEdge(void *cell, JSGCTraceKind kind)
     }
 
     /* Add this edge to the reversed map. */
-    return a->value.incoming.append(OldMove(e));
+    return a->value.incoming.append(Move(e));
 }
 
 bool
diff --git a/js/src/vm/MemoryMetrics.cpp b/js/src/vm/MemoryMetrics.cpp
index 7aea4c4c8cc..8b2301cea0f 100644
--- a/js/src/vm/MemoryMetrics.cpp
+++ b/js/src/vm/MemoryMetrics.cpp
@@ -24,8 +24,7 @@
 
 using mozilla::DebugOnly;
 using mozilla::MallocSizeOf;
-using mozilla::MoveRef;
-using mozilla::OldMove;
+using mozilla::Move;
 using mozilla::PodEqual;
 
 using namespace js;
@@ -95,12 +94,12 @@ InefficientNonFlatteningStringHashPolicy::match(const JSString *const &k, const
 namespace JS {
 
 NotableStringInfo::NotableStringInfo()
-    : bufferSize(0),
-      buffer(0)
+  : bufferSize(0),
+    buffer(0)
 {}
 
 NotableStringInfo::NotableStringInfo(JSString *str, const StringInfo &info)
-    : StringInfo(info)
+  : StringInfo(info)
 {
     bufferSize = Min(str->length() + 1, size_t(4096));
     buffer = js_pod_malloc<char>(bufferSize);
@@ -125,8 +124,8 @@ NotableStringInfo::NotableStringInfo(JSString *str, const StringInfo &info)
 }
 
 NotableStringInfo::NotableStringInfo(const NotableStringInfo& info)
-    : StringInfo(info),
-      bufferSize(info.bufferSize)
+  : StringInfo(info),
+    bufferSize(info.bufferSize)
 {
     buffer = js_pod_malloc<char>(bufferSize);
     if (!buffer)
@@ -135,17 +134,18 @@ NotableStringInfo::NotableStringInfo(const NotableStringInfo& info)
     strcpy(buffer, info.buffer);
 }
 
-NotableStringInfo::NotableStringInfo(MoveRef<NotableStringInfo> info)
-    : StringInfo(info)
+NotableStringInfo::NotableStringInfo(NotableStringInfo &&info)
+  : StringInfo(Move(info))
 {
-    buffer = info->buffer;
-    info->buffer = nullptr;
+    buffer = info.buffer;
+    info.buffer = nullptr;
 }
 
-NotableStringInfo &NotableStringInfo::operator=(MoveRef<NotableStringInfo> info)
+NotableStringInfo &NotableStringInfo::operator=(NotableStringInfo &&info)
 {
+    MOZ_ASSERT(this != &info, "self-move assignment is prohibited");
     this->~NotableStringInfo();
-    new (this) NotableStringInfo(info);
+    new (this) NotableStringInfo(Move(info));
     return *this;
 }
 
@@ -414,7 +414,7 @@ FindNotableStrings(ZoneStats &zStats)
             !zStats.notableStrings.growBy(1))
             continue;
 
-        zStats.notableStrings.back() = OldMove(NotableStringInfo(str, info));
+        zStats.notableStrings.back() = NotableStringInfo(str, info);
 
         // We're moving this string from a non-notable to a notable bucket, so
         // subtract it out of the non-notable tallies.
diff --git a/mfbt/Move.h b/mfbt/Move.h
index a18da32ad84..f7d39ffa9b2 100644
--- a/mfbt/Move.h
+++ b/mfbt/Move.h
@@ -16,14 +16,6 @@ namespace mozilla {
 /*
  * "Move" References
  *
- * [Once upon a time, C++11 rvalue references were not implemented by all the
- * compilers we cared about, so we invented mozilla::Move() (now called
- * OldMove()), which does something similar.  We're in the process of
- * transitioning away from this to pure stl (bug 896100).  Until that bug is
- * completed, this header will provide both mozilla::OldMove() and
- * mozilla::Move().]
- *
- *
  * Some types can be copied much more efficiently if we know the original's
  * value need not be preserved --- that is, if we are doing a "move", not a
  * "copy". For example, if we have:
@@ -43,32 +35,36 @@ namespace mozilla {
  * But once the elements have been migrated, we're just going to throw away the
  * old buffer; we don't care if they still have their values. So if the vector's
  * element type can implement "move" more efficiently than "copy", the vector
- * resizing should by all means use a "move" operation. Hash tables also need to
- * be resized.
+ * resizing should by all means use a "move" operation. Hash tables should also
+ * use moves when resizing their internal array as entries are added and
+ * removed.
  *
- * The details of the optimization, and whether it's worth applying, vary from
- * one type to the next. And while some constructor calls are moves, many really
- * are copies, and can't be optimized this way. So we need:
+ * The details of the optimization, and whether it's worth applying, vary
+ * from one type to the next: copying an 'int' is as cheap as moving it, so
+ * there's no benefit in distinguishing 'int' moves from copies. And while
+ * some constructor calls for complex types are moves, many really have to
+ * be copies, and can't be optimized this way. So we need:
  *
- * 1) a way for a particular invocation of a copy constructor to say that it's
- *    really a move, and that the value of the original isn't important
- *    afterwards (although it must still be safe to destroy); and
- *
- * 2) a way for a type (like Vector) to announce that it can be moved more
+ * 1) a way for a type (like Vector) to announce that it can be moved more
  *    efficiently than it can be copied, and provide an implementation of that
- *    move operation.
+ *    move operation; and
  *
- * The OldMove(T&) function takes a reference to a T, and returns a MoveRef<T>
- * referring to the same value; that's (1). A MoveRef<T> is simply a reference
- * to a T, annotated to say that a copy constructor applied to it may move that
- * T, instead of copying it. Finally, a constructor that accepts an MoveRef<T>
- * should perform a more efficient move, instead of a copy, providing (2).
+ * 2) a way for a particular invocation of a copy constructor to say that it's
+ *    really a move, not a copy, and that the value of the original isn't
+ *    important afterwards (although it must still be safe to destroy).
  *
- * The Move(T&) function takes a reference to a T and returns a T&&.  It acts
- * just like std::move(), which is not available on all our platforms.
+ * If a constructor has a single argument of type 'T&&' (an 'rvalue reference
+ * to T'), that indicates that it is a 'move constructor'. That's 1). It should
+ * move, not copy, its argument into the object being constructed. It may leave
+ * the original in any safely-destructible state.
  *
- * In new code, you should use Move(T&) and T&& instead of OldMove(T&) and
- * MoveRef<T>, where possible.
+ * If a constructor's argument is an rvalue, as in 'C(f(x))' or 'C(x + y)', as
+ * opposed to an lvalue, as in 'C(x)', then overload resolution will prefer the
+ * move constructor, if there is one. The 'mozilla::Move' function, defined in
+ * this file, is an identity function you can use in a constructor invocation to
+ * make any argument into an rvalue, like this: C(Move(x)). That's 2). (You
+ * could use any function that works, but 'Move' indicates your intention
+ * clearly.)
  *
  * Where we might define a copy constructor for a class C like this:
  *
@@ -78,10 +74,6 @@ namespace mozilla {
  *
  *   C(C&& rhs) { .. move rhs to this ... }
  *
- * or, in the deprecated OldMove style:
- *
- *   C(MoveRef<C> rhs) { ... move rhs to this ... }
- *
  * And where we might perform a copy like this:
  *
  *   C c2(c1);
@@ -90,90 +82,105 @@ namespace mozilla {
  *
  *   C c2(Move(c1));
  *
- * or, in the deprecated OldMove style:
+ * Note that 'T&&' implicitly converts to 'T&'. So you can pass a 'T&&' to an
+ * ordinary copy constructor for a type that doesn't support a special move
+ * constructor, and you'll just get a copy. This means that templates can use
+ * Move whenever they know they won't use the original value any more, even if
+ * they're not sure whether the type at hand has a specialized move constructor.
+ * If it doesn't, the 'T&&' will just convert to a 'T&', and the ordinary copy
+ * constructor will apply.
  *
- *   C c2(OldMove(c1));
+ * A class with a move constructor can also provide a move assignment operator.
+ * A generic definition would run this's destructor, and then apply the move
+ * constructor to *this's memory. A typical definition:
  *
- * Note that MoveRef<T> implicitly converts to T&, so you can pass a MoveRef<T>
- * to an ordinary copy constructor for a type that doesn't support a special
- * move constructor, and you'll just get a copy.  This means that templates can
- * use Move whenever they know they won't use the original value any more, even
- * if they're not sure whether the type at hand has a specialized move
- * constructor.  If it doesn't, the MoveRef<T> will just convert to a T&, and
- * the ordinary copy constructor will apply.
- *
- * A class with a move constructor can also provide a move assignment operator,
- * which runs this's destructor, and then applies the move constructor to
- * *this's memory. A typical definition:
- *
- *   C& operator=(C&& rhs) {  // or |MoveRef<C> rhs|
+ *   C& operator=(C&& rhs) {
+ *     MOZ_ASSERT(&rhs != this, "self-moves are prohibited");
  *     this->~C();
- *     new(this) C(rhs);
+ *     new(this) C(Move(rhs));
  *     return *this;
  *   }
  *
  * With that in place, one can write move assignments like this:
  *
- *   c2 = Move(c1); // or OldMove()
+ *   c2 = Move(c1);
  *
  * This destroys c1, moves c1's value to c2, and leaves c1 in an undefined but
  * destructible state.
  *
- * This header file defines MoveRef, Move, and OldMove in the mozilla namespace.
- * It's up to individual containers to annotate moves as such, by calling Move
- * or OldMove; and it's up to individual types to define move constructors.
+ * As we say, a move must leave the original in a "destructible" state. The
+ * original's destructor will still be called, so if a move doesn't
+ * actually steal all its resources, that's fine. We require only that the
+ * move destination must take on the original's value; and that destructing
+ * the original must not break the move destination.
  *
- * One hint: if you're writing a move constructor where the type has members
- * that should be moved themselves, it's much nicer to write this:
+ * (Opinions differ on whether move assignment operators should deal with move
+ * assignment of an object onto itself. It seems wise to either handle that
+ * case, or assert that it does not occur.)
  *
- *   C(MoveRef<C> c) : x(Move(c->x)), y(Move(c->y)) { }
+ * Forwarding:
  *
- * than the equivalent:
+ * Sometimes we want copy construction or assignment if we're passed an ordinary
+ * value, but move construction if passed an rvalue reference. For example, if
+ * our constructor takes two arguments and either could usefully be a move, it
+ * seems silly to write out all four combinations:
  *
- *   C(MoveRef<C> c) { new(&x) X(Move(c->x)); new(&y) Y(Move(c->y)); }
+ *   C::C(X&  x, Y&  y) : x(x),       y(y)       { }
+ *   C::C(X&  x, Y&& y) : x(x),       y(Move(y)) { }
+ *   C::C(X&& x, Y&  y) : x(Move(x)), y(y)       { }
+ *   C::C(X&& x, Y&& y) : x(Move(x)), y(Move(y)) { }
  *
- * especially since GNU C++ fails to notice that this does indeed initialize x
- * and y, which may matter if they're const.
+ * To avoid this, C++11 has tweaks to make it possible to write what you mean.
+ * The four constructor overloads above can be written as one constructor
+ * template like so:
+ *
+ *   template <typename XArg, typename YArg>
+ *   C::C(XArg&& x, YArg&& y) : x(Forward<XArg>(x)), y(Forward<YArg>(y)) { }
+ *
+ * ("'Don't Repeat Yourself'? What's that?")
+ *
+ * This takes advantage of two new rules in C++11:
+ *
+ * - First, when a function template takes an argument that is an rvalue
+ *   reference to a template argument (like 'XArg&& x' and 'YArg&& y' above),
+ *   then when the argument is applied to an lvalue, the template argument
+ *   resolves to 'T &'; and when it is applied to an rvalue, the template
+ *   argument resolves to 'T &&'. Thus, in a call to C::C like:
+ *
+ *      X foo(int);
+ *      Y yy;
+ *
+ *      C(foo(5), yy)
+ *
+ *   XArg would resolve to 'X&&', and YArg would resolve to 'Y&'.
+ *
+ * - Second, Whereas C++ used to forbid references to references, C++11 defines
+ *   'collapsing rules': 'T& &', 'T&& &', and 'T& &&' (that is, any combination
+ *   involving an lvalue reference) now collapse to simply 'T&'; and 'T&& &&'
+ *   collapses to 'T&&'.
+ *
+ *   Thus, in the call above, 'XArg&&' is 'X&& &&', collapsing to 'X&&'; and
+ *   'YArg&&' is 'Y& &&', which collapses to 'Y &'. Because the arguments are
+ *   declared as rvalue references to template arguments, the rvalue-ness
+ *   "shines through" where present.
+ *
+ * Then, the 'Forward<T>' function --- you must invoke 'Forward' with its type
+ * argument --- returns an lvalue reference or an rvalue reference to its
+ * argument, depending on what T is. In our unified constructor definition, that
+ * means that we'll invoke either the copy or move constructors for x and y,
+ * depending on what we gave C's constructor. In our call, we'll move 'foo()'
+ * into 'x', but copy 'yy' into 'y'.
+ *
+ * This header file defines Move and Forward in the mozilla namespace. It's up
+ * to individual containers to annotate moves as such, by calling Move; and it's
+ * up to individual types to define move constructors and assignment operators
+ * when valuable.
+ *
+ * (C++11 says that the <utility> header file should define 'std::move' and
+ * 'std::forward', which are just like our 'Move' and 'Forward'; but those
+ * definitions aren't available in that header on all our platforms, so we
+ * define them ourselves here.)
  */
-template<typename T>
-class MoveRef
-{
-    T* pointer;
-
-  public:
-    explicit MoveRef(T& t) : pointer(&t) { }
-    T& operator*() const { return *pointer; }
-    T* operator->() const { return pointer; }
-    operator T& () const { return *pointer; }
-};
-
-template<typename T>
-inline MoveRef<T>
-OldMove(T& t)
-{
-  return MoveRef<T>(t);
-}
-
-template<typename T>
-inline MoveRef<T>
-OldMove(const T& t)
-{
-  // With some versions of gcc, for a class C, there's an (incorrect) ambiguity
-  // between the C(const C&) constructor and the default C(C&&) C++11 move
-  // constructor, when the constructor is called with a const C& argument.
-  //
-  // This ambiguity manifests with the Move implementation above when Move is
-  // passed const U& for some class U.  Calling Move(const U&) returns a
-  // MoveRef<const U&>, which is then commonly passed to the U constructor,
-  // triggering an implicit conversion to const U&.  gcc doesn't know whether to
-  // call U(const U&) or U(U&&), so it wrongly reports a compile error.
-  //
-  // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50442 has since been fixed, so
-  // this is no longer an issue for up-to-date compilers.  But there's no harm
-  // in keeping it around for older compilers, so we might as well.  See also
-  // bug 686280.
-  return MoveRef<T>(const_cast<T&>(t));
-}
 
 /**
  * Identical to std::Move(); this is necessary until our stlport supports
@@ -187,7 +194,7 @@ Move(T&& a)
 }
 
 /**
- * These two overloads are identidal to std::Forward(); they are necessary until
+ * These two overloads are identical to std::forward(); they are necessary until
  * our stlport supports std::forward().
  */
 template<typename T>
@@ -211,9 +218,9 @@ template<typename T>
 inline void
 Swap(T& t, T& u)
 {
-  T tmp(OldMove(t));
-  t = OldMove(u);
-  u = OldMove(tmp);
+  T tmp(Move(t));
+  t = Move(u);
+  u = Move(tmp);
 }
 
 } // namespace mozilla
diff --git a/mfbt/Vector.h b/mfbt/Vector.h
index 54e266eeb7e..1ec19eb6cbd 100644
--- a/mfbt/Vector.h
+++ b/mfbt/Vector.h
@@ -84,9 +84,9 @@ struct VectorImpl
      * [dst, dst+(srcend-srcbeg)) from the range [srcbeg, srcend).
      */
     template<typename U>
-    static inline void moveConstruct(T* dst, const U* srcbeg, const U* srcend) {
-      for (const U* p = srcbeg; p < srcend; ++p, ++dst)
-        new(dst) T(OldMove(*p));
+    static inline void moveConstruct(T* dst, U* srcbeg, U* srcend) {
+      for (U* p = srcbeg; p < srcend; ++p, ++dst)
+        new(dst) T(Move(*p));
     }
 
     /*
@@ -115,7 +115,7 @@ struct VectorImpl
       T* dst = newbuf;
       T* src = v.beginNoCheck();
       for (; src < v.endNoCheck(); ++dst, ++src)
-        new(dst) T(OldMove(*src));
+        new(dst) T(Move(*src));
       VectorImpl::destroy(v.beginNoCheck(), v.endNoCheck());
       v.free_(v.mBegin);
       v.mBegin = newbuf;
@@ -302,7 +302,7 @@ class VectorBase : private AllocPolicy
 #endif
 
     /* Append operations guaranteed to succeed due to pre-reserved space. */
-    template<typename U> void internalAppend(const U& u);
+    template<typename U> void internalAppend(U&& u);
     template<typename U, size_t O, class BP, class UV>
     void internalAppendAll(const VectorBase<U, O, BP, UV>& u);
     void internalAppendN(const T& t, size_t n);
@@ -314,8 +314,8 @@ class VectorBase : private AllocPolicy
     typedef T ElementType;
 
     VectorBase(AllocPolicy = AllocPolicy());
-    VectorBase(MoveRef<ThisVector>); /* Move constructor. */
-    ThisVector& operator=(MoveRef<ThisVector>); /* Move assignment. */
+    VectorBase(ThisVector&&); /* Move constructor. */
+    ThisVector& operator=(ThisVector&&); /* Move assignment. */
     ~VectorBase();
 
     /* accessors */
@@ -453,15 +453,15 @@ class VectorBase : private AllocPolicy
      */
     bool canAppendWithoutRealloc(size_t needed) const;
 
+    /** Potentially fallible append operations. */
+
     /**
-     * Potentially fallible append operations.
-     *
-     * The function templates that take an unspecified type U require a const T&
-     * or a MoveRef<T>.  The MoveRef<T> variants move their operands into the
-     * vector, instead of copying them.  If they fail, the operand is left
-     * unmoved.
+     * This can take either a T& or a T&&. Given a T&&, it moves |u| into the
+     * vector, instead of copying it. If it fails, |u| is left unmoved. ("We are
+     * not amused.")
      */
-    template<typename U> bool append(const U& u);
+    template<typename U> bool append(U&& u);
+
     template<typename U, size_t O, class BP, class UV>
     bool appendAll(const VectorBase<U, O, BP, UV>& u);
     bool appendN(const T& t, size_t n);
@@ -473,8 +473,8 @@ class VectorBase : private AllocPolicy
      * memory has been pre-reserved.  Don't use this if you haven't reserved the
      * memory!
      */
-    template<typename U> void infallibleAppend(const U& u) {
-      internalAppend(u);
+    template<typename U> void infallibleAppend(U&& u) {
+      internalAppend(Forward<U>(u));
     }
     void infallibleAppendN(const T& t, size_t n) {
       internalAppendN(t, n);
@@ -526,7 +526,8 @@ class VectorBase : private AllocPolicy
      *
      * This is inherently a linear-time operation.  Be careful!
      */
-    T* insert(T* p, const T& val);
+    template<typename U>
+    T* insert(T* p, U&& val);
 
     /**
      * Removes the element |t|, which must fall in the bounds [begin, end),
@@ -550,6 +551,10 @@ class VectorBase : private AllocPolicy
   private:
     VectorBase(const VectorBase&) MOZ_DELETE;
     void operator=(const VectorBase&) MOZ_DELETE;
+
+    /* Move-construct/assign only from our derived class, ThisVector. */
+    VectorBase(VectorBase&&) MOZ_DELETE;
+    void operator=(VectorBase&&) MOZ_DELETE;
 };
 
 /* This does the re-entrancy check plus several other sanity checks. */
@@ -579,22 +584,22 @@ VectorBase<T, N, AP, TV>::VectorBase(AP ap)
 /* Move constructor. */
 template<typename T, size_t N, class AllocPolicy, class TV>
 MOZ_ALWAYS_INLINE
-VectorBase<T, N, AllocPolicy, TV>::VectorBase(MoveRef<TV> rhs)
-  : AllocPolicy(rhs)
+VectorBase<T, N, AllocPolicy, TV>::VectorBase(TV&& rhs)
+  : AllocPolicy(Move(rhs))
 #ifdef DEBUG
     , entered(false)
 #endif
 {
-  mLength = rhs->mLength;
-  mCapacity = rhs->mCapacity;
+  mLength = rhs.mLength;
+  mCapacity = rhs.mCapacity;
 #ifdef DEBUG
-  mReserved = rhs->mReserved;
+  mReserved = rhs.mReserved;
 #endif
 
-  if (rhs->usingInlineStorage()) {
+  if (rhs.usingInlineStorage()) {
     /* We can't move the buffer over in this case, so copy elements. */
     mBegin = static_cast<T*>(storage.addr());
-    Impl::moveConstruct(mBegin, rhs->beginNoCheck(), rhs->endNoCheck());
+    Impl::moveConstruct(mBegin, rhs.beginNoCheck(), rhs.endNoCheck());
     /*
      * Leave rhs's mLength, mBegin, mCapacity, and mReserved as they are.
      * The elements in its in-line storage still need to be destroyed.
@@ -604,12 +609,12 @@ VectorBase<T, N, AllocPolicy, TV>::VectorBase(MoveRef<TV> rhs)
      * Take src's buffer, and turn src into an empty vector using
      * in-line storage.
      */
-    mBegin = rhs->mBegin;
-    rhs->mBegin = static_cast<T*>(rhs->storage.addr());
-    rhs->mCapacity = sInlineCapacity;
-    rhs->mLength = 0;
+    mBegin = rhs.mBegin;
+    rhs.mBegin = static_cast<T*>(rhs.storage.addr());
+    rhs.mCapacity = sInlineCapacity;
+    rhs.mLength = 0;
 #ifdef DEBUG
-    rhs->mReserved = sInlineCapacity;
+    rhs.mReserved = sInlineCapacity;
 #endif
   }
 }
@@ -618,11 +623,12 @@ VectorBase<T, N, AllocPolicy, TV>::VectorBase(MoveRef<TV> rhs)
 template<typename T, size_t N, class AP, class TV>
 MOZ_ALWAYS_INLINE
 TV&
-VectorBase<T, N, AP, TV>::operator=(MoveRef<TV> rhs)
+VectorBase<T, N, AP, TV>::operator=(TV&& rhs)
 {
+  MOZ_ASSERT(this != &rhs, "self-move assignment is prohibited");
   TV* tv = static_cast<TV*>(this);
   tv->~TV();
-  new(tv) TV(rhs);
+  new(tv) TV(Move(rhs));
   return *tv;
 }
 
@@ -895,11 +901,11 @@ VectorBase<T, N, AP, TV>::internalAppendAll(const VectorBase<U, O, BP, UV>& othe
 template<typename T, size_t N, class AP, class TV>
 template<typename U>
 MOZ_ALWAYS_INLINE void
-VectorBase<T, N, AP, TV>::internalAppend(const U& u)
+VectorBase<T, N, AP, TV>::internalAppend(U&& u)
 {
   MOZ_ASSERT(mLength + 1 <= mReserved);
   MOZ_ASSERT(mReserved <= mCapacity);
-  new(endNoCheck()) T(u);
+  new(endNoCheck()) T(Forward<U>(u));
   ++mLength;
 }
 
@@ -930,8 +936,9 @@ VectorBase<T, N, AP, TV>::internalAppendN(const T& t, size_t needed)
 }
 
 template<typename T, size_t N, class AP, class TV>
+template<typename U>
 inline T*
-VectorBase<T, N, AP, TV>::insert(T* p, const T& val)
+VectorBase<T, N, AP, TV>::insert(T* p, U&& val)
 {
   MOZ_ASSERT(begin() <= p);
   MOZ_ASSERT(p <= end());
@@ -939,15 +946,15 @@ VectorBase<T, N, AP, TV>::insert(T* p, const T& val)
   MOZ_ASSERT(pos <= mLength);
   size_t oldLength = mLength;
   if (pos == oldLength) {
-    if (!append(val))
+    if (!append(Forward<U>(val)))
       return nullptr;
   } else {
-    T oldBack = back();
-    if (!append(oldBack)) /* Dup the last element. */
+    T oldBack = Move(back());
+    if (!append(Move(oldBack))) /* Dup the last element. */
       return nullptr;
     for (size_t i = oldLength; i > pos; --i)
-      (*this)[i] = (*this)[i - 1];
-    (*this)[pos] = val;
+      (*this)[i] = Move((*this)[i - 1]);
+    (*this)[pos] = Forward<U>(val);
   }
   return begin() + pos;
 }
@@ -997,7 +1004,7 @@ VectorBase<T, N, AP, TV>::internalAppend(const U* insBegin, size_t insLength)
 template<typename T, size_t N, class AP, class TV>
 template<typename U>
 MOZ_ALWAYS_INLINE bool
-VectorBase<T, N, AP, TV>::append(const U& u)
+VectorBase<T, N, AP, TV>::append(U&& u)
 {
   MOZ_REENTRANCY_GUARD_ET_AL;
   if (mLength == mCapacity && !growStorageBy(1))
@@ -1007,7 +1014,7 @@ VectorBase<T, N, AP, TV>::append(const U& u)
   if (mLength + 1 > mReserved)
     mReserved = mLength + 1;
 #endif
-  internalAppend(u);
+  internalAppend(Forward<U>(u));
   return true;
 }
 
@@ -1177,9 +1184,9 @@ class Vector
 
   public:
     Vector(AllocPolicy alloc = AllocPolicy()) : Base(alloc) {}
-    Vector(mozilla::MoveRef<Vector> vec) : Base(vec) {}
-    Vector& operator=(mozilla::MoveRef<Vector> vec) {
-      return Base::operator=(vec);
+    Vector(Vector&& vec) : Base(Move(vec)) {}
+    Vector& operator=(Vector&& vec) {
+      return Base::operator=(Move(vec));
     }
 };
 
diff --git a/xpcom/glue/nsHashKeys.h b/xpcom/glue/nsHashKeys.h
index e8ffda64746..9fb2a233552 100644
--- a/xpcom/glue/nsHashKeys.h
+++ b/xpcom/glue/nsHashKeys.h
@@ -483,10 +483,10 @@ public:
   nsCharPtrHashKey(const char* aKey) : mKey(strdup(aKey)) { }
   nsCharPtrHashKey(const nsCharPtrHashKey& toCopy) : mKey(strdup(toCopy.mKey)) { }
 
-  nsCharPtrHashKey(mozilla::MoveRef<nsCharPtrHashKey> other)
-    : mKey(other->mKey)
+  nsCharPtrHashKey(nsCharPtrHashKey&& other)
+    : mKey(other.mKey)
   {
-    other->mKey = nullptr;
+    other.mKey = nullptr;
   }
 
   ~nsCharPtrHashKey() { if (mKey) free(const_cast<char *>(mKey)); }
@@ -520,10 +520,10 @@ public:
   nsUnicharPtrHashKey(const PRUnichar* aKey) : mKey(NS_strdup(aKey)) { }
   nsUnicharPtrHashKey(const nsUnicharPtrHashKey& toCopy) : mKey(NS_strdup(toCopy.mKey)) { }
 
-  nsUnicharPtrHashKey(mozilla::MoveRef<nsUnicharPtrHashKey> other)
-    : mKey(other->mKey)
+  nsUnicharPtrHashKey(nsUnicharPtrHashKey&& other)
+    : mKey(other.mKey)
   {
-    other->mKey = nullptr;
+    other.mKey = nullptr;
   }
 
   ~nsUnicharPtrHashKey() { if (mKey) NS_Free(const_cast<PRUnichar *>(mKey)); }

From 08bd61eef87b208e2677fa115f258870e1f9e48a Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 14:52:23 -0500
Subject: [PATCH 77/92] Bug 939609 - Build content/xslt in unified mode; r=jst

--HG--
extra : rebase_source : 315b7c5762ae4bf8e698f09073d34d048f320bec
---
 content/xslt/src/base/moz.build  | 2 +-
 content/xslt/src/base/txLog.h    | 2 +-
 content/xslt/src/xml/moz.build   | 2 +-
 content/xslt/src/xpath/moz.build | 2 +-
 content/xslt/src/xslt/moz.build  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build
index 2d6f963a251..80f398f9952 100644
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'txDouble.cpp',
     'txExpandedNameMap.cpp',
     'txList.cpp',
diff --git a/content/xslt/src/base/txLog.h b/content/xslt/src/base/txLog.h
index 56ec1a6dbeb..3b3d9c3b70b 100644
--- a/content/xslt/src/base/txLog.h
+++ b/content/xslt/src/base/txLog.h
@@ -7,7 +7,6 @@
 #define txLog_h__
 
 #include "prlog.h"
-#endif
 
 #ifdef PR_LOGGING
 class txLog
@@ -31,3 +30,4 @@ public:
 #define TX_LG_CREATE
 
 #endif
+#endif
diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build
index 05b93ede15c..ef446a1e0bc 100644
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
 ]
diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build
index 008cdd3fa5e..21d43ebdc4d 100644
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
     'XPathEvaluator.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsXPathExpression.cpp',
     'nsXPathNSResolver.cpp',
     'nsXPathResult.cpp',
diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build
index 0050b93350c..36cccfbb1cc 100644
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'txBufferingHandler.cpp',
     'txCurrentFunctionCall.cpp',
     'txDocumentFunctionCall.cpp',

From 2b9e6ffb650a11f572dbc4acecdda20f695a46b0 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Tue, 19 Nov 2013 10:55:02 -0500
Subject: [PATCH 78/92] Bug 940178 - Build cairo in unified mode. r=ehsan

--HG--
extra : rebase_source : b24a1e1f1384c78f0d09d84c573d11e57024b43a
---
 gfx/cairo/cairo/src/moz.build | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index e00735176c0..62ec1beb0e0 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -114,14 +114,18 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     ]
 
 SOURCES += [
+    'cairo-bentley-ottmann-rectangular.c', # redefinition of '_cairo_bo_trap'
+    'cairo-bentley-ottmann-rectilinear.c', # redefinition of '_cairo_bo_trap'
+    'cairo-bentley-ottmann.c', # redefinition of '_cairo_bo_trap'
+    'cairo-surface-wrapper.c', #  redefinition of '_copy_transformed_pattern'
+]
+
+UNIFIED_SOURCES += [
     'cairo-analysis-surface.c',
     'cairo-arc.c',
     'cairo-array.c',
     'cairo-atomic.c',
     'cairo-base64-stream.c',
-    'cairo-bentley-ottmann-rectangular.c',
-    'cairo-bentley-ottmann-rectilinear.c',
-    'cairo-bentley-ottmann.c',
     'cairo-botor-scan-converter.c',
     'cairo-boxes.c',
     'cairo-cache.c',
@@ -173,7 +177,6 @@ SOURCES += [
     'cairo-surface-offset.c',
     'cairo-surface-snapshot.c',
     'cairo-surface-subsurface.c',
-    'cairo-surface-wrapper.c',
     'cairo-surface.c',
     'cairo-tee-surface.c',
     'cairo-tor-scan-converter.c',

From 39d062ad5560255424fb872f9420852d9818ef40 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Tue, 19 Nov 2013 11:08:19 -0500
Subject: [PATCH 79/92] Bug 940416 - Build gfx/harfbuzz in unified mode.
 r=ehsan

--HG--
extra : rebase_source : 2d656203217681d0d1518dbb6e0f680f63d3dd92
---
 gfx/harfbuzz/src/moz.build | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
index 0f59509005a..a52266b4041 100644
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -23,9 +23,15 @@ EXPORTS.harfbuzz += [
 ]
 
 SOURCES += [
+    'hb-common.cc', # error: use of undeclared identifier 'strdup'
+    'hb-ot-shape-complex-indic.cc', # error: redefinition of enumerator 'INIT'
+    'hb-ot-shape-complex-sea.cc', # error: redefinition of 'basic_features'
+    'hb-ot-shape.cc', # error: functions that differ only in their return type cannot be overloaded
+]
+
+UNIFIED_SOURCES += [
     'hb-blob.cc',
     'hb-buffer.cc',
-    'hb-common.cc',
     'hb-face.cc',
     'hb-fallback-shape.cc',
     'hb-font.cc',
@@ -34,13 +40,10 @@ SOURCES += [
     'hb-ot-shape-complex-arabic.cc',
     'hb-ot-shape-complex-default.cc',
     'hb-ot-shape-complex-indic-table.cc',
-    'hb-ot-shape-complex-indic.cc',
     'hb-ot-shape-complex-myanmar.cc',
-    'hb-ot-shape-complex-sea.cc',
     'hb-ot-shape-complex-thai.cc',
     'hb-ot-shape-fallback.cc',
     'hb-ot-shape-normalize.cc',
-    'hb-ot-shape.cc',
     'hb-ot-tag.cc',
     'hb-set.cc',
     'hb-shape-plan.cc',

From 3bff0e8c5a8370c4972c802665f92cb1454532cc Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 19 Nov 2013 15:01:58 -0500
Subject: [PATCH 80/92] Bug 937119 - Fix stereo setting errors on
 Android/OpenSLES. r=jesup

---
 .../webrtc/modules/audio_device/android/opensles_input.cc | 8 ++++++++
 .../webrtc/modules/audio_device/android/opensles_input.h  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
index 59a1ce759e1..086258ff30d 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
@@ -256,6 +256,14 @@ int32_t OpenSlesInput::StereoRecordingIsAvailable(bool& available) {  // NOLINT
   return 0;
 }
 
+int32_t OpenSlesInput::SetStereoRecording(bool enable) {  // NOLINT
+  if (enable) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
 int32_t OpenSlesInput::StereoRecording(bool& enabled) const {  // NOLINT
   enabled = false;
   return 0;
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
index e718c511ad7..7e549f255ae 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
@@ -101,7 +101,7 @@ class OpenSlesInput {
 
   // Stereo support
   int32_t StereoRecordingIsAvailable(bool& available);  // NOLINT
-  int32_t SetStereoRecording(bool enable) { return -1; }
+  int32_t SetStereoRecording(bool enable);
   int32_t StereoRecording(bool& enabled) const;  // NOLINT
 
   // Delay information and control

From 468c9672d88b3f14c62908983a5b200236863c73 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Tue, 19 Nov 2013 15:02:23 -0500
Subject: [PATCH 81/92] Bug 937119 - Increase default Android audio buffers to
 40ms. r=jesup

---
 .../trunk/webrtc/modules/audio_device/android/opensles_input.h  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
index 7e549f255ae..d223ba419ca 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
@@ -121,7 +121,7 @@ class OpenSlesInput {
     // Keep as few OpenSL buffers as possible to avoid wasting memory. 2 is
     // minimum for playout. Keep 2 for recording as well.
     kNumOpenSlBuffers = 2,
-    kNum10MsToBuffer = 3,
+    kNum10MsToBuffer = 4,
   };
 
   int InitSampleRate();

From deb33a30a95873dda7157c4180a5ff538cd10485 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Nov 2013 15:03:40 -0500
Subject: [PATCH 82/92] Bug 939608 - Part 1: Code changes required to build
 xpconnect in unified mode; r=bholley

--HG--
extra : rebase_source : e691b361737fbb233a0b33ed7fc6aa97ae172223
---
 js/xpconnect/loader/mozJSComponentLoader.h | 5 +++++
 js/xpconnect/src/XPCJSID.cpp               | 2 +-
 js/xpconnect/wrappers/XrayWrapper.h        | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/js/xpconnect/loader/mozJSComponentLoader.h b/js/xpconnect/loader/mozJSComponentLoader.h
index c7d7b411291..17781640e61 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.h
+++ b/js/xpconnect/loader/mozJSComponentLoader.h
@@ -4,6 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef mozJSComponentLoader_h
+#define mozJSComponentLoader_h
+
 #include "mozilla/ModuleLoader.h"
 #include "nsISupports.h"
 #include "nsIObserver.h"
@@ -143,3 +146,5 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
     bool mInitialized;
     bool mReuseLoaderGlobal;
 };
+
+#endif
diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp
index 18c2decad4e..8f5b8cb1cf3 100644
--- a/js/xpconnect/src/XPCJSID.cpp
+++ b/js/xpconnect/src/XPCJSID.cpp
@@ -825,7 +825,7 @@ nsJSCID::Construct(nsIXPConnectWrappedNative *wrapper,
 
     // 'push' a call context and call on it
     RootedId name(cx, rt->GetStringID(XPCJSRuntime::IDX_CREATE_INSTANCE));
-    XPCCallContext ccx(JS_CALLER, cx, obj, NullPtr(), name, args.length(), args.array(),
+    XPCCallContext ccx(JS_CALLER, cx, obj, JS::NullPtr(), name, args.length(), args.array(),
                        args.rval().address());
 
     *_retval = XPCWrappedNative::CallMethod(ccx);
diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h
index 91f14707681..b5332c277d5 100644
--- a/js/xpconnect/wrappers/XrayWrapper.h
+++ b/js/xpconnect/wrappers/XrayWrapper.h
@@ -5,6 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef XrayWrapper_h
+#define XrayWrapper_h
+
 #include "mozilla/Attributes.h"
 
 #include "jswrapper.h"
@@ -190,3 +193,4 @@ private:
 
 }
 
+#endif

From 6eeb0d3c513e7739bfdf7e63a7850a6d3b798da1 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Tue, 19 Nov 2013 12:52:37 -0800
Subject: [PATCH 83/92] Bug 937496 - Check if libudev already loaded before
 trying to load symbols from it; r=ted

---
 hal/linux/udev.h | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/hal/linux/udev.h b/hal/linux/udev.h
index 049b20357ea..9c29c2905bf 100644
--- a/hal/linux/udev.h
+++ b/hal/linux/udev.h
@@ -30,13 +30,27 @@ class udev_lib {
     // symbols this code relies on, per:
     // https://lists.fedoraproject.org/pipermail/devel/2012-June/168227.html
     const char* lib_names[] = {"libudev.so.0", "libudev.so.1"};
+    // Check whether a library is already loaded so we don't load two
+    // conflicting libs.
     for (unsigned i = 0; i < ArrayLength(lib_names); i++) {
-      lib = dlopen(lib_names[i], RTLD_LAZY | RTLD_GLOBAL);
-      if (lib)
+      lib = dlopen(lib_names[i], RTLD_NOLOAD | RTLD_LAZY | RTLD_GLOBAL);
+      if (lib) {
         break;
+      }
     }
-    if (lib && LoadSymbols())
+    // If nothing loads the first time through, it means no version of libudev
+    // was already loaded.
+    if (!lib) {
+      for (unsigned i = 0; i < ArrayLength(lib_names); i++) {
+        lib = dlopen(lib_names[i], RTLD_LAZY | RTLD_GLOBAL);
+        if (lib) {
+          break;
+        }
+      }
+    }
+    if (lib && LoadSymbols()) {
       udev = udev_new();
+    }
   }
 
   ~udev_lib() {

From ed37da0a3df70f267cbfd471f355e343196c831b Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Tue, 19 Nov 2013 21:10:34 +0100
Subject: [PATCH 84/92] Bug 927516 - Bump Ion script size limit for DOM
 workers. r=bhackett

---
 dom/workers/RuntimeService.cpp |  2 ++
 js/src/jit/Ion.cpp             | 24 ++++++++++++++++++++++--
 js/src/jsfriendapi.cpp         |  6 ++++++
 js/src/jsfriendapi.h           |  3 +++
 js/src/vm/Runtime.cpp          |  3 ++-
 js/src/vm/Runtime.h            |  9 +++++++++
 6 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index bbfcf87d151..3e64dc70aa0 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -805,6 +805,8 @@ CreateJSContextForWorker(WorkerPrivate* aWorkerPrivate, JSRuntime* aRuntime)
     }
   }
 
+  JS_SetIsWorkerRuntime(aRuntime);
+
   JS_SetNativeStackQuota(aRuntime, WORKER_CONTEXT_NATIVE_STACK_LIMIT);
 
   // Security policy:
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index bf048c745b0..e337353c68f 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -1740,10 +1740,15 @@ CheckScript(JSContext *cx, JSScript *script, bool osr)
 
 // Longer scripts can only be compiled off thread, as these compilations
 // can be expensive and stall the main thread for too long.
-static const uint32_t MAX_OFF_THREAD_SCRIPT_SIZE = 100000;
-static const uint32_t MAX_MAIN_THREAD_SCRIPT_SIZE = 2000;
+static const uint32_t MAX_OFF_THREAD_SCRIPT_SIZE = 100 * 1000;
+static const uint32_t MAX_MAIN_THREAD_SCRIPT_SIZE = 2 * 1000;
 static const uint32_t MAX_MAIN_THREAD_LOCALS_AND_ARGS = 256;
 
+// DOM Worker runtimes don't have off thread compilation, but can also compile
+// larger scripts since this doesn't stall the main thread.
+static const uint32_t MAX_DOM_WORKER_SCRIPT_SIZE = 16 * 1000;
+static const uint32_t MAX_DOM_WORKER_LOCALS_AND_ARGS = 2048;
+
 static MethodStatus
 CheckScriptSize(JSContext *cx, JSScript* script)
 {
@@ -1757,6 +1762,21 @@ CheckScriptSize(JSContext *cx, JSScript* script)
     }
 
     uint32_t numLocalsAndArgs = analyze::TotalSlots(script);
+    if (cx->runtime()->isWorkerRuntime()) {
+        // DOM Workers don't have off thread compilation enabled. Since workers
+        // don't block the browser's event loop, allow them to compile larger
+        // scripts.
+        JS_ASSERT(!OffThreadIonCompilationEnabled(cx->runtime()));
+
+        if (script->length > MAX_DOM_WORKER_SCRIPT_SIZE ||
+            numLocalsAndArgs > MAX_DOM_WORKER_LOCALS_AND_ARGS)
+        {
+            return Method_CantCompile;
+        }
+
+        return Method_Compiled;
+    }
+
     if (script->length > MAX_MAIN_THREAD_SCRIPT_SIZE ||
         numLocalsAndArgs > MAX_MAIN_THREAD_LOCALS_AND_ARGS)
     {
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index e431cad6d61..2db72cb6bd3 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -73,6 +73,12 @@ JS_GetAnonymousString(JSRuntime *rt)
     return rt->atomState.anonymous;
 }
 
+JS_FRIEND_API(void)
+JS_SetIsWorkerRuntime(JSRuntime *rt)
+{
+    rt->setIsWorkerRuntime();
+}
+
 JS_FRIEND_API(JSObject *)
 JS_FindCompilationScope(JSContext *cx, JSObject *objArg)
 {
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 2dda4f373b0..ad430f19cd2 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -48,6 +48,9 @@ JS_SetGrayGCRootsTracer(JSRuntime *rt, JSTraceDataOp traceOp, void *data);
 extern JS_FRIEND_API(JSString *)
 JS_GetAnonymousString(JSRuntime *rt);
 
+extern JS_FRIEND_API(void)
+JS_SetIsWorkerRuntime(JSRuntime *rt);
+
 extern JS_FRIEND_API(JSObject *)
 JS_FindCompilationScope(JSContext *cx, JSObject *obj);
 
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index b36a52519d4..64b294ea902 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -286,7 +286,8 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     useHelperThreads_(useHelperThreads),
     requestedHelperThreadCount(-1),
     useHelperThreadsForIonCompilation_(true),
-    useHelperThreadsForParsing_(true)
+    useHelperThreadsForParsing_(true),
+    isWorkerRuntime_(false)
 #ifdef DEBUG
     , enteredPolicy(nullptr)
 #endif
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 0fa95dbc270..eb76993eb61 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -1695,6 +1695,9 @@ struct JSRuntime : public JS::shadow::Runtime,
     bool useHelperThreadsForIonCompilation_;
     bool useHelperThreadsForParsing_;
 
+    // True iff this is a DOM Worker runtime.
+    bool isWorkerRuntime_;
+
   public:
 
     bool useHelperThreads() const {
@@ -1735,6 +1738,12 @@ struct JSRuntime : public JS::shadow::Runtime,
     bool useHelperThreadsForParsing() const {
         return useHelperThreadsForParsing_;
     }
+    void setIsWorkerRuntime() {
+        isWorkerRuntime_ = true;
+    }
+    bool isWorkerRuntime() const {
+        return isWorkerRuntime_;
+    }
 
 #ifdef DEBUG
   public:

From 5727e364732e980e388bfbe4209964d326643a7f Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Tue, 19 Nov 2013 10:12:10 -0800
Subject: [PATCH 85/92] Bug 940505 - Handlify GetXrayWaiver; r=bholley

--HG--
extra : rebase_source : 1812e79207fccdcf479b14637b67b2510d2f317b
---
 js/xpconnect/wrappers/WrapperFactory.cpp | 2 +-
 js/xpconnect/wrappers/WrapperFactory.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp
index 43e064dd61d..e492c0a9c7e 100644
--- a/js/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -49,7 +49,7 @@ WrapperFactory::IsCOW(JSObject *obj)
 }
 
 JSObject *
-WrapperFactory::GetXrayWaiver(JSObject *obj)
+WrapperFactory::GetXrayWaiver(HandleObject obj)
 {
     // Object should come fully unwrapped but outerized.
     MOZ_ASSERT(obj == UncheckedUnwrap(obj));
diff --git a/js/xpconnect/wrappers/WrapperFactory.h b/js/xpconnect/wrappers/WrapperFactory.h
index 91464e744cb..cfdc28e99b3 100644
--- a/js/xpconnect/wrappers/WrapperFactory.h
+++ b/js/xpconnect/wrappers/WrapperFactory.h
@@ -38,7 +38,7 @@ class WrapperFactory {
 
     static bool IsCOW(JSObject *wrapper);
 
-    static JSObject *GetXrayWaiver(JSObject *obj);
+    static JSObject *GetXrayWaiver(JS::HandleObject obj);
     static JSObject *CreateXrayWaiver(JSContext *cx, JS::HandleObject obj);
     static JSObject *WaiveXray(JSContext *cx, JSObject *obj);
 

From 7bb2451052cdeb174f28e72fab022e1f68ba76d7 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Tue, 19 Nov 2013 16:01:15 -0500
Subject: [PATCH 86/92] Bug 935698 - isolate nsIAccessibleValue implementation
 into separate class, r=tbsaunde

---
 accessible/src/atk/nsMaiInterfaceValue.cpp    | 82 ++++++----------
 accessible/src/generic/Accessible.cpp         | 89 +++++++----------
 accessible/src/generic/Accessible.h           | 24 +++--
 .../src/generic/FormControlAccessible.cpp     | 88 +++++++----------
 .../src/generic/FormControlAccessible.h       |  8 +-
 .../src/html/HTMLFormControlAccessible.cpp    | 63 ++++++------
 .../src/html/HTMLFormControlAccessible.h      | 10 +-
 .../src/windows/ia2/ia2AccessibleValue.cpp    | 26 +++--
 accessible/src/xpcom/moz.build                |  2 +
 accessible/src/xpcom/xpcAccessibleValue.cpp   | 90 +++++++++++++++++
 accessible/src/xpcom/xpcAccessibleValue.h     | 35 +++++++
 accessible/src/xul/XULSliderAccessible.cpp    | 97 ++++++-------------
 accessible/src/xul/XULSliderAccessible.h      | 19 ++--
 .../tests/mochitest/value/test_progress.html  |  2 +-
 .../tests/mochitest/value/test_progress.xul   |  2 +-
 xpcom/base/ErrorList.h                        |  2 -
 16 files changed, 338 insertions(+), 301 deletions(-)
 create mode 100644 accessible/src/xpcom/xpcAccessibleValue.cpp
 create mode 100644 accessible/src/xpcom/xpcAccessibleValue.h

diff --git a/accessible/src/atk/nsMaiInterfaceValue.cpp b/accessible/src/atk/nsMaiInterfaceValue.cpp
index 2810f482af4..e7b2279cc03 100644
--- a/accessible/src/atk/nsMaiInterfaceValue.cpp
+++ b/accessible/src/atk/nsMaiInterfaceValue.cpp
@@ -5,11 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "InterfaceInitFuncs.h"
-#include "mozilla/Likely.h"
 
 #include "AccessibleWrap.h"
 #include "nsMai.h"
 
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/Likely.h"
+
+using namespace mozilla;
 using namespace mozilla::a11y;
 
 extern "C" {
@@ -21,18 +24,13 @@ getCurrentValueCB(AtkValue *obj, GValue *value)
   if (!accWrap)
     return;
 
-    nsCOMPtr<nsIAccessibleValue> accValue;
-    accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue),
-                            getter_AddRefs(accValue));
-    if (!accValue)
-        return;
+  memset (value,  0, sizeof (GValue));
+  double accValue = accWrap->CurValue();
+  if (IsNaN(accValue))
+    return;
 
-    memset (value,  0, sizeof (GValue));
-    double accDouble;
-    if (NS_FAILED(accValue->GetCurrentValue(&accDouble)))
-        return;
-    g_value_init (value, G_TYPE_DOUBLE);
-    g_value_set_double (value, accDouble);
+  g_value_init (value, G_TYPE_DOUBLE);
+  g_value_set_double (value, accValue);
 }
 
 static void
@@ -42,18 +40,13 @@ getMaximumValueCB(AtkValue *obj, GValue *value)
   if (!accWrap)
     return;
 
-    nsCOMPtr<nsIAccessibleValue> accValue;
-    accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue),
-                            getter_AddRefs(accValue));
-    if (!accValue)
-        return;
+  memset(value,  0, sizeof (GValue));
+  double accValue = accWrap->MaxValue();
+  if (IsNaN(accValue))
+    return;
 
-    memset (value,  0, sizeof (GValue));
-    double accDouble;
-    if (NS_FAILED(accValue->GetMaximumValue(&accDouble)))
-        return;
-    g_value_init (value, G_TYPE_DOUBLE);
-    g_value_set_double (value, accDouble);
+  g_value_init(value, G_TYPE_DOUBLE);
+  g_value_set_double(value, accValue);
 }
 
 static void
@@ -63,18 +56,13 @@ getMinimumValueCB(AtkValue *obj, GValue *value)
   if (!accWrap)
     return;
 
-    nsCOMPtr<nsIAccessibleValue> accValue;
-    accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue),
-                            getter_AddRefs(accValue));
-    if (!accValue)
-        return;
+  memset(value,  0, sizeof (GValue));
+  double accValue = accWrap->MinValue();
+  if (IsNaN(accValue))
+    return;
 
-    memset (value,  0, sizeof (GValue));
-    double accDouble;
-    if (NS_FAILED(accValue->GetMinimumValue(&accDouble)))
-        return;
-    g_value_init (value, G_TYPE_DOUBLE);
-    g_value_set_double (value, accDouble);
+  g_value_init(value, G_TYPE_DOUBLE);
+  g_value_set_double(value, accValue);
 }
 
 static void
@@ -84,18 +72,13 @@ getMinimumIncrementCB(AtkValue *obj, GValue *minimumIncrement)
   if (!accWrap)
     return;
 
-    nsCOMPtr<nsIAccessibleValue> accValue;
-    accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue),
-                            getter_AddRefs(accValue));
-    if (!accValue)
-        return;
+  memset(minimumIncrement,  0, sizeof (GValue));
+  double accValue = accWrap->Step();
+  if (IsNaN(accValue))
+    accValue = 0; // zero if the minimum increment is undefined
 
-    memset (minimumIncrement,  0, sizeof (GValue));
-    double accDouble;
-    if (NS_FAILED(accValue->GetMinimumIncrement(&accDouble)))
-        return;
-    g_value_init (minimumIncrement, G_TYPE_DOUBLE);
-    g_value_set_double (minimumIncrement, accDouble);
+  g_value_init(minimumIncrement, G_TYPE_DOUBLE);
+  g_value_set_double(minimumIncrement, accValue);
 }
 
 static gboolean
@@ -105,13 +88,8 @@ setCurrentValueCB(AtkValue *obj, const GValue *value)
   if (!accWrap)
     return FALSE;
 
-    nsCOMPtr<nsIAccessibleValue> accValue;
-    accWrap->QueryInterface(NS_GET_IID(nsIAccessibleValue),
-                            getter_AddRefs(accValue));
-    NS_ENSURE_TRUE(accValue, FALSE);
-
-    double accDouble =g_value_get_double (value);
-    return !NS_FAILED(accValue->SetCurrentValue(accDouble));
+  double accValue =g_value_get_double(value);
+  return accWrap->SetCurValue(accValue);
 }
 }
 
diff --git a/accessible/src/generic/Accessible.cpp b/accessible/src/generic/Accessible.cpp
index 8f2ce0bdaff..6a02c47efb2 100644
--- a/accessible/src/generic/Accessible.cpp
+++ b/accessible/src/generic/Accessible.cpp
@@ -78,6 +78,7 @@
 #endif
 
 #include "mozilla/Assertions.h"
+#include "mozilla/FloatingPoint.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/unused.h"
 #include "mozilla/Preferences.h"
@@ -1672,61 +1673,53 @@ Accessible::Value(nsString& aValue)
   }
 }
 
-// nsIAccessibleValue
-NS_IMETHODIMP
-Accessible::GetMaximumValue(double *aMaximumValue)
+double
+Accessible::MaxValue() const
 {
-  return GetAttrValue(nsGkAtoms::aria_valuemax, aMaximumValue);
+  return AttrNumericValue(nsGkAtoms::aria_valuemax);
 }
 
-NS_IMETHODIMP
-Accessible::GetMinimumValue(double *aMinimumValue)
+double
+Accessible::MinValue() const
 {
-  return GetAttrValue(nsGkAtoms::aria_valuemin, aMinimumValue);
+  return AttrNumericValue(nsGkAtoms::aria_valuemin);
 }
 
-NS_IMETHODIMP
-Accessible::GetMinimumIncrement(double *aMinIncrement)
+double
+Accessible::Step() const
 {
-  NS_ENSURE_ARG_POINTER(aMinIncrement);
-  *aMinIncrement = 0;
-
-  // No mimimum increment in dynamic content spec right now
-  return NS_OK_NO_ARIA_VALUE;
+  return UnspecifiedNaN(); // no mimimum increment (step) in ARIA.
 }
 
-NS_IMETHODIMP
-Accessible::GetCurrentValue(double *aValue)
+double
+Accessible::CurValue() const
 {
-  return GetAttrValue(nsGkAtoms::aria_valuenow, aValue);
+  return AttrNumericValue(nsGkAtoms::aria_valuenow);
 }
 
-NS_IMETHODIMP
-Accessible::SetCurrentValue(double aValue)
+bool
+Accessible::SetCurValue(double aValue)
 {
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;
-
   if (!mRoleMapEntry || mRoleMapEntry->valueRule == eNoValue)
-    return NS_OK_NO_ARIA_VALUE;
+    return false;
 
   const uint32_t kValueCannotChange = states::READONLY | states::UNAVAILABLE;
-
   if (State() & kValueCannotChange)
-    return NS_ERROR_FAILURE;
+    return false;
 
-  double minValue = 0;
-  if (NS_SUCCEEDED(GetMinimumValue(&minValue)) && aValue < minValue)
-    return NS_ERROR_INVALID_ARG;
+  double checkValue = MinValue();
+  if (!IsNaN(checkValue) && aValue < checkValue)
+    return false;
 
-  double maxValue = 0;
-  if (NS_SUCCEEDED(GetMaximumValue(&maxValue)) && aValue > maxValue)
-    return NS_ERROR_INVALID_ARG;
+  checkValue = MaxValue();
+  if (!IsNaN(checkValue) && aValue > checkValue)
+    return false;
 
-  nsAutoString newValue;
-  newValue.AppendFloat(aValue);
-  return mContent->SetAttr(kNameSpaceID_None,
-                           nsGkAtoms::aria_valuenow, newValue, true);
+  nsAutoString strValue;
+  strValue.AppendFloat(aValue);
+
+  return NS_SUCCEEDED(
+    mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::aria_valuenow, strValue, true));
 }
 
 /* void setName (in DOMString name); */
@@ -3116,31 +3109,19 @@ Accessible::GetFirstAvailableAccessible(nsINode *aStartNode) const
   return nullptr;
 }
 
-nsresult
-Accessible::GetAttrValue(nsIAtom *aProperty, double *aValue)
+double
+Accessible::AttrNumericValue(nsIAtom* aAttr) const
 {
-  NS_ENSURE_ARG_POINTER(aValue);
-  *aValue = 0;
-
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;  // Node already shut down
-
- if (!mRoleMapEntry || mRoleMapEntry->valueRule == eNoValue)
-    return NS_OK_NO_ARIA_VALUE;
+  if (!mRoleMapEntry || mRoleMapEntry->valueRule == eNoValue)
+    return UnspecifiedNaN();
 
   nsAutoString attrValue;
-  mContent->GetAttr(kNameSpaceID_None, aProperty, attrValue);
-
-  // Return zero value if there is no attribute or its value is empty.
-  if (attrValue.IsEmpty())
-    return NS_OK;
+  if (!mContent->GetAttr(kNameSpaceID_None, aAttr, attrValue))
+    return UnspecifiedNaN();
 
   nsresult error = NS_OK;
   double value = attrValue.ToDouble(&error);
-  if (NS_SUCCEEDED(error))
-    *aValue = value;
-
-  return NS_OK;
+  return NS_FAILED(error) ? UnspecifiedNaN() : value;
 }
 
 uint32_t
diff --git a/accessible/src/generic/Accessible.h b/accessible/src/generic/Accessible.h
index 9af7eee2eb4..61468f9abfd 100644
--- a/accessible/src/generic/Accessible.h
+++ b/accessible/src/generic/Accessible.h
@@ -13,9 +13,9 @@
 
 #include "nsIAccessible.h"
 #include "nsIAccessibleHyperLink.h"
-#include "nsIAccessibleValue.h"
 #include "nsIAccessibleStates.h"
 #include "xpcAccessibleSelectable.h"
+#include "xpcAccessibleValue.h"
 
 #include "nsIContent.h"
 #include "nsString.h"
@@ -105,7 +105,7 @@ typedef nsRefPtrHashtable<nsPtrHashKey<const void>, Accessible>
 class Accessible : public nsIAccessible,
                    public nsIAccessibleHyperLink,
                    public xpcAccessibleSelectable,
-                   public nsIAccessibleValue
+                   public xpcAccessibleValue
 {
 public:
   Accessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -116,7 +116,6 @@ public:
 
   NS_DECL_NSIACCESSIBLE
   NS_DECL_NSIACCESSIBLEHYPERLINK
-  NS_DECL_NSIACCESSIBLEVALUE
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_ACCESSIBLE_IMPL_IID)
 
   //////////////////////////////////////////////////////////////////////////////
@@ -688,6 +687,15 @@ public:
    */
   virtual bool UnselectAll();
 
+  //////////////////////////////////////////////////////////////////////////////
+  // Value (numeric value interface)
+
+  virtual double MaxValue() const;
+  virtual double MinValue() const;
+  virtual double CurValue() const;
+  virtual double Step() const;
+  virtual bool SetCurValue(double aValue);
+
   //////////////////////////////////////////////////////////////////////////////
   // Widgets
 
@@ -911,14 +919,12 @@ protected:
   nsIContent* GetAtomicRegion() const;
 
   /**
-   * Get numeric value of the given ARIA attribute.
+   * Return numeric value of the given ARIA attribute, NaN if not applicable.
    *
-   * @param aAriaProperty - the ARIA property we're using
-   * @param aValue - value of the attribute
-   *
-   * @return - NS_OK_NO_ARIA_VALUE if there is no setted ARIA attribute
+   * @param aARIAProperty  [in] the ARIA property we're using
+   * @return  a numeric value
    */
-  nsresult GetAttrValue(nsIAtom *aAriaProperty, double *aValue);
+  double AttrNumericValue(nsIAtom* aARIAAttr) const;
 
   /**
    * Return the action rule based on ARIA enum constants EActionRule
diff --git a/accessible/src/generic/FormControlAccessible.cpp b/accessible/src/generic/FormControlAccessible.cpp
index 02323a5554e..435d898391b 100644
--- a/accessible/src/generic/FormControlAccessible.cpp
+++ b/accessible/src/generic/FormControlAccessible.cpp
@@ -8,6 +8,7 @@
 #include "FormControlAccessible.h"
 #include "Role.h"
 
+#include "mozilla/FloatingPoint.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDOMXULControlElement.h"
@@ -82,14 +83,12 @@ ProgressMeterAccessible<Max>::Value(nsString& aValue)
   if (!aValue.IsEmpty())
     return;
 
-  double maxValue = 0;
-  nsresult rv = GetMaximumValue(&maxValue);
-  if (NS_FAILED(rv) || maxValue == 0)
+  double maxValue = MaxValue();
+  if (IsNaN(maxValue) || maxValue == 0)
     return;
 
-  double curValue = 0;
-  GetCurrentValue(&curValue);
-  if (NS_FAILED(rv))
+  double curValue = CurValue();
+  if (IsNaN(curValue))
     return;
 
   // Treat the current value bigger than maximum as 100%.
@@ -101,77 +100,62 @@ ProgressMeterAccessible<Max>::Value(nsString& aValue)
 }
 
 template<int Max>
-NS_IMETHODIMP
-ProgressMeterAccessible<Max>::GetMaximumValue(double* aMaximumValue)
+double
+ProgressMeterAccessible<Max>::MaxValue() const
 {
-  nsresult rv = LeafAccessible::GetMaximumValue(aMaximumValue);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  double value = LeafAccessible::MaxValue();
+  if (!IsNaN(value))
+    return value;
 
-  nsAutoString value;
-  if (mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::max, value)) {
+  nsAutoString strValue;
+  if (mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::max, strValue)) {
     nsresult result = NS_OK;
-    *aMaximumValue = value.ToDouble(&result);
-    return result;
+    value = strValue.ToDouble(&result);
+    if (NS_SUCCEEDED(result))
+      return value;
   }
 
-  *aMaximumValue = Max;
-  return NS_OK;
+  return Max;
 }
 
 template<int Max>
-NS_IMETHODIMP
-ProgressMeterAccessible<Max>::GetMinimumValue(double* aMinimumValue)
+double
+ProgressMeterAccessible<Max>::MinValue() const
 {
-  nsresult rv = LeafAccessible::GetMinimumValue(aMinimumValue);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
-
-  *aMinimumValue = 0;
-  return NS_OK;
+  double value = LeafAccessible::MinValue();
+  return IsNaN(value) ? 0 : value;
 }
 
 template<int Max>
-NS_IMETHODIMP
-ProgressMeterAccessible<Max>::GetMinimumIncrement(double* aMinimumIncrement)
+double
+ProgressMeterAccessible<Max>::Step() const
 {
-  nsresult rv = LeafAccessible::GetMinimumIncrement(aMinimumIncrement);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
-
-  *aMinimumIncrement = 0;
-  return NS_OK;
+  double value = LeafAccessible::Step();
+  return IsNaN(value) ? 0 : value;
 }
 
 template<int Max>
-NS_IMETHODIMP
-ProgressMeterAccessible<Max>::GetCurrentValue(double* aCurrentValue)
+double
+ProgressMeterAccessible<Max>::CurValue() const
 {
-  nsresult rv = LeafAccessible::GetCurrentValue(aCurrentValue);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  double value = LeafAccessible::CurValue();
+  if (!IsNaN(value))
+    return value;
 
   nsAutoString attrValue;
-  mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::value, attrValue);
-
-  // Return zero value if there is no attribute or its value is empty.
-  if (attrValue.IsEmpty())
-    return NS_OK;
+  if (!mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::value, attrValue))
+    return UnspecifiedNaN();
 
   nsresult error = NS_OK;
-  double value = attrValue.ToDouble(&error);
-  if (NS_FAILED(error))
-    return NS_OK; // Zero value because of wrong markup.
-
-  *aCurrentValue = value;
-  return NS_OK;
+  value = attrValue.ToDouble(&error);
+  return NS_FAILED(error) ? UnspecifiedNaN() : value;
 }
 
 template<int Max>
-NS_IMETHODIMP
-ProgressMeterAccessible<Max>::SetCurrentValue(double aValue)
+bool
+ProgressMeterAccessible<Max>::SetCurValue(double aValue)
 {
-  return NS_ERROR_FAILURE; // Progress meters are readonly.
+  return false; // progress meters are readonly.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/src/generic/FormControlAccessible.h b/accessible/src/generic/FormControlAccessible.h
index cbd129c1bf7..88521a3e1d6 100644
--- a/accessible/src/generic/FormControlAccessible.h
+++ b/accessible/src/generic/FormControlAccessible.h
@@ -28,13 +28,19 @@ public:
   }
 
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLEVALUE
 
   // Accessible
   virtual void Value(nsString& aValue);
   virtual mozilla::a11y::role NativeRole();
   virtual uint64_t NativeState();
 
+  // Value
+  virtual double MaxValue() const MOZ_OVERRIDE;
+  virtual double MinValue() const MOZ_OVERRIDE;
+  virtual double CurValue() const MOZ_OVERRIDE;
+  virtual double Step() const MOZ_OVERRIDE;
+  virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
+
   // Widgets
   virtual bool IsWidget() const;
 };
diff --git a/accessible/src/html/HTMLFormControlAccessible.cpp b/accessible/src/html/HTMLFormControlAccessible.cpp
index 1384b4b35f9..bc3601fb49e 100644
--- a/accessible/src/html/HTMLFormControlAccessible.cpp
+++ b/accessible/src/html/HTMLFormControlAccessible.cpp
@@ -27,6 +27,7 @@
 #include "nsIServiceManager.h"
 #include "nsITextControlFrame.h"
 
+#include "mozilla/FloatingPoint.h"
 #include "mozilla/Preferences.h"
 
 using namespace mozilla;
@@ -545,9 +546,6 @@ HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
 // HTMLRangeAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED1(HTMLRangeAccessible, LeafAccessible,
-                             nsIAccessibleValue)
-
 role
 HTMLRangeAccessible::NativeRole()
 {
@@ -570,58 +568,53 @@ HTMLRangeAccessible::Value(nsString& aValue)
   HTMLInputElement::FromContent(mContent)->GetValue(aValue);
 }
 
-NS_IMETHODIMP
-HTMLRangeAccessible::GetMaximumValue(double* aMaximumValue)
+double
+HTMLRangeAccessible::MaxValue() const
 {
-  nsresult rv = LeafAccessible::GetMaximumValue(aMaximumValue);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  double value = LeafAccessible::MaxValue();
+  if (!IsNaN(value))
+    return value;
 
-  *aMaximumValue = HTMLInputElement::FromContent(mContent)->GetMaximum().toDouble();
-  return NS_OK;
+  return HTMLInputElement::FromContent(mContent)->GetMaximum().toDouble();
 }
 
 
-NS_IMETHODIMP
-HTMLRangeAccessible::GetMinimumValue(double* aMinimumValue)
+double
+HTMLRangeAccessible::MinValue() const
 {
-  nsresult rv = LeafAccessible::GetMinimumValue(aMinimumValue);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  double value = LeafAccessible::MinValue();
+  if (!IsNaN(value))
+    return value;
 
-  *aMinimumValue = HTMLInputElement::FromContent(mContent)->GetMinimum().toDouble();
-  return NS_OK;
+  return HTMLInputElement::FromContent(mContent)->GetMinimum().toDouble();
 }
 
-
-NS_IMETHODIMP
-HTMLRangeAccessible::GetMinimumIncrement(double* aMinimumIncrement)
+double
+HTMLRangeAccessible::Step() const
 {
-  nsresult rv = LeafAccessible::GetMinimumIncrement(aMinimumIncrement);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  double value = LeafAccessible::Step();
+  if (!IsNaN(value))
+    return value;
 
-  *aMinimumIncrement = HTMLInputElement::FromContent(mContent)->GetStep().toDouble();
-  return NS_OK;
+  return HTMLInputElement::FromContent(mContent)->GetStep().toDouble();
 }
 
-NS_IMETHODIMP
-HTMLRangeAccessible::GetCurrentValue(double* aCurrentValue)
+double
+HTMLRangeAccessible::CurValue() const
 {
-  nsresult rv = LeafAccessible::GetCurrentValue(aCurrentValue);
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  double value = LeafAccessible::CurValue();
+  if (!IsNaN(value))
+    return value;
 
-  *aCurrentValue = HTMLInputElement::FromContent(mContent)->GetValueAsDecimal().toDouble();
-  return NS_OK;
+  return HTMLInputElement::FromContent(mContent)->GetValueAsDecimal().toDouble();
 }
 
-NS_IMETHODIMP
-HTMLRangeAccessible::SetCurrentValue(double aValue)
+bool
+HTMLRangeAccessible::SetCurValue(double aValue)
 {
   ErrorResult er;
   HTMLInputElement::FromContent(mContent)->SetValueAsNumber(aValue, er);
-  return er.ErrorCode();
+  return !er.Failed();
 }
 
 
diff --git a/accessible/src/html/HTMLFormControlAccessible.h b/accessible/src/html/HTMLFormControlAccessible.h
index 44fd50514a1..843227b5956 100644
--- a/accessible/src/html/HTMLFormControlAccessible.h
+++ b/accessible/src/html/HTMLFormControlAccessible.h
@@ -172,13 +172,17 @@ public:
     mStateFlags |= eHasNumericValue;
   }
 
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLEVALUE
-
   // Accessible
   virtual void Value(nsString& aValue);
   virtual mozilla::a11y::role NativeRole();
 
+  // Value
+  virtual double MaxValue() const MOZ_OVERRIDE;
+  virtual double MinValue() const MOZ_OVERRIDE;
+  virtual double CurValue() const MOZ_OVERRIDE;
+  virtual double Step() const MOZ_OVERRIDE;
+  virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
+
   // Widgets
   virtual bool IsWidget() const;
 };
diff --git a/accessible/src/windows/ia2/ia2AccessibleValue.cpp b/accessible/src/windows/ia2/ia2AccessibleValue.cpp
index 7634ad9aa0a..861bf4b4555 100644
--- a/accessible/src/windows/ia2/ia2AccessibleValue.cpp
+++ b/accessible/src/windows/ia2/ia2AccessibleValue.cpp
@@ -13,6 +13,8 @@
 #include "Accessible-inl.h"
 #include "IUnknownImpl.h"
 
+#include "mozilla/FloatingPoint.h"
+
 using namespace mozilla::a11y;
 
 // IUnknown
@@ -55,10 +57,9 @@ ia2AccessibleValue::get_currentValue(VARIANT* aCurrentValue)
   if (valueAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
-  double currentValue = 0;
-  nsresult rv = valueAcc->GetCurrentValue(&currentValue);
-  if (NS_FAILED(rv))
-    return GetHRESULT(rv);
+  double currentValue = valueAcc->CurValue();
+  if (IsNaN(currentValue))
+    return S_FALSE;
 
   aCurrentValue->vt = VT_R8;
   aCurrentValue->dblVal = currentValue;
@@ -79,8 +80,7 @@ ia2AccessibleValue::setCurrentValue(VARIANT aValue)
   if (aValue.vt != VT_R8)
     return E_INVALIDARG;
 
-  nsresult rv = valueAcc->SetCurrentValue(aValue.dblVal);
-  return GetHRESULT(rv);
+  return valueAcc->SetCurValue(aValue.dblVal) ? S_OK : E_FAIL;
 
   A11Y_TRYBLOCK_END
 }
@@ -99,10 +99,9 @@ ia2AccessibleValue::get_maximumValue(VARIANT* aMaximumValue)
   if (valueAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
-  double maximumValue = 0;
-  nsresult rv = valueAcc->GetMaximumValue(&maximumValue);
-  if (NS_FAILED(rv))
-    return GetHRESULT(rv);
+  double maximumValue = valueAcc->MaxValue();
+  if (IsNaN(maximumValue))
+    return S_FALSE;
 
   aMaximumValue->vt = VT_R8;
   aMaximumValue->dblVal = maximumValue;
@@ -125,10 +124,9 @@ ia2AccessibleValue::get_minimumValue(VARIANT* aMinimumValue)
   if (valueAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
-  double minimumValue = 0;
-  nsresult rv = valueAcc->GetMinimumValue(&minimumValue);
-  if (NS_FAILED(rv))
-    return GetHRESULT(rv);
+  double minimumValue = valueAcc->MinValue();
+  if (IsNaN(minimumValue))
+    return S_FALSE;
 
   aMinimumValue->vt = VT_R8;
   aMinimumValue->dblVal = minimumValue;
diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build
index 947c45d054e..3f964b45023 100644
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -7,6 +7,7 @@
 EXPORTS += [
     'xpcAccessibleHyperText.h',
     'xpcAccessibleSelectable.h',
+    'xpcAccessibleValue.h',
 ]
 
 UNIFIED_SOURCES += [
@@ -15,6 +16,7 @@ UNIFIED_SOURCES += [
     'xpcAccessibleSelectable.cpp',
     'xpcAccessibleTable.cpp',
     'xpcAccessibleTableCell.cpp',
+    'xpcAccessibleValue.cpp',
 ]
 
 GENERATED_SOURCES += [
diff --git a/accessible/src/xpcom/xpcAccessibleValue.cpp b/accessible/src/xpcom/xpcAccessibleValue.cpp
new file mode 100644
index 00000000000..89caa28dcf0
--- /dev/null
+++ b/accessible/src/xpcom/xpcAccessibleValue.cpp
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "xpcAccessibleValue.h"
+#include "Accessible.h"
+
+using namespace mozilla;
+using namespace mozilla::a11y;
+
+NS_IMETHODIMP
+xpcAccessibleValue::GetMaximumValue(double* aValue)
+{
+  NS_ENSURE_ARG_POINTER(aValue);
+  *aValue = 0;
+
+  Accessible* acc = static_cast<Accessible*>(this);
+  if (acc->IsDefunct())
+    return NS_ERROR_FAILURE;
+
+  double value = acc->MaxValue();
+  if (!IsNaN(value))
+    *aValue = value;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+xpcAccessibleValue::GetMinimumValue(double* aValue)
+{
+  NS_ENSURE_ARG_POINTER(aValue);
+  *aValue = 0;
+
+  Accessible* acc = static_cast<Accessible*>(this);
+  if (acc->IsDefunct())
+    return NS_ERROR_FAILURE;
+
+  double value = acc->MinValue();
+  if (!IsNaN(value))
+    *aValue = value;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+xpcAccessibleValue::GetCurrentValue(double* aValue)
+{
+  NS_ENSURE_ARG_POINTER(aValue);
+  *aValue = 0;
+
+  Accessible* acc = static_cast<Accessible*>(this);
+  if (acc->IsDefunct())
+    return NS_ERROR_FAILURE;
+
+  double value = acc->CurValue();
+  if (!IsNaN(value))
+    *aValue = value;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+xpcAccessibleValue::SetCurrentValue(double aValue)
+{
+  Accessible* acc = static_cast<Accessible*>(this);
+  if (acc->IsDefunct())
+    return NS_ERROR_FAILURE;
+
+  acc->SetCurValue(aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+xpcAccessibleValue::GetMinimumIncrement(double* aValue)
+{
+  NS_ENSURE_ARG_POINTER(aValue);
+  *aValue = 0;
+
+  Accessible* acc = static_cast<Accessible*>(this);
+  if (acc->IsDefunct())
+    return NS_ERROR_FAILURE;
+
+  double value = acc->Step();
+  if (!IsNaN(value))
+    *aValue = value;
+
+  return NS_OK;
+}
diff --git a/accessible/src/xpcom/xpcAccessibleValue.h b/accessible/src/xpcom/xpcAccessibleValue.h
new file mode 100644
index 00000000000..0110d4edacf
--- /dev/null
+++ b/accessible/src/xpcom/xpcAccessibleValue.h
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_xpcAccessibleValue_h_
+#define mozilla_a11y_xpcAccessibleValue_h_
+
+#include "nsIAccessibleValue.h"
+
+namespace mozilla {
+namespace a11y {
+
+class xpcAccessibleValue : public nsIAccessibleValue
+{
+public:
+  NS_IMETHOD GetMaximumValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE;
+  NS_IMETHOD GetMinimumValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE;
+  NS_IMETHOD GetCurrentValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE;
+  NS_IMETHOD SetCurrentValue(double aValue) MOZ_FINAL MOZ_OVERRIDE;
+  NS_IMETHOD GetMinimumIncrement(double* aMinIncrement) MOZ_FINAL MOZ_OVERRIDE;
+
+private:
+  xpcAccessibleValue() { }
+  friend class Accessible;
+
+  xpcAccessibleValue(const xpcAccessibleValue&) MOZ_DELETE;
+  xpcAccessibleValue& operator =(const xpcAccessibleValue&) MOZ_DELETE;
+};
+
+} // namespace a11y
+} // namespace mozilla
+
+#endif
diff --git a/accessible/src/xul/XULSliderAccessible.cpp b/accessible/src/xul/XULSliderAccessible.cpp
index ec8f1028bb9..ba1f052343e 100644
--- a/accessible/src/xul/XULSliderAccessible.cpp
+++ b/accessible/src/xul/XULSliderAccessible.cpp
@@ -11,6 +11,7 @@
 
 #include "nsIFrame.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/FloatingPoint.h"
 
 using namespace mozilla::a11y;
 
@@ -25,12 +26,6 @@ XULSliderAccessible::
   mStateFlags |= eHasNumericValue;
 }
 
-// nsISupports
-
-NS_IMPL_ISUPPORTS_INHERITED1(XULSliderAccessible,
-                             AccessibleWrap,
-                             nsIAccessibleValue)
-
 // Accessible
 
 role
@@ -99,64 +94,39 @@ XULSliderAccessible::DoAction(uint8_t aIndex)
   return NS_OK;
 }
 
-// nsIAccessibleValue
-
-NS_IMETHODIMP
-XULSliderAccessible::GetMaximumValue(double* aValue)
+double
+XULSliderAccessible::MaxValue() const
 {
-  nsresult rv = AccessibleWrap::GetMaximumValue(aValue);
-
-  // ARIA redefined maximum value.
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
-
-  return GetSliderAttr(nsGkAtoms::maxpos, aValue);
+  double value = AccessibleWrap::MaxValue();
+  return IsNaN(value) ? GetSliderAttr(nsGkAtoms::maxpos) : value;
 }
 
-NS_IMETHODIMP
-XULSliderAccessible::GetMinimumValue(double* aValue)
+double
+XULSliderAccessible::MinValue() const
 {
-  nsresult rv = AccessibleWrap::GetMinimumValue(aValue);
-
-  // ARIA redefined minmum value.
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
-
-  return GetSliderAttr(nsGkAtoms::minpos, aValue);
+  double value = AccessibleWrap::MinValue();
+  return IsNaN(value) ? GetSliderAttr(nsGkAtoms::minpos) : value;
 }
 
-NS_IMETHODIMP
-XULSliderAccessible::GetMinimumIncrement(double* aValue)
+double
+XULSliderAccessible::Step() const
 {
-  nsresult rv = AccessibleWrap::GetMinimumIncrement(aValue);
-
-  // ARIA redefined minimum increment value.
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
-
-  return GetSliderAttr(nsGkAtoms::increment, aValue);
+  double value = AccessibleWrap::Step();
+  return IsNaN(value) ? GetSliderAttr(nsGkAtoms::increment) : value;
 }
 
-NS_IMETHODIMP
-XULSliderAccessible::GetCurrentValue(double* aValue)
+double
+XULSliderAccessible::CurValue() const
 {
-  nsresult rv = AccessibleWrap::GetCurrentValue(aValue);
-
-  // ARIA redefined current value.
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
-
-  return GetSliderAttr(nsGkAtoms::curpos, aValue);
+  double value = AccessibleWrap::CurValue();
+  return IsNaN(value) ? GetSliderAttr(nsGkAtoms::curpos) : value;
 }
 
-NS_IMETHODIMP
-XULSliderAccessible::SetCurrentValue(double aValue)
+bool
+XULSliderAccessible::SetCurValue(double aValue)
 {
-  nsresult rv = AccessibleWrap::SetCurrentValue(aValue);
-
-  // ARIA redefined current value.
-  if (rv != NS_OK_NO_ARIA_VALUE)
-    return rv;
+  if (AccessibleWrap::SetCurValue(aValue))
+    return true;
 
   return SetSliderAttr(nsGkAtoms::curpos, aValue);
 }
@@ -184,7 +154,7 @@ XULSliderAccessible::GetSliderElement() const
 }
 
 nsresult
-XULSliderAccessible::GetSliderAttr(nsIAtom* aName, nsAString& aValue)
+XULSliderAccessible::GetSliderAttr(nsIAtom* aName, nsAString& aValue) const
 {
   aValue.Truncate();
 
@@ -211,35 +181,26 @@ XULSliderAccessible::SetSliderAttr(nsIAtom* aName, const nsAString& aValue)
   return NS_OK;
 }
 
-nsresult
-XULSliderAccessible::GetSliderAttr(nsIAtom* aName, double* aValue)
+double
+XULSliderAccessible::GetSliderAttr(nsIAtom* aName) const
 {
-  NS_ENSURE_ARG_POINTER(aValue);
-  *aValue = 0;
-
   nsAutoString attrValue;
   nsresult rv = GetSliderAttr(aName, attrValue);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Return zero value if there is no attribute or its value is empty.
-  if (attrValue.IsEmpty())
-    return NS_OK;
+  if (NS_FAILED(rv))
+    return UnspecifiedNaN();
 
   nsresult error = NS_OK;
   double value = attrValue.ToDouble(&error);
-  if (NS_SUCCEEDED(error))
-    *aValue = value;
-
-  return NS_OK;
+  return NS_FAILED(error) ? UnspecifiedNaN() : value;
 }
 
-nsresult
+bool
 XULSliderAccessible::SetSliderAttr(nsIAtom* aName, double aValue)
 {
   nsAutoString value;
   value.AppendFloat(aValue);
 
-  return SetSliderAttr(aName, value);
+  return NS_SUCCEEDED(SetSliderAttr(aName, value));
 }
 
 
diff --git a/accessible/src/xul/XULSliderAccessible.h b/accessible/src/xul/XULSliderAccessible.h
index 36e74486813..3d23a7b55b1 100644
--- a/accessible/src/xul/XULSliderAccessible.h
+++ b/accessible/src/xul/XULSliderAccessible.h
@@ -21,16 +21,10 @@ class XULSliderAccessible : public AccessibleWrap
 public:
   XULSliderAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
-
   // nsIAccessible
   NS_IMETHOD GetActionName(uint8_t aIndex, nsAString& aName);
   NS_IMETHOD DoAction(uint8_t aIndex);
 
-  // nsIAccessibleValue
-  NS_DECL_NSIACCESSIBLEVALUE
-
   // Accessible
   virtual void Value(nsString& aValue);
   virtual a11y::role NativeRole();
@@ -38,6 +32,13 @@ public:
   virtual bool NativelyUnavailable() const;
   virtual bool CanHaveAnonChildren();
 
+  // Value
+  virtual double MaxValue() const MOZ_OVERRIDE;
+  virtual double MinValue() const MOZ_OVERRIDE;
+  virtual double CurValue() const MOZ_OVERRIDE;
+  virtual double Step() const MOZ_OVERRIDE;
+  virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
+
   // ActionAccessible
   virtual uint8_t ActionCount();
 
@@ -47,11 +48,11 @@ protected:
    */
   nsIContent* GetSliderElement() const;
 
-  nsresult GetSliderAttr(nsIAtom *aName, nsAString& aValue);
+  nsresult GetSliderAttr(nsIAtom *aName, nsAString& aValue) const;
   nsresult SetSliderAttr(nsIAtom *aName, const nsAString& aValue);
 
-  nsresult GetSliderAttr(nsIAtom *aName, double *aValue);
-  nsresult SetSliderAttr(nsIAtom *aName, double aValue);
+  double GetSliderAttr(nsIAtom *aName) const;
+  bool SetSliderAttr(nsIAtom *aName, double aValue);
 
 private:
   mutable nsCOMPtr<nsIContent> mSliderNode;
diff --git a/accessible/tests/mochitest/value/test_progress.html b/accessible/tests/mochitest/value/test_progress.html
index cdccbdc3f52..b99cce14c7e 100644
--- a/accessible/tests/mochitest/value/test_progress.html
+++ b/accessible/tests/mochitest/value/test_progress.html
@@ -21,7 +21,7 @@
     function doTest()
     {
       // HTML5 progress element tests
-      testValue("pr_indeterminate", "0%", 0, 0, 1, 0);
+      testValue("pr_indeterminate", "", 0, 0, 1, 0);
       testValue("pr_zero", "0%", 0, 0, 1, 0);
       testValue("pr_zeropointfive", "50%", 0.5, 0, 1, 0);
       testValue("pr_one", "100%", 1, 0, 1, 0);
diff --git a/accessible/tests/mochitest/value/test_progress.xul b/accessible/tests/mochitest/value/test_progress.xul
index a9aa8a6823b..5ae4a358f7f 100644
--- a/accessible/tests/mochitest/value/test_progress.xul
+++ b/accessible/tests/mochitest/value/test_progress.xul
@@ -21,7 +21,7 @@
       // progressmeter
       testValue("pm1", "50%", 50, 0, 100, 0);
       testValue("pm2", "50%", 500, 0, 1000, 0);
-      testValue("pm3", "0%", 0, 0, 100, 0);
+      testValue("pm3", "", 0, 0, 100, 0);
 
       // scale
       testValue("sc1", "500", 500, 0, 1000, 10);
diff --git a/xpcom/base/ErrorList.h b/xpcom/base/ErrorList.h
index f6a5bb4a0d0..1552bb0e11d 100644
--- a/xpcom/base/ErrorList.h
+++ b/xpcom/base/ErrorList.h
@@ -863,8 +863,6 @@
   /* raised when current pivot's position is needed but it's not in the tree */
   ERROR(NS_ERROR_NOT_IN_TREE,  FAILURE(38)),
 
-  /* see Accessible::GetAttrValue */
-  ERROR(NS_OK_NO_ARIA_VALUE,           SUCCESS(33)),
   /* see nsTextEquivUtils */
   ERROR(NS_OK_NO_NAME_CLAUSE_HANDLED,  SUCCESS(34))
 #undef MODULE

From b5a4bf4034b4d3a4f1eae70578c41ef113174214 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 19 Nov 2013 14:10:34 -0700
Subject: [PATCH 87/92] Bug 928111 - Update mochitest README.txt; r=ted

---
 testing/mochitest/README.txt | 114 +----------------------------------
 1 file changed, 1 insertion(+), 113 deletions(-)

diff --git a/testing/mochitest/README.txt b/testing/mochitest/README.txt
index c0bf337b5a1..45caa674d1d 100644
--- a/testing/mochitest/README.txt
+++ b/testing/mochitest/README.txt
@@ -1,113 +1 @@
- ----------------
- mochitest README
- ----------------
-
-Steps to get started:
-
- 1.) Run the runtests.pl script to start the server.
- 
-     Currently, the test script automatically determines the location
-     of *Firefox*.
-
- 2.) gen_template.pl will generate test templates for HTML, XUL, and XHTML.
-     Read the comment at the top of the file for usage instructions.
-
- 3.) Write a test.
-
-
-Example test:
-
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=345656
--->
-<head>
-  <title>Test for Bug 345656</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 345656 **/
-//
-//add information to show on the test page
-//
-$("display").innerHTML = "doing stuff...";
-
-//
-// The '$' is function is shorthand for getElementById. This is the same thing:
-//
-document.getElementById("display").innerHTML = "doing stuff...";
-
-//
-// you can add content that you don't want to clutter 
-// the display to the content div.
-//
-// You can write directly, or you can use MochiKit functions
-// to do it in JS like this:
-//
-appendChildNodes($("content"),
-                 DIV({class: "qux"},
-                     SPAN({id: "span42"}, "content"))
-                 );
-
-//
-// the ok() function is like assert
-//
-ok(true, "checking to see if true is true);
-
-//
-// this will fail
-//
-ok(1==2, "1 equals 2?");
-
-
-//
-// this will be marked as a todo.
-// When we fix 1 so it equals 2, we'll need to change this 
-// function to ok() or is().
-//
-todo(1==2, "1 equals 2?");
-
-//
-// is() takes two args
-//
-myVar = "foo";
-is(myVar, "foo", "checking to see if myVar is 'foo'");
-
-//
-// Tests can run in event handlers.
-// Call this to tell SimpleTest to wait for SimpleTest.finish() 
-//
-SimpleTest.waitForExplicitFinish();
-
-//
-// event handler:
-//
-function event_fired(ev) {
-  is(ev.newValue, "width: auto;", "DOMAttrModified event reports correct newValue");
-  SimpleTest.finish(); // trigger the end of our test sequence
-}
-
-//
-// Hook up the event. Mochikit.Signal has many conveniences for this, if you want.
-//
-$("content").addEventListener("DOMAttrModified", event_fired, false);
-
-//
-// Fire the event.
-//
-$("content").style.width = "auto";
-
-</script>
-</pre>
-</body>
-</html>
+See https://developer.mozilla.org/en/docs/Mochitest for detailed information on running and writing mochitests.

From 9ac3576ea988d7d9eae5537ad0e5d58c335ae6df Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 19 Nov 2013 14:10:36 -0700
Subject: [PATCH 88/92] Bug 940441 - Disable Bug914137.js on Android;
 r=nmatsakis

---
 js/src/tests/ecma_6/TypedObject/Bug914137.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/tests/ecma_6/TypedObject/Bug914137.js b/js/src/tests/ecma_6/TypedObject/Bug914137.js
index 92359d9451d..93602713793 100644
--- a/js/src/tests/ecma_6/TypedObject/Bug914137.js
+++ b/js/src/tests/ecma_6/TypedObject/Bug914137.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty("TypedObject"))
+// |reftest| skip-if(!this.hasOwnProperty("TypedObject")||(Android))
 var BUGNUMBER = 914137;
 var summary = 'Fuzz bug';
 

From 3e3050489e38dfa329f6c530f246b00565fb8419 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Tue, 19 Nov 2013 22:20:37 +0100
Subject: [PATCH 89/92] Bug 937550 - Report OOM to stderr in
 JS_MORE_DETERMINISTIC builds. r=jorendorff

---
 js/src/jscntxt.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index b91c69f8115..07c22fe19fc 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -352,6 +352,15 @@ PopulateReportBlame(JSContext *cx, JSErrorReport *report)
 void
 js_ReportOutOfMemory(ThreadSafeContext *cxArg)
 {
+#ifdef JS_MORE_DETERMINISTIC
+    /*
+     * OOMs are non-deterministic, especially across different execution modes
+     * (e.g. interpreter vs JIT). In more-deterministic builds, print to stderr
+     * so that the fuzzers can detect this.
+     */
+    fprintf(stderr, "js_ReportOutOfMemory called\n");
+#endif
+
     if (cxArg->isForkJoinSlice()) {
         cxArg->asForkJoinSlice()->setPendingAbortFatal(ParallelBailoutOutOfMemory);
         return;

From d7bcb918f2451092356b1b0acfe67c01e14493e7 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 19 Nov 2013 13:20:15 -0800
Subject: [PATCH 90/92] Bug 935784 - Avoid popping up the findbar when editing
 text fields in e10s (r=evilpie)

---
 toolkit/content/browser-child.js           | 20 +++++++++++++++++---
 toolkit/content/widgets/findbar.xml        |  9 ++++++---
 toolkit/content/widgets/remote-browser.xml | 11 +++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js
index 35fa00eb389..d08bfdb9250 100644
--- a/toolkit/content/browser-child.js
+++ b/toolkit/content/browser-child.js
@@ -10,6 +10,22 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import("resource://gre/modules/RemoteAddonsChild.jsm");
 
+let SyncHandler = {
+  init: function() {
+    sendAsyncMessage("SetSyncHandler", {}, {handler: this});
+  },
+
+  getFocusedElementAndWindow: function() {
+    let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
+
+    let focusedWindow = {};
+    let elt = fm.getFocusedElementForWindow(content, true, focusedWindow);
+    return [elt, focusedWindow.value];
+  },
+};
+
+SyncHandler.init();
+
 let WebProgressListener = {
   init: function() {
     let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
@@ -33,10 +49,8 @@ let WebProgressListener = {
   },
 
   _setupObjects: function setupObjects(aWebProgress) {
-    let win = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                      .getInterface(Ci.nsIDOMWindow);
     return {
-      contentWindow: win,
+      contentWindow: content,
       // DOMWindow is not necessarily the content-window with subframes.
       DOMWindow: aWebProgress.DOMWindow
     };
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index 649716d1550..973c688e4d5 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -679,11 +679,15 @@
             return false;
 
           let elt = document.commandDispatcher.focusedElement;
+          let win = document.commandDispatcher.focusedWindow;
 
           // Temporary fix for e10s.
-          if (elt instanceof XULElement && elt.tagName == "xul:browser" &&
+          const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+          if (elt instanceof XULElement &&
+              elt.localName == "browser" &&
+              elt.namespaceURI == XUL_NS &&
               elt.getAttribute("remote")) {
-            elt = elt.contentDocument.activeElement;
+            [elt, win] = elt.syncHandler.getFocusedElementAndWindow();
           }
 
           if (elt) {
@@ -697,7 +701,6 @@
               return false;
           }
 
-          let win = document.commandDispatcher.focusedWindow;
           if (win && !this._mimeTypeIsTextBased(win.document.contentType))
               return false;
 
diff --git a/toolkit/content/widgets/remote-browser.xml b/toolkit/content/widgets/remote-browser.xml
index c66d5b8026d..1b9930333f4 100644
--- a/toolkit/content/widgets/remote-browser.xml
+++ b/toolkit/content/widgets/remote-browser.xml
@@ -107,6 +107,12 @@
                 onget="return this.contentWindow ? this.contentWindow.document : null"
                 readonly="true"/>
 
+      <field name="_syncHandler">null</field>
+
+      <property name="syncHandler"
+                onget="return this._syncHandler"
+                readonly="true"/>
+
       <field name="_imageDocument">null</field>
 
       <property name="imageDocument"
@@ -121,6 +127,7 @@
 
           this.messageManager.addMessageListener("DOMTitleChanged", this);
           this.messageManager.addMessageListener("ImageDocumentLoaded", this);
+          this.messageManager.addMessageListener("SetSyncHandler", this);
           this.messageManager.loadFrameScript("chrome://global/content/browser-child.js", true);
 
           if (this.hasAttribute("selectpopup")) {
@@ -159,6 +166,10 @@
               };
               break;
 
+            case "SetSyncHandler":
+              this._syncHandler = aMessage.objects.handler;
+              break;
+
             case "Forms:ShowDropDown": {
               Cu.import("resource://gre/modules/SelectParentHelper.jsm");
               let dropdown = document.getElementById(this.getAttribute("selectpopup"));

From 26966ec5dfae079bb43e9c68c2b3ab5b7602c580 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 19 Nov 2013 13:20:28 -0800
Subject: [PATCH 91/92] Bug 919878 - Improve failure handling for
 TabChild::InitRenderingState (r=mattwoodrow)

---
 dom/ipc/PBrowser.ipdl            |  7 ++++--
 dom/ipc/TabChild.cpp             | 14 +++++++----
 dom/ipc/TabChild.h               |  4 +---
 dom/ipc/TabParent.cpp            | 40 ++++++++++++++++++++------------
 dom/ipc/TabParent.h              | 14 +++++------
 layout/ipc/RenderFrameParent.cpp | 16 +++++++++----
 layout/ipc/RenderFrameParent.h   | 14 ++++++-----
 7 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 0360c282fea..53d350f39b8 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -226,9 +226,12 @@ parent:
      * Create a layout frame (encapsulating a remote layer tree) for
      * the page that is currently loaded in the <browser>.
      */
-    sync PRenderFrame()
+    sync PRenderFrame();
+
+    sync InitRenderFrame(PRenderFrame aFrame)
         returns (ScrollingBehavior scrolling,
-                 TextureFactoryIdentifier textureFactoryIdentifier, uint64_t layersId);
+                 TextureFactoryIdentifier textureFactoryIdentifier, uint64_t layersId,
+                 bool success);
 
     /** 
      * Starts an offline application cache update.
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 4fc014c5211..98d80103ade 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -2173,9 +2173,7 @@ TabChild::RecvSetUpdateHitRegion(const bool& aEnabled)
 }
 
 PRenderFrameChild*
-TabChild::AllocPRenderFrameChild(ScrollingBehavior* aScrolling,
-                            TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                            uint64_t* aLayersId)
+TabChild::AllocPRenderFrameChild()
 {
     return new RenderFrameChild();
 }
@@ -2233,11 +2231,17 @@ TabChild::InitRenderingState()
     static_cast<PuppetWidget*>(mWidget.get())->InitIMEState();
 
     uint64_t id;
+    bool success;
     RenderFrameChild* remoteFrame =
-        static_cast<RenderFrameChild*>(SendPRenderFrameConstructor(
-                                         &mScrolling, &mTextureFactoryIdentifier, &id));
+        static_cast<RenderFrameChild*>(SendPRenderFrameConstructor());
     if (!remoteFrame) {
+        NS_WARNING("failed to construct RenderFrame");
+        return false;
+    }
+    SendInitRenderFrame(remoteFrame, &mScrolling, &mTextureFactoryIdentifier, &id, &success);
+    if (!success) {
       NS_WARNING("failed to construct RenderFrame");
+      PRenderFrameChild::Send__delete__(remoteFrame);
       return false;
     }
 
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 0202ac5581b..77a92de113d 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -362,9 +362,7 @@ public:
     }
 
 protected:
-    virtual PRenderFrameChild* AllocPRenderFrameChild(ScrollingBehavior* aScrolling,
-                                                      TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                                      uint64_t* aLayersId) MOZ_OVERRIDE;
+    virtual PRenderFrameChild* AllocPRenderFrameChild() MOZ_OVERRIDE;
     virtual bool DeallocPRenderFrameChild(PRenderFrameChild* aFrame) MOZ_OVERRIDE;
     virtual bool RecvDestroy() MOZ_OVERRIDE;
     virtual bool RecvSetUpdateHitRegion(const bool& aEnabled) MOZ_OVERRIDE;
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 64ac8dce6f7..9a06193e689 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -1445,23 +1445,36 @@ TabParent::HandleDelayedDialogs()
   }
 }
 
-PRenderFrameParent*
-TabParent::AllocPRenderFrameParent(ScrollingBehavior* aScrolling,
-                                   TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                   uint64_t* aLayersId)
+bool
+TabParent::RecvInitRenderFrame(PRenderFrameParent* aFrame,
+                               ScrollingBehavior* aScrolling,
+                               TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                               uint64_t* aLayersId,
+                               bool *aSuccess)
 {
-  MOZ_ASSERT(ManagedPRenderFrameParent().IsEmpty());
+  *aScrolling = UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
+  *aTextureFactoryIdentifier = TextureFactoryIdentifier();
+  *aLayersId = 0;
 
   nsRefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
   if (!frameLoader) {
-    NS_WARNING("Can't allocate graphics resources, aborting subprocess");
-    return nullptr;
+    NS_WARNING("Can't allocate graphics resources. May already be shutting down.");
+    *aSuccess = false;
+    return true;
   }
 
-  *aScrolling = UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
-  return new RenderFrameParent(frameLoader,
-                               *aScrolling,
-                               aTextureFactoryIdentifier, aLayersId);
+  static_cast<RenderFrameParent*>(aFrame)->Init(frameLoader, *aScrolling,
+                                                aTextureFactoryIdentifier, aLayersId);
+
+  *aSuccess = true;
+  return true;
+}
+
+PRenderFrameParent*
+TabParent::AllocPRenderFrameParent()
+{
+  MOZ_ASSERT(ManagedPRenderFrameParent().IsEmpty());
+  return new RenderFrameParent();
 }
 
 bool
@@ -1600,10 +1613,7 @@ TabParent::RecvBrowserFrameOpenWindow(PBrowserParent* aOpener,
 }
 
 bool
-TabParent::RecvPRenderFrameConstructor(PRenderFrameParent* actor,
-                                       ScrollingBehavior* scrolling,
-                                       TextureFactoryIdentifier* factoryIdentifier,
-                                       uint64_t* layersId)
+TabParent::RecvPRenderFrameConstructor(PRenderFrameParent* actor)
 {
   RenderFrameParent* rfp = GetRenderFrame();
   if (mDimensions != nsIntSize() && rfp) {
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index d315b08366a..eb67fbe060f 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -109,10 +109,12 @@ public:
 
     virtual bool RecvMoveFocus(const bool& aForward);
     virtual bool RecvEvent(const RemoteDOMEvent& aEvent);
-    virtual bool RecvPRenderFrameConstructor(PRenderFrameParent* actor,
-                                             ScrollingBehavior* scrolling,
-                                             TextureFactoryIdentifier* identifier,
-                                             uint64_t* layersId);
+    virtual bool RecvPRenderFrameConstructor(PRenderFrameParent* aFrame);
+    virtual bool RecvInitRenderFrame(PRenderFrameParent* aFrame,
+                                     ScrollingBehavior* aScrolling,
+                                     TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                                     uint64_t* aLayersId,
+                                     bool *aSuccess);
     virtual bool RecvBrowserFrameOpenWindow(PBrowserParent* aOpener,
                                             const nsString& aURL,
                                             const nsString& aName,
@@ -306,9 +308,7 @@ protected:
     bool ShouldDelayDialogs();
     bool AllowContentIME();
 
-    virtual PRenderFrameParent* AllocPRenderFrameParent(ScrollingBehavior* aScrolling,
-                                                        TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                                        uint64_t* aLayersId) MOZ_OVERRIDE;
+    virtual PRenderFrameParent* AllocPRenderFrameParent() MOZ_OVERRIDE;
     virtual bool DeallocPRenderFrameParent(PRenderFrameParent* aFrame) MOZ_OVERRIDE;
 
     // IME
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index ce53a7318b4..799695bbdab 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -618,15 +618,21 @@ private:
   CSSToScreenScale mMaxZoom;
 };
 
-RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader,
-                                     ScrollingBehavior aScrollingBehavior,
-                                     TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                     uint64_t* aId)
+RenderFrameParent::RenderFrameParent()
   : mLayersId(0)
-  , mFrameLoader(aFrameLoader)
   , mFrameLoaderDestroyed(false)
   , mBackgroundColor(gfxRGBA(1, 1, 1))
 {
+}
+
+void
+RenderFrameParent::Init(nsFrameLoader* aFrameLoader,
+                        ScrollingBehavior aScrollingBehavior,
+                        TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                        uint64_t* aId)
+{
+  mFrameLoader = aFrameLoader;
+
   mContentViews[FrameMetrics::ROOT_SCROLL_ID] =
     new nsContentView(aFrameLoader, FrameMetrics::ROOT_SCROLL_ID);
 
diff --git a/layout/ipc/RenderFrameParent.h b/layout/ipc/RenderFrameParent.h
index 2b1bed50ff0..e25fe8c5ef1 100644
--- a/layout/ipc/RenderFrameParent.h
+++ b/layout/ipc/RenderFrameParent.h
@@ -54,17 +54,19 @@ class RenderFrameParent : public PRenderFrameParent,
 public:
   typedef std::map<ViewID, nsRefPtr<nsContentView> > ViewMap;
 
+  /* Init should be called immediately after allocation. */
+  RenderFrameParent();
+  virtual ~RenderFrameParent();
+
   /**
    * Select the desired scrolling behavior.  If ASYNC_PAN_ZOOM is
    * chosen, then RenderFrameParent will watch input events and use
    * them to asynchronously pan and zoom.
    */
-  RenderFrameParent(nsFrameLoader* aFrameLoader,
-                    ScrollingBehavior aScrollingBehavior,
-                    TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                    uint64_t* aId);
-  virtual ~RenderFrameParent();
-
+  void Init(nsFrameLoader* aFrameLoader,
+            ScrollingBehavior aScrollingBehavior,
+            TextureFactoryIdentifier* aTextureFactoryIdentifier,
+            uint64_t* aId);
   void Destroy();
 
   /**

From fe34c3a95976bc1f5d47bb76ec6ca3e8f9aad661 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 19 Nov 2013 13:20:33 -0800
Subject: [PATCH 92/92] Bug 895395 - Support NameFunctions when compiling
 scripts off the main thread Bug 895395 - Support NameFunctions when compiling
 scripts off the main thread (r=bhackett)

---
 js/src/frontend/BytecodeCompiler.cpp | 4 +---
 js/src/frontend/NameFunctions.cpp    | 6 +++---
 js/src/frontend/NameFunctions.h      | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index c0fc473f71b..cfcf1735ed9 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -355,9 +355,7 @@ frontend::CompileScript(ExclusiveContext *cx, LifoAlloc *alloc, HandleObject sco
         if (!FoldConstants(cx, &pn, &parser))
             return nullptr;
 
-        // Inferring names for functions in compiled scripts is currently only
-        // supported while on the main thread. See bug 895395.
-        if (cx->isJSContext() && !NameFunctions(cx->asJSContext(), pn))
+        if (!NameFunctions(cx, pn))
             return nullptr;
 
         if (!EmitTree(cx, &bce, pn))
diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp
index ab26b3fddd5..23805cace95 100644
--- a/js/src/frontend/NameFunctions.cpp
+++ b/js/src/frontend/NameFunctions.cpp
@@ -23,7 +23,7 @@ class NameResolver
 {
     static const size_t MaxParents = 100;
 
-    JSContext *cx;
+    ExclusiveContext *cx;
     size_t nparents;                /* number of parents in the parents array */
     ParseNode *parents[MaxParents]; /* history of ParseNodes we've been looking at */
     StringBuffer *buf;              /* when resolving, buffer to append to */
@@ -262,7 +262,7 @@ class NameResolver
     }
 
   public:
-    explicit NameResolver(JSContext *cx) : cx(cx), nparents(0), buf(nullptr) {}
+    explicit NameResolver(ExclusiveContext *cx) : cx(cx), nparents(0), buf(nullptr) {}
 
     /*
      * Resolve all names for anonymous functions recursively within the
@@ -331,7 +331,7 @@ class NameResolver
 } /* anonymous namespace */
 
 bool
-frontend::NameFunctions(JSContext *cx, ParseNode *pn)
+frontend::NameFunctions(ExclusiveContext *cx, ParseNode *pn)
 {
     NameResolver nr(cx);
     nr.resolve(pn);
diff --git a/js/src/frontend/NameFunctions.h b/js/src/frontend/NameFunctions.h
index c6845c4cbfa..0f8717e7443 100644
--- a/js/src/frontend/NameFunctions.h
+++ b/js/src/frontend/NameFunctions.h
@@ -10,12 +10,15 @@
 #include "js/TypeDecls.h"
 
 namespace js {
+
+class ExclusiveContext;
+
 namespace frontend {
 
 class ParseNode;
 
 bool
-NameFunctions(JSContext *cx, ParseNode *pn);
+NameFunctions(ExclusiveContext *cx, ParseNode *pn);
 
 } /* namespace frontend */
 } /* namespace js */