diff --git a/Makefile.in b/Makefile.in
index 4eb5d26b9cce..0076ada21aaf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= .
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/Makefile.in b/accessible/Makefile.in
index ba8fcfc10345..022644d94c86 100644
--- a/accessible/Makefile.in
+++ b/accessible/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/accessible/build/Makefile.in b/accessible/build/Makefile.in
index 74444cc7699f..6eac32010fb2 100644
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/public/Makefile.in b/accessible/public/Makefile.in
index e721119b4432..36e92f5bbbfe 100644
--- a/accessible/public/Makefile.in
+++ b/accessible/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in
index 6f232fd89d6f..504c2c0077ca 100644
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in
index 905dff2439d0..2055ad2fb039 100644
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/src/Makefile.in b/accessible/src/Makefile.in
index 1902bf08f6d9..6ec39aa61b08 100644
--- a/accessible/src/Makefile.in
+++ b/accessible/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
index 4968e5868314..abdcb3c3105e 100644
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in
index ee7306e2a535..f74d2b0029b3 100644
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/base/StyleInfo.cpp b/accessible/src/base/StyleInfo.cpp
index 14a203980ba4..74da80083da1 100644
--- a/accessible/src/base/StyleInfo.cpp
+++ b/accessible/src/base/StyleInfo.cpp
@@ -8,6 +8,7 @@
 
 #include "mozilla/dom/Element.h"
 #include "nsComputedDOMStyle.h"
+#include "nsIFrame.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
diff --git a/accessible/src/generic/BaseAccessibles.cpp b/accessible/src/generic/BaseAccessibles.cpp
index aa24ee6f4bcb..80af31543fba 100644
--- a/accessible/src/generic/BaseAccessibles.cpp
+++ b/accessible/src/generic/BaseAccessibles.cpp
@@ -15,7 +15,6 @@
 
 #include "nsGUIEvent.h"
 #include "nsILink.h"
-#include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"
 
diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in
index ed36feddcf68..dd7a57d427d9 100644
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/generic/RootAccessible.cpp b/accessible/src/generic/RootAccessible.cpp
index 198971761b29..b4d50e8de845 100644
--- a/accessible/src/generic/RootAccessible.cpp
+++ b/accessible/src/generic/RootAccessible.cpp
@@ -26,24 +26,13 @@
 #include "mozilla/dom/Element.h"
 
 #include "nsIAccessibleRelation.h"
-#include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsIDocShellTreeNode.h"
 #include "nsIDocShellTreeOwner.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventListener.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMHTMLSelectElement.h"
 #include "nsIDOMDataContainerEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMXULMultSelectCntrlEl.h"
-#include "nsIDOMXULPopupElement.h"
 #include "nsIDocument.h"
 #include "nsEventListenerManager.h"
-#include "nsIFrame.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsPIDOMWindow.h"
@@ -262,9 +251,9 @@ RootAccessible::DocumentActivated(DocAccessible* aDocument)
 NS_IMETHODIMP
 RootAccessible::HandleEvent(nsIDOMEvent* aDOMEvent)
 {
-  nsCOMPtr<nsIDOMNSEvent> DOMNSEvent(do_QueryInterface(aDOMEvent));
+  MOZ_ASSERT(aDOMEvent);
   nsCOMPtr<nsIDOMEventTarget> DOMEventTarget;
-  DOMNSEvent->GetOriginalTarget(getter_AddRefs(DOMEventTarget));
+  aDOMEvent->GetOriginalTarget(getter_AddRefs(DOMEventTarget));
   nsCOMPtr<nsINode> origTargetNode(do_QueryInterface(DOMEventTarget));
   if (!origTargetNode)
     return NS_OK;
@@ -299,9 +288,9 @@ RootAccessible::HandleEvent(nsIDOMEvent* aDOMEvent)
 void
 RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
 {
-  nsCOMPtr<nsIDOMNSEvent> DOMNSEvent(do_QueryInterface(aDOMEvent));
+  MOZ_ASSERT(aDOMEvent);
   nsCOMPtr<nsIDOMEventTarget> DOMEventTarget;
-  DOMNSEvent->GetOriginalTarget(getter_AddRefs(DOMEventTarget));
+  aDOMEvent->GetOriginalTarget(getter_AddRefs(DOMEventTarget));
   nsCOMPtr<nsINode> origTargetNode(do_QueryInterface(DOMEventTarget));
 
   nsAutoString eventType;
diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in
index 78c9d0b643dc..b5b76bdcc4f0 100644
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/jsat/Makefile.in b/accessible/src/jsat/Makefile.in
index 6b510e2d49a0..397021d1dfcf 100644
--- a/accessible/src/jsat/Makefile.in
+++ b/accessible/src/jsat/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in
index 7deb2db4ed8d..8a55afedef4a 100644
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/msaa/DocAccessibleWrap.cpp b/accessible/src/msaa/DocAccessibleWrap.cpp
index 9d3d54d55d40..88a69bd259a1 100644
--- a/accessible/src/msaa/DocAccessibleWrap.cpp
+++ b/accessible/src/msaa/DocAccessibleWrap.cpp
@@ -17,7 +17,6 @@
 
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeNode.h"
-#include "nsIFrame.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsISelectionController.h"
 #include "nsIServiceManager.h"
diff --git a/accessible/src/msaa/Makefile.in b/accessible/src/msaa/Makefile.in
index 0b842bf6dd49..2722e474e29e 100644
--- a/accessible/src/msaa/Makefile.in
+++ b/accessible/src/msaa/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp
index 9d24ac6c3e1c..b3059c252973 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -20,7 +20,6 @@
 #include "nsAttrName.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMHTMLElement.h"
-#include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIServiceManager.h"
diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in
index d76ad6465cd0..865676f29fcc 100644
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/windows/Makefile.in b/accessible/src/windows/Makefile.in
index cf648a322f98..40e85e280f73 100644
--- a/accessible/src/windows/Makefile.in
+++ b/accessible/src/windows/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in
index cf1907668ffa..3208c05c0f77 100644
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/xforms/Makefile.in b/accessible/src/xforms/Makefile.in
index 6c5131a6cbe2..dca5e3e91ab3 100644
--- a/accessible/src/xforms/Makefile.in
+++ b/accessible/src/xforms/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in
index d773db053092..74374da148e3 100644
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in
index 9685643f083d..0b0e22cac721 100644
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/accessible/src/xul/XULTabAccessible.cpp b/accessible/src/xul/XULTabAccessible.cpp
index e7d7a1dad4d0..89bb95470d49 100644
--- a/accessible/src/xul/XULTabAccessible.cpp
+++ b/accessible/src/xul/XULTabAccessible.cpp
@@ -13,7 +13,6 @@
 // NOTE: alphabetically ordered
 #include "nsIAccessibleRelation.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
diff --git a/accessible/tests/Makefile.in b/accessible/tests/Makefile.in
index ff16fb88c9ff..6622a085059e 100644
--- a/accessible/tests/Makefile.in
+++ b/accessible/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/accessible/tests/mochitest/Makefile.in b/accessible/tests/mochitest/Makefile.in
index 7862e2dc5577..261a6ed51722 100644
--- a/accessible/tests/mochitest/Makefile.in
+++ b/accessible/tests/mochitest/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/actions/Makefile.in b/accessible/tests/mochitest/actions/Makefile.in
index bf0b092b921f..f421d1adb031 100644
--- a/accessible/tests/mochitest/actions/Makefile.in
+++ b/accessible/tests/mochitest/actions/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/attributes/Makefile.in b/accessible/tests/mochitest/attributes/Makefile.in
index 3ca209f63983..76f179a7350f 100644
--- a/accessible/tests/mochitest/attributes/Makefile.in
+++ b/accessible/tests/mochitest/attributes/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/bounds/Makefile.in b/accessible/tests/mochitest/bounds/Makefile.in
index e1fabc591af3..42d8b07631e3 100644
--- a/accessible/tests/mochitest/bounds/Makefile.in
+++ b/accessible/tests/mochitest/bounds/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/editabletext/Makefile.in b/accessible/tests/mochitest/editabletext/Makefile.in
index 9d1898a85433..1e3507203044 100644
--- a/accessible/tests/mochitest/editabletext/Makefile.in
+++ b/accessible/tests/mochitest/editabletext/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/elm/Makefile.in b/accessible/tests/mochitest/elm/Makefile.in
index 0dce10af5dd5..76c5eb5b11d5 100644
--- a/accessible/tests/mochitest/elm/Makefile.in
+++ b/accessible/tests/mochitest/elm/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/events/Makefile.in b/accessible/tests/mochitest/events/Makefile.in
index cdb67c46046e..06b3e408c85b 100644
--- a/accessible/tests/mochitest/events/Makefile.in
+++ b/accessible/tests/mochitest/events/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/focus/Makefile.in b/accessible/tests/mochitest/focus/Makefile.in
index 558a9aacedab..1ccaabbc6352 100644
--- a/accessible/tests/mochitest/focus/Makefile.in
+++ b/accessible/tests/mochitest/focus/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/hittest/Makefile.in b/accessible/tests/mochitest/hittest/Makefile.in
index 51679ad187da..997a2169c1cd 100644
--- a/accessible/tests/mochitest/hittest/Makefile.in
+++ b/accessible/tests/mochitest/hittest/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/hyperlink/Makefile.in b/accessible/tests/mochitest/hyperlink/Makefile.in
index 884be06ab714..96b32ee9a799 100644
--- a/accessible/tests/mochitest/hyperlink/Makefile.in
+++ b/accessible/tests/mochitest/hyperlink/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/hypertext/Makefile.in b/accessible/tests/mochitest/hypertext/Makefile.in
index 43a4a53b1779..9821aab7779d 100644
--- a/accessible/tests/mochitest/hypertext/Makefile.in
+++ b/accessible/tests/mochitest/hypertext/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/name/Makefile.in b/accessible/tests/mochitest/name/Makefile.in
index abe9bb79d2fa..79d4e869b0ee 100644
--- a/accessible/tests/mochitest/name/Makefile.in
+++ b/accessible/tests/mochitest/name/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/pivot/Makefile.in b/accessible/tests/mochitest/pivot/Makefile.in
index a9ae640f71ba..cb9c01b7f767 100644
--- a/accessible/tests/mochitest/pivot/Makefile.in
+++ b/accessible/tests/mochitest/pivot/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/relations/Makefile.in b/accessible/tests/mochitest/relations/Makefile.in
index 0e5a0ed3582c..29dd608b6a6b 100644
--- a/accessible/tests/mochitest/relations/Makefile.in
+++ b/accessible/tests/mochitest/relations/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/role/Makefile.in b/accessible/tests/mochitest/role/Makefile.in
index c6182e8238f2..89e70f0c5f8a 100644
--- a/accessible/tests/mochitest/role/Makefile.in
+++ b/accessible/tests/mochitest/role/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/selectable/Makefile.in b/accessible/tests/mochitest/selectable/Makefile.in
index d6d9436d36af..55014433d110 100644
--- a/accessible/tests/mochitest/selectable/Makefile.in
+++ b/accessible/tests/mochitest/selectable/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/states/Makefile.in b/accessible/tests/mochitest/states/Makefile.in
index 082d4783ec48..14f3b2e4bff3 100644
--- a/accessible/tests/mochitest/states/Makefile.in
+++ b/accessible/tests/mochitest/states/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/table/Makefile.in b/accessible/tests/mochitest/table/Makefile.in
index f2d00547e222..92d17a9c52d5 100644
--- a/accessible/tests/mochitest/table/Makefile.in
+++ b/accessible/tests/mochitest/table/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/text/Makefile.in b/accessible/tests/mochitest/text/Makefile.in
index 198b86134913..f130fc3d3b87 100644
--- a/accessible/tests/mochitest/text/Makefile.in
+++ b/accessible/tests/mochitest/text/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/textcaret/Makefile.in b/accessible/tests/mochitest/textcaret/Makefile.in
index ca65c9ad67b4..3aa8ac38cc10 100644
--- a/accessible/tests/mochitest/textcaret/Makefile.in
+++ b/accessible/tests/mochitest/textcaret/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/textselection/Makefile.in b/accessible/tests/mochitest/textselection/Makefile.in
index 3eea1b9068b2..eb85e634c2f1 100644
--- a/accessible/tests/mochitest/textselection/Makefile.in
+++ b/accessible/tests/mochitest/textselection/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/tree/Makefile.in b/accessible/tests/mochitest/tree/Makefile.in
index 2fd113df3940..2662891bd00c 100644
--- a/accessible/tests/mochitest/tree/Makefile.in
+++ b/accessible/tests/mochitest/tree/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/treeupdate/Makefile.in b/accessible/tests/mochitest/treeupdate/Makefile.in
index fb8d97ac3d57..849c699eeac7 100644
--- a/accessible/tests/mochitest/treeupdate/Makefile.in
+++ b/accessible/tests/mochitest/treeupdate/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/accessible/tests/mochitest/value/Makefile.in b/accessible/tests/mochitest/value/Makefile.in
index 9e827c4bf84f..6af9fcc2c677 100644
--- a/accessible/tests/mochitest/value/Makefile.in
+++ b/accessible/tests/mochitest/value/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/aclocal.m4 b/aclocal.m4
index c1e6c07bd7fa..cd4dfea19a10 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,9 @@
 dnl
 dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
-dnl 
+dnl
 
+builtin(include, build/autoconf/config.status.m4)dnl
 builtin(include, build/autoconf/toolchain.m4)dnl
 builtin(include, build/autoconf/ccache.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
@@ -22,6 +23,7 @@ builtin(include, build/autoconf/expandlibs.m4)dnl
 builtin(include, build/autoconf/arch.m4)dnl
 builtin(include, build/autoconf/android.m4)dnl
 builtin(include, build/autoconf/zlib.m4)dnl
+builtin(include, build/autoconf/linux.m4)dnl
 
 MOZ_PROG_CHECKMSYS()
 
diff --git a/allmakefiles.sh b/allmakefiles.sh
index 5e21b10d7ed7..c2e6b3b3e2eb 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -25,6 +25,7 @@ fi
 
 # Common makefiles used by everyone
 add_makefiles "
+mozilla-config.h
 Makefile
 build/Makefile
 build/pgo/Makefile
@@ -121,7 +122,6 @@ fi
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
-    build/autoconf/test/Makefile
     config/makefiles/test/Makefile
     config/tests/makefiles/autodeps/Makefile
     config/tests/src-simple/Makefile
diff --git a/b2g/Makefile.in b/b2g/Makefile.in
index 6fa4ddc43701..7d17e123e1bd 100644
--- a/b2g/Makefile.in
+++ b/b2g/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in
index 75f47480c8d0..c7b26e6a55a6 100644
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 9a5e63a712c2..7e33bcaa1cf7 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -68,7 +68,6 @@ pref("mozilla.widget.force-24bpp", true);
 pref("mozilla.widget.use-buffer-pixmap", true);
 pref("mozilla.widget.disable-native-theme", true);
 pref("layout.reflow.synthMouseMove", false);
-pref("dom.send_after_paint_to_content", true);
 
 /* download manager (don't show the window or alert) */
 pref("browser.download.useDownloadDir", true);
@@ -481,3 +480,18 @@ pref("javascript.options.mem.log", true);
 
 // Increase mark slice time from 10ms to 30ms
 pref("javascript.options.mem.gc_incremental_slice_ms", 30);
+
+// Show/Hide scrollbars when active/inactive
+pref("ui.showHideScrollbars", 1);
+
+// Enable the ProcessPriorityManager, and give processes with no visible
+// documents a 1s grace period before they're eligible to be marked as
+// background.
+pref("dom.ipc.processPriorityManager.enabled", true);
+pref("dom.ipc.processPriorityManager.gracePeriodMS", 1000);
+pref("hal.processPriorityManager.gonk.masterOomAdjust", 0);
+pref("hal.processPriorityManager.gonk.foregroundOomAdjust", 1);
+pref("hal.processPriorityManager.gonk.backgroundOomAdjust", 2);
+pref("hal.processPriorityManager.gonk.masterNice", -1);
+pref("hal.processPriorityManager.gonk.foregroundNice", 0);
+pref("hal.processPriorityManager.gonk.backgroundNice", 10);
diff --git a/b2g/branding/official/Makefile.in b/b2g/branding/official/Makefile.in
index 62c1937e4648..35ffc39b103d 100644
--- a/b2g/branding/official/Makefile.in
+++ b/b2g/branding/official/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/b2g/branding/official/content/Makefile.in b/b2g/branding/official/content/Makefile.in
index d904db48d518..44788ba11c4c 100644
--- a/b2g/branding/official/content/Makefile.in
+++ b/b2g/branding/official/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/b2g/branding/official/locales/Makefile.in b/b2g/branding/official/locales/Makefile.in
index 864636cce8ed..2839d474fe52 100644
--- a/b2g/branding/official/locales/Makefile.in
+++ b/b2g/branding/official/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = b2g/branding/official/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/b2g/branding/unofficial/Makefile.in b/b2g/branding/unofficial/Makefile.in
index 62c1937e4648..35ffc39b103d 100644
--- a/b2g/branding/unofficial/Makefile.in
+++ b/b2g/branding/unofficial/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/b2g/branding/unofficial/content/Makefile.in b/b2g/branding/unofficial/content/Makefile.in
index 3dedb72df1e4..7ffd29e10afe 100644
--- a/b2g/branding/unofficial/content/Makefile.in
+++ b/b2g/branding/unofficial/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/b2g/branding/unofficial/locales/Makefile.in b/b2g/branding/unofficial/locales/Makefile.in
index 002c6498d0ce..2839d474fe52 100644
--- a/b2g/branding/unofficial/locales/Makefile.in
+++ b/b2g/branding/unofficial/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = b2g/branding/unofficial/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/b2g/chrome/Makefile.in b/b2g/chrome/Makefile.in
index bdca6afdec9a..d816fe52e224 100644
--- a/b2g/chrome/Makefile.in
+++ b/b2g/chrome/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/b2g/chrome/content/content.css b/b2g/chrome/content/content.css
index 9a045cdbd34b..77dd90a4dfe4 100644
--- a/b2g/chrome/content/content.css
+++ b/b2g/chrome/content/content.css
@@ -11,23 +11,19 @@ xul|window xul|scrollbar {
 }
 
 html xul|scrollbar {
-  display: block;
-}
-
-xul|scrollbar[orient="vertical"] {
   -moz-appearance: none !important;
   position: relative;
-  margin-left: -8px;
-  min-width: 8px;
-  max-width: 8px;
   background-color: transparent !important;
   background-image: none !important;
   border: 0px solid transparent !important;
+  z-index: 2147483647;
+  opacity: 1;
 }
 
-xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
-  margin-left: 2px;
-  margin-right: -10px;
+xul|scrollbar[orient="vertical"] {
+  -moz-margin-start: -8px;
+  min-width: 8px;
+  max-width: 8px;
 }
 
 xul|scrollbar[orient="vertical"] xul|thumb {
@@ -36,14 +32,9 @@ xul|scrollbar[orient="vertical"] xul|thumb {
 }
 
 xul|scrollbar[orient="horizontal"] {
-  -moz-appearance: none !important;
-  position: relative;
+  margin-top: -8px;
   min-height: 8px;
   max-height: 8px;
-  margin-top: -8px;
-  background-color: transparent !important;
-  background-image: none !important;
-  border: 0px solid transparent !important;
 }
 
 xul|scrollbar[orient="horizontal"] xul|thumb {
@@ -51,9 +42,10 @@ xul|scrollbar[orient="horizontal"] xul|thumb {
   min-height: 6px !important;
 }
 
-xul|scrollbox {
-  overflow-y: scroll;
-  overflow-x: scroll;
+xul|scrollbar:not([active="true"]),
+xul|scrollbar[disabled] {
+  opacity: 0;
+  -moz-transition: opacity 1s ease;
 }
 
 xul|scrollbarbutton {
diff --git a/b2g/components/Makefile.in b/b2g/components/Makefile.in
index 12b27ae65028..f06178a7f648 100644
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in
index 67a8111e735b..9bb1de88f527 100644
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 4a0cdd2d8b0f..097717e73e5a 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -686,3 +686,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/components/ActivitiesGlue.js
 @BINPATH@/components/ProcessGlobal.js
 @BINPATH@/components/ContentHandler.js
+
+#ifdef XP_MACOSX
+@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+#endif
diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in
index 1f069a53c28b..54428e41bc40 100644
--- a/b2g/locales/Makefile.in
+++ b/b2g/locales/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = b2g/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/Makefile.in b/browser/Makefile.in
index d3d2e3bea65b..0f8dddbf2870 100644
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index f57c7a2fa8a9..0d3ab5e4af25 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index 06e39b889cc2..e94fb3494a92 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1341959296000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1343854380000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -299,6 +299,10 @@
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i115" id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+                        <versionRange  minVersion="0" maxVersion="*">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i56" id="flash@adobe.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
@@ -415,6 +419,9 @@
       <pluginItem  blockID="p102">
                   <match name="filename" exp="npmozax\.dll" />                      <versionRange  minVersion="0" maxVersion="*"></versionRange>
                   </pluginItem>
+      <pluginItem  blockID="p113">
+                  <match name="filename" exp="npuplaypc\.dll" />                      <versionRange  minVersion="0" maxVersion="1.0.0.0" severity="1"></versionRange>
+                  </pluginItem>
     </pluginItems>
 
   <gfxItems>
diff --git a/browser/app/profile/extensions/Makefile.in b/browser/app/profile/extensions/Makefile.in
index 0cf924535410..fb9a5d1c9bb6 100644
--- a/browser/app/profile/extensions/Makefile.in
+++ b/browser/app/profile/extensions/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
index 6a31f74128d7..9f245b98b9ab 100644
--- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index 7ee8843299b2..ff343c440eed 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 078e607c8dc7..5fa88f5c3b1e 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -406,6 +406,13 @@ var SocialSidebar = {
     return Services.prefs.getBoolPref("social.sidebar.open");
   },
 
+  dispatchEvent: function(aType, aDetail) {
+    let sbrowser = document.getElementById("social-sidebar-browser");
+    let evt = sbrowser.contentDocument.createEvent("CustomEvent");
+    evt.initCustomEvent(aType, true, true, aDetail ? aDetail : {});
+    sbrowser.contentDocument.documentElement.dispatchEvent(evt);
+  },
+
   updateSidebar: function SocialSidebar_updateSidebar() {
     // Hide the toggle menu item if the sidebar cannot appear
     let command = document.getElementById("Social:ToggleSidebar");
@@ -418,17 +425,29 @@ var SocialSidebar = {
     broadcaster.hidden = hideSidebar;
     command.setAttribute("checked", !hideSidebar);
 
-    // If the sidebar is hidden, unload its document
-    // XXX this results in a poor UX, we should revisit
     let sbrowser = document.getElementById("social-sidebar-browser");
-    if (broadcaster.hidden) {
-      sbrowser.removeAttribute("origin");
-      sbrowser.setAttribute("src", "about:blank");
-      return;
+    if (hideSidebar) {
+      this.dispatchEvent("sidebarhide");
+      // If we're disabled, unload the sidebar content
+      if (!this.canShow) {
+        sbrowser.removeAttribute("origin");
+        sbrowser.setAttribute("src", "about:blank");
+      }
+    } else {
+      // Make sure the right sidebar URL is loaded
+      if (sbrowser.getAttribute("origin") != Social.provider.origin) {
+        sbrowser.setAttribute("origin", Social.provider.origin);
+        sbrowser.setAttribute("src", Social.provider.sidebarURL);
+        sbrowser.addEventListener("load", function sidebarOnShow() {
+          sbrowser.removeEventListener("load", sidebarOnShow);
+          // let load finish, then fire our event
+          setTimeout(function () {
+            SocialSidebar.dispatchEvent("sidebarshow");
+          }, 0);
+        });
+      } else {
+        this.dispatchEvent("sidebarshow");
+      }
     }
-
-    // Load the sidebar document
-    sbrowser.setAttribute("origin", Social.provider.origin);
-    sbrowser.setAttribute("src", Social.provider.sidebarURL);
   }
 }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 76fe11d488fa..94b3ffcb1259 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -658,6 +658,7 @@
       <toolbaritem id="social-toolbar-button"
                    class="toolbarbutton-1 chromeclass-toolbar-additional"
                    removable="false"
+                   pack="center"
                    title="&socialToolbar.title;"
                    hidden="true">
         <hbox id="social-toolbar-button-box" class="social-statusarea-container">
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 8ca5a14405ab..fe09213f65df 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/base/content/test
+relativesrcdir  = @relativesrcdir@
 
 DIRS += \
 		newtab \
diff --git a/browser/base/content/test/browser_gestureSupport.js b/browser/base/content/test/browser_gestureSupport.js
index 845ab2ecbc17..7746f6c2c9d5 100644
--- a/browser/base/content/test/browser_gestureSupport.js
+++ b/browser/base/content/test/browser_gestureSupport.js
@@ -67,13 +67,13 @@ function test_gestureListener(evt)
   is(evt.delta, test_expectedDelta,
      "evt.delta (" + evt.delta + ") does not match expected value");
 
-  is(evt.shiftKey, (test_expectedModifiers & Components.interfaces.nsIDOMNSEvent.SHIFT_MASK) != 0,
+  is(evt.shiftKey, (test_expectedModifiers & Components.interfaces.nsIDOMEvent.SHIFT_MASK) != 0,
      "evt.shiftKey did not match expected value");
-  is(evt.ctrlKey, (test_expectedModifiers & Components.interfaces.nsIDOMNSEvent.CONTROL_MASK) != 0,
+  is(evt.ctrlKey, (test_expectedModifiers & Components.interfaces.nsIDOMEvent.CONTROL_MASK) != 0,
      "evt.ctrlKey did not match expected value");
-  is(evt.altKey, (test_expectedModifiers & Components.interfaces.nsIDOMNSEvent.ALT_MASK) != 0,
+  is(evt.altKey, (test_expectedModifiers & Components.interfaces.nsIDOMEvent.ALT_MASK) != 0,
      "evt.altKey did not match expected value");
-  is(evt.metaKey, (test_expectedModifiers & Components.interfaces.nsIDOMNSEvent.META_MASK) != 0,
+  is(evt.metaKey, (test_expectedModifiers & Components.interfaces.nsIDOMEvent.META_MASK) != 0,
      "evt.metaKey did not match expected value");
 
   if (evt.type == "MozTapGesture") {
@@ -158,19 +158,19 @@ function test_TestEventListeners()
   e("MozEdgeUIGesture", 0, 0, 0);
 
   // event.shiftKey
-  let modifier = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+  let modifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
   e("MozSwipeGesture", SimpleGestureEvent.DIRECTION_RIGHT, 0, modifier);
 
   // event.metaKey
-  modifier = Components.interfaces.nsIDOMNSEvent.META_MASK;
+  modifier = Components.interfaces.nsIDOMEvent.META_MASK;
   e("MozSwipeGesture", SimpleGestureEvent.DIRECTION_RIGHT, 0, modifier);
 
   // event.altKey
-  modifier = Components.interfaces.nsIDOMNSEvent.ALT_MASK;
+  modifier = Components.interfaces.nsIDOMEvent.ALT_MASK;
   e("MozSwipeGesture", SimpleGestureEvent.DIRECTION_RIGHT, 0, modifier);
 
   // event.ctrlKey
-  modifier = Components.interfaces.nsIDOMNSEvent.CONTROL_MASK;
+  modifier = Components.interfaces.nsIDOMEvent.CONTROL_MASK;
   e("MozSwipeGesture", SimpleGestureEvent.DIRECTION_RIGHT, 0, modifier);
 }
 
diff --git a/browser/base/content/test/browser_social_sidebar.js b/browser/base/content/test/browser_social_sidebar.js
index 052ba6a3bcc6..0da759b48c51 100644
--- a/browser/base/content/test/browser_social_sidebar.js
+++ b/browser/base/content/test/browser_social_sidebar.js
@@ -15,9 +15,9 @@ function test() {
 
   let manifest = { // normal provider
     name: "provider 1",
-    origin: "https://example1.com",
-    sidebarURL: "https://example1.com/sidebar.html",
-    workerURL: "https://example1.com/worker.js",
+    origin: "https://example.com",
+    sidebarURL: "https://example.com/browser/browser/base/content/test/social_sidebar.html",
+    workerURL: "https://example.com/browser/browser/base/content/test/social_worker.js",
     iconURL: "chrome://branding/content/icon48.png"
   };
   runSocialTestWithProvider(manifest, doTest);
@@ -29,24 +29,45 @@ function doTest() {
 
   let command = document.getElementById("Social:ToggleSidebar");
   let sidebar = document.getElementById("social-sidebar-box");
+  let browser = sidebar.firstChild;
 
-  // Check the the sidebar is initially visible, and loaded
-  ok(!command.hidden, "sidebar toggle command should be visible");
-  is(command.getAttribute("checked"), "true", "sidebar toggle command should be checked");
-  ok(!sidebar.hidden, "sidebar itself should be visible");
-  ok(Services.prefs.getBoolPref("social.sidebar.open"), "sidebar open pref should be true");
-  is(sidebar.firstChild.getAttribute('src'), "https://example1.com/sidebar.html", "sidebar url should be set");
+  function checkShown(shouldBeShown) {
+    is(command.getAttribute("checked"), shouldBeShown ? "true" : "false",
+       "toggle command should be " + (shouldBeShown ? "checked" : "unchecked"));
+    is(sidebar.hidden, !shouldBeShown,
+       "sidebar should be " + (shouldBeShown ? "visible" : "hidden"));
+    is(Services.prefs.getBoolPref("social.sidebar.open"), shouldBeShown,
+       "sidebar open pref should be " + shouldBeShown);
+    if (shouldBeShown)
+      is(browser.getAttribute('src'), Social.provider.sidebarURL, "sidebar url should be set");
+  }
 
-  // Now toggle it!
-  info("Toggling sidebar");
+  // First check the the sidebar is initially visible, and loaded
+  ok(!command.hidden, "toggle command should be visible");
+  checkShown(true);
+
+  browser.addEventListener("sidebarhide", function sidebarhide() {
+    browser.removeEventListener("sidebarhide", sidebarhide);
+
+    checkShown(false);
+
+    browser.addEventListener("sidebarshow", function sidebarshow() {
+      browser.removeEventListener("sidebarshow", sidebarshow);
+
+      checkShown(true);
+
+      // Remove the test provider
+      SocialService.removeProvider(Social.provider.origin, finish);
+    });
+
+    // Toggle it back on
+    info("Toggling sidebar back on");
+    Social.toggleSidebar();
+  });
+
+  // Now toggle it off
+  info("Toggling sidebar off");
   Social.toggleSidebar();
-  is(command.getAttribute("checked"), "false", "sidebar toggle command should not be checked");
-  ok(sidebar.hidden, "sidebar itself should not be visible");
-  ok(!Services.prefs.getBoolPref("social.sidebar.open"), "sidebar open pref should be false");
-  is(sidebar.firstChild.getAttribute('src'), "about:blank", "sidebar url should not be set");
-
-  // Remove the test provider
-  SocialService.removeProvider(Social.provider.origin, finish);
 }
 
 // XXX test sidebar in popup
diff --git a/browser/base/content/test/newtab/Makefile.in b/browser/base/content/test/newtab/Makefile.in
index 43d06a023111..e395003106d2 100644
--- a/browser/base/content/test/newtab/Makefile.in
+++ b/browser/base/content/test/newtab/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/base/content/test/newtab
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in
index b891e3a40161..fdee7bad0216 100644
--- a/browser/branding/aurora/Makefile.in
+++ b/browser/branding/aurora/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/aurora/content/Makefile.in b/browser/branding/aurora/content/Makefile.in
index 3dedb72df1e4..7ffd29e10afe 100644
--- a/browser/branding/aurora/content/Makefile.in
+++ b/browser/branding/aurora/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/aurora/locales/Makefile.in b/browser/branding/aurora/locales/Makefile.in
index 02eb6a9bd782..d199ba23528e 100644
--- a/browser/branding/aurora/locales/Makefile.in
+++ b/browser/branding/aurora/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/branding/aurora/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in
index b891e3a40161..fdee7bad0216 100644
--- a/browser/branding/nightly/Makefile.in
+++ b/browser/branding/nightly/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/nightly/content/Makefile.in b/browser/branding/nightly/content/Makefile.in
index 3dedb72df1e4..7ffd29e10afe 100644
--- a/browser/branding/nightly/content/Makefile.in
+++ b/browser/branding/nightly/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/nightly/locales/Makefile.in b/browser/branding/nightly/locales/Makefile.in
index ceccd83c8297..d199ba23528e 100644
--- a/browser/branding/nightly/locales/Makefile.in
+++ b/browser/branding/nightly/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/branding/nightly/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
index b891e3a40161..fdee7bad0216 100644
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/official/content/Makefile.in b/browser/branding/official/content/Makefile.in
index 3dedb72df1e4..7ffd29e10afe 100644
--- a/browser/branding/official/content/Makefile.in
+++ b/browser/branding/official/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/official/locales/Makefile.in b/browser/branding/official/locales/Makefile.in
index f2ad66b2d792..2839d474fe52 100644
--- a/browser/branding/official/locales/Makefile.in
+++ b/browser/branding/official/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/branding/official/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in
index b891e3a40161..fdee7bad0216 100644
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/unofficial/content/Makefile.in b/browser/branding/unofficial/content/Makefile.in
index 3dedb72df1e4..7ffd29e10afe 100644
--- a/browser/branding/unofficial/content/Makefile.in
+++ b/browser/branding/unofficial/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/branding/unofficial/locales/Makefile.in b/browser/branding/unofficial/locales/Makefile.in
index 24d3ec7f3b8d..d199ba23528e 100644
--- a/browser/branding/unofficial/locales/Makefile.in
+++ b/browser/branding/unofficial/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/branding/unofficial/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index 17a196529745..07ca3eb9a96a 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/about/Makefile.in b/browser/components/about/Makefile.in
index e83ef7e13fb7..b4356c1808c1 100644
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 941982b9718c..6ba178acdf57 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH=../../..
+DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
diff --git a/browser/components/certerror/Makefile.in b/browser/components/certerror/Makefile.in
index f35ebe56fe5c..5cf9d09f4cc3 100644
--- a/browser/components/certerror/Makefile.in
+++ b/browser/components/certerror/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/certerror/test/Makefile.in b/browser/components/certerror/test/Makefile.in
index 7d34b749bba6..70ded1e0c58d 100644
--- a/browser/components/certerror/test/Makefile.in
+++ b/browser/components/certerror/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/certerror/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in
index 08c23a9e7a6c..c458f132be99 100644
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/dirprovider/tests/Makefile.in b/browser/components/dirprovider/tests/Makefile.in
index 05ff1a207f16..e524962e0de9 100644
--- a/browser/components/dirprovider/tests/Makefile.in
+++ b/browser/components/dirprovider/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/components/dirprovider/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/downloads/Makefile.in b/browser/components/downloads/Makefile.in
index 6920622f05a3..4ef23b3a78a8 100644
--- a/browser/components/downloads/Makefile.in
+++ b/browser/components/downloads/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/downloads/src/Makefile.in b/browser/components/downloads/src/Makefile.in
index 8bc3274bcf11..c138500934a3 100644
--- a/browser/components/downloads/src/Makefile.in
+++ b/browser/components/downloads/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/downloads/test/Makefile.in b/browser/components/downloads/test/Makefile.in
index a6db9bda3ae1..808b09fd811d 100644
--- a/browser/components/downloads/test/Makefile.in
+++ b/browser/components/downloads/test/Makefile.in
@@ -1,12 +1,12 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-relativesrcdir = browser/components/downloads/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/downloads/test/browser/Makefile.in b/browser/components/downloads/test/browser/Makefile.in
index a0202f9f0b04..c92c74629714 100644
--- a/browser/components/downloads/test/browser/Makefile.in
+++ b/browser/components/downloads/test/browser/Makefile.in
@@ -1,12 +1,12 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH     = ../../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-relativesrcdir = browser/components/downloads/test/browser
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/feeds/Makefile.in b/browser/components/feeds/Makefile.in
index c0e5a2b36215..85635f3f91b4 100644
--- a/browser/components/feeds/Makefile.in
+++ b/browser/components/feeds/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/feeds/public/Makefile.in b/browser/components/feeds/public/Makefile.in
index 7ec80d2debee..faa1ebfb078d 100644
--- a/browser/components/feeds/public/Makefile.in
+++ b/browser/components/feeds/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in
index b4d386fe2abf..3a060447532d 100644
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in
index 669722e4439d..9fe66eaebe91 100644
--- a/browser/components/feeds/test/Makefile.in
+++ b/browser/components/feeds/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/feeds/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/feeds/test/chrome/Makefile.in b/browser/components/feeds/test/chrome/Makefile.in
index 51ab99ba47b7..020e4b6525cb 100644
--- a/browser/components/feeds/test/chrome/Makefile.in
+++ b/browser/components/feeds/test/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/feeds/test/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/migration/Makefile.in b/browser/components/migration/Makefile.in
index 5fbde097d1ec..d80c17f0fa1a 100644
--- a/browser/components/migration/Makefile.in
+++ b/browser/components/migration/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/migration/public/Makefile.in b/browser/components/migration/public/Makefile.in
index 410f9e105cfe..d71d9f30d889 100644
--- a/browser/components/migration/public/Makefile.in
+++ b/browser/components/migration/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
index 216b602b35da..ccae043284e5 100644
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/migration/tests/Makefile.in b/browser/components/migration/tests/Makefile.in
index 9e62100e0b30..3071e1969143 100644
--- a/browser/components/migration/tests/Makefile.in
+++ b/browser/components/migration/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		  = ../../../..
+DEPTH		  = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		  = @srcdir@
-relativesrcdir = browser/components/migration/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/places/Makefile.in b/browser/components/places/Makefile.in
index ed0c7e2683ac..53bc82a1c7c8 100644
--- a/browser/components/places/Makefile.in
+++ b/browser/components/places/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/places/src/Makefile.in b/browser/components/places/src/Makefile.in
index a47e1aae8823..1d793a3943ef 100644
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/browser/components/places/tests/Makefile.in b/browser/components/places/tests/Makefile.in
index 5f61222aa31b..e2b8a09e914b 100644
--- a/browser/components/places/tests/Makefile.in
+++ b/browser/components/places/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = browser/components/places/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/places/tests/browser/Makefile.in b/browser/components/places/tests/browser/Makefile.in
index 478e8fa69959..9dad75f9d028 100644
--- a/browser/components/places/tests/browser/Makefile.in
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH			= ../../../../..
+DEPTH			= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
-relativesrcdir  = browser/components/places/tests/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/places/tests/chrome/Makefile.in b/browser/components/places/tests/chrome/Makefile.in
index df55f9333eff..33375ca8ba99 100644
--- a/browser/components/places/tests/chrome/Makefile.in
+++ b/browser/components/places/tests/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/components/places/tests/chrome
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/preferences/Makefile.in b/browser/components/preferences/Makefile.in
index 0c145c4429da..855b00888a4c 100644
--- a/browser/components/preferences/Makefile.in
+++ b/browser/components/preferences/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/preferences/in-content/Makefile.in b/browser/components/preferences/in-content/Makefile.in
index e49c8eb28773..cfd054c434cd 100644
--- a/browser/components/preferences/in-content/Makefile.in
+++ b/browser/components/preferences/in-content/Makefile.in
@@ -2,7 +2,7 @@
 #  - License, v. 2.0. If a copy of the MPL was not distributed with this file,
 #  - You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in
index bfd436fb4499..efa3069d0bad 100644
--- a/browser/components/preferences/in-content/tests/Makefile.in
+++ b/browser/components/preferences/in-content/tests/Makefile.in
@@ -2,11 +2,11 @@
 #  - License, v. 2.0. If a copy of the MPL was not distributed with this file,
 #  - You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/preferences/in-content/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in
index 8f3149fc53ec..0e034b76b370 100644
--- a/browser/components/preferences/tests/Makefile.in
+++ b/browser/components/preferences/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/preferences/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/privatebrowsing/Makefile.in b/browser/components/privatebrowsing/Makefile.in
index 59d39e0a9e81..93889ee84b2c 100644
--- a/browser/components/privatebrowsing/Makefile.in
+++ b/browser/components/privatebrowsing/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/privatebrowsing/src/Makefile.in b/browser/components/privatebrowsing/src/Makefile.in
index 7a7ab036eeb7..700cde3b7869 100644
--- a/browser/components/privatebrowsing/src/Makefile.in
+++ b/browser/components/privatebrowsing/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/browser/components/privatebrowsing/test/Makefile.in b/browser/components/privatebrowsing/test/Makefile.in
index 14b952559bea..2e3d021b4d3f 100644
--- a/browser/components/privatebrowsing/test/Makefile.in
+++ b/browser/components/privatebrowsing/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/privatebrowsing/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index 02377ab8ddc4..d569a5b07fb3 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/privatebrowsing/test/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/search/Makefile.in b/browser/components/search/Makefile.in
index 87b10a524784..a7947a7592f1 100644
--- a/browser/components/search/Makefile.in
+++ b/browser/components/search/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/components/search/test/Makefile.in b/browser/components/search/test/Makefile.in
index 35af257f7f28..9d46cbb5a9e5 100644
--- a/browser/components/search/test/Makefile.in
+++ b/browser/components/search/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  =  browser/components/search/test
+relativesrcdir  =  @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/sessionstore/Makefile.in b/browser/components/sessionstore/Makefile.in
index fdea77a77969..aafd3bffbd5d 100644
--- a/browser/components/sessionstore/Makefile.in
+++ b/browser/components/sessionstore/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/sessionstore/src/Makefile.in b/browser/components/sessionstore/src/Makefile.in
index a8d4832f7bae..5d6eba4d26c2 100644
--- a/browser/components/sessionstore/src/Makefile.in
+++ b/browser/components/sessionstore/src/Makefile.in
@@ -2,12 +2,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
 
 EXTRA_COMPONENTS = \
   nsSessionStore.manifest \
@@ -18,24 +19,16 @@ EXTRA_PP_COMPONENTS = \
 	nsSessionStartup.js \
 	$(NULL)
 
-libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/sessionstore
+JS_MODULES_PATH := $(FINAL_TARGET)/modules/sessionstore
 
-SS_EXTRA_PP_JS_MODULES = \
+EXTRA_JS_MODULES := \
+  DocumentUtils.jsm \
+  SessionStorage.jsm \
+  XPathGenerator.jsm \
+  $(NULL)
+
+EXTRA_PP_JS_MODULES := \
 	SessionStore.jsm \
 	$(NULL)
 
-ifdef SS_EXTRA_PP_JS_MODULES
-libs:: $(SS_EXTRA_PP_JS_MODULES)
-ifndef NO_DIST_INSTALL
-	$(EXIT_ON_ERROR) \
-	$(NSINSTALL) -D $(FINAL_TARGET)/modules/sessionstore; \
-	for i in $^; do \
-	  dest=$(FINAL_TARGET)/modules/sessionstore/`basename $$i`; \
-	  $(RM) -f $$dest; \
-	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
-	done
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/sessionstore/test/Makefile.in b/browser/components/sessionstore/test/Makefile.in
index 95c7616268d7..d572f0f39951 100644
--- a/browser/components/sessionstore/test/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/sessionstore/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/shell/Makefile.in b/browser/components/shell/Makefile.in
index c0e5a2b36215..85635f3f91b4 100644
--- a/browser/components/shell/Makefile.in
+++ b/browser/components/shell/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/shell/public/Makefile.in b/browser/components/shell/public/Makefile.in
index 9935d293067c..8b7a2acb2d18 100644
--- a/browser/components/shell/public/Makefile.in
+++ b/browser/components/shell/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
index 6ec7d4ec6b66..39ed4bce0ce0 100644
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/browser/components/shell/test/Makefile.in b/browser/components/shell/test/Makefile.in
index e41430da0593..58ebaadb9921 100644
--- a/browser/components/shell/test/Makefile.in
+++ b/browser/components/shell/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/shell/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/sidebar/Makefile.in b/browser/components/sidebar/Makefile.in
index 8011b310d4aa..433d4ce4ad8a 100644
--- a/browser/components/sidebar/Makefile.in
+++ b/browser/components/sidebar/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/tabview/Makefile.in b/browser/components/tabview/Makefile.in
index 21649e5ae190..b3ae2ef4cc2e 100644
--- a/browser/components/tabview/Makefile.in
+++ b/browser/components/tabview/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/tabview/test/Makefile.in b/browser/components/tabview/test/Makefile.in
index c1dfd36a6da9..7668f5851901 100644
--- a/browser/components/tabview/test/Makefile.in
+++ b/browser/components/tabview/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/tabview/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/test/Makefile.in b/browser/components/test/Makefile.in
index c0838c62f3d3..b2e2e479dcc5 100644
--- a/browser/components/test/Makefile.in
+++ b/browser/components/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/components/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/components/thumbnails/Makefile.in b/browser/components/thumbnails/Makefile.in
index 4a51f7697f18..359502c4278a 100644
--- a/browser/components/thumbnails/Makefile.in
+++ b/browser/components/thumbnails/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/thumbnails/test/Makefile.in b/browser/components/thumbnails/test/Makefile.in
index d12bd360f110..f916eb5b52f5 100644
--- a/browser/components/thumbnails/test/Makefile.in
+++ b/browser/components/thumbnails/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/thumbnails/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in
index c290fc1a341f..96f76873a7cc 100644
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/browser/devtools/commandline/Makefile.in b/browser/devtools/commandline/Makefile.in
index d96152027a52..df206dadd999 100644
--- a/browser/devtools/commandline/Makefile.in
+++ b/browser/devtools/commandline/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/commandline/test/Makefile.in b/browser/devtools/commandline/test/Makefile.in
index 9540e1cc1b1d..c27c88df288c 100644
--- a/browser/devtools/commandline/test/Makefile.in
+++ b/browser/devtools/commandline/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/devtools/commandline/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/debugger/Makefile.in b/browser/devtools/debugger/Makefile.in
index ed8461cf583c..570ac82504d5 100644
--- a/browser/devtools/debugger/Makefile.in
+++ b/browser/devtools/debugger/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 6cdaba124413..6cbddf15925a 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir  = browser/devtools/debugger/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/highlighter/Makefile.in b/browser/devtools/highlighter/Makefile.in
index fbf68192850d..d0d0a2a28932 100644
--- a/browser/devtools/highlighter/Makefile.in
+++ b/browser/devtools/highlighter/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/highlighter/test/Makefile.in b/browser/devtools/highlighter/test/Makefile.in
index 0db71e10830f..f1b292a8b418 100644
--- a/browser/devtools/highlighter/test/Makefile.in
+++ b/browser/devtools/highlighter/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/devtools/highlighter/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/layoutview/Makefile.in b/browser/devtools/layoutview/Makefile.in
index d96152027a52..df206dadd999 100644
--- a/browser/devtools/layoutview/Makefile.in
+++ b/browser/devtools/layoutview/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/layoutview/test/Makefile.in b/browser/devtools/layoutview/test/Makefile.in
index 66c9fb23aa5a..c26ccd036103 100644
--- a/browser/devtools/layoutview/test/Makefile.in
+++ b/browser/devtools/layoutview/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/devtools/layoutview/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/responsivedesign/Makefile.in b/browser/devtools/responsivedesign/Makefile.in
index 414f0f9a74ad..44def55d2c64 100644
--- a/browser/devtools/responsivedesign/Makefile.in
+++ b/browser/devtools/responsivedesign/Makefile.in
@@ -1,4 +1,4 @@
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/responsivedesign/test/Makefile.in b/browser/devtools/responsivedesign/test/Makefile.in
index 2b24b3fb693f..78c3fc38489f 100644
--- a/browser/devtools/responsivedesign/test/Makefile.in
+++ b/browser/devtools/responsivedesign/test/Makefile.in
@@ -35,11 +35,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/devtools/responsivedesign/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/scratchpad/Makefile.in b/browser/devtools/scratchpad/Makefile.in
index d96152027a52..df206dadd999 100644
--- a/browser/devtools/scratchpad/Makefile.in
+++ b/browser/devtools/scratchpad/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/scratchpad/test/Makefile.in b/browser/devtools/scratchpad/test/Makefile.in
index 8e1f19a757b4..ad9381ae6242 100644
--- a/browser/devtools/scratchpad/test/Makefile.in
+++ b/browser/devtools/scratchpad/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH			= ../../../..
+DEPTH			= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
-relativesrcdir  = browser/devtools/scratchpad/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/shared/Makefile.in b/browser/devtools/shared/Makefile.in
index d96152027a52..df206dadd999 100644
--- a/browser/devtools/shared/Makefile.in
+++ b/browser/devtools/shared/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in
index 817d56e67dca..7b9c323b639a 100644
--- a/browser/devtools/shared/test/Makefile.in
+++ b/browser/devtools/shared/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/devtools/shared/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/sourceeditor/Makefile.in b/browser/devtools/sourceeditor/Makefile.in
index 52db856acd78..9142aa349368 100644
--- a/browser/devtools/sourceeditor/Makefile.in
+++ b/browser/devtools/sourceeditor/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/sourceeditor/test/Makefile.in b/browser/devtools/sourceeditor/test/Makefile.in
index 2db4fd9ef892..75408aa038d6 100644
--- a/browser/devtools/sourceeditor/test/Makefile.in
+++ b/browser/devtools/sourceeditor/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = browser/devtools/sourceeditor/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/styleeditor/Makefile.in b/browser/devtools/styleeditor/Makefile.in
index 421bdba52a31..b5fdc2bfaeaf 100644
--- a/browser/devtools/styleeditor/Makefile.in
+++ b/browser/devtools/styleeditor/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/styleeditor/test/Makefile.in b/browser/devtools/styleeditor/test/Makefile.in
index 398535ae2860..5d05b6e5ad70 100644
--- a/browser/devtools/styleeditor/test/Makefile.in
+++ b/browser/devtools/styleeditor/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/devtools/styleeditor/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/styleinspector/Makefile.in b/browser/devtools/styleinspector/Makefile.in
index 757c302fee1a..4b3473e97fa0 100644
--- a/browser/devtools/styleinspector/Makefile.in
+++ b/browser/devtools/styleinspector/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/styleinspector/test/Makefile.in b/browser/devtools/styleinspector/test/Makefile.in
index ed8caa354b8d..656b92413ca2 100644
--- a/browser/devtools/styleinspector/test/Makefile.in
+++ b/browser/devtools/styleinspector/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/devtools/styleinspector/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/tilt/Makefile.in b/browser/devtools/tilt/Makefile.in
index c805c21269a2..56f758211c12 100644
--- a/browser/devtools/tilt/Makefile.in
+++ b/browser/devtools/tilt/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index 0a3e1928b8e5..0083aa512956 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH			= ../../../..
+DEPTH			= @DEPTH@
 topsrcdir		= @top_srcdir@
 srcdir			= @srcdir@
 VPATH			= @srcdir@
-relativesrcdir 	= browser/devtools/tilt/test
+relativesrcdir 	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/devtools/webconsole/HUDService-content.js b/browser/devtools/webconsole/HUDService-content.js
index 19d60544014f..36e30af2ba94 100644
--- a/browser/devtools/webconsole/HUDService-content.js
+++ b/browser/devtools/webconsole/HUDService-content.js
@@ -1161,17 +1161,17 @@ let ConsoleAPIObserver = {
           WebConsoleUtils.cloneObject(aOriginalMessage.arguments, true);
         break;
 
-      case "log":
-      case "info":
-      case "warn":
-      case "error":
-      case "debug":
       case "groupEnd":
         aRemoteMessage.argumentsToString =
           Array.map(aOriginalMessage.arguments || [],
                     this._formatObject.bind(this));
         break;
 
+      case "log":
+      case "info":
+      case "warn":
+      case "error":
+      case "debug":
       case "dir": {
         aRemoteMessage.objectsCacheId = Manager.sequenceId;
         aRemoteMessage.argumentsToString = [];
diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in
index 98bcfffbb3d3..d8ae9a8729da 100644
--- a/browser/devtools/webconsole/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index 194e1e963b39..4421f80bb2ff 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH			= ../../../..
+DEPTH			= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
-relativesrcdir  = browser/devtools/webconsole/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -112,6 +112,7 @@ MOCHITEST_BROWSER_FILES = \
 	browser_result_format_as_string.js \
 	browser_webconsole_bug_737873_mixedcontent.js \
 	browser_output_breaks_after_console_dir_uninspectable.js \
+	browser_console_log_inspectable_object.js \
 	head.js \
 	$(NULL)
 
diff --git a/browser/devtools/webconsole/test/browser_console_log_inspectable_object.js b/browser/devtools/webconsole/test/browser_console_log_inspectable_object.js
new file mode 100644
index 000000000000..2369a98d107b
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_console_log_inspectable_object.js
@@ -0,0 +1,57 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that objects given to console.log() are inspectable.
+
+function test()
+{
+  waitForExplicitFinish();
+
+  addTab("data:text/html,test for bug 676722 - inspectable objects for window.console");
+
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
+    openConsole(null, performTest);
+  }, true);
+}
+
+function performTest(hud)
+{
+  hud.jsterm.clearOutput(true);
+
+  hud.jsterm.execute("myObj = {abba: 'omgBug676722'}");
+  hud.jsterm.execute("console.log('fooBug676722', myObj)");
+  waitForSuccess({
+    name: "eval results are shown",
+    validatorFn: function()
+    {
+      return hud.outputNode.textContent.indexOf("fooBug676722") > -1 &&
+             hud.outputNode.querySelector(".hud-clickable");
+    },
+    successFn: function()
+    {
+      isnot(hud.outputNode.textContent.indexOf("myObj = {"), -1,
+            "myObj = ... is shown");
+
+      let clickable = hud.outputNode.querySelector(".hud-clickable");
+      ok(clickable, "the console.log() object .hud-clickable was found");
+      isnot(clickable.textContent.indexOf("omgBug676722"), -1,
+            "clickable node content is correct");
+
+      document.addEventListener("popupshown", function _onPopupShown(aEvent) {
+        document.removeEventListener("popupshown", _onPopupShown);
+
+        isnot(aEvent.target.label.indexOf("omgBug676722"), -1,
+           "object inspector opened on click");
+
+        executeSoon(finishTest);
+      });
+
+      executeSoon(function() {
+        EventUtils.synthesizeMouse(clickable, 2, 2, {}, hud.iframeWindow);
+      });
+    },
+    failureFn: finishTest,
+  });
+}
diff --git a/browser/devtools/webconsole/webconsole.js b/browser/devtools/webconsole/webconsole.js
index 7998daf9364a..4266cdd6322b 100644
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -944,7 +944,12 @@ WebConsoleFrame.prototype = {
       case "warn":
       case "error":
       case "debug":
-        body = argsToString.join(" ");
+        body = {
+          cacheId: aMessage.objectsCacheId,
+          remoteObjects: args,
+          argsToString: argsToString,
+        };
+        clipboardText = argsToString.join(" ");
         sourceURL = aMessage.apiMessage.filename;
         sourceLine = aMessage.apiMessage.lineNumber;
         break;
@@ -1068,6 +1073,57 @@ WebConsoleFrame.prototype = {
     return node;
   },
 
+  /**
+   * The click event handler for objects shown inline coming from the
+   * window.console API.
+   *
+   * @private
+   * @param nsIDOMNode aMessage
+   *        The message element this handler corresponds to.
+   * @param nsIDOMNode aAnchor
+   *        The object inspector anchor element. This is the clickable element
+   *        in the console.log message we display.
+   * @param array aRemoteObject
+   *        The remote object representation.
+   */
+  _consoleLogClick:
+  function WCF__consoleLogClick(aMessage, aAnchor, aRemoteObject)
+  {
+    if (aAnchor._panelOpen) {
+      return;
+    }
+
+    let options = {
+      title: aAnchor.textContent,
+      anchor: aAnchor,
+
+      // Data to inspect.
+      data: {
+        // This is where the resultObject children are cached.
+        rootCacheId: aMessage._evalCacheId,
+        remoteObject: aRemoteObject,
+        // This is where all objects retrieved by the panel will be cached.
+        panelCacheId: "HUDPanel-" + gSequenceId(),
+        remoteObjectProvider: this.jsterm.remoteObjectProvider.bind(this.jsterm),
+      },
+    };
+
+    let propPanel = this.jsterm.openPropertyPanel(options);
+    propPanel.panel.setAttribute("hudId", this.hudId);
+
+    let onPopupHide = function JST__evalInspectPopupHide() {
+      propPanel.panel.removeEventListener("popuphiding", onPopupHide, false);
+
+      this.jsterm.clearObjectCache(options.data.panelCacheId);
+
+      if (!aMessage.parentNode && aMessage._evalCacheId) {
+        this.jsterm.clearObjectCache(aMessage._evalCacheId);
+      }
+    }.bind(this);
+
+    propPanel.panel.addEventListener("popuphiding", onPopupHide, false);
+  },
+
   /**
    * Reports an error in the page source, either JavaScript or CSS.
    *
@@ -1828,19 +1884,31 @@ WebConsoleFrame.prototype = {
     aClipboardText = aClipboardText ||
                      (aBody + (aSourceURL ? " @ " + aSourceURL : "") +
                               (aSourceLine ? ":" + aSourceLine : ""));
-    if (!(aBody instanceof Ci.nsIDOMNode)) {
-      aBody = this.document.createTextNode(aLevel == "dir" ?
-                                           aBody.resultString : aBody);
-    }
 
-    if (!aBody.nodeType) {
-      aBody = this.document.createTextNode(aBody.toString());
-    }
-    if (typeof aBody == "string") {
-      aBody = this.document.createTextNode(aBody);
-    }
+    // Create the containing node and append all its elements to it.
+    let node = this.document.createElementNS(XUL_NS, "richlistitem");
 
-    bodyNode.appendChild(aBody);
+    if (aBody instanceof Ci.nsIDOMNode) {
+      bodyNode.appendChild(aBody);
+    }
+    else {
+      let str = undefined;
+      if (aLevel == "dir") {
+        str = aBody.resultString;
+      }
+      else if (["log", "info", "warn", "error", "debug"].indexOf(aLevel) > -1 &&
+               typeof aBody == "object") {
+        this._makeConsoleLogMessageBody(node, bodyNode, aBody);
+      }
+      else {
+        str = aBody;
+      }
+
+      if (str !== undefined) {
+        aBody = this.document.createTextNode(str);
+        bodyNode.appendChild(aBody);
+      }
+    }
 
     let repeatContainer = this.document.createElementNS(XUL_NS, "hbox");
     repeatContainer.setAttribute("align", "start");
@@ -1863,8 +1931,6 @@ WebConsoleFrame.prototype = {
       locationNode = this.createLocationNode(aSourceURL, aSourceLine);
     }
 
-    // Create the containing node and append all its elements to it.
-    let node = this.document.createElementNS(XUL_NS, "richlistitem");
     node.clipboardText = aClipboardText;
     node.classList.add("hud-msg-node");
 
@@ -1924,6 +1990,58 @@ WebConsoleFrame.prototype = {
     return node;
   },
 
+  /**
+   * Make the message body for console.log() calls.
+   *
+   * @private
+   * @param nsIDOMElement aMessage
+   *        The message element that holds the output for the given call.
+   * @param nsIDOMElement aContainer
+   *        The specific element that will hold each part of the console.log
+   *        output.
+   * @param object aBody
+   *        The object given by this.logConsoleAPIMessage(). This object holds
+   *        the call information that we need to display.
+   */
+  _makeConsoleLogMessageBody:
+  function WCF__makeConsoleLogMessageBody(aMessage, aContainer, aBody)
+  {
+    aMessage._evalCacheId = aBody.cacheId;
+
+    Object.defineProperty(aMessage, "_panelOpen", {
+      get: function() {
+        let nodes = aContainer.querySelectorAll(".hud-clickable");
+        return Array.prototype.some.call(nodes, function(aNode) {
+          return aNode._panelOpen;
+        });
+      },
+      enumerable: true,
+      configurable: false
+    });
+
+    aBody.remoteObjects.forEach(function(aItem, aIndex) {
+      if (aContainer.firstChild) {
+        aContainer.appendChild(this.document.createTextNode(" "));
+      }
+
+      let text = aBody.argsToString[aIndex];
+      if (!Array.isArray(aItem)) {
+        aContainer.appendChild(this.document.createTextNode(text));
+        return;
+      }
+
+      let elem = this.document.createElement("description");
+      elem.classList.add("hud-clickable");
+      elem.setAttribute("aria-haspopup", "true");
+      elem.appendChild(this.document.createTextNode(text));
+
+      this._addMessageLinkCallback(elem,
+        this._consoleLogClick.bind(this, aMessage, elem, aItem));
+
+      aContainer.appendChild(elem);
+    }, this);
+  },
+
   /**
    * Creates the XUL label that displays the textual location of an incoming
    * message.
@@ -2031,6 +2149,20 @@ WebConsoleFrame.prototype = {
 
     linkNode.setAttribute("aria-haspopup", "true");
 
+    this._addMessageLinkCallback(aNode, aCallback);
+  },
+
+  /**
+   * Add the mouse event handlers needed to make a link.
+   *
+   * @private
+   * @param nsIDOMNode aNode
+   *        The node for which you want to add the event handlers.
+   * @param function aCallback
+   *        The function you want to invoke on click.
+   */
+  _addMessageLinkCallback: function WCF__addMessageLinkCallback(aNode, aCallback)
+  {
     aNode.addEventListener("mousedown", function(aEvent) {
       this._startX = aEvent.clientX;
       this._startY = aEvent.clientY;
diff --git a/browser/extensions/Makefile.in b/browser/extensions/Makefile.in
index ae38beb49b10..b4d622a1dbfe 100644
--- a/browser/extensions/Makefile.in
+++ b/browser/extensions/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/browser/extensions/pdfjs/test/Makefile.in b/browser/extensions/pdfjs/test/Makefile.in
index ca686d1b4f6a..986b071009a3 100644
--- a/browser/extensions/pdfjs/test/Makefile.in
+++ b/browser/extensions/pdfjs/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/extensions/pdfjs/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/fuel/Makefile.in b/browser/fuel/Makefile.in
index e2da7224c9fa..55fbb31cf6cb 100644
--- a/browser/fuel/Makefile.in
+++ b/browser/fuel/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/fuel/public/Makefile.in b/browser/fuel/public/Makefile.in
index f1577fc0d665..6bda8b1638cf 100644
--- a/browser/fuel/public/Makefile.in
+++ b/browser/fuel/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/fuel/src/Makefile.in b/browser/fuel/src/Makefile.in
index 71e19feb9ffb..396343e20deb 100644
--- a/browser/fuel/src/Makefile.in
+++ b/browser/fuel/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/fuel/test/Makefile.in b/browser/fuel/test/Makefile.in
index fc91b7f06335..f8663ac7a64e 100644
--- a/browser/fuel/test/Makefile.in
+++ b/browser/fuel/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/fuel/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 404e63fe5163..6622ae61bceb 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in
index 7b8fe2847167..c1e74b74224d 100644
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 812dc1e4b592..f51c1abf5e72 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = browser/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in
index f1ffb15f21ca..782a91653787 100644
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
@@ -30,8 +30,4 @@ EXTRA_JS_MODULES += \
 	$(NULL)
 endif
 
-EXTRA_PP_JS_MODULES = \
-	WebappsInstaller.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/modules/test/Makefile.in b/browser/modules/test/Makefile.in
index eb1f9a6c4a7f..8efc8fcd502c 100644
--- a/browser/modules/test/Makefile.in
+++ b/browser/modules/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/modules/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/modules/webappsUI.jsm b/browser/modules/webappsUI.jsm
index df7913cc953e..0185afca1754 100644
--- a/browser/modules/webappsUI.jsm
+++ b/browser/modules/webappsUI.jsm
@@ -11,7 +11,7 @@ let Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
-Cu.import("resource:///modules/WebappsInstaller.jsm");
+Cu.import("resource://gre/modules/WebappsInstaller.jsm");
 Cu.import("resource://gre/modules/WebappOSUtils.jsm");
 
 let webappsUI = {
diff --git a/browser/themes/Makefile.in b/browser/themes/Makefile.in
index a0f8abddafaa..38de7356b222 100644
--- a/browser/themes/Makefile.in
+++ b/browser/themes/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/themes/gnomestripe/Makefile.in b/browser/themes/gnomestripe/Makefile.in
index 1d167d85cc28..372888149d48 100644
--- a/browser/themes/gnomestripe/Makefile.in
+++ b/browser/themes/gnomestripe/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 19daf0b02321..daa552af4b10 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -2632,3 +2632,120 @@ stack[anonid=browserStack][responsivemode] {
   background-image: -moz-linear-gradient(top, #B4211B, #8A1915);
   border-radius: 1px;
 }
+
+#social-toolbar-button {
+  -moz-appearance: toolbarbutton;
+}
+
+/* favicon for the service */
+#social-provider-image {
+  -moz-appearance: none;
+  border: none;
+  min-width: 20px;
+  min-height: 20px;
+  padding: 2px 5px;
+  margin: 0;
+  background: transparent;
+  list-style-image: url("chrome://browser/skin/social/social.png");
+}
+
+#social-provider-image > .button-box > .box-inherit > .button-icon {
+  max-height: 16px;
+  max-width: 16px;
+}
+
+#social-provider-image > .button-box {
+  padding: 0;
+  margin: 0;
+  background: transparent;
+  border: none;
+}
+
+#social-provider-image > .button-box > .button-menu-dropmarker {
+  display: none;
+}
+
+/* hbox that hold notification icons */
+#social-status-iconbox {
+  margin: 0;
+  padding: 0;
+}
+
+/* hbox that surrounds an image and its counter */
+.social-notification-icon-container {
+  padding: 0;
+  margin: 0;
+  position: relative;
+}
+
+/* notification counter box */
+.social-notification-icon-counter {
+  background-color: rgb(240,61,37);
+  border: 1px solid rgb(216,55,34);
+  box-shadow: 0px 1px 0px rgba(0,39,121,0.77);
+  padding-right: 1px;
+  padding-left: 1px;
+  color: white;
+  font-size: 9px;
+  font-weight: bold;
+  position: absolute;
+  right: -3px;
+  top: -4px;
+  z-index: 1;
+  text-align: center;
+}
+
+/* notification image */
+.social-notification-icon-image {
+  padding: 2px;
+  margin: 0;
+  min-width: 20px;
+  max-width: 32px;
+  max-height: 20px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+/* social toolbar provider menu */
+#social-statusarea-popup {
+  margin-top: 0;
+  margin-left: -12px;
+  margin-right: -12px;
+}
+
+#social-statusarea-user {
+  border-bottom: 1px solid rgb(221,221,221);
+  background-color: -moz-Dialog;
+  color: -moz-dialogtext;
+  position: relative;
+  font: message-box;
+  font-size: 12px;
+}
+
+#social-statusarea-user-portrait {
+  width: 32px;
+  height: 32px;
+  border-radius: 2px;
+  margin: 10px;
+  list-style-image: url("chrome://browser/skin/social/social.png");
+}
+
+#social-statusarea-username {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  color: -moz-nativehyperlinktext;
+  cursor: pointer;
+  min-width: 0;
+  margin: 0 6px;
+}
+#social-statusarea-username:hover {
+  text-decoration: underline;
+}
+
+#social-notification-panel {
+  min-height: 100px;
+  min-width: 100px;
+  max-height: 600px;
+  max-width: 400px;
+}
+
diff --git a/browser/themes/gnomestripe/communicator/Makefile.in b/browser/themes/gnomestripe/communicator/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/browser/themes/gnomestripe/communicator/Makefile.in
+++ b/browser/themes/gnomestripe/communicator/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/themes/pinstripe/Makefile.in b/browser/themes/pinstripe/Makefile.in
index 1d167d85cc28..372888149d48 100644
--- a/browser/themes/pinstripe/Makefile.in
+++ b/browser/themes/pinstripe/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/themes/pinstripe/communicator/Makefile.in b/browser/themes/pinstripe/communicator/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/browser/themes/pinstripe/communicator/Makefile.in
+++ b/browser/themes/pinstripe/communicator/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/browser/themes/winstripe/Makefile.in b/browser/themes/winstripe/Makefile.in
index 1d167d85cc28..372888149d48 100644
--- a/browser/themes/winstripe/Makefile.in
+++ b/browser/themes/winstripe/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/themes/winstripe/communicator/Makefile.in b/browser/themes/winstripe/communicator/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/browser/themes/winstripe/communicator/Makefile.in
+++ b/browser/themes/winstripe/communicator/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/build/ConfigStatus.py b/build/ConfigStatus.py
new file mode 100644
index 000000000000..6b53b07c2380
--- /dev/null
+++ b/build/ConfigStatus.py
@@ -0,0 +1,325 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Combined with build/autoconf/config.status.m4, ConfigStatus is an almost
+# drop-in replacement for autoconf 2.13's config.status, with features
+# borrowed from autoconf > 2.5, and additional features.
+
+from __future__ import with_statement
+from optparse import OptionParser
+import sys, re, os, posixpath, ntpath
+from StringIO import StringIO
+# Standalone js doesn't have virtualenv.
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config'))
+from Preprocessor import Preprocessor
+
+# Basic logging facility
+verbose = False
+def log(string):
+    if verbose:
+        print >>sys.stderr, string
+
+# We need relpath, but it is introduced in python 2.6
+# http://docs.python.org/library/os.path.html
+def my_relpath(path, start):
+    """
+    Return a relative version of a path
+    from /usr/lib/python2.6/posixpath.py
+    """
+
+    if not path:
+        raise ValueError("no path specified")
+
+    start_list = os.path.abspath(start).split(os.path.sep)
+    path_list = os.path.abspath(path).split(os.path.sep)
+
+    # Work out how much of the filepath is shared by start and path.
+    i = len(os.path.commonprefix([start_list, path_list]))
+
+    rel_list = [os.path.pardir] * (len(start_list)-i) + path_list[i:]
+    if not rel_list:
+        return os.curdir
+    return os.path.join(*rel_list)
+
+relpath = getattr(os.path, "relpath", my_relpath)
+
+def ensureParentDir(file):
+    '''Ensures the directory parent to the given file exists'''
+    dir = os.path.dirname(file)
+    if dir and not os.path.exists(dir):
+        try:
+            os.makedirs(dir)
+        except OSError, error:
+            if error.errno != errno.EEXIST:
+                raise
+
+class FileAvoidWrite(StringIO):
+    '''file-like object that buffers its output and only writes it to disk
+    if the new contents are different from what the file may already contain.
+    '''
+    def __init__(self, filename):
+        self.filename = filename
+        StringIO.__init__(self)
+
+    def close(self):
+        buf = self.getvalue()
+        StringIO.close(self)
+        try:
+            file = open(self.filename, 'rU')
+        except IOError:
+            pass
+        else:
+            try:
+                 if file.read() == buf:
+                     log("%s is unchanged" % relpath(self.filename, os.curdir))
+                     return
+            except IOError:
+                pass
+            finally:
+                file.close()
+
+        log("creating %s" % relpath(self.filename, os.curdir))
+        ensureParentDir(self.filename)
+        with open(self.filename, 'w') as file:
+            file.write(buf)
+
+    def __enter__(self):
+        return self
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+def shell_escape(s):
+    '''Escape some characters with a backslash, and double dollar signs.
+    '''
+    return re.sub('''([ \t`#$^&*(){}\\|;'"<>?\[\]])''', r'\\\1', str(s)).replace('$', '$$')
+
+class ConfigEnvironment(object):
+    '''A ConfigEnvironment is defined by a source directory and a build
+    directory. It preprocesses files from the source directory and stores
+    the result in the object directory.
+
+     There are two types of files: config files and config headers,
+     each treated through a different member function.
+
+     Creating a ConfigEnvironment requires a few arguments:
+       - topsrcdir and topobjdir are, respectively, the top source and
+         the top object directory.
+       - defines is a list of (name, value) tuples. In autoconf, these are
+         set with AC_DEFINE and AC_DEFINE_UNQUOTED
+       - non_global_defines are a list of names appearing in defines above
+         that are not meant to be exported in ACDEFINES and ALLDEFINES (see
+         below)
+       - substs is a list of (name, value) tuples. In autoconf, these are
+         set with AC_SUBST.
+
+     ConfigEnvironment automatically defines two additional substs variables
+     from all the defines not appearing in non_global_defines:
+       - ACDEFINES contains the defines in the form -DNAME=VALUE, for use on
+         preprocessor command lines. The order in which defines were given
+         when creating the ConfigEnvironment is preserved.
+       - ALLDEFINES contains the defines in the form #define NAME VALUE, in
+         sorted order, for use in config files, for an automatic listing of
+         defines.
+
+    ConfigEnvironment expects a "top_srcdir" subst to be set with the top
+    source directory, in msys format on windows. It is used to derive a
+    "srcdir" subst when treating config files. It can either be an absolute
+    path or a path relative to the topobjdir.
+    '''
+
+    def __init__(self, topobjdir = '.', topsrcdir = '.',
+                 defines = [], non_global_defines = [], substs = []):
+        self.defines = dict(defines)
+        self.substs = dict(substs)
+        self.topsrcdir = topsrcdir
+        self.topobjdir = topobjdir
+        global_defines = [name for name, value in defines if not name in non_global_defines]
+        self.substs['ACDEFINES'] = ' '.join(["-D%s=%s" % (name, shell_escape(self.defines[name])) for name in global_defines])
+        self.substs['ALLDEFINES'] = '\n'.join(sorted(["#define %s %s" % (name, self.defines[name]) for name in global_defines]))
+
+    def get_relative_srcdir(self, file):
+        '''Returns the relative source directory for the given file, always
+        using / as a path separator.
+        '''
+        assert(isinstance(file, basestring))
+        dir = posixpath.dirname(relpath(file, self.topobjdir).replace(os.sep, '/'))
+        if dir:
+            return dir
+        return '.'
+
+    def get_top_srcdir(self, file):
+        '''Returns a normalized top_srcdir for the given file: if
+        substs['top_srcdir'] is a relative path, it is relative to the
+        topobjdir. Adjust it to be relative to the file path.'''
+        top_srcdir = self.substs['top_srcdir']
+        if posixpath.isabs(top_srcdir) or ntpath.isabs(top_srcdir):
+            return top_srcdir
+        return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))
+
+    def get_file_srcdir(self, file):
+        '''Returns the srcdir for the given file, where srcdir is in msys
+        format on windows, thus derived from top_srcdir.
+        '''
+        dir = self.get_relative_srcdir(file)
+        top_srcdir = self.get_top_srcdir(file)
+        return posixpath.normpath(posixpath.join(top_srcdir, dir))
+
+    def get_depth(self, file):
+        '''Returns the DEPTH for the given file, that is, the path to the
+        object directory relative to the directory containing the given file.
+        Always uses / as a path separator.
+        '''
+        return relpath(self.topobjdir, os.path.dirname(file)).replace(os.sep, '/')
+
+    def get_input(self, file):
+        '''Returns the input file path in the source tree that can be used
+        to create the given config file or header.
+        '''
+        assert(isinstance(file, basestring))
+        return os.path.normpath(os.path.join(self.topsrcdir, "%s.in" % relpath(file, self.topobjdir)))
+
+    def create_config_file(self, path):
+        '''Creates the given config file. A config file is generated by
+        taking the corresponding source file and replacing occurences of
+        "@VAR@" by the value corresponding to "VAR" in the substs dict.
+
+        Additional substs are defined according to the file being treated:
+            "srcdir" for its the path to its source directory
+            "relativesrcdir" for its source directory relative to the top
+            "DEPTH" for the path to the top object directory
+        '''
+        input = self.get_input(path)
+        pp = Preprocessor()
+        pp.context.update(self.substs)
+        pp.context.update(top_srcdir = self.get_top_srcdir(path))
+        pp.context.update(srcdir = self.get_file_srcdir(path))
+        pp.context.update(relativesrcdir = self.get_relative_srcdir(path))
+        pp.context.update(DEPTH = self.get_depth(path))
+        pp.do_filter('attemptSubstitution')
+        pp.setMarker(None)
+        with FileAvoidWrite(path) as pp.out:
+            pp.do_include(input)
+
+    def create_config_header(self, path):
+        '''Creates the given config header. A config header is generated by
+        taking the corresponding source file and replacing some #define/#undef
+        occurences:
+            "#undef NAME" is turned into "#define NAME VALUE"
+            "#define NAME" is unchanged
+            "#define NAME ORIGINAL_VALUE" is turned into "#define NAME VALUE"
+            "#undef UNKNOWN_NAME" is turned into "/* #undef UNKNOWN_NAME */"
+            Whitespaces are preserved.
+        '''
+        with open(self.get_input(path), 'rU') as input:
+            ensureParentDir(path)
+            output = FileAvoidWrite(path)
+            r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+            for l in input:
+                m = r.match(l)
+                if m:
+                    cmd = m.group('cmd')
+                    name = m.group('name')
+                    value = m.group('value')
+                    if name:
+                        if name in self.defines:
+                            if cmd == 'define' and value:
+                                l = l[:m.start('value')] + str(self.defines[name]) + l[m.end('value'):]
+                            elif cmd == 'undef':
+                                l = l[:m.start('cmd')] + 'define' + l[m.end('cmd'):m.end('name')] + ' ' + str(self.defines[name]) + l[m.end('name'):]
+                        elif cmd == 'undef':
+                           l = '/* ' + l[:m.end('name')] + ' */' + l[m.end('name'):]
+
+                output.write(l)
+            output.close()
+
+def config_status(topobjdir = '.', topsrcdir = '.',
+                  defines = [], non_global_defines = [], substs = [],
+                  files = [], headers = []):
+    '''Main function, providing config.status functionality.
+
+    Contrary to config.status, it doesn't use CONFIG_FILES or CONFIG_HEADERS
+    variables, but like config.status from autoconf 2.6, single files may be
+    generated with the --file and --header options. Several such options can
+    be given to generate several files at the same time.
+
+    Without the -n option, this program acts as config.status and considers
+    the current directory as the top object directory, even when config.status
+    is in a different directory. It will, however, treat the directory
+    containing config.status as the top object directory with the -n option,
+    while files given to the --file and --header arguments are considered
+    relative to the current directory.
+
+    The --recheck option, like with the original config.status, runs configure
+    again, with the options given in the "ac_configure_args" subst.
+
+    The options to this function are passed when creating the
+    ConfigEnvironment, except for files and headers, which contain the list
+    of files and headers to be generated by default. These lists, as well as
+    the actual wrapper script around this function, are meant to be generated
+    by configure. See build/autoconf/config.status.m4.
+
+    Unlike config.status behaviour with CONFIG_FILES and CONFIG_HEADERS,
+    but like config.status behaviour with --file and --header, providing
+    files or headers on the command line inhibits the default generation of
+    files when given headers and headers when given files.
+
+    Unlike config.status, the FILE:TEMPLATE syntax is not supported for
+    files and headers. The template is always the filename suffixed with
+    '.in', in the corresponding directory under the top source directory.
+    '''
+
+    if 'CONFIG_FILES' in os.environ:
+        raise Exception, 'Using the CONFIG_FILES environment variable is not supported. Use --file instead.'
+    if 'CONFIG_HEADERS' in os.environ:
+        raise Exception, 'Using the CONFIG_HEADERS environment variable is not supported. Use --header instead.'
+
+    parser = OptionParser()
+    parser.add_option('--recheck', dest='recheck', action='store_true',
+                      help='update config.status by reconfiguring in the same conditions')
+    parser.add_option('--file', dest='files', metavar='FILE', action='append',
+                      help='instantiate the configuration file FILE')
+    parser.add_option('--header', dest='headers', metavar='FILE', action='append',
+                      help='instantiate the configuration header FILE')
+    parser.add_option('-v', '--verbose', dest='verbose', action='store_true',
+                      help='display verbose output')
+    parser.add_option('-n', dest='not_topobjdir', action='store_true',
+                      help='do not consider current directory as top object directory')
+    (options, args) = parser.parse_args()
+
+    # Without -n, the current directory is meant to be the top object directory
+    if not options.not_topobjdir:
+        topobjdir = '.'
+
+    env = ConfigEnvironment(topobjdir = topobjdir, topsrcdir = topsrcdir,
+                            defines = defines, non_global_defines = non_global_defines,
+                            substs = substs)
+
+    if options.recheck:
+        # Execute configure from the top object directory
+        if not os.path.isabs(topsrcdir):
+            topsrcdir = relpath(topsrcdir, topobjdir)
+        os.chdir(topobjdir)
+        os.execlp('sh', 'sh', '-c', ' '.join([os.path.join(topsrcdir, 'configure'), env.substs['ac_configure_args'], '--no-create', '--no-recursion']))
+
+    if options.files:
+        files = options.files
+        headers = []
+    if options.headers:
+        headers = options.headers
+        if not options.files:
+            files = []
+    # Default to display messages when giving --file or --headers on the
+    # command line.
+    if options.files or options.headers or options.verbose:
+        global verbose
+        verbose = True
+    if not options.files and not options.headers:
+        print >>sys.stderr, "creating config files and headers..."
+        files = [os.path.join(topobjdir, f) for f in files]
+        headers = [os.path.join(topobjdir, f) for f in headers]
+
+    for file in files:
+        env.create_config_file(file)
+    for header in headers:
+        env.create_config_header(header)
diff --git a/build/Makefile.in b/build/Makefile.in
index 9ceb4c6a265c..e8e043e4f4c9 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -26,7 +26,6 @@ endif
 
 DIRS += pgo
 
-TEST_DIRS += autoconf/test
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 TEST_DIRS += mobile/sutagent/android \
           mobile/sutagent/android/watcher \
@@ -263,4 +262,8 @@ libs:: $(topsrcdir)/tools/rb/fix-linux-stack.pl
 endif
 
 GARBAGE += $(srcdir)/automationutils.pyc
+
+# Test for ConfigStatus.py
+check::
+	$(PYTHON) $(srcdir)/tests/unit-ConfigStatus.py
 endif # ENABLE_TESTS
diff --git a/build/autoconf/acoutput-fast.pl b/build/autoconf/acoutput-fast.pl
deleted file mode 100755
index 5837122d47f1..000000000000
--- a/build/autoconf/acoutput-fast.pl
+++ /dev/null
@@ -1,170 +0,0 @@
-#! /usr/bin/env perl
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# acoutput-fast.pl - Quickly create makefiles that are in a common format.
-#
-# Most of the makefiles in mozilla only refer to two configure variables:
-#     @srcdir@
-#     @top_srcdir@
-# However, configure does not know any better and it runs sed on each file
-# with over 150 replacement rules (slow as molasses).
-#
-# This script takes a list of makefiles as input. For example,
-#   
-#     echo $MAKEFILES | acoutput-fast.pl
-#
-# The script creates each Makefile that only references @srcdir@ and
-# @top_srcdir@. For other files, it lists them in a shell command that is
-# printed to stdout:
-#
-#     CONFIG_FILES="unhandled_files..."; export CONFIG_FILES
-#
-# This command can be used to have config.status create the unhandled
-# files. For example,
-#
-#     eval "echo $MAKEFILES | acoutput-fast.pl"
-#     AC_OUTPUT($MAKEFILES)
-#
-# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
-
-#use File::Basename;
-sub dirname {
-  my $dir = $_[0];
-  return '.' if not $dir =~ m%/%;
-  $dir =~ s%/[^/][^/]*$%%;
-  return $dir;
-}
-
-# Create one directory. Assumes it doesn't already exist.
-# Will create parent(s) if needed.
-sub create_directory {
-  my $dir = $_[0];
-  my $parent = dirname($dir);
-  create_directory($parent) if not -d $parent;
-  mkdir "$dir",0777;
-}
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-sub create_directories {
-  my @makefiles = @_;
-  my @dirs = ();
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    push @dirs, dirname($ac_file);
-  }
-  # Call mkdir with the directories sorted by subdir count (how many /'s)
-  if (@dirs) {
-    foreach $dir (@dirs) {
-      if (not -d $dir) {
-        print STDERR "Creating directory $dir\n";
-        create_directory($dir);
-      }
-    }
-  }
-}
-
-while($arg = shift) {
-    if ($arg =~ /^--srcdir=/) {
-        $ac_given_srcdir = (split /=/, $arg)[1];
-    }
-    if ($arg =~ /^--cygwin-srcdir/) {
-        $ac_cygwin_srcdir = (split /=/, $arg)[1];
-    }
-}
-
-if (!$ac_given_srcdir) {
-  $ac_given_srcdir = $0;
-  $ac_given_srcdir =~ s|/?build/autoconf/.*$||;
-  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
-}
-
-if (!$ac_cygwin_srcdir) {
-    $ac_cygwin_srcdir = $ac_given_srcdir;
-}
-
-# Read list of makefiles from the stdin or,
-#   from files listed on the command-line.
-#
-@makefiles=();
-push @makefiles, split while (<STDIN>);
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-create_directories(@makefiles);
-
-# Output the makefiles.
-#
-@unhandled=();
-foreach $ac_file (@makefiles) {
-  if (not $ac_file =~ /Makefile$/ or $ac_file =~ /:/) {
-    push @unhandled, $ac_file;
-    next;
-  }
-  $ac_file_in = "$ac_given_srcdir/$ac_file.in";
-  $ac_dir = dirname($ac_file);
-  if ($ac_dir eq '.') {
-    $ac_dir_suffix = '';
-    $ac_dots = '';
-  } else {
-    $ac_dir_suffix = "/$ac_dir";
-    $ac_dir_suffix =~ s%^/\./%/%;
-    $ac_dots = $ac_dir_suffix;
-    $ac_dots =~ s%/[^/]*%../%g;
-  }
-  if ($ac_given_srcdir eq '.') {
-    $srcdir = '.';
-    if ($ac_dots eq '') {
-      $top_srcdir = '.'
-    } else {
-      $top_srcdir = $ac_dots;
-      $top_srcdir =~ s%/$%%;
-    }
-  } elsif ($ac_cygwin_srcdir =~ m%^/% or $ac_cygwin_srcdir =~ m%^.:/%) {
-    $srcdir     = "$ac_cygwin_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_cygwin_srcdir";
-  } else {
-    $srcdir     = "$ac_dots$ac_cygwin_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_dots$ac_cygwin_srcdir";
-  }
-
-  if (-e $ac_file) {
-    next if -M _ < -M $ac_file_in;
-    print STDERR "updating $ac_file\n";
-  } else {
-    print STDERR "creating $ac_file\n";
-  }
-
-  open (INFILE, "<$ac_file_in")
-    or ( die "can't read $ac_file_in: No such file or directory\n");
-  open (OUTFILE, ">$ac_file")
-    or ( warn "Unable to create $ac_file\n" and next);
-
-  while (<INFILE>) {
-    #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
-    #  warn "Two defines on a line:$ac_file:$.:$_";
-    #  push @unhandled, $ac_file;
-    #  last;
-    #}
-
-    s/\@srcdir\@/$srcdir/g;
-    s/\@top_srcdir\@/$top_srcdir/g;
-
-    if (/\@[_a-zA-Z]*\@/) {
-      warn "Unknown variable:$ac_file:$.:$_";
-      push @unhandled, $ac_file;
-      last;
-    }
-    print OUTFILE;
-  }
-  close INFILE;
-  close OUTFILE;
-}
-
-# Print the shell command to be evaluated by configure.
-#
-print "CONFIG_FILES=\"".join(' ', @unhandled)."\"; export CONFIG_FILES\n";
-
diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index 209053b5028d..9a1d46a68540 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -15,12 +15,20 @@ MOZ_ARG_WITH_STRING(android-toolchain,
                           location of the android toolchain],
     android_toolchain=$withval)
 
+dnl default android_version is different per target cpu
+case "$target_cpu" in
+arm)
+    android_version=5
+    ;;
+i?86|mipsel)
+    android_version=9
+    ;;
+esac
 
 MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
-                          android platform version, default 5],
-    android_version=$withval,
-    android_version=5)
+                          android platform version, default 5 for arm, 9 for x86/mips],
+    android_version=$withval)
 
 MOZ_ARG_WITH_STRING(android-platform,
 [  --with-android-platform=DIR
diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4
new file mode 100644
index 000000000000..9c43b3021602
--- /dev/null
+++ b/build/autoconf/config.status.m4
@@ -0,0 +1,170 @@
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+dnl For use in AC_SUBST replacement
+define([MOZ_DIVERSION_SUBST], 11)
+
+dnl Replace AC_SUBST to store values in a format suitable for python.
+dnl The necessary comma after the tuple can't be put here because it
+dnl can mess around with things like:
+dnl    AC_SOMETHING(foo,AC_SUBST(),bar)
+define([AC_SUBST],
+[ifdef([AC_SUBST_$1], ,
+[define([AC_SUBST_$1], )dnl
+AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
+        (''' $1 ''', r''' [$]$1 ''')
+AC_DIVERT_POP()dnl
+])])
+
+dnl Wrap AC_DEFINE to store values in a format suitable for python.
+dnl autoconf's AC_DEFINE still needs to be used to fill confdefs.h,
+dnl which is #included during some compile checks.
+dnl The necessary comma after the tuple can't be put here because it
+dnl can mess around with things like:
+dnl    AC_SOMETHING(foo,AC_DEFINE(),bar)
+define([_MOZ_AC_DEFINE], defn([AC_DEFINE]))
+define([AC_DEFINE],
+[cat >> confdefs.pytmp <<\EOF
+        (''' $1 ''', ifelse($#, 2, [r''' $2 '''], $#, 3, [r''' $2 '''], ' 1 '))
+EOF
+ifelse($#, 2, _MOZ_AC_DEFINE([$1], [$2]), $#, 3, _MOZ_AC_DEFINE([$1], [$2], [$3]),_MOZ_AC_DEFINE([$1]))dnl
+])
+
+dnl Wrap AC_DEFINE_UNQUOTED to store values in a format suitable for
+dnl python.
+define([_MOZ_AC_DEFINE_UNQUOTED], defn([AC_DEFINE_UNQUOTED]))
+define([AC_DEFINE_UNQUOTED],
+[cat >> confdefs.pytmp <<EOF
+        (''' $1 ''', ifelse($#, 2, [r''' $2 '''], $#, 3, [r''' $2 '''], ' 1 '))
+EOF
+ifelse($#, 2, _MOZ_AC_DEFINE_UNQUOTED($1, $2), $#, 3, _MOZ_AC_DEFINE_UNQUOTED($1, $2, $3),_MOZ_AC_DEFINE_UNQUOTED($1))dnl
+])
+
+dnl Replace AC_OUTPUT to create and call a python config.status
+define([AC_OUTPUT],
+[dnl Top source directory in Windows format (as opposed to msys format).
+WIN_TOP_SRC=
+encoding=utf-8
+case "$host_os" in
+mingw*)
+    WIN_TOP_SRC=`cd $srcdir; pwd -W`
+    encoding=mbcs
+    ;;
+esac
+AC_SUBST(WIN_TOP_SRC)
+
+dnl Used in all Makefile.in files
+top_srcdir=$srcdir
+AC_SUBST(top_srcdir)
+
+dnl Picked from autoconf 2.13
+trap '' 1 2 15
+AC_CACHE_SAVE
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+: ${CONFIG_STATUS=./config.status}
+
+dnl We're going to need [ ] for python syntax.
+changequote(<<<, >>>)dnl
+echo creating $CONFIG_STATUS
+
+cat > $CONFIG_STATUS <<EOF
+#!${PYTHON}
+# coding=$encoding
+
+import os, sys
+dnl topsrcdir is the top source directory in native form, as opposed to a
+dnl form suitable for make.
+topsrcdir = '''${WIN_TOP_SRC:-$srcdir}'''
+if not os.path.isabs(topsrcdir):
+    topsrcdir = os.path.normpath(os.path.join(os.path.dirname(<<<__file__>>>), topsrcdir))
+dnl Don't rely on virtualenv here. Standalone js doesn't use it.
+sys.path.append(os.path.join(topsrcdir, ${COMM_BUILD:+'mozilla',} 'build'))
+from ConfigStatus import config_status
+
+args = {
+    'topsrcdir': topsrcdir,
+    'topobjdir': os.path.dirname(<<<__file__>>>),
+
+dnl All defines and substs are stored with an additional space at the beginning
+dnl and at the end of the string, to avoid any problem with values starting or
+dnl ending with quotes.
+    'defines': [(name[1:-1], value[1:-1]) for name, value in [
+EOF
+
+dnl confdefs.pytmp contains AC_DEFINEs, in the expected format, but
+dnl lacks the final comma (see above).
+sed 's/$/,/' confdefs.pytmp >> $CONFIG_STATUS
+rm confdefs.pytmp confdefs.h
+
+cat >> $CONFIG_STATUS <<\EOF
+    ] ],
+
+    'substs': [(name[1:-1], value[1:-1]) for name, value in [
+EOF
+
+dnl The MOZ_DIVERSION_SUBST output diversion contains AC_SUBSTs, in the
+dnl expected format, but lacks the final comma (see above).
+sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+undivert(MOZ_DIVERSION_SUBST)dnl
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+    ] ],
+
+dnl List of files to apply AC_SUBSTs to. This is the list of files given
+dnl as an argument to AC_OUTPUT ($1)
+    'files': [
+EOF
+
+for out in $1; do
+  echo "        '$out'," >> $CONFIG_STATUS
+done
+
+cat >> $CONFIG_STATUS <<\EOF
+    ],
+
+dnl List of header files to apply AC_DEFINEs to. This is stored in the
+dnl AC_LIST_HEADER m4 macro by AC_CONFIG_HEADER.
+    'headers': [
+EOF
+
+ifdef(<<<AC_LIST_HEADER>>>, <<<
+HEADERS="AC_LIST_HEADER"
+for header in $HEADERS; do
+  echo "        '$header'," >> $CONFIG_STATUS
+done
+>>>)dnl
+
+cat >> $CONFIG_STATUS <<\EOF
+    ],
+
+dnl List of AC_DEFINEs that aren't to be exposed in ALLDEFINES
+    'non_global_defines': [
+EOF
+
+if test -n "$_NON_GLOBAL_ACDEFINES"; then
+  for var in $_NON_GLOBAL_ACDEFINES; do
+    echo "        '$var'," >> $CONFIG_STATUS
+  done
+fi
+
+cat >> $CONFIG_STATUS <<\EOF
+    ]
+}
+
+dnl Do the actual work
+config_status(**args)
+EOF
+changequote([, ])
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+dnl Execute config.status, unless --no-create was passed to configure.
+test "$no_create" = yes || ${PYTHON} $CONFIG_STATUS || exit 1
+])
diff --git a/build/autoconf/linux.m4 b/build/autoconf/linux.m4
new file mode 100644
index 000000000000..10a8cab857aa
--- /dev/null
+++ b/build/autoconf/linux.m4
@@ -0,0 +1,39 @@
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+AC_DEFUN([MOZ_LINUX_PERF_EVENT],
+[
+
+MOZ_ARG_WITH_STRING(linux-headers,
+[  --with-linux-headers=DIR
+                          location where the Linux kernel headers can be found],
+    linux_headers=$withval)
+
+LINUX_HEADERS_INCLUDES=
+
+if test "$linux_headers"; then
+    LINUX_HEADERS_INCLUDES="-I$linux_headers"
+fi
+
+_SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES"
+
+dnl Performance measurement headers.
+MOZ_CHECK_HEADER(linux/perf_event.h,
+    [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
+        [AC_TRY_COMPILE([#include <asm/unistd.h>],[return sizeof(__NR_perf_event_open);],
+        ac_cv_perf_event_open=yes,
+        ac_cv_perf_event_open=no)])])
+if test "$ac_cv_perf_event_open" = "yes"; then
+    HAVE_LINUX_PERF_EVENT_H=1
+else
+    HAVE_LINUX_PERF_EVENT_H=
+    LINUX_HEADERS_INCLUDES=
+fi
+AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
+AC_SUBST(LINUX_HEADERS_INCLUDES)
+
+CFLAGS="$_SAVE_CFLAGS"
+
+])
diff --git a/build/autoconf/make-makefile b/build/autoconf/make-makefile
deleted file mode 100755
index c35adc5fbb3e..000000000000
--- a/build/autoconf/make-makefile
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/usr/bin/env perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-use Getopt::Long;
-
-use Benchmark;
-use Cwd;
-use File::Basename;
-use File::Copy;
-use File::Path      qw{mkpath};
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(2.0);
-
-##--------------------##
-##---]  INCLUDES  [---##
-##--------------------##
-
-##############################################################
-# pymake: special case path handling for windows cmd shell.
-#   if invoked by cmd.exe and msys-perl is in play
-#     $0 may contain a drive letter
-#     modules use-or-expect msys/unix paths
-#     adjust $0 => C:/foo => /c/foo so string tests and
-#     manipulation can by applied properly.
-##############################################################
-sub BEGIN
-{
-    if ($^O eq 'msys' && $ENV{PATH} =~ m!\w:/!)
-    {
-	$0 =~ s!^(\w):!/$1!;
-    }
-    eval 'use FindBin';
-    die $@ if ($@);
-}
-
-use lib $FindBin::Bin;
-use makemakefile;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-my %argv;
-
-my $t0 = Benchmark->new();
-sub END
-{
-    if ($argv{bench})
-    {
-        my $t1 = Benchmark->new();
-        my $delta = timediff($t1, $t0);
-        print STDERR timestr($delta), "\n";
-    }
-}
-
-##----------------##
-##---]  MAIN  [---##
-##----------------##
-umask 0;
-
-my $debug = $argv{debug} || 0;
-
-my $pwdcmd = ($^O eq 'msys') ? 'pwd -W' : 'pwd';
-
-# Determine various tree path variables
-#
-my ($topsrcdir, $ptopsrcdir, $depth, @makefiles) = parse_arguments(@ARGV);
-
-my $object_fullpath = `$pwdcmd`; # Cwd::getcwd()
-chdir $depth;
-my $object_root = `$pwdcmd`;  # Cwd::getcwd()
-chomp $object_fullpath;
-chomp $object_root;
-
-# $source_subdir is the path from the object root to where
-#    'make-makefile' was called. For example, if make-makefile was
-#    called from "mozilla/gfx/src", then $source_subdir would be
-#    "gfx/src/".
-my $source_subdir = "$object_fullpath/";
-my $quoted_object_root = quotemeta($object_root);
-$source_subdir =~ s|^$quoted_object_root/||;
-
-# Prefix makefiles with $source_subdir so that paths
-# will be relative to the top of the object tree.
-#
-my $makefile;
-for $makefile (@makefiles) { # dead code ?
-  $makefile = "$source_subdir$makefile";
-}
-
-# Find the path to the source directory based on how 'make-makefile'
-#  was invoked. The path is either relative to the object directory
-#  or an absolute path.
-my $given_srcdir = find_srcdir($topsrcdir, $depth);
-my $pgiven_srcdir = find_srcdir($ptopsrcdir, $depth);
-
-if ($debug) {
-  warn "object_fullpath = $object_fullpath\n";
-  warn "object_root     = $object_root\n";
-  warn "source_subdir   = $source_subdir\n";
-  warn "makefiles       = @makefiles\n";
-  warn "given_srcdir    = $given_srcdir\n";
-}
-
-my @errors;
-my @unhandled = update_makefiles_legacy($given_srcdir, $pgiven_srcdir, @makefiles);
-push(@errors, $@) if ($@);
-
-run_config_status(@unhandled);
-push(@errors, $@) if ($@ && $argv{'no-warnings'});
-
-exit scalar(@errors);
-
-# end of Main
-############################################################
-
-###########################################################################
-# find_depth: Pull the value of DEPTH out of a Makefile (or Makefile.in)
-###########################################################################
-sub find_depth {
-  my $depth = '';
-  open(MAKEFILE, "<$_[0]") || die "Unable to open $_[0]: $!\n";
-  while (<MAKEFILE>) {
-    next unless /^DEPTH\s*=\s*(\..*)/;
-    $depth = $1;
-    last;
-  }
-  close MAKEFILE;
-  return $depth;
-}
-
-###########################################################################
-## Intent: Parse command line arguments and assign values
-###########################################################################
-sub parse_arguments {
-  my @args = @_;
-  my @makefiles = ();
-
-  my @arglist = qw(badtokens! bench
-                   chdir=s
-                   debug
-                   depth|d=s
-                   enhanced
-                   obj=s top|t=s ptop|p=s
-                   src=s dst=s
-                   );
-  unless(GetOptions(\%argv, @arglist))
-  {
-      my $script = join('/', $FindBin::RealBin, $FindBin::Script);
-      system("perldoc $script </dev/null");
-      exit
-  }
-  @args = @ARGV;
-
-  my $topsrcdir = $argv{top} || '';
-  if (! $topsrcdir)
-  {
-      $topsrcdir = $argv{top} = getTopDir();
-  }
-
-  my $ptopsrcdir ||= $argv{ptop} || $topsrcdir || '';
-
-  ## Init --no- switch values
-  foreach my $var (qw(badtokens exclusions warnings))
-  {
-      $argv{"no-${var}"} = $argv{$var} || 0;
-  }
-  # Propogate parsed arguments for module use [--debug, --verbose]
-  while (my($k, $v) = each %argv)
-  {
-      $main::argv{$k} = $v;
-  }
-
-  if ($argv{chdir})
-  {
-      chdir $argv{chdir} || die "chdir $argv{chdir} failed: $!";
-  }
-
-  ##############################################################
-  ## Arguments allowing make-makefile to be invoked from $topsrc
-  ##############################################################
-  if (!$argv{top} || !$argv{obj})
-  {
-  }
-  ## Limit access to container makefiles for now
-  elsif ($argv{enhanced})
-  {
-      my @errors;
-
-      ## iterate over @ARGV to preserve original filename for 'unhandled'
-      my @files = map{ getRelPath($_) } @ARGV;
-
-      my $top = getTopDir();
-      my $obj = getObjDir();
-
-      mkdirr(map{ "$obj/$_" } @files);
-      push(@errors, $@) if ($@); # legacy behavior: do not exit with status
-
-      my $exclude = join('/', $FindBin::RealBin, $FindBin::Script);
-      $exclude .= '.excl'; # $argv{exclude}
-      my %exclude = getExclusions($exclude);
-      my @unhandled;
-      foreach my $relpath (@files)
-      {
-          my $rel = join('/', $relpath, 'Makefile.in');
-          my $mf = join('/', $top, $rel);
-          next if ($exclude{$rel});
-          print STDERR " ** relpath=[$relpath], mf=[$mf]\n" if ($main::argv{debug});
-
-          my $rc = updateMakefiles($relpath, {depth=>$depth, obj=>$obj, top=>$top});
-          if ($@)
-          {
-            push(@errors, $@);
-          }
-          elsif ($rc eq 'badtokens')
-          {
-            push(@unhandled, $mf);
-          }
-      }
-
-      run_config_status(@unhandled);
-      push(@errors, $@) if ($@ && $argv{'no-warnings'});
-      exit scalar(@errors);
-  }
-
-
-  my $depth = $argv{depth} || '';
-  if (! $depth)
-  {
-      foreach my $fyl (@args)
-      {
-          if (my $tmp = find_depth($fyl))
-          {
-              $depth = $tmp;
-              last;
-          }
-      }
-  }
-
-  if (! $depth) {
-    # Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
-    if (-e "Makefile.in") {
-      $depth = find_depth("Makefile.in");
-    } elsif (-e "Makefile") {
-      $depth = find_depth("Makefile");
-    } elsif (-e "../Makefile") {
-      $depth = "../".find_depth("../Makefile");
-      $depth =~ s/\/\.$//;
-    } else {
-      warn "Unable to determine depth (e.g. ../..) to root of objdir tree.\n";
-      die  "No Makefile(.in) present. Try running with '-d <depth>'\n";
-    }
-  } 
-
-  # Build the list of makefiles to generate
-  #
-  @makefiles = ();
-  while (@args)
-  {
-      next unless my $makefile = shift @args;
-      $makefile =~ s/\.in$//;
-      $makefile =~ s/\/$//;
-      $makefile =~ /Makefile$/
-        or $makefile =~ /^\.\//
-        or $makefile .= "/Makefile";
-    push @makefiles, "$makefile";
-  }
-  @makefiles = "Makefile" unless @makefiles;
-
-  return ($topsrcdir, $ptopsrcdir, $depth, @makefiles);
-}
-
-# Find the top of the source directory
-# (Assuming that the executable is in $top_srcdir/build/autoconf)
-sub find_srcdir {
-  my ($ac_given_srcdir, $depth) = @_;
-
-  if ($debug) {
-    print "ac_given_srcdir = $ac_given_srcdir\n";
-    print "depth           = $depth\n";
-  }
-  if ($ac_given_srcdir =~ /^\./ and $depth ne '.') {
-    my $quoted_depth = quotemeta($depth);
-    $ac_given_srcdir =~ s|^$quoted_depth/?||;
-  }
-  if ($debug) {
-    print "ac_given_srcdir = $ac_given_srcdir\n";
-  }
-  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
-  return $ac_given_srcdir;
-}
-
-1;
-###########################################################################
-## perldoc 
-###########################################################################
-__END__
-
-=head1 NAME
-
-make-makefile - Generate a Makefile from a F<Makefile.in> template
-
-=head1 SYNOPSIS
-
-make-makefile [--top t] [--obj o] [--depth d] foo/bar/Makefile.in tans/fans/Makefile foo/bar
-
-=head1 DESCRIPTION
-
-Given options and makefile path arguments determine path to the template
-F<Makefile.in> beneath a source directory and path to generated F<Makefile>
-beneath $MOZ_OBJDIR.  DEPTH from destination directory to the 'root' will
-also be determined.  F<Makefile.in> will be read in, template strings of the
-gorm @token@ will be replaced with derived values and a generated makefile
-will be written out as F<Makefile>.
-
-Makefile DEPTH= can be determined in a few different ways:
-  o The string C<DEPTH=../../..> may be embedded within F<Makefile.in>.
-  o Search parent directories for F<Makefile.in> and use it to assign the child.
-
-
-=head2 Option List
-
-=over 4
-
-=item --chdir
-
-Move to this directory before doing anything else
-
-=item -d, --depth
-
-Explicitly specify the relative path from directory containing Makefile.in
-to the top sandbox directory.  memory/makefile, DEPTH=../.., js/src/config, DEPTH=..
-
-=item --enhanced
-
-Use alternate/simplified path construction when options --top and --obj are
-passed.  This feature will be used by container makefiles to support makefile
-generation while cd'd into the sandbox top directory.
-
-=item -t, --top
-
-Path the root of a development sandbox.
-
-=item --obj
-
-Path to object directory where generated makefile will be written ($MOZ_OBJDIR).
-
-=item --ptop
-
-Print top source dir
-
-=back
-
-
-=head2 Options List DEBUG
-
-=over 4
-
-=item --bench
-
-Enable script benchmarking, report elapsed runtime.
-
-=item --debug
-
-Enable script debug mode.
-
-=back
-
-
-=head2 Options List --NO-
-
-=over 4
-
-=item --no-badtokens (wip)
-
-Handle unexpanded @token@ makefile tokens as an error condition.
-Do not rely on system(config.status) to externally supply values.
-
-=item --no-excludes
-
-Ignore file entries on the exclusion list, generate everything.
-
-=item --no-warnings
-
-Warnings are handled as an error condition.
-
-=back
-
-
-=head2 Examples
-
-=over 4
-
-=item * make-makefile -t /mozilla/nightly -d . memory/mozalloc
-
-cd $MOZ_OBJDIR;
---top and --depth are explicitly set for generting memory/mozalloc/Makefile.
-
-=item * make-makefile -t /mozilla/nightly -d ../../../.. html5lib_tree_construction/Makefile
-
-cd $MOZ_OBJDIR/parser/htmlparser/tests/mochitest
-
---top and --depth are explicitly set for generting a makefile from within
-a subdirectory of $MOZ_OBJDIR
-
-=item * make-makefile --top /mozilla/nightly --obj /mozilla/nightly/obj memory/mozalloc
-
-With --top and --obj explicitly set generate $MOZ_OBJDIR/memory/mozalloc/Makefile
-while sitting in the sandbox root.
-
-=back
-
-
-=head2 Work In Progress
-
-=over 4
-
-=item --no-badtokens
-
-Fail on unexpanded @foo@ makefile tokens.  Any tokens that can be expanded
-directly by make-makefile will avoid config.status shell overhead.
-
-=item Depth from delta(--obj, --top)
-
-If DEPTH= has not been embedded within a makefile the value could
-be set directly if --top and --obj are specified and the paths overlap.
-
-=back
-
-
-=head1 SEE ALSO
-
-L<config/rules.mk>
-
-=cut
diff --git a/build/autoconf/make-makefile.excl b/build/autoconf/make-makefile.excl
deleted file mode 100644
index 74fea3517466..000000000000
--- a/build/autoconf/make-makefile.excl
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-###########################################################################
-## Intent: Exclusion list for container make builds
-###########################################################################
-
-# EOF
diff --git a/build/autoconf/makemakefile.pm b/build/autoconf/makemakefile.pm
deleted file mode 100644
index b2559cbcd8da..000000000000
--- a/build/autoconf/makemakefile.pm
+++ /dev/null
@@ -1,711 +0,0 @@
-package makemakefile;
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-# use feature 'state'; 5.10+ not available everywhere
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(2.0);
-use Exporter;
-our @ISA = qw(Exporter);
-our @EXPORT = qw(dirname_legacy
-                 getConfig getDepth getRelPath getObjDir getTopDir mkdirr
-                 getExclusions
-                 run_config_status
-                 updateMakefiles
-                 update_makefiles_legacy
-                 );
-
-##--------------------##
-##---]  INCLUDES  [---##
-##--------------------##
-use Cwd;
-use Cwd     qw{abs_path};
-use FindBin;
-use File::Basename;
-use File::Copy;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-umask 0;
-my $cwd = Cwd::abs_path('.');
-my %argv;
-
-
-###########################################################################
-## Intent: Helper function, retrieve contents of a file with error checking
-## -----------------------------------------------------------------------
-## Args:
-##   scalar   path to input file
-## Returns:
-##   array    contents of the given file
-##   $@       set on error
-###########################################################################
-sub cat
-{
-    my $fyl = shift || '';
-    $@ = '';
-    my @data;
-
-    local *FYL;
-    if (!open(FYL, $fyl))
-    {
-        $@ = "open($fyl) failed: $!";
-    }
-    else
-    {
-        @data = <FYL>;
-        close(FYL);
-    }
-    return @data;
-} # cat
-
-###########################################################################
-## Intent: Return directory path for a given argument
-## -----------------------------------------------------------------------
-## -----------------------------------------------------------------------
-## Todo:
-##   o Check if function can be replaced by File::Basename::dirname()
-###########################################################################
-sub dirname_legacy
-{
-    my $str = (@_ && defined($_[0])) ? shift : '';
-    return $str =~ /(.*)\/.*/ ? "$1" : '.';
-}
-
-###########################################################################
-## Intent: Given a list of makefile paths recursively create all
-##         directories between file and the root
-## -----------------------------------------------------------------------
-## Args:
-##   array   A list of makefiles
-##   fargs   Function arguments
-##     mode  Filesystem mode used for directory creation
-## Returns:
-##   $@      Set on error
-##   0       on success
-## -----------------------------------------------------------------------
-## Note:
-##   Reporting directory creation can be enabled by the --verbose
-##   command line argument.
-###########################################################################
-sub mkdirr
-{
-    my %fargs = (@_ && ref($_[$#_])) ? %{ (pop) } : ();
-    my $mode = $fargs{mode} || 0755;
-    my $verbose = $main::argv{verbose} || 0;
-    $@ = '' unless ($fargs{recursive});
-    $fargs{recursive} = 1;
-
-    my @errors;
-    push(@errors, $@) if ($@);
-    foreach my $path (@_)
-    {
-        (my $dir = $path) =~ s%/?Makefile[^/]*$%%o;
-        next unless (length($dir));
-        next if (-e $dir);
-        mkdirr( dirname($dir), \%fargs);
-        eval{ File::Path::mkpath($dir, $verbose, 0755); };
-        push(@errors, $@) if ($@);
-    }
-    $@ = join("\n", @errors);
-    return $@ ? 0 : 1;
-} # mkdirr
-
-###########################################################################
-## Intent: Read in configure values and return a hash of key/value pairs
-## -----------------------------------------------------------------------
-## Args:
-##   fargs  Function arguments
-##     reset   clear value storage and repopulate
-## Returns:
-##   hash  configure data to use for makefile substitutions
-## -----------------------------------------------------------------------
-## Todo: wrapper for reading config* and run_config_status
-###########################################################################
-my %_CONFIG_; # todo: state %config; w/5.10
-sub getConfig
-{
-    my %fargs = (@_ && ref($_[$#_]) eq 'HASH') ? %{ (pop) } : ();
-    if ($fargs{reset})
-    {
-        %_CONFIG_ = ();
-        shift;
-    }
-
-    #my $ac_file_in    = "$ac_given_srcdir/${ac_file}.in";
-    #my $ac_dir        = dirname_legacy($ac_file);
-    #my $ac_dots       = '';
-    #my $ac_dir_suffix = '';
-    #my $srcdir        = '.';
-    #my $top_srcdir    = '.';
-    unless (%_CONFIG_)
-    {
-        while (@_)
-        {
-            my ($k, $v) = splice(@_, 0, 2);
-            $_CONFIG_{$k} = $v;
-        }
-    }
-
-    return %_CONFIG_;
-} # getConfig
-
-###########################################################################
-## Intent: Determine path depth between leaf and root directory.
-##   o DEPTH= may be set by makefile content
-##   o DEPTH= may be set by Makefile in a parent
-##   o Manually determine by relpath form leaf to sandbox top
-## -----------------------------------------------------------------------
-## Args:
-##   scalar  Path to makefile or directory to determine DEPTH for
-## Returns:
-##   scalar  Relative path from leaf to root directory
-## -----------------------------------------------------------------------
-###########################################################################
-sub getDepth($)
-{
-    my $fyl = shift || '';
-
-    my @path = split(m%/%o, $fyl);
-    pop(@path) if ('Makefile' eq substr($path[$#path], 0, 8));
-    my $depth;
-    my @depth;
-
-    my $top = getTopDir();
-    my @top = split(m%/%o, $top);
-    my @pathNoTop = @path;
-    splice(@pathNoTop, 0, scalar(@top));
-
-    SEARCH:
-    while (@path)
-    {
-        ## Search for a file containing DEPTH=../..
-        foreach my $fyl ( qw{Makefile.in Makefile} )
-        {
-            my $path = join('/', @path, $fyl);
-            local *FYL;
-            if (!open(FYL, $path)) {} # NOP
-            elsif (my @tmp = map{ /^\s*DEPTH\s*=\s*([\.\/]+)/o ? $1 : () } <FYL>)
-            {
-                $depth = join('/', @depth, shift @tmp);
-                last SEARCH;
-            }
-            close(FYL);
-        }
-        pop @path;
-        pop @pathNoTop;
-
-        if (0 == scalar(@pathNoTop))
-        {
-            $depth = join('/', @depth);
-            last;
-        }
-        
-        ## Construct path manually
-        push(@depth, '..');
-    }
-    return $depth;
-} # getDepth
-
-###########################################################################
-## Intent: Read in the exclusion file
-###########################################################################
-sub getExclusions
-{
-    my $file = shift || '';
-    
-    return () if ($main::argv{'no-exclusions'});
-
-    my %exclude;
-    if ($file)
-    {
-        my @data = cat($file);
-        foreach (@data)
-        {
-            next unless ($_);
-            next if (/^\s*\#/o);
-            next unless (m%/%);
-            chomp;
-            $exclude{$_}++;
-        }
-    }
-    return %exclude;
-} # getExclusions
-
-###########################################################################
-## Intent: Given the path to a makefile beneath either src or obj
-##         derive the relative path prefix between makefile and root.
-###########################################################################
-sub getRelPath
-{
-    my $path0 =  shift;
-    my $abspath;
-
-    # Determine type and orientation
-    my $name = basename($path0);
-    my $haveMF = ($name eq 'Makefile.in') ? 1
-        : ($name eq 'Makefile') ? -1
-        : 0
-        ;
-
-    ####################################################
-    ## Prep work: form a relative path with ../ removed
-    ####################################################
-    my $top = getTopDir();
-    my $obj = getObjDir();
-    ## If the same Makefile will be created alongside Makefile.in
-    my $topQM = quotemeta($top);
-    my $objQM = quotemeta($obj);
-
-    if ('..' eq substr($path0, 0, 2))
-    {
-        my @cwd = split(m%/%, $cwd);
-        my @pth = split(m%/%, $path0);
-        while (@pth && $pth[0] eq '..')
-        {
-            pop(@cwd);
-            shift @pth;
-        }
-        $path0 = join('/', @cwd, @pth);
-        $abspath = $path0;
-    }
-
-    if ('/' eq substr($path0, 0, 1))
-    {
-        $path0 =~ s%^$objQM\/?%%;
-        $path0 =~ s%^$topQM\/?%%;
-    }
-
-    #######################################################################
-    ## Build a list of directories to search.  Input source will be one
-    ## of path to Makefile.in, path to Makefile, directory, file within
-    ## a directory or relative path from cwd.
-    #######################################################################
-    my @subdirs;
-    my $path = (0 == $haveMF) ? $path0 : dirname($path0);
-    push(@subdirs, $path); # containing directory
-    push(@subdirs, dirname($path)) if (0 == $haveMF && -f $path); # Arg is file within a directory
-    push(@subdirs, $cwd);  # relative to pwd
-
-    # obj - path to generated makefile
-    # top - path to Makefile.in source template
-    my @prefixes = ('/' ne substr($path0, 0, 1))
-        ? (&getTopDir, &getObjDir)
-        : ()
-        ;
-
-  ON_SAFARI:
-    for my $prefix (@prefixes)
-    {
-        next unless ($prefix); # no command line not passed
-        foreach my $subdir (@subdirs)
-        {
-            foreach my $mf ('Makefile.in', 'Makefile')
-            {
-                my $path = join('/', $prefix, $subdir, $mf);
-                if (-e $path)
-                {
-                    $name = $mf;
-                    $haveMF = ($mf eq 'Makefile.in') ? 1 : -1;
-                    $abspath = $path;
-                    last ON_SAFARI;
-                }
-            }
-        }
-    }
-
-    #######################################################################
-    ## Generated makefile does not yet exist or path is invalid.
-    ## Should this conditon be handled to detect non-existent Makefile.in:
-    ##   Makefile.am => Makefile.in => Makefile but Makefile.in
-    #######################################################################
-    if (!$abspath && -1 == $haveMF && $obj)
-    {
-        $abspath = ('/' eq substr($path0, 0, 1)) 
-            ? $path0
-            : join('/', $obj, $path0)
-            ;
-    }
-
-    ########################################################
-    ## If --top and/or --obj specified extract relative path
-    ########################################################
-    my $relpath;
-    if (! $abspath)
-    {
-        # Error, fall through
-    }
-    elsif (1 == $haveMF) # Makefile.in
-    {
-        ## err w/o --top
-        (my $tmp = $abspath) =~ s%^$topQM/?%%;
-        $relpath = dirname($tmp) unless ($tmp eq $abspath);
-    }
-    elsif (-1 == $haveMF) # Makefile
-    {
-        ## err w/o --obj
-        (my $tmp = $abspath) =~ s%^$objQM/?%%;
-        $relpath = dirname($tmp) unless ($tmp eq $abspath);
-    }
-
-    $relpath ||= '';
-    $relpath =~ s%/./%/%og; # filter ./
-
-    $@ = ($relpath) ? '' : "ERROR($path0): Unable to locate sources";
-    return $relpath || '';
-} # getRelPath
-
-###########################################################################
-## Intent: Determine sandbox root from script startup directory
-## -----------------------------------------------------------------------
-## Args:
-##    _set_    optional, if passed use the given value as path
-##    _reset_  clear cached directory path to reassign
-## Returns:
-##   scalar - absolute path to the sandbox root directory
-## -----------------------------------------------------------------------
-###########################################################################
-my $gtd_dir;
-sub getTopDir
-{
-    if (@_) # testing override
-    {
-        $gtd_dir = abs_path($_[1] || '.') if ($_[0] eq '_set_');
-        $gtd_dir = ''    if ($_[0] eq '_reset_');
-    }
-
-    unless ($gtd_dir)
-    {
-        ## Set by command line
-        if ($main::argv{top})
-        {
-            $gtd_dir = $main::argv{top};
-        }
-        else
-        {
-            my $path = abs_path($FindBin::RealBin);
-            my @path = split(m%/%o, $path);
-            ## --2 memory/mozalloc/Makefile.in
-            ## --3 was this for FindBin::Script ?
-            splice(@path, -2);
-            $gtd_dir = join('/', @path);
-        }
-    }
-    return $gtd_dir;
-} # getTopDir
-
-###########################################################################
-## Intent: Determine path to MOZ_OBJDIR/object directory
-## -----------------------------------------------------------------------
-## Args:
-##   _set_    optional testing arg, if passed re-compute cached value
-## Returns:
-##   scalar - absolute path to the sandbox object directory
-## -----------------------------------------------------------------------
-###########################################################################
-my $god_dir;
-sub getObjDir
-{
-    if (@_) # testing override
-    {
-        if ($_[0] eq '_reset_')
-        {
-            $god_dir = '';
-            shift;
-        }
-        elsif ($_[0] eq '_set_')
-        {
-            shift;
-            my $path = $_[0] || '.';
-            $god_dir = abs_path($path);
-            shift;
-        }
-    }
-
-    ## extract $obj from given path
-    unless ($god_dir)
-    {
-        if ($main::argv{obj})
-        {
-            $god_dir = $main::argv{obj};
-        }
-        elsif (@_ && 'Makefile' eq substr($_, -8))
-        {
-            $god_dir = abs_path(shift);
-        }
-        else # assume we are sitting in moz_objdir
-        {
-            $god_dir = abs_path('.');
-        }
-    }
-
-    return $god_dir;
-} # getObjDir
-
-###########################################################################
-## Intent: Generate Makefile from a given Makefile.in template
-## -----------------------------------------------------------------------
-## Args:
-##   scalar  Relative path to a directory containing a makefile
-##   fargs   Hash ref of function arguments.
-##     obj     Absolute path to MOZ_OBJ/a destination directory
-##     top     Absolute path to the sandbox root
-## Returns:
-##    $@     Set on error
-##    scalar
-##      1     True if the makefile was updated
-##      0     Otherwise
-##      badtokens - If the makefile contains unexpandable @token@ strings
-## -----------------------------------------------------------------------
-###########################################################################
-sub updateMakefiles
-{
-    my %fargs = (@_ && ref($_[$#_])) ? %{ (pop) } : ();
-    local $_;
-    $@ = '';
-
-    my $top = $fargs{top};
-    my $obj = $fargs{obj};
-
-    my $relpath = shift || '';
-    my $src = join('/',  $top, $relpath, 'Makefile.in');
-    my $depth = getDepth($src);
-
-    my @src = cat($src);
-    return 0 if ($@);
-
-    my $dst = join('/', $obj, $relpath, 'Makefile');
-    my @dst = cat($dst);
-    $@ = '';
-
-    my $dstD = dirname($dst);
-    mkdirr($dstD);
-    return 0 if ($@);
-
-    my %data =
-        ( getConfig(),
-          depth      => $depth,
-          srcdir     => join('/', $top, $relpath),
-          top_srcdir => $top,
-        );
-
-    my $line = 0;
-    my @data;
-    while (scalar @src)
-    {
-        $line++;
-        $_ = shift(@src);
-
-        ## Expand embedded @foo@
-        while (/\@[^\@\s\$]+\@/go)
-        {
-            my $end = pos($_);
-            my $val = $&;
-            my $len = length($val);
-            $val =~ s/^\@\s*//o;
-            $val =~ s/\s*\@$//o;
-
-            ## Identify expansions to see if we can avoid shell overhead
-            if (!defined $data{$val} && !$argv{'no-badtokens'})
-            {
-                if (1) # warnings
-                {
-                    print STDERR "WARNING: token $val not defined\n";
-                    print STDERR "   line $line, src: $src\n";
-                }
-                return 'badtokens';
-            }
-
-            # Insert $(error txt) makefile macros for invalid tokens
-            my $val1 = defined($data{$val})
-                ? $data{$val}
-                : "\$(error $FindBin::Script: variable ${val} is undefined)"
-                ;
-            substr($_, ($end-$len), $len, $val1);
-        }
-        push(@data, $_);
-    }
-
-    if (("@data" eq "@dst") && scalar(@data))
-    {
-        print "Skipping up2date makefile: $dst\n" if ($argv{verbose});
-    }
-    else
-    {
-        my $action = (scalar @dst) ? 'Updating' : 'Creating';
-        print "$action makefile: $dst\n";
-
-        my $tmp = join('.', $dst, "tmp_$$");
-        if (!open(FYL, "> $tmp"))
-        {
-            $@ = "open($tmp) failed: $!";
-        }
-        else
-        {
-            print FYL @data;
-            close(FYL);
-
-            ## Install the new makefile
-            File::Copy::move($tmp, $dst)
-                || ($@ = "move($tmp, $dst) failed: $!");
-        }
-    }
-
-    return $@ ? 0 : 1;
-} # updateMakefiles
-
-# Output the makefiles.
-#
-sub update_makefiles_legacy {
-  my ($ac_given_srcdir, $pac_given_srcdir, @makefiles) = @_;
-  my $debug = $main::argv{debug} || 0;
-  my $pwdcmd = ($^O eq 'msys') ? 'pwd -W' : 'pwd';
-  my @unhandled=();
-
-  my @warn;
-
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    my $ac_file_in    = "$ac_given_srcdir/${ac_file}.in";
-    my $ac_dir        = dirname_legacy($ac_file);
-    my $ac_dots       = '';
-    my $ac_dir_suffix = '';
-    my $srcdir        = '.';
-    my $top_srcdir    = '.';
-
-    # Determine $srcdir and $top_srcdir
-    #
-    if ($ac_dir ne '.') {
-      $ac_dir_suffix = "/$ac_dir";
-      $ac_dir_suffix =~ s%^/\./%/%;
-      $ac_dots = $ac_dir_suffix;
-      # Remove .. components from the provided dir suffix, and
-      # also the forward path components they were reversing.
-      my $backtracks = $ac_dots =~ s%\.\.(/|$)%%g;
-      while ($backtracks--) {
-        $ac_dots =~ s%/[^/]*%%;
-      }
-      $ac_dots =~ s%/[^/]*%../%g;
-    }
-    if ($ac_given_srcdir eq '.') {
-      if ($ac_dots ne '') {
-        $top_srcdir = $ac_dots;
-        $top_srcdir =~ s%/$%%;
-      }
-    } elsif ($pac_given_srcdir =~ m%^/% or $pac_given_srcdir =~ m%^.:/%) {
-      $srcdir     = "$pac_given_srcdir$ac_dir_suffix";
-      $top_srcdir = "$pac_given_srcdir";
-    } else {
-      if ($debug) {
-              print "ac_dots       = $ac_dots\n";
-        print "ac_dir_suffix = $ac_dir_suffix\n";
-      }
-      $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
-      $top_srcdir = "$ac_dots$ac_given_srcdir";
-    }
-
-    if ($debug) {
-      print "ac_dir     = $ac_dir\n";
-      print "ac_file    = $ac_file\n";
-      print "ac_file_in = $ac_file_in\n";
-      print "srcdir     = $srcdir\n";
-      print "top_srcdir = $top_srcdir\n";
-      print "cwd        = " . `$pwdcmd` . "\n";
-    }
-
-    # Copy the file and make substitutions.
-    #    @srcdir@     -> value of $srcdir
-    #    @top_srcdir@ -> value of $top_srcdir
-    #
-    if (-e $ac_file) {
-      next if -M _ < -M $ac_file_in;  # Next if Makefile is up-to-date.
-      warn "updating $ac_file\n";
-    } else {
-      warn "creating $ac_file\n";
-    }
-
-    mkdirr(dirname($ac_file));
-
-    open INFILE, "<$ac_file_in" or do {
-      warn "$0: Cannot read $ac_file_in: No such file or directory\n";
-      next;
-    };
-    open OUTFILE, ">$ac_file" or do {
-      warn "$0: Unable to create $ac_file\n";
-      next;
-    };
-
-    while (<INFILE>) {
-      s/\@srcdir\@/$srcdir/g;
-      s/\@top_srcdir\@/$top_srcdir/g;
-
-      if (/\@[_a-zA-Z]*\@/) {
-        #warn "Unknown variable:$ac_file:$.:$_";
-        push @unhandled, $ac_file;
-        last;
-      }
-      print OUTFILE;
-    }
-    close INFILE;
-    close OUTFILE;
-  }
-  return @unhandled;
-} # update_makefiles_legacy
-
-###########################################################################
-## Intent: Invoke config.status for unknown makefiles to create
-##         directory hierarchy for the tree.
-## -----------------------------------------------------------------------
-## Args:
-##   array   an optional list of makefiles to process
-## Returns:
-##   0    on success
-##   $#   set on error
-## -----------------------------------------------------------------------
-## Note: Is this function needed anymore ?  Undefined tokens should fail
-##   at time of expansion rather than having to source config.status.
-##   Also config.status could be parsed to define values and avoide the
-##   shell overhead altogether.
-###########################################################################
-sub run_config_status {
-  my @unhandled = @_;
-
-  # Run config.status with any unhandled files.
-  #
-  my @errors;
-  if (@unhandled) {
-    local $ENV{CONFIG_FILES}= join ' ', @unhandled;
-
-    my $conf = 'config.status';
-    if (! -e $conf) # legacy behavior, warn rather than err
-    {
-        my $cwd = cwd();
-        my $err = "$FindBin::Script ERROR: Config file $conf does not exist, cwd=$cwd";
-        push(@errors, $err);
-    }
-    elsif (0 != system("./config.status"))
-    {
-        my $cwd = cwd();
-        push(@errors, "config.status failed \$?=$?, \$!=$!, cwd: $cwd");
-    }
-  }
-  $@ = join("\n", @errors);
-
-  ## Legacy behavior: config.status problems are not fatal {yet}.
-  ## Display warning since caller will not be calling die.
-  warn $@ if ($@ && $argv{'no-warnings'});
-  return $@ ? 1 : 0;
-}
-
-1;
diff --git a/build/autoconf/test/Makefile.in b/build/autoconf/test/Makefile.in
deleted file mode 100644
index a2caee827dc5..000000000000
--- a/build/autoconf/test/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- makefile -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-##################################################
-## Gather a list of tests, generate timestamp deps
-##################################################
-TS=.ts
-ifneq (,$(findstring check,$(MAKECMDGOALS)))
-          allsrc = $(wildcard $(srcdir)/*)
-       tests2run = $(notdir $(filter %.tpl,$(allsrc)))
-       tests2run += $(notdir $(filter %.tpm,$(allsrc)))
-  check_targets += $(addprefix $(TS)/,$(tests2run))
-endif
-
-all_nop: # export, libs and tools are not needed
-
-check:: $(TS) $(check_targets)
-
-#############################################
-# Only invoke tests when sources have changed
-#############################################
-$(TS)/%: $(srcdir)/%
-	$(PERL) $(srcdir)/runtest $<
-	@touch $@
-
-parent = $(patsubst %/,%,$(dir $(srcdir)))
-$(TS)/make-makefile.tpl: \
-  $(srcdir)/make-makefile.tpl\
-  $(parent)/makemakefile.pm\
-  $(NULL)
-	$(PERL) $(srcdir)/runtest $<
-	@touch $@
-
-$(TS)/makemakefile.tpm: \
-  $(srcdir)/makemakefile.tpm \
-  $(parent)/makemakefile.pm \
-  $(NULL)
-	$(PERL) $(srcdir)/runtest $<
-	@touch $@
-
-#####################################################
-## Extra dep needed to synchronize parallel execution
-#####################################################
-$(TS): $(TS)/.done
-$(TS)/.done:
-	$(MKDIR) -p $(dir $@)
-	touch $@
-
-GARBAGE_DIRS += $(TS)
-
-# EOF
diff --git a/build/autoconf/test/data/mf.notokens b/build/autoconf/test/data/mf.notokens
deleted file mode 100644
index 6fc504413177..000000000000
--- a/build/autoconf/test/data/mf.notokens
+++ /dev/null
@@ -1,4 +0,0 @@
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
-        @$(RM) $@ jsautocfg.tmp
-        ./jscpucfg > jsautocfg.tmp
-        mv jsautocfg.tmp $@
diff --git a/build/autoconf/test/data/mf.notokens.exp b/build/autoconf/test/data/mf.notokens.exp
deleted file mode 100644
index 6fc504413177..000000000000
--- a/build/autoconf/test/data/mf.notokens.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
-        @$(RM) $@ jsautocfg.tmp
-        ./jscpucfg > jsautocfg.tmp
-        mv jsautocfg.tmp $@
diff --git a/build/autoconf/test/make-makefile.excl b/build/autoconf/test/make-makefile.excl
deleted file mode 100644
index e65b133454b8..000000000000
--- a/build/autoconf/test/make-makefile.excl
+++ /dev/null
@@ -1,8 +0,0 @@
-###########################################################################
-## Intent: Exclusion list for container make builds
-###########################################################################
-
-/dev/null
-/foo/bar
-/a/b/c
-/a/b/d
diff --git a/build/autoconf/test/make-makefile.tpl b/build/autoconf/test/make-makefile.tpl
deleted file mode 100644
index 22108d238636..000000000000
--- a/build/autoconf/test/make-makefile.tpl
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/usr/bin/env perl
-###########################################################################
-## Intent: Unit test to verify make-makefile.tpl
-###########################################################################
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-#use feature 'state';  # 5.10+ not installed everywhere
-use Getopt::Long;
-
-use Cwd;
-use Cwd         qw{abs_path};
-use File::Basename;
-use File::Copy;
-use File::Path;
-use File::Temp  qw{ tempdir };
-
-use Test;
-sub BEGIN { plan tests => 4 };
-my @workdirs;
-sub END { system("/bin/rm -fr @workdirs"); }  # cleanup behind interrupts
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-use FindBin;
-our $VERSION = qw(1.0);
-
-##------------------##
-##---] INCLUDES [---##
-##------------------##
-use FindBin;
-use lib "$FindBin::RealBin/..";
-use makemakefile;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-my %argv;
-
-###########################################################################
-## Intent: Create a temp sandbox populated with sources
-## -----------------------------------------------------------------------
-## Args:
-##   array    a list of file paths to copy
-## Returns:
-##     $@     set on error
-##   scalar   path to scratch sandbox
-## -----------------------------------------------------------------------
-###########################################################################
-my $root; # state $root not available
-sub createSandbox
-{
-    my @errors;
-
-    unless ($root)
-    {
-        my @tmp = split(m%/%, $FindBin::RealBin);
-        splice(@tmp, -3);
-        $root = join('/', @tmp);
-    }
-
-    my $work = tempdir();
-    push(@workdirs, $work);
-    my @dirs = map{ join('/', $work, dirname($_)) } @_;
-    mkdirr(@dirs);
-    push(@errors, "createSandbox: $@") if ($@);
-
-    foreach (@_)
-    {
-        ## Copy sources into the temp source directory
-        my $src = join('/', $root, $_);
-        my $dst = join('/', $work, $_);
-        unless (copy($src, $dst))
-        {
-            push(@errors, "copy($src, $dst) failed: $!");
-        }
-    }
-    print STDERR "createSandbox: $work\n" if ($main::argv{debug});
-    $@ = join('', map{ "$_\n" } @errors);
-    $work;
-} # createSandbox
-
-###########################################################################
-## Intent: wrapper to run the make-makefile command.
-## -----------------------------------------------------------------------
-## Args:
-##   array  command line arguments passed to make-makefile
-## Returns:
-##    array  command output
-##    $@     set by shell exit status, empty string on success
-##    $?     command shell exit status
-###########################################################################
-my $mm; # state $mm not available
-sub makemakefile
-{
-    my %fargs = (@_ && ref($_[$#_])) ? %{ (pop) } : ();
-    $mm ||= join('/', dirname($FindBin::Bin), 'make-makefile'); # cmd in parent of test/
-    my $cmd = join(' ', $mm, @_);
-    print "RUNNING: $cmd\n" if ($fargs{debug});
-    my @out = `$cmd 2>&1`;
-    print STDERR map{ "out> $_" } @out if ($argv{verbose});
-    $@ = (0 == $?) ? '' : "Command failed: $cmd\n@out";
-    @out;
-} # makemakefile
-
-###########################################################################
-## Intent: Helper function, display the contents of a given sandbox
-## -----------------------------------------------------------------------
-## Args:
-##   scalar   Path to sandbox
-## Returns:
-##   none
-## -----------------------------------------------------------------------
-###########################################################################
-sub find_ls
-{
-    my $path = shift || '';
-
-    # Assuming dot contributes to cryptic problems
-    die "find_ls: a path is required" unless ($path);
-
-    my $cmd = "find $path -ls";
-    print "\nRunning: $cmd\n";
-    print '=' x 75, "\n";
-    print `$cmd`;
-} # myls
-
-###########################################################################
-## Intent: Verify make-makefile is able to digest paths and generate
-##         makefiles when object directory is a child of top.
-###########################################################################
-sub check_makemakefile
-{
-    my $work = createSandbox
-        (
-         'memory/mozalloc/Makefile.in',
-         'toolkit/system/windowsproxy/Makefile.in',
-         'toolkit/crashreporter/google-breakpad/src/client/Makefile.in',
-        );
-
-
-    my $workdir = createSandbox();
-    my $top = $workdir;
-    chdir $top;
-
-    my $objA = 'obj-arch-dir';
-    my $obj = join('/', $top, $objA);
-
-    # getTopDir()
-    local $main::argv{top} = $work;
-    local $main::argv{obj} = $obj;
-    getObjDir('_reset_');
-
-    my @root = split(m%/%, $FindBin::RealBin);
-    splice(@root, -3);
-    my $root = join('/', @root);
-    my @args =
-        (
-
-         [
-          banner => "--top and --obj are impled, generate Makefile",
-             rel => 'memory/mozalloc',
-             cmd => join(' ',
-                         '--top', $top,
-                         '--obj', $obj,
-                         'memory/mozalloc/Makefile',
-                         ),
-         ],
-
-         [
-          banner => "--top and abs(obj) passed",
-             rel => "toolkit/system/windowsproxy",
-             cmd => join(' ',
-                         '--top', $top,
-                         "$obj/toolkit/system/windowsproxy/Makefile",
-                         ),
-             exp => "$obj/toolkit/system/windowsproxy/Makefile",
-            skip => 1, #
-         ],
-
-
-         [
-          banner => "--obj and abs(top) passed",
-             rel => "toolkit/crashreporter/google-breakpad/src/client",
-             cmd => join(' ',
-                         '--obj', $obj,
-                         "$top/toolkit/crashreporter/google-breakpad/src/client/Makefile.in",
-                         ),
-             exp => "$top/toolkit/crashreporter/google-breakpad/src/client/Makefile.in",
-          skip => 1, #
-         ],
-
-         );
-
-    foreach (@args)
-    {
-        my %rec = @{ $_ };
-        next if ($rec{skip});
-        next unless ($rec{rel});
-
-        my $srcR = join('/', $top, $rec{rel});
-        my $dstR = join('/', $obj, $rec{rel});
-
-        my $src = join('/', $top, $rec{rel}, 'Makefile.in');
-        my $dst = join('/', $obj, $rec{rel}, 'Makefile');
-
-        # Use distinct sources to avoid cleanup overhead between tests
-        die "Test source already used: $dstR" if (-d $dstR);
-
-        ## Copy sources into the temp source directory
-        my $rootR = join('/', $root, $rec{rel});
-        my $rootS = join('/', $root, $rec{rel}, 'Makefile.in');
-        File::Path::mkpath($srcR, 0, 0700);
-        copy($rootS, $src) or die "copy($rootS, $src) failed: $!";
-
-        die "source does not exist: $src" unless (-e $src);
-
-        ######################
-        ## Generate and verify
-        ######################
-        print STDERR "RUNNING: $rec{banner}\n" if ($argv{debug});
-        my @errs;
-        makemakefile('--enhanced', $rec{cmd}, {verbose=>1});
-        if ($@)
-        {
-            push(@errs, "\$@ should not be set: $@\n");
-        }
-        elsif (! -e $dst)
-        {
-            push(@errs, "Generated makefile does not exist: $dst, banner: $rec{banner}\n");
-        }
-
-        ok(scalar(@errs), 0, "Errors detected:\n" . join("    $_", @errs));
-        find_ls($top) if (@errs);
-    }
-
-} # check_makemakefile
-
-###########################################################################
-## Intent: Verify make-makefile is able to digest paths and generate
-##         makefiles when top/MOZ_OBJDIR are not parent/child directories
-## ---------------------------------------------------------------------------
-## Args:
-##   none
-## Returns:
-##   none
-## ---------------------------------------------------------------------------
-###########################################################################
-sub check_makemakefile_distinct
-{
-    my $workdir = createSandbox();
-#    my $workdir = tempdir();
-
-    ###############################################
-    ## Now update when top/obj are not parent/child
-    ###############################################
-    my $top = join('/', $workdir, 'top');
-    my $obj = join('/', $workdir, 'obj');
-
-    $main::argv{top} = $top;
-    $main::argv{obj} = $obj;  # test afterward, using undef ?
-
-    my @sbxroot = split(m%/%, $FindBin::RealBin);
-    splice(@sbxroot, -2);
-    my $sbxroot = join('/', @sbxroot);
-
-    ## Copy in a makefile template to to convert
-    File::Path::mkpath(["$top/memory/mozalloc"], 0, 0700);
-    copy("$sbxroot/memory/mozalloc/Makefile.in", "$top/memory/mozalloc/Makefile.in");
-
-
-    # work/memory/mozalloc/Makefile.in
-
-    my @args =
-        (
-         [
-          banner => '--top and --obj are distinct [1]',
-             cmd => "--obj $obj memory/mozalloc/Makefile",
-             exp => "$obj/memory/mozalloc/Makefile",
-         ],
-
-         [
-          banner => "--top and --obj are distinct [2]",
-             cmd => "--top $top memory/mozalloc/Makefile.in",
-             exp => "$obj/memory/mozalloc/Makefile",
-            skip => 1,  # test problem: top != obj
-         ],
-
-         [
-          banner => "--top and --obj are distinct [3]",
-             cmd => join(' ',
-                         "--top $top",
-                         "--obj $obj",
-                         "memory/mozalloc/Makefile.in",
-                         ),
-             exp => "$obj/memory/mozalloc/Makefile",
-            skip => 1,  # test problem: top != obj
-         ],
-        );
-
-
-    foreach (@args)
-    {
-        my %rec = @{ $_ };
-        print STDERR "banner: $rec{banner}\n" if ($argv{debug});
-        next if $rec{skip};
-
-        unlink $rec{exp};
-        makemakefile('--enhanced', $rec{cmd});
-
-        my @errs;
-        if ($@)
-        {
-            push(@errs, "\$@ should not be set: $@\n");
-        }
-        elsif (! -e $rec{exp})
-        {
-            push(@errs, "Makefile does not exist: $rec{exp}\n");
-        }
-        ok(scalar(@errs), 0, "Errors detected:\n" . join("    $_", @errs));
-    }
-
-} # check_makemakefile_distinct
-
-###########################################################################
-## Intent: Verify legacy behavior, invoke make-makefile when cwd is
-##         a subdirectory beneath MOZ_OBJDIR.
-## -----------------------------------------------------------------------
-## Args:
-##   none
-## Returns:
-##   none
-## -----------------------------------------------------------------------
-###########################################################################
-sub check_makemakefile_legacy
-{
-    my $work = createSandbox
-        (
-         'memory/mozalloc/Makefile.in',
-         'parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in',
-        );
-
-    my $obj = join('/', $work, 'obj');
-    mkdir $obj;
-
-    my @args =
-        (
-         {
-             banner => '-t path -d dot',
-                cwd => $obj,
-                cmd => "-t $work -d . memory/mozalloc/Makefile",
-                exp => "$obj/memory/mozalloc/Makefile",
-               skip => 0,
-         },
-         
-         {
-             banner => '-t path -d relpath',
-                cwd => join('/', $obj, 'parser/htmlparser/tests/mochitest'),
-                cmd => "-t $work -d ../../../.. html5lib_tree_construction/Makefile",
-                exp => "$obj/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile",
-               skip => 0,
-         },
-        );
-
-    foreach (@args)
-    {
-        my %rec = %{ $_ };
-        next if ($rec{skip});
-
-        ## make-make while sitting in $objdir
-        mkdirr($rec{cwd});
-        chdir $rec{cwd} || die "chdir $rec{cwd} failed; $!";
-
-        makemakefile($rec{cmd});
-        my @errs;
-        if ($@)
-        {
-            push(@errs, "make-makefile $rec{cmd} failed: $@");
-        }
-        elsif (! -e $rec{exp})
-        {
-            push(@errs, "generated makefile does not exist: $rec{exp}");
-        }
-        ok(scalar(@errs), 0, "Errors detected: @errs");
-        find_ls($work) if (@errs);
-    }
-    chdir $FindBin::RealBin;
-} # check_makemakefile_legacy
-
-###########################################################################
-## Intent: Smoke tests for the unittests module
-###########################################################################
-sub smoke
-{
-    print STDERR "Running test: smoke()\n" if ($argv{debug});
-} # smoke()
-
-###########################################################################
-## Intent: Intitialize global test objects and consts
-###########################################################################
-sub init
-{
-    print "Running: init()\n" if ($argv{debug});
-#    testplan(24, 0);
-} # init()
-
-##----------------##
-##---]  MAIN  [---##
-##----------------##
-unless(GetOptions(\%argv,
-                  qw(
-                     debug|d
-                     manual
-                     test=s@
-                     verbose
-                     )))
-{
-    print "USAGE: $0\n";
-    print "  --debug    Enable script debug mode\n";
-    print "  --manual   Also run disabled tests\n";
-    print "  --smoke    Run smoke tests then exit\n";
-    print "  --test     Run a list of tests by function name\n";
-    print "  --verbose  Enable script verbose mode\n";
-    exit 1;
-}
-
-init();
-smoke();
-
-check_makemakefile();
-check_makemakefile_distinct();
-check_makemakefile_legacy();
diff --git a/build/autoconf/test/makemakefile.tpm b/build/autoconf/test/makemakefile.tpm
deleted file mode 100644
index c64f5f9eede3..000000000000
--- a/build/autoconf/test/makemakefile.tpm
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/usr/bin/env perl
-###########################################################################
-## Intent: Unit test to verify the makemakefile.pm module
-###########################################################################
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-#use feature 'state';
-use Getopt::Long;
-
-use FindBin;
-use Cwd         qw{abs_path};
-use File::Basename;
-use File::Compare;
-use File::Copy;
-use File::Temp  qw{tempdir};
-
-use Test;
-sub BEGIN { plan tests => 36 };
-my @workdirs;
-sub END { system("/bin/rm -fr @workdirs"); }  # cleanup behind interrupts
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(1.0);
-
-##------------------##
-##---] INCLUDES [---##
-##------------------##
-use FindBin;
-use lib "$FindBin::RealBin/..";
-use makemakefile;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-my %argv;
-
-###########################################################################
-## Intent: Create a temp sandbox populated with sources
-## -----------------------------------------------------------------------
-## Args:
-##   array    files to copy into the temporary sandbox
-## Returns:
-##     $@     set on error
-##   array 
-##     top  - path to temp sandbox root
-##     obj  - path to temp sandbox moz_obj directory
-## -----------------------------------------------------------------------
-###########################################################################
-my $_root_; # state $root
-sub createSandbox
-{
-#    state $root;
-    my @errors;
-
-    unless ($_root_)
-    {
-        my @tmp = split(m%/%, $FindBin::RealBin);
-        splice(@tmp, -3);
-        $_root_ = join('/', @tmp);
-    }
-
-    my $work = tempdir(CLEANUP=>1);
-    push(@workdirs, $work);
-    my @dirs = map{ join('/', $work, dirname($_)) } @_;
-    mkdirr(@dirs);
-    push(@errors, "createSandbox: $@") if ($@);
-
-    foreach (@_)
-    {
-        ## Copy sources into the temp source directory
-        my $src = join('/', $_root_, $_);
-        my $dst = join('/', $work, $_);
-        unless (copy($src, $dst))
-        {
-            push(@errors, "copy($src, $dst) failed: $!");
-        }
-    }
-    print STDERR "createSandbox: $work\n" if ($main::argv{debug});
-    $@ = join('', map{ "$_\n" } @errors);
-    $work;
-} # createSandbox
-
-###########################################################################
-## Intent: Verify legacy dirname function
-###########################################################################
-sub check_dirname_legacy
-{
-    print "Running: check_dirname_legacy\n" if ($main::argv{debug});
-
-    foreach (
-        ['/dev/null', '/dev'],
-        ['/foo/bar/Makefile', '/foo/bar'],
-        )
-    {
-        my ($src, $exp) = @{ $_ };
-        my $dir = dirname_legacy($src);
-        ok($dir, $exp, "dirname_legacy($src) failed");
-    }
-
-    my $path = dirname_legacy(undef);
-    ok($path ? 1 : 0, 1, "dirname('') should expand to cwd");
-} # check_dirname_legacy
-
-###########################################################################
-## Intent: Verify topdir lookup function
-###########################################################################
-sub check_getTopDir
-{
-    print "Running: check_getTopDir\n" if ($main::argv{debug});
-
-    my $path = getTopDir();
-
-    ## Unit test is special, cmd not invoked from the same directory
-    ## as the makemakefile.pm module.
-    ok($path ? 1 : 0, 1, "getTopDir failed");
-    ok(-d $path ? 1 : 0, 1, "getTopDir: directory $path does not exist");
-    ok($FindBin::RealBin =~ m%\Q$path/% ? 1 : 0, 1, 'Invalid topdir path');
-    ok(-e "$path/client.mk" ? 1 : 0, 1, "client.mk not found in $path");
-} # check_getTopDir
-
-###########################################################################
-## Intent: Verify objdir lookup function
-###########################################################################
-sub check_getObjDir
-{
-    print "Running: check_getObjDir\n" if ($main::argv{debug});
-    local $main::argv{obj} = '/bin';
-    my $path = getObjDir('_reset_');
-    ok($path ? 1 : 0, 1, "getObjDir failed");
-    ok(-d $path ? 1 : 0, 1, "getObjDir: directory $path does not exist");
-
-    my $top = getTopDir();
-    $main::argv{obj} = join('/', $top, 'browser'); # use existing path so file can be resolved
-    my $obj = getObjDir('_reset_');
-    ok($top ne $obj ? 1 : 0, 1, "top and object directory paths should not match");
-
-    ## If we fail for /bin use here getObjDir() was not reset
-    my $client = join('/', $obj, '..', 'client.mk');
-    ok(-e $client ? 1 : 0, 1, "client.mk not found in parent of $path, $client");
-    getObjDir('_set_'); # clear cached value and recompute
-
-    foreach my $file ("$top/memory/mozalloc/Makefile")
-    {
-        my $obj = getObjDir('_reset_', $file);
-        ok($obj ne $file ? 1 : 0, 1, "getObjDir($file) failed")
-    }
-} # check_getObjDir
-
-###########################################################################
-## Intent: Verify rel-path-to-root/getdepth function
-###########################################################################
-sub check_getDepth
-{
-    my @tmp = split(m%/%o, $FindBin::Bin);
-    splice(@tmp, -3);
-    my $root = abs_path( join('/', @tmp) );
-
-    my %data =
-        (
-         $root => '.',
-         join('/', $root, 'netwerk/Makefile.in') => '..',
-
-         join('/', $root, 'browser/components/privatebrowsing/test/browser/Makefile.in') => '../../../../..',
-         join('/', $root, 'browser/components/privatebrowsing/test/browser/') => '../../../../..',
-         join('/', $root, 'browser/components/privatebrowsing/test/browser') => '../../../../..',
-         join('/', $root, 'browser/components/privatebrowsing/test') => '../../../..',
-        );
-
-    while (my($k, $v) = each %data)
-    {
-        my $depth = makemakefile::getDepth($k);
-        ok($depth, $v, "getDepth($k) failed");
-    }
-} # check_getDepth
-
-###########################################################################
-## Intent: Verify reading the exclusion file
-###########################################################################
-sub check_getExclusions
-{
-    my $cfg = join('/', $FindBin::RealBin, 'make-makefile.excl');
-    my %excl = getExclusions($cfg);
-    ok($@, '', '$@ should not be set');
-
-    my @excl = sort keys %excl;
-    ok(scalar @excl, 4, "Exclusion file is invalid: \@excl=@excl");
-} # check_getExclusions
-
-###########################################################################
-## Intent: Verify rel-path-to-root function
-## -----------------------------------------------------------------------
-## Args:
-##   none
-## Returns:
-##   none
-## -----------------------------------------------------------------------
-## Note:
-##   String test only, top and obj paths are bogus for this test
-###########################################################################
-sub check_getRelPath
-{
-    my @tmp = split(m%/%o, $FindBin::Bin);
-    splice(@tmp, -3);
-    my $root = abs_path( join('/', @tmp) );
-    my $obj0 = 'obj-arch';
-    my $obj = join('/', $root, $obj0);
-
-    local $main::argv{top} = $root;
-    local $main::argv{obj} = $obj;
-    getTopDir('_reset_');
-    getObjDir('_set_', $obj);
-
-    ## Cannot test relative paths with objdir beneath /tmp
-    ## Commented paths are needed for full test coverage
-    ## but are not currently supported by all module functions.
-    my %data =
-        (
-         # Relative - path correct for build directory but 
-         'profile/dirserviceprovider/public/Makefile.in'                   => 'profile/dirserviceprovider/public',
-
-         join('/', $root, 'profile/dirserviceprovider/public/Makefile.in') => 'profile/dirserviceprovider/public',
-
-         # File search
-         'profile/dirserviceprovider/public'                               => 'profile/dirserviceprovider/public',
-
-         # cwd + cleanup
-         # '../../../profile/dirserviceprovider/public/Makefile.in'          => 'profile/dirserviceprovider/public',
-#         "../../../${obj0}/profile/dirserviceprovider/public/Makefile.in"  => 'profile/dirserviceprovider/public',
-
-         ## Special case: This could be handled but permutations of non-existent files, non-overlapping paths
-         ## and relative paths containing partial subdirectories will compilicate the logic.  Wait until needed.
-         ## Relative path: $root + obj + subdir
-#         "${obj0}/profile/dirserviceprovider/public/Makefile"          => 'profile/dirserviceprovider/public',
-         join('/', $obj, 'profile/dirserviceprovider/public/Makefile') => 'profile/dirserviceprovider/public',
-
-         # $RealBin, -d ../../..
-         # top and obj not subdirectories of each other:  /foo/x, /bar/y
-        );
-
-    while (my($k, $v) = each %data)
-    {
-        my $dir = getRelPath($k);
-        ok($@, '', '$@ should not be set');
-        ok($dir, $v, "ERROR[$k]: exp[$v] != found=[$dir]");
-    }
-
-
-    my $top = '/tmp/foo';
-    my $tmp = '/tmp/bar';
-    local $main::argv{top} = $tmp;
-    local $main::argv{obj} = $obj;
-
-    %data =
-        (
-#         "$top/profile/dirserviceprovider/public/Makefile.in" => 'profile/dirserviceprovider/public',
-         "$obj/profile/dirserviceprovider/public/Makefile"    => 'profile/dirserviceprovider/public',
-        );
-
-    while (my($k, $v) = each %data)
-    {
-        my $dir = getRelPath($k);
-        ok($dir, $v, "ERROR[$k]: exp[$v] != found=[$dir]");
-    }
-} # check_getRelPath
-
-###########################################################################
-## Intent: Verify rel-path-to-root directory creation
-###########################################################################
-sub check_mkdirr
-{
-    if (-w '/bin') # cygwin may be writable
-    {
-        ok(1, 1, 'bogus test to maintain count');
-    } else {
-        mkdirr('/bin/invalid/Makefile');
-        ok($@ ? 1 : 0, 1, '$@ should be set');
-    }
-
-    my $work = createSandbox();
-    my @paths = map{ join('/', $work, $_, 'Makefile.in') } qw (xyz/abc foo/bar a/b/c/d/e);
-    mkdirr(@paths);
-    ok($@ ? 1 : 0, 0, '$@ should not be set');
-
-    push(@paths, '/bin');
-
-    my @errors;
-    foreach (@paths)
-    {
-        my $dir = dirname($_);
-        next if (-d $dir);
-        push(@errors, "mkdirr($dir) failed\n");
-    }
-    ok(scalar @errors, 0, "Errors detected: @errors");
-} # check_mkdirr
-
-###########################################################################
-## Intent: Verify permutations for system("config.status")
-###########################################################################
-sub check_run_config_status
-{
-    print STDERR "Running: check_run_config_status()\n"
-        if ($main::argv{debug});
-
-    my $work = createSandbox();
-    chdir $work;
-    run_config_status();
-    ok($@ ? 1 : 0, '$@ should be set, config.status does not exist');
-
-    my $cfg = join('/', $work, 'config.status');
-    local *CFG;
-    open(CFG, "> $cfg") && close(CFG);
-    run_config_status();
-    ok($@, qr/config.status failed/, '$@ should be set, config.status is not executabl');
-
-    open(CFG, "> $cfg");
-    print CFG join("\n",
-		   '#!/bin/sh',
-		   '',
-		   'true',
-		   '');
-    close(CFG);
-    chmod 0555, $cfg;
-    run_config_status();
-    ok($@, qr/config.status failed/, '$@ should not be set');
-		   
-} # check_run_config_status
-
-###########################################################################
-## Intent: Verify makefile generation by legacy make-makefile functions
-##   o make-makefile -t /x/y -d ..
-###########################################################################
-sub check_update_makefiles_legacy
-{
-    print STDERR "Running: check_update_makefiles_legacy()\n"
-        if ($main::argv{debug});
-    
-    return unless ($argv{legacy});
-    print STDERR "check_update_makefiles_legacy: not yet implemented\n";
-
-} # check_update_makefiles_legacy
-
-###########################################################################
-## Intent: Verify updateMakefiles()
-##   o a makefile is generated when none exists.
-##   o a makefile will only be updated when the templates changes.
-##   o existing makefiles will be updated when the template changes.
-##   o @foo@ tokens have been expanded
-###########################################################################
-sub check_updateMakefiles
-{
-    my @errors;
-
-    print STDERR "Running: check_updateMakefiles()\n"
-        if ($main::argv{debug});
-
-    my $mf = 'memory/mozalloc/Makefile.in';
-
-    my $work = createSandbox($mf);
-    my $obj = join('/', $work, 'obj');
-    my %args =
-        (
-         top => $work,
-         obj => $obj,
-        );
-
-    my $mf_src = join('/', $work, 'memory/mozalloc/Makefile.in');
-    my $mf_dst = join('/', $obj, 'memory/mozalloc/Makefile');
-
-    updateMakefiles('memory/mozalloc', \%args);
-    my $tlm0 = (stat $mf_dst)[9] || 0;
-    ok(-e $mf_dst ? 1 : 0, 1, "failed to generate makefile: $mf_dst");
-
-    #############################
-    ## Regeneration will be a nop
-    #############################
-    updateMakefiles('memory/mozalloc', \%args);   
-    my $tlm1 = (stat $mf_dst)[9] || -1;
-    ok($tlm1, $tlm0, "makefile should not have been modified");
-
-    #####################################################
-    ## Modify template to verify makefile will regenerate
-    #####################################################
-    local *MF;
-    if (open(MF, ">> $mf_src"))
-    {
-        print MF map{ "# MODIFIED MAKEFILE\n" } 0..4;
-        close(MF);
-    }
-    updateMakefiles('memory/mozalloc', \%args);
-    my @data = makemakefile::cat($mf_dst);
-    ## Check content to avoid a silly 'sleep [n]' call here
-    ok(grep(/^\# MODIFIED MAKEFILE/o, @data) ? 1 : 0,
-       1,
-       "template modified, makefile should have regenerated");
-
-    ## VERIFY template expansion
-    my @gen = makemakefile::cat($mf_dst);
-    push(@errors, $@) if ($@);
-
-    foreach (@gen)
-    {
-        if (/\@[^\@]+\@/o)
-        {
-            push(@errors, join("\n",
-                               "Unexpanded template string detected [$_]",
-                               "Makefile: $mf_src",
-                 ));
-            last;
-            
-        }
-    }
-
-    ok(scalar(@errors), 0, "Errors detected: @errors");
-} # check_updateMakefiles
-
-###########################################################################
-## Intent: Verify makefile generation by updateMakefiles() when
-##         command line arguments --top and --obj were passed.
-###########################################################################
-sub check_updateMakefilesByTopObj
-{
-    my @errors;
-
-    print STDERR "Running: check_updateMakefilesByTopObj()\n"
-        if ($main::argv{debug});
-
-    my $work = createSandbox();
-    my %args =
-        (
-         top => $work,
-         obj => $work,
-        );
-
-    ## Grab a list of makefile templates to generate
-    my @all = glob('data/mf.*');
-    my @src = map{ /\.exp$/o ? () : $_ } @all;
-
-    foreach my $src (@src)
-    {
-        my $dst = join('/', $work, 'Makefile');
-        unlink $dst;
-        copy($src, "$work/Makefile.in");
-        updateMakefiles('.', \%args);
-        ok($@, '', '$@ should not be set');
-
-        my @dst = makemakefile::cat($dst);
-
-        my $exp = join('.', $src, 'exp');
-        my @exp = makemakefile::cat($exp);
-        ok("@dst", "@exp", "updateMakefile($dst) failed");
-    }
-    return;
-} # check_updateMakefilesByTopObj
-
-###########################################################################
-## Intent: Smoke tests for the unittests module
-###########################################################################
-sub smoke
-{
-    print STDERR "Running test: smoke()\n" if ($argv{debug});
-} # smoke()
-
-###########################################################################
-## Intent: Intitialize global test objects and consts
-###########################################################################
-sub init
-{
-    print "Running: init()\n" if ($argv{debug});
-#    testplan(24, 0);
-
-    my @path = split(m%/%, $FindBin::RealBin);
-    splice(@path, -3);
-    my $top = join('/', @path);
-    ## Top set based on make-makefile startup directory so adjust for test/ use
-    getTopDir('_set_', $top);
-
-} # init()
-
-##----------------##
-##---]  MAIN  [---##
-##----------------##
-unless(GetOptions(\%argv,
-                  qw(
-                     debug|d
-                     manual
-                     test=s@
-                     verbose
-                     )))
-{
-    print "USAGE: $0\n";
-    print "  --debug    Enable script debug mode\n";
-    print "  --manual   Also run disabled tests\n";
-    print "  --smoke    Run smoke tests then exit\n";
-    print "  --test     Run a list of tests by function name\n";
-    print "  --verbose  Enable script verbose mode\n";
-    exit 1;
-}
-
-init();
-smoke();
-
-check_dirname_legacy();
-
-check_getTopDir();
-check_getObjDir();
-check_getDepth();
-check_getExclusions();
-check_getRelPath();
-check_mkdirr();
-
-check_updateMakefiles();
-check_update_makefiles_legacy();
-check_updateMakefilesByTopObj();
diff --git a/build/autoconf/test/runtest b/build/autoconf/test/runtest
deleted file mode 100644
index 3a53b0682bcc..000000000000
--- a/build/autoconf/test/runtest
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env perl
-###########################################################################
-## Intent:
-##   Test::Harness is a testing wrapper that will process output
-##   from Test.pm module tests.  Sumarize results, report stats
-##   and exit with overall status for the testing suites.
-##
-## Run testing suite:
-##   % make clean test
-##   % perl runtest
-##
-## Run Individual tests
-##   % perl tUtils0
-###########################################################################
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-use Getopt::Long;
-
-use Test::Harness;
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(1.0);
-use FindBin;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-my %argv;
-
-##----------------##
-##---]  MAIN  [---##
-##----------------##
-unless(GetOptions(\%argv,
-		  qw(debug|d)
-		 ))
-{
-    print "Usage: $0\n";
-    print "  --debug  Enable debug mode\n";
-    exit 1;
-}
-
-if (2 > $Test::Harness::VERSION)
-{
-    print "Unit tests will not be run, Test::Harness is too old\n"
-	if ($argv{debug});
-    exit 0;
-}
-
-
-my @tests;
-
-########################################
-## Gather a list of tests if none passed
-########################################
-unless (@tests = @ARGV)
-{
-  local *D;
-    opendir(D, '.');
-    while($_ = readdir(D)) {
-	next unless /.t\S+$/;
-	next if (/\.ts$/);
-	push(@tests, $_);
-    }
-    closedir(D);
-}
-
-###############################################
-## Glob a list of tests when directories passed
-###############################################
-my @tmp;
-foreach (@tests)
-{
-  local *D;
-    if (-d $_ && (my $dir = $_))
-    {
-        opendir(D, $_) || die "opendir(D) failed: $!";
-	my @tests = grep(/\.t[^\.\s]+/o, readdir(D));
-	closedir(D);
-	push(@tmp, map{ join('/', $dir, $_); } @tests);
-    } else {
-        push(@tmp, $_);
-    }
-}
-@tests = @tmp;
-
-print "$0: @ARGV\n" if ($argv{debug});
-runtests(@tests);
-
-# EOF
diff --git a/build/manifestparser.py b/build/manifestparser.py
index b781e20cac35..ba341cf23c8e 100644
--- a/build/manifestparser.py
+++ b/build/manifestparser.py
@@ -50,7 +50,7 @@ except AttributeError:
 
         rel_list = [os.path.pardir] * (len(start_list)-i) + path_list[i:]
         if not rel_list:
-            return start
+            return os.curdir
         return os.path.join(*rel_list)
 
 # expr.py
diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py
index 55e98fccd266..26b94dcb42f0 100644
--- a/build/mobile/b2gautomation.py
+++ b/build/mobile/b2gautomation.py
@@ -106,7 +106,7 @@ class B2GRemoteAutomation(Automation):
         return nettools.getLanIp()
 
     def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime,
-                      debuggerInfo, symbolsPath, logger):
+                      debuggerInfo, symbolsPath):
         """ Wait for mochitest to finish (as evidenced by a signature string
             in logcat), or for a given amount of time to elapse with no
             output.
diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index fa4ba29398c5..156d91862fe2 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/build/mobile/sutagent/android/Makefile.in b/build/mobile/sutagent/android/Makefile.in
index 4f2201f7c91d..64e40d5063f2 100755
--- a/build/mobile/sutagent/android/Makefile.in
+++ b/build/mobile/sutagent/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/mobile/sutagent/android/fencp/Makefile.in b/build/mobile/sutagent/android/fencp/Makefile.in
index 17438ad38764..24c29638af18 100644
--- a/build/mobile/sutagent/android/fencp/Makefile.in
+++ b/build/mobile/sutagent/android/fencp/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/mobile/sutagent/android/ffxcp/Makefile.in b/build/mobile/sutagent/android/ffxcp/Makefile.in
index be89ff9e8cd1..5b8eaf38594c 100644
--- a/build/mobile/sutagent/android/ffxcp/Makefile.in
+++ b/build/mobile/sutagent/android/ffxcp/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/mobile/sutagent/android/watcher/Makefile.in b/build/mobile/sutagent/android/watcher/Makefile.in
index ba46f7ca88e5..e139ffe17ed0 100644
--- a/build/mobile/sutagent/android/watcher/Makefile.in
+++ b/build/mobile/sutagent/android/watcher/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/package/Makefile.in b/build/package/Makefile.in
index 637f486639fe..163fab806826 100644
--- a/build/package/Makefile.in
+++ b/build/package/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/pgo/Makefile.in b/build/pgo/Makefile.in
index 8909be31af15..b9f97dbbc9a1 100644
--- a/build/pgo/Makefile.in
+++ b/build/pgo/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = build/pgo
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/build/pgo/blueprint/Makefile.in b/build/pgo/blueprint/Makefile.in
index 3d99270fc7a2..d03ac9c411b2 100644
--- a/build/pgo/blueprint/Makefile.in
+++ b/build/pgo/blueprint/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/pgo/js-input/Makefile.in b/build/pgo/js-input/Makefile.in
index 63a127f68b2e..ed4bc9a8d71c 100644
--- a/build/pgo/js-input/Makefile.in
+++ b/build/pgo/js-input/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/pymake/pymake/parser.py b/build/pymake/pymake/parser.py
index 7320e7d063a0..3d89af476a29 100644
--- a/build/pymake/pymake/parser.py
+++ b/build/pymake/pymake/parser.py
@@ -498,9 +498,9 @@ def parsestring(s, filename):
                 e.rstrip()
 
                 if token is None:
-                    condstack[-1].append(parserdata.ExportDirective(e, single=False))
+                    condstack[-1].append(parserdata.ExportDirective(e, concurrent_set=False))
                 else:
-                    condstack[-1].append(parserdata.ExportDirective(e, single=True))
+                    condstack[-1].append(parserdata.ExportDirective(e, concurrent_set=True))
 
                     value = flattenmakesyntax(d, offset).lstrip()
                     condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=None))
diff --git a/build/pymake/pymake/parserdata.py b/build/pymake/pymake/parserdata.py
index 5d7b82123f3e..c5dcb6fa14d3 100644
--- a/build/pymake/pymake/parserdata.py
+++ b/build/pymake/pymake/parserdata.py
@@ -88,6 +88,7 @@ def parsecommandlineargs(args):
             vname = vname.strip()
             vnameexp = data.Expansion.fromstring(vname, "Command-line argument")
 
+            stmts.append(ExportDirective(vnameexp, concurrent_set=True))
             stmts.append(SetVariable(vnameexp, token=t,
                                      value=val, valueloc=Location('<command-line>', i, len(vname) + len(t)),
                                      targetexp=None, source=data.Variables.SOURCE_COMMANDLINE))
@@ -548,20 +549,22 @@ class ExportDirective(Statement):
 
     See https://www.gnu.org/software/make/manual/make.html#Variables_002fRecursion
 
-    The `single` field defines whether this statement occurred with or without
-    a variable assignment. If True, no variable assignment was present. If
-    False, the SetVariable immediately following this statement originally came
-    from this export directive (the parser splits it into multiple statements).
+    The `concurrent_set` field defines whether this statement occurred with or
+    without a variable assignment. If False, no variable assignment was
+    present. If True, the SetVariable immediately following this statement
+    originally came from this export directive (the parser splits it into
+    multiple statements).
     """
-    __slots__ = ('exp', 'single')
 
-    def __init__(self, exp, single):
+    __slots__ = ('exp', 'concurrent_set')
+
+    def __init__(self, exp, concurrent_set):
         assert isinstance(exp, (data.Expansion, data.StringExpansion))
         self.exp = exp
-        self.single = single
+        self.concurrent_set = concurrent_set
 
     def execute(self, makefile, context):
-        if self.single:
+        if self.concurrent_set:
             vlist = [self.exp.resolvestr(makefile, makefile.variables)]
         else:
             vlist = list(self.exp.resolvesplit(makefile, makefile.variables))
diff --git a/build/pymake/pymake/process.py b/build/pymake/pymake/process.py
index 815ae5899c2e..b4afac1ede38 100644
--- a/build/pymake/pymake/process.py
+++ b/build/pymake/pymake/process.py
@@ -15,7 +15,8 @@ if sys.platform=='win32':
 _log = logging.getLogger('pymake.process')
 
 _escapednewlines = re.compile(r'\\\n')
-_blacklist = re.compile(r'[$><;[{~`|&()]')
+_blacklist = re.compile(r'[$><;[~`|&()]' +
+    r'|\${|(?:^|\s){(?:$|\s)')  # Blacklist ${foo} and { commands }
 _needsglob = re.compile(r'[\*\?]')
 def clinetoargv(cline):
     """
diff --git a/build/pymake/tests/makeflags.mk b/build/pymake/tests/makeflags.mk
index 07ad21a3392d..288ff786632d 100644
--- a/build/pymake/tests/makeflags.mk
+++ b/build/pymake/tests/makeflags.mk
@@ -2,5 +2,6 @@
 
 all:
 	test "$(OVAR)" = "oval"
+	test "$$OVAR" = "oval"
 	@echo TEST-PASS
 
diff --git a/build/pymake/tests/native-simple.mk b/build/pymake/tests/native-simple.mk
index c0ea3118e364..c67a89908b63 100644
--- a/build/pymake/tests/native-simple.mk
+++ b/build/pymake/tests/native-simple.mk
@@ -2,9 +2,10 @@ ifndef TOUCH
 TOUCH = touch
 endif
 
-all: testfile
+all: testfile {testfile2}
 	test -f testfile
+	test -f {testfile2}
 	@echo TEST-PASS
 
-testfile:
+testfile {testfile2}:
 	$(TOUCH) $@
diff --git a/build/stlport/Makefile.in b/build/stlport/Makefile.in
index 15310143df7c..6bc2af3ea974 100644
--- a/build/stlport/Makefile.in
+++ b/build/stlport/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/build/tests/unit-ConfigStatus.py b/build/tests/unit-ConfigStatus.py
new file mode 100644
index 000000000000..26e5c3c533fe
--- /dev/null
+++ b/build/tests/unit-ConfigStatus.py
@@ -0,0 +1,328 @@
+from __future__ import with_statement
+import os, posixpath
+from StringIO import StringIO
+import unittest
+from mozunit import main, MockedOpen
+import ConfigStatus
+from ConfigStatus import FileAvoidWrite
+
+class ConfigEnvironment(ConfigStatus.ConfigEnvironment):
+    def __init__(self, **args):
+        ConfigStatus.ConfigEnvironment.__init__(self, **args)
+        # Be helpful to unit tests
+        if not 'top_srcdir' in self.substs:
+            if os.path.isabs(self.topsrcdir):
+                self.substs['top_srcdir'] = self.topsrcdir.replace(os.sep, '/')
+            else:
+                self.substs['top_srcdir'] = ConfigStatus.relpath(self.topsrcdir, self.topobjdir).replace(os.sep, '/')
+
+class TestFileAvoidWrite(unittest.TestCase):
+    def test_file_avoid_write(self):
+        '''Test the FileAvoidWrite class
+        '''
+        with MockedOpen({'file': 'content'}):
+            # Overwriting an existing file replaces its content
+            with FileAvoidWrite('file') as file:
+                file.write('bazqux')
+            self.assertEqual(open('file', 'r').read(), 'bazqux')
+
+            # Creating a new file (obviously) stores its content
+            with FileAvoidWrite('file2') as file:
+                file.write('content')
+            self.assertEqual(open('file2').read(), 'content')
+
+        class MyMockedOpen(MockedOpen):
+            '''MockedOpen extension to raise an exception if something
+            attempts to write in an opened file.
+            '''
+            def __call__(self, name, mode):
+                if 'w' in mode:
+                    raise Exception, 'Unexpected open with write mode'
+                return MockedOpen.__call__(self, name, mode)
+
+        with MyMockedOpen({'file': 'content'}):
+            # Validate that MyMockedOpen works as intended
+            file = FileAvoidWrite('file')
+            file.write('foobar')
+            self.assertRaises(Exception, file.close)
+
+            # Check that no write actually happens when writing the
+            # same content as what already is in the file
+            with FileAvoidWrite('file') as file:
+                file.write('content')
+
+
+class TestEnvironment(unittest.TestCase):
+    def test_auto_substs(self):
+        '''Test the automatically set values of ACDEFINES and ALLDEFINES.
+        '''
+        env = ConfigEnvironment(
+                  defines = [ ('foo', 'bar'), ('baz', 'qux 42'),
+                              ('abc', 'def'), ('extra', 'foobar') ],
+                  non_global_defines = ['extra', 'ignore'])
+        # non_global_defines should be filtered out in ACDEFINES and
+        # ALLDEFINES.
+        # Original order of the defines need to be respected in ACDEFINES
+        self.assertEqual(env.substs['ACDEFINES'], '-Dfoo=bar -Dbaz=qux\\ 42 -Dabc=def')
+        # ALLDEFINES, on the other hand, needs to be sorted
+        self.assertEqual(env.substs['ALLDEFINES'], '''#define abc def
+#define baz qux 42
+#define foo bar''')
+
+    def test_config_file(self):
+        '''Test the creation of config files.
+        '''
+        with MockedOpen({'file.in': '''#ifdef foo
+@foo@
+@bar@
+'''}):
+            env = ConfigEnvironment(substs = [ ('foo', 'bar baz') ])
+            env.create_config_file('file')
+            self.assertEqual(open('file', 'r').read(), '''#ifdef foo
+bar baz
+@bar@
+''')
+
+    def test_config_header(self):
+        '''Test the creation of config headers.
+        '''
+        with MockedOpen({'file.in': '''
+/* Comment */
+#define foo
+#define foo 42
+#undef foo
+#define bar
+#define bar 42
+#undef bar
+
+# undef baz
+
+#ifdef foo
+#   undef   foo
+#  define foo    42
+  #     define   foo   42   
+#endif
+'''}):
+            env = ConfigEnvironment(defines = [ ('foo', 'baz qux'), ('baz', 1) ])
+            env.create_config_header('file')
+            self.assertEqual(open('file','r').read(), '''
+/* Comment */
+#define foo
+#define foo baz qux
+#define foo baz qux
+#define bar
+#define bar 42
+/* #undef bar */
+
+# define baz 1
+
+#ifdef foo
+#   define   foo baz qux
+#  define foo    baz qux
+  #     define   foo   baz qux   
+#endif
+''')
+
+# Tests for get_relative_srcdir, get_depth, get_input and get_file_srcdir,
+# depending on various cases of top source directory and top build
+# directory location.
+class TestPaths(unittest.TestCase):
+    def setUp(self):
+        self.dir = os.path.basename(os.path.abspath(os.curdir))
+        self.absolute = os.path.normpath('/absolute')
+
+class TestPathsLocalBuildDir(TestPaths):
+    def get_env(self, topsrcdir):
+        env = ConfigEnvironment(topsrcdir = topsrcdir, topobjdir = '.')
+        self.assertEqual(env.get_relative_srcdir('file'), '.')
+        self.assertEqual(env.get_relative_srcdir('dir/file'), 'dir')
+        self.assertEqual(env.get_relative_srcdir('deeply/nested/path/to/file'), 'deeply/nested/path/to')
+        self.assertEqual(env.get_depth('file'), '.')
+        self.assertEqual(env.get_depth('dir/file'), '..')
+        self.assertEqual(env.get_depth('deeply/nested/path/to/file'), '../../../..')
+        return env
+
+    def test_paths_local_build_local_src(self):
+        # topsrcdir = . ; topobjdir = .
+        env = self.get_env('.')
+        self.assertEqual(env.get_input('file'), 'file.in')
+        self.assertEqual(env.get_input('dir/file'), os.path.join('dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('file'), '.')
+        self.assertEqual(env.get_top_srcdir('dir/file'), '..')
+        self.assertEqual(env.get_file_srcdir('file'), '.')
+        self.assertEqual(env.get_file_srcdir('dir/file'), '../dir')
+
+    def test_paths_local_build_parent_src(self):
+        # topsrcdir = .. ; topobjdir = .
+        env = self.get_env('..')
+        self.assertEqual(env.get_input('file'), os.path.join('..', 'file.in'))
+        self.assertEqual(env.get_input('dir/file'), os.path.join('..', 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('file'), '..')
+        self.assertEqual(env.get_top_srcdir('dir/file'), '../..')
+        self.assertEqual(env.get_file_srcdir('file'), '..')
+        self.assertEqual(env.get_file_srcdir('dir/file'), '../../dir')
+
+    def test_paths_local_build_absolute_src(self):
+        # topsrcdir = /absolute ; topobjdir = /absolute
+        env = self.get_env(self.absolute)
+        self.assertEqual(env.get_input('file'), os.path.join(self.absolute, 'file.in'))
+        self.assertEqual(env.get_input('dir/file'), os.path.join(self.absolute, 'dir', 'file.in'))
+        self.assertEqual(env.get_input('%s/file' % self.dir), os.path.join(self.absolute, self.dir, 'file.in'))
+        self.assertEqual(env.get_top_srcdir('file'), '/absolute')
+        self.assertEqual(env.get_top_srcdir('dir/file'), '/absolute')
+        self.assertEqual(env.get_top_srcdir('%s/file' % dir), '/absolute')
+        self.assertEqual(env.get_file_srcdir('file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('dir/file'), '/absolute/dir')
+        self.assertEqual(env.get_file_srcdir('%s/file' % dir), '/absolute/%s' % dir)
+
+class TestPathsParentBuildDir(TestPaths):
+    def get_env(self, topsrcdir):
+        env = ConfigEnvironment(topsrcdir = topsrcdir, topobjdir = '..')
+        self.assertEqual(env.get_relative_srcdir('..'), '.')
+        self.assertEqual(env.get_relative_srcdir('file'), self.dir)
+        self.assertEqual(env.get_relative_srcdir('dir/file'), '%s/dir' % self.dir)
+        self.assertEqual(env.get_relative_srcdir('deeply/nested/path/to/file'), '%s/deeply/nested/path/to' % self.dir)
+        self.assertEqual(env.get_depth('../file'), '.')
+        self.assertEqual(env.get_depth('file'), '..')
+        self.assertEqual(env.get_depth('dir/file'), '../..')
+        self.assertEqual(env.get_depth('deeply/nested/path/to/file'), '../../../../..')
+        return env
+
+    def test_paths_parent_build_parent_src(self):
+        # topsrcdir = .. ; topobjdir = ..
+        env = self.get_env('..')
+        self.assertEqual(env.get_input('../file'), os.path.join('..', 'file.in'))
+        self.assertEqual(env.get_input('file'), os.path.join('..', self.dir, 'file.in'))
+        self.assertEqual(env.get_input('dir/file'), os.path.join('..', self.dir, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('../file'), '.')
+        self.assertEqual(env.get_top_srcdir('file'), '..')
+        self.assertEqual(env.get_top_srcdir('dir/file'), '../..')
+        self.assertEqual(env.get_file_srcdir('../file'), '.')
+        self.assertEqual(env.get_file_srcdir('file'), '../%s' % self.dir)
+        self.assertEqual(env.get_file_srcdir('dir/file'), '../../%s/dir' % self.dir)
+
+    def test_paths_parent_build_ancestor_src(self):
+        # topsrcdir = ../.. ; topobjdir = ..
+        env = self.get_env('../..')
+        self.assertEqual(env.get_input('../file'), os.path.join('..', '..', 'file.in'))
+        self.assertEqual(env.get_input('file'), os.path.join('..', '..', self.dir, 'file.in'))
+        self.assertEqual(env.get_input('dir/file'), os.path.join('..', '..', self.dir, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('../file'), '..')
+        self.assertEqual(env.get_top_srcdir('file'), '../..')
+        self.assertEqual(env.get_top_srcdir('dir/file'), '../../..')
+        self.assertEqual(env.get_file_srcdir('../file'), '..')
+        self.assertEqual(env.get_file_srcdir('file'), '../../%s' % self.dir)
+        self.assertEqual(env.get_file_srcdir('dir/file'), '../../../%s/dir' % self.dir)
+
+    def test_paths_parent_build_absolute_src(self):
+        # topsrcdir = /absolute ; topobjdir = ..
+        env = self.get_env(self.absolute)
+        self.assertEqual(env.get_input('../file'), os.path.join(self.absolute, 'file.in'))
+        self.assertEqual(env.get_input('file'), os.path.join(self.absolute, self.dir, 'file.in'))
+        self.assertEqual(env.get_input('dir/file'), os.path.join(self.absolute, self.dir, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('../file'), '/absolute')
+        self.assertEqual(env.get_top_srcdir('file'), '/absolute')
+        self.assertEqual(env.get_top_srcdir('dir/file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('../file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('file'), '/absolute/%s' % self.dir)
+        self.assertEqual(env.get_file_srcdir('dir/file'), '/absolute/%s/dir' % self.dir)
+
+class TestPathsRelativeBuild(TestPaths):
+    def get_env(self, topsrcdir):
+        env = ConfigEnvironment(topsrcdir = topsrcdir, topobjdir = 'relative')
+        self.assertEqual(env.get_relative_srcdir('relative/file'), '.')
+        self.assertEqual(env.get_relative_srcdir('relative/dir/file'), 'dir')
+        self.assertEqual(env.get_relative_srcdir('relative/deeply/nested/path/to/file'), 'deeply/nested/path/to')
+        self.assertEqual(env.get_depth('relative/file'), '.')
+        self.assertEqual(env.get_depth('relative/dir/file'), '..')
+        self.assertEqual(env.get_depth('relative/deeply/nested/path/to/file'), '../../../..')
+        return env
+
+    def test_paths_relative_build_relative_src(self):
+        # topsrcdir = relative ; topobjdir = relative
+        env = self.get_env('relative')
+        self.assertEqual(env.get_input('relative/file'), os.path.join('relative', 'file.in'))
+        self.assertEqual(env.get_input('relative/dir/file'), os.path.join('relative', 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('relative/file'), '.')
+        self.assertEqual(env.get_top_srcdir('relative/dir/file'), '..')
+        self.assertEqual(env.get_file_srcdir('relative/file'), '.')
+        self.assertEqual(env.get_file_srcdir('relative/dir/file'), '../dir')
+
+    def test_paths_relative_build_local_src(self):
+        # topsrcdir = . ; topobjdir = relative
+        env = self.get_env('.')
+        self.assertEqual(env.get_input('relative/file'), 'file.in')
+        self.assertEqual(env.get_input('relative/dir/file'), os.path.join('dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('relative/file'), '..')
+        self.assertEqual(env.get_top_srcdir('relative/dir/file'), '../..')
+        self.assertEqual(env.get_file_srcdir('relative/file'), '..')
+        self.assertEqual(env.get_file_srcdir('relative/dir/file'), '../../dir')
+
+    def test_paths_relative_build_parent_src(self):
+        # topsrcdir = .. ; topobjdir = relative
+        env = self.get_env('..')
+        self.assertEqual(env.get_input('relative/file'), os.path.join('..', 'file.in'))
+        self.assertEqual(env.get_input('relative/dir/file'), os.path.join('..', 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('relative/file'), '../..')
+        self.assertEqual(env.get_top_srcdir('relative/dir/file'), '../../..')
+        self.assertEqual(env.get_file_srcdir('relative/file'), '../..')
+        self.assertEqual(env.get_file_srcdir('relative/dir/file'), '../../../dir')
+
+    def test_paths_relative_build_absolute_src(self):
+        # topsrcdir = /absolute ; topobjdir = relative
+        env = self.get_env(self.absolute)
+        self.assertEqual(env.get_input('relative/file'), os.path.join(self.absolute, 'file.in'))
+        self.assertEqual(env.get_input('relative/dir/file'), os.path.join(self.absolute, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('relative/file'), '/absolute')
+        self.assertEqual(env.get_top_srcdir('relative/dir/file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('relative/file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('relative/dir/file'), '/absolute/dir')
+
+class TestPathsAbsoluteBuild(unittest.TestCase):
+    def setUp(self):
+        self.absolute_build = os.path.normpath('/absolute/build')
+
+    def get_env(self, topsrcdir):
+        env = ConfigEnvironment(topsrcdir = topsrcdir, topobjdir = self.absolute_build)
+        self.assertEqual(env.get_relative_srcdir('/absolute/build/file'), '.')
+        self.assertEqual(env.get_relative_srcdir('/absolute/build/dir/file'), 'dir')
+        self.assertEqual(env.get_relative_srcdir('/absolute/build/deeply/nested/path/to/file'), 'deeply/nested/path/to')
+        self.assertEqual(env.get_depth('/absolute/build/file'), '.')
+        self.assertEqual(env.get_depth('/absolute/build/dir/file'), '..')
+        self.assertEqual(env.get_depth('/absolute/build/deeply/nested/path/to/file'), '../../../..')
+        return env
+
+    def test_paths_absolute_build_same_src(self):
+        # topsrcdir = /absolute/build ; topobjdir = /absolute/build
+        env = self.get_env(self.absolute_build)
+        self.assertEqual(env.get_input('/absolute/build/file'), os.path.join(self.absolute_build, 'file.in'))
+        self.assertEqual(env.get_input('/absolute/build/dir/file'), os.path.join(self.absolute_build, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('/absolute/build/file'), '/absolute/build')
+        self.assertEqual(env.get_top_srcdir('/absolute/build/dir/file'), '/absolute/build')
+        self.assertEqual(env.get_file_srcdir('/absolute/build/file'), '/absolute/build')
+        self.assertEqual(env.get_file_srcdir('/absolute/build/dir/file'), '/absolute/build/dir')
+
+    def test_paths_absolute_build_ancestor_src(self):
+        # topsrcdir = /absolute ; topobjdir = /absolute/build
+        absolute = os.path.dirname(self.absolute_build)
+        env = self.get_env(absolute)
+        self.assertEqual(env.get_input('/absolute/build/file'), os.path.join(absolute, 'file.in'))
+        self.assertEqual(env.get_input('/absolute/build/dir/file'), os.path.join(absolute, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('/absolute/build/file'), '/absolute')
+        self.assertEqual(env.get_top_srcdir('/absolute/build/dir/file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('/absolute/build/file'), '/absolute')
+        self.assertEqual(env.get_file_srcdir('/absolute/build/dir/file'), '/absolute/dir')
+
+    def test_paths_absolute_build_different_src(self):
+        # topsrcdir = /some/path ; topobjdir = /absolute/build
+        absolute = os.path.normpath('/some/path')
+        env = self.get_env(absolute)
+        self.assertEqual(env.get_input('/absolute/build/file'), os.path.join(absolute, 'file.in'))
+        self.assertEqual(env.get_input('/absolute/build/dir/file'), os.path.join(absolute, 'dir', 'file.in'))
+        self.assertEqual(env.get_top_srcdir('/absolute/build/file'), '/some/path')
+        self.assertEqual(env.get_top_srcdir('/absolute/build/dir/file'), '/some/path')
+        self.assertEqual(env.get_file_srcdir('/absolute/build/file'), '/some/path')
+        self.assertEqual(env.get_file_srcdir('/absolute/build/dir/file'), '/some/path/dir')
+
+if __name__ == "__main__":
+    main()
diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in
index 6fcb0c2a9e90..f5c01a3d7dce 100644
--- a/build/unix/Makefile.in
+++ b/build/unix/Makefile.in
@@ -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/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
index d02a3b298bc3..f425f3918c06 100644
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in
index 94bde4078f14..e2dd83e2a352 100644
--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/unix/test/Makefile.in b/build/unix/test/Makefile.in
index f215e88537a9..237fab8fb3f4 100644
--- a/build/unix/test/Makefile.in
+++ b/build/unix/test/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/build/virtualenv/packages.txt b/build/virtualenv/packages.txt
index aa0f576b29e1..5df0f09002dc 100644
--- a/build/virtualenv/packages.txt
+++ b/build/virtualenv/packages.txt
@@ -7,5 +7,6 @@ setup.py:testing/mozbase/mozprocess:develop
 setup.py:testing/mozbase/mozprofile:develop
 setup.py:testing/mozbase/mozrunner:develop
 setup.py:python/blessings:develop
+setup.py:python/mozbuild:develop
 mozilla.pth:build
 mozilla.pth:config
diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index 5c3ea0a6e15c..742af5c139c0 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/build/win32/crashinjectdll/Makefile.in b/build/win32/crashinjectdll/Makefile.in
index 1775b1111a51..b5ce557f82d0 100644
--- a/build/win32/crashinjectdll/Makefile.in
+++ b/build/win32/crashinjectdll/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/build/win32/vmwarerecordinghelper/Makefile.in b/build/win32/vmwarerecordinghelper/Makefile.in
index 1527d8e7b2fc..8f69b9cfdce2 100644
--- a/build/win32/vmwarerecordinghelper/Makefile.in
+++ b/build/win32/vmwarerecordinghelper/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/caps/Makefile.in b/caps/Makefile.in
index 8c2f6bf7011d..dd4c46db31d6 100644
--- a/caps/Makefile.in
+++ b/caps/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/caps/idl/Makefile.in b/caps/idl/Makefile.in
index 074b45b628a5..f29091516f71 100644
--- a/caps/idl/Makefile.in
+++ b/caps/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/caps/idl/nsIPrincipal.idl b/caps/idl/nsIPrincipal.idl
index c1f6efbd37a2..a0e6d1d6dcc7 100644
--- a/caps/idl/nsIPrincipal.idl
+++ b/caps/idl/nsIPrincipal.idl
@@ -241,8 +241,9 @@ interface nsIPrincipal : nsISerializable
     readonly attribute unsigned short appStatus;
 
     /**
-     * Returns the app id the principal is in.
-     * Returns nsIAppsService::NO_APP_ID if this principal isn't part of an app.
+     * Returns the app id the principal is in, or returns
+     * nsIScriptSecurityManager::NO_APP_ID if this principal isn't part of an
+     * app.
      */
     readonly attribute unsigned long appId;
 
diff --git a/caps/include/Makefile.in b/caps/include/Makefile.in
index bf90ade93ccf..d187cca4a137 100644
--- a/caps/include/Makefile.in
+++ b/caps/include/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in
index 4a05e1401252..d0c09e0ef32e 100644
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/caps/tests/mochitest/Makefile.in b/caps/tests/mochitest/Makefile.in
index 4ddf8cd816b9..c7d0b47a7627 100644
--- a/caps/tests/mochitest/Makefile.in
+++ b/caps/tests/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = caps/tests/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/chrome/Makefile.in b/chrome/Makefile.in
index 41869f62ba13..d96f6073a39f 100644
--- a/chrome/Makefile.in
+++ b/chrome/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/chrome/public/Makefile.in b/chrome/public/Makefile.in
index 1b16a8fae75c..e7145b2d1af8 100644
--- a/chrome/public/Makefile.in
+++ b/chrome/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in
index 24b92352c055..01348e3ea7e2 100644
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/chrome/test/Makefile.in b/chrome/test/Makefile.in
index f591a5e8836a..2cfe3cfd0f43 100644
--- a/chrome/test/Makefile.in
+++ b/chrome/test/Makefile.in
@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
-relativesrcdir = chrome/test
+relativesrcdir = @relativesrcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
diff --git a/client.mk b/client.mk
index 53b8c04e021c..1ba3cac8f723 100644
--- a/client.mk
+++ b/client.mk
@@ -320,8 +320,7 @@ endif
 
 ifneq (,$(CONFIG_STATUS))
 $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
-	cd $(OBJDIR); \
-	  CONFIG_FILES=config/autoconf.mk ./config.status
+	$(PYTHON) $(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk
 endif
 
 
diff --git a/config/Makefile.in b/config/Makefile.in
index 9a3bafe7adb3..1b152573f708 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -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/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/config/Preprocessor.py b/config/Preprocessor.py
index b45d92653519..c9192a83e3aa 100644
--- a/config/Preprocessor.py
+++ b/config/Preprocessor.py
@@ -92,10 +92,17 @@ class Preprocessor:
     """
     Set the marker to be used for processing directives.
     Used for handling CSS files, with pp.setMarker('%'), for example.
+    The given marker may be None, in which case no markers are processed.
     """
     self.marker = aMarker
-    self.instruction = re.compile('%s(?P<cmd>[a-z]+)(?:\s(?P<args>.*))?$'%aMarker, re.U)
-    self.comment = re.compile(aMarker, re.U)
+    if aMarker:
+      self.instruction = re.compile('%s(?P<cmd>[a-z]+)(?:\s(?P<args>.*))?$'%aMarker, re.U)
+      self.comment = re.compile(aMarker, re.U)
+    else:
+      class NoMatch(object):
+        def match(self, *args):
+          return False
+      self.instruction = self.comment = NoMatch()
   
   def clone(self):
     """
@@ -392,7 +399,7 @@ class Preprocessor:
         return str(self.context[varname])
       if fatal:
         raise Preprocessor.Error(self, 'UNDEFINED_VAR', varname)
-      return ''
+      return matchobj.group(0)
     return self.varsubst.sub(repl, aLine)
   def filter_attemptSubstitution(self, aLine):
     return self.filter_substitution(aLine, fatal=False)
diff --git a/config/add-chrome.pl b/config/add-chrome.pl
deleted file mode 100644
index c9e99801be22..000000000000
--- a/config/add-chrome.pl
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-use File::Path;
-use Getopt::Std;
-use IO::File;
-use mozLock;
-
-getopts("lxo:");
-
-my $installedChromeFile = $ARGV[0];
-my $disableJarPackaging = $ARGV[1];
-my $chromeType = $ARGV[2];
-my $pkgName = $ARGV[3];
-my $jarFileName = $ARGV[4];
-
-my $win32 = ($^O =~ /((MS)?win32)|msys|cygwin|os2/i) ? 1 : 0;
-my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
-my $unix  = !($win32 || $macos) ? 1 : 0;
-
-sub foreignPlatformFile
-{
-   my ($jarfile) = @_;
-   
-   if (!$win32 && index($jarfile, "-win") != -1) {
-     return 1;
-   }
-   
-   if (!$unix && index($jarfile, "-unix") != -1) {
-     return 1; 
-   }
-
-   if (!$macos && index($jarfile, "-mac") != -1) {
-     return 1;
-   }
-
-   return 0;
-}
-
-sub foreignPlatformPath
-{
-   my ($jarpath) = @_;
-   
-   if (!$win32 && index($jarpath, "-platform/win") != -1) {
-     return 1;
-   }
-   
-   if (!$unix && index($jarpath, "-platform/unix") != -1) {
-     return 1; 
-   }
-
-   if (!$macos && index($jarpath, "-platform/mac") != -1) {
-     return 1;
-   }
-
-   return 0;
-}
-
-#print "add-chrome $installedChromeFile $disableJarPackaging $chromeType $pkgName $jarFileName\n";
-
-my $nofilelocks = 0;
-if (defined($::opt_l)) {
-    $nofilelocks = 1;
-}
-
-if (defined($::opt_x)) {
-    $win32 = 0;
-    $macos = 0;
-    $unix = 1;
-}
-
-my $force_os;
-if (defined($::opt_o)) {
-    $force_os = $::opt_o;
-}
-
-if (defined($force_os)) {
-    $win32 = 0;
-    $macos = 0;
-    $unix = 0;
-    if ($force_os eq "WINNT") {
-	$win32 = 1;
-    } elsif ($force_os eq "OS2") {
-	$win32 = 1;
-    } elsif ($force_os eq "Darwin") {
-	$macos = 1;
-    } else {
-	$unix = 1;
-    }
-}
-
-if ($jarFileName =~ /(.*)\.jar/) {
-    $jarFileName = $1;
-}
-
-if (!foreignPlatformFile($jarFileName) && !foreignPlatformPath($pkgName)) {
-
-my $line;
-if ($disableJarPackaging) {
-    $line = "$chromeType,install,url,resource:/chrome/$jarFileName/$chromeType/$pkgName/";
-}
-else {
-    $line = "$chromeType,install,url,jar:resource:/chrome/$jarFileName.jar!/$chromeType/$pkgName/";
-}
-
-my $lockfile = "$installedChromeFile.lck";
-my $err;
-
-mozLock($lockfile) if (!$nofilelocks);
-$err = 0;
-if (open(FILE, "<$installedChromeFile")) {
-    while (<FILE>) {
-        chomp;
-        if ($_ eq $line) {
-            # line already appears in installed-chrome.txt file
-            # just update the mod date
-            close(FILE) or $err = 1; 
-	    if ($err) {
-		mozUnlock($lockfile) if (!$nofilelocks);
-		die "error: can't close $installedChromeFile: $!";
-	    }
-            my $now = time;
-            utime($now, $now, $installedChromeFile) or $err = 1;
-	    mozUnlock($lockfile) if (!$nofilelocks);
-	    if ($err) {
-		die "couldn't touch $installedChromeFile";
-	    }
-            print "+++ updating chrome $installedChromeFile\n+++\t$line\n";
-            exit;
-        }
-    }
-    close(FILE) or $err = 1;
-    if ($err) {
-	mozUnlock($lockfile) if (!$nofilelocks);
-	die "error: can't close $installedChromeFile: $!";
-    }
-}
-mozUnlock($lockfile) if (!$nofilelocks);
-
-my $dir = $installedChromeFile;
-if ("$dir" =~ /([\w\d.\-\\\/]+)[\\\/]([\w\d.\-]+)/) {
-    $dir = $1;
-}
-mkpath($dir, 0, 0755);
-
-mozLock($lockfile) if (!$nofilelocks);
-$err = 0;
-open(FILE, ">>$installedChromeFile") or $err = 1;
-if ($err) {
-    mozUnlock($lockfile) if (!$nofilelocks);
-    die "can't open $installedChromeFile: $!";
-}
-print FILE "$line\n";
-close(FILE) or $err = 1;
-mozUnlock($lockfile) if (!$nofilelocks);
-if ($err) {
-    die "error: can't close $installedChromeFile: $!";
-}
-print "+++ adding chrome $installedChromeFile\n+++\t$line\n";
-}
-
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index c9e7e25c5b5d..58da2dd4d7b6 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -82,7 +82,6 @@ MOZ_CALLGRIND   = @MOZ_CALLGRIND@
 MOZ_VALGRIND    = @MOZ_VALGRIND@
 MOZ_VTUNE       = @MOZ_VTUNE@
 MOZ_ETW         = @MOZ_ETW@
-MOZ_TRACE_JSCALLS = @MOZ_TRACE_JSCALLS@
 DEHYDRA_PATH    = @DEHYDRA_PATH@
 
 MOZ_USING_CCACHE = @MOZ_USING_CCACHE@
@@ -104,7 +103,6 @@ IBMBIDI = @IBMBIDI@
 MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
 ACCESSIBILITY = @ACCESSIBILITY@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
-XPCOM_USE_LEA = @XPCOM_USE_LEA@
 MOZ_MAINTENANCE_SERVICE	= @MOZ_MAINTENANCE_SERVICE@
 MOZ_VERIFY_MAR_SIGNATURE	= @MOZ_VERIFY_MAR_SIGNATURE@
 MOZ_ENABLE_SIGNMAR	= @MOZ_ENABLE_SIGNMAR@
@@ -484,7 +482,6 @@ DLL_SUFFIX              = @DLL_SUFFIX@
 NO_LD_ARCHIVE_FLAGS     = @NO_LD_ARCHIVE_FLAGS@
 
 GTK_CONFIG	= @GTK_CONFIG@
-QT_CONFIG	= @QT_CONFIG@
 TK_CFLAGS	= @TK_CFLAGS@
 TK_LIBS		= @TK_LIBS@
 
@@ -580,10 +577,6 @@ MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
 
 MOZ_PSM=@MOZ_PSM@
 
-# Gssapi (krb5) libraries and headers for the Negotiate auth method
-GSSAPI_INCLUDES = @GSSAPI_INCLUDES@
-USE_GSSAPI	= @USE_GSSAPI@
-
 MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
 
 # Win32 options
diff --git a/config/config.mk b/config/config.mk
index cc0d6e36395d..e361689fcf12 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -126,13 +126,12 @@ MKDIR ?= mkdir
 SLEEP ?= sleep
 TOUCH ?= touch
 
-ifndef .PYMAKE
-PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
-else
+ifdef .PYMAKE
 PYCOMMANDPATH += $(topsrcdir)/config
-PYTHON_PATH = %pythonpath main
 endif
 
+PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
+
 # determine debug-related options
 _DEBUG_ASFLAGS :=
 _DEBUG_CFLAGS :=
diff --git a/config/makefiles/test/Makefile.in b/config/makefiles/test/Makefile.in
index 697df3205e95..7c521b4e7bde 100644
--- a/config/makefiles/test/Makefile.in
+++ b/config/makefiles/test/Makefile.in
@@ -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/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/config/mkdepend/Makefile.in b/config/mkdepend/Makefile.in
index b2c13119a66d..31d4df693457 100644
--- a/config/mkdepend/Makefile.in
+++ b/config/mkdepend/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/config/nspr/Makefile.in b/config/nspr/Makefile.in
index 99bfd82409fa..49e3199bf2a0 100644
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/config/rules.mk b/config/rules.mk
index 640894f887d2..28508b7a43b0 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1153,27 +1153,28 @@ GARBAGE_DIRS += $(_JAVA_DIR)
 ###############################################################################
 
 ifndef NO_MAKEFILE_RULE
-# Note: Passing depth to make-makefile is optional.
-#       It saves the script some work, though.
 Makefile: Makefile.in
-	@$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH)
+	@$(PYTHON) $(DEPTH)/config.status -n --file=Makefile
+	@$(TOUCH) $@
 endif
 
 ifndef NO_SUBMAKEFILES_RULE
 ifdef SUBMAKEFILES
 # VPATH does not work on some machines in this case, so add $(srcdir)
 $(SUBMAKEFILES): % : $(srcdir)/%.in
-	$(if $(subsrcdir),cd $(subsrcdir) && )$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir)$(addprefix /,$(subsrcdir)) -d $(DEPTH) $(@:$(subsrcdir)/%=%)
+	$(PYTHON) $(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@
+	@$(TOUCH) $@
 endif
 endif
 
 ifdef AUTOUPDATE_CONFIGURE
 $(topsrcdir)/configure: $(topsrcdir)/configure.in
-	(cd $(topsrcdir) && $(AUTOCONF)) && (cd $(DEPTH) && ./config.status --recheck)
+	(cd $(topsrcdir) && $(AUTOCONF)) && $(PYTHON) $(DEPTH)/config.status -n --recheck)
 endif
 
 $(DEPTH)/config/autoconf.mk: $(topsrcdir)/config/autoconf.mk.in
-	cd $(DEPTH) && CONFIG_HEADERS= CONFIG_FILES=config/autoconf.mk ./config.status
+	$(PYTHON) $(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk
+	$(TOUCH) $@
 
 ###############################################################################
 # Bunch of things that extend the 'export' rule (in order):
@@ -1385,11 +1386,14 @@ libs::
 endif
 
 ################################################################################
-# Copy each element of EXTRA_JS_MODULES to $(FINAL_TARGET)/modules
+# Copy each element of EXTRA_JS_MODULES to JS_MODULES_PATH, or
+# $(FINAL_TARGET)/modules if that isn't defined.
+JS_MODULES_PATH ?= $(FINAL_TARGET)/modules
+
 ifdef EXTRA_JS_MODULES
 libs:: $(EXTRA_JS_MODULES)
 ifndef NO_DIST_INSTALL
-	$(call install_cmd,$(IFLAGS1) $^ $(FINAL_TARGET)/modules)
+	$(call install_cmd,$(IFLAGS1) $^ $(JS_MODULES_PATH))
 endif
 
 endif
@@ -1398,9 +1402,9 @@ ifdef EXTRA_PP_JS_MODULES
 libs:: $(EXTRA_PP_JS_MODULES)
 ifndef NO_DIST_INSTALL
 	$(EXIT_ON_ERROR) \
-	$(NSINSTALL) -D $(FINAL_TARGET)/modules; \
+	$(NSINSTALL) -D $(JS_MODULES_PATH); \
 	for i in $^; do \
-	  dest=$(FINAL_TARGET)/modules/`basename $$i`; \
+	  dest=$(JS_MODULES_PATH)/`basename $$i`; \
 	  $(RM) -f $$dest; \
 	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
 	done
@@ -1550,23 +1554,6 @@ libs::
 
 endif
 
-ifneq (,$(filter flat symlink,$(MOZ_CHROME_FILE_FORMAT)))
-_JAR_REGCHROME_DISABLE_JAR=1
-else
-_JAR_REGCHROME_DISABLE_JAR=0
-endif
-
-REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
-	$(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \
-	$(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(FINAL_TARGET)/chrome/installed-chrome.txt \
-	$(_JAR_REGCHROME_DISABLE_JAR)
-
-REGCHROME_INSTALL = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
-	$(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \
-	$(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt \
-	$(_JAR_REGCHROME_DISABLE_JAR)
-
-
 #############################################################################
 # Dependency system
 #############################################################################
diff --git a/config/tests/makefiles/autodeps/Makefile.in b/config/tests/makefiles/autodeps/Makefile.in
index 662d46d57199..bbe2f85228f7 100644
--- a/config/tests/makefiles/autodeps/Makefile.in
+++ b/config/tests/makefiles/autodeps/Makefile.in
@@ -11,7 +11,7 @@ PYTEST = $(PYTHON) -E
 # python -B not supported by older interpreters
 export PYTHONDONTWRITEBYTECODE=1
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in
index ba7711db61c6..5607538ef722 100644
--- a/config/tests/src-simple/Makefile.in
+++ b/config/tests/src-simple/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/config/tests/unit-Preprocessor.py b/config/tests/unit-Preprocessor.py
index b15477fc6269..3fd2a3534afb 100644
--- a/config/tests/unit-Preprocessor.py
+++ b/config/tests/unit-Preprocessor.py
@@ -33,6 +33,16 @@ PASS
     self.pp.do_include(f)
     self.assertEqual(self.pp.out.getvalue(), "PASS\n")
 
+  def test_no_marker(self):
+    no_marker = """#if 0
+PASS
+#endif
+"""
+    f = NamedIO("no_marker.in", no_marker)
+    self.pp.setMarker(None)
+    self.pp.do_include(f)
+    self.assertEqual(self.pp.out.getvalue(), no_marker)
+
   def test_string_value(self):
     f = NamedIO("string_value.in", """#define FOO STRING
 #if FOO
@@ -172,11 +182,11 @@ BAR
   
   def test_filter_attemptSubstitution(self):
     f = NamedIO('filter_attemptSubstitution.in', '''#filter attemptSubstitution
-P@VAR@ASS
+@PASS@
 #unfilter attemptSubstitution
 ''')
     self.pp.do_include(f)
-    self.assertEqual(self.pp.out.getvalue(), "PASS\n")
+    self.assertEqual(self.pp.out.getvalue(), "@PASS@\n")
   
   def test_filter_emptyLines(self):
     f = NamedIO('filter_emptyLines.in', '''lines with a
diff --git a/configure.in b/configure.in
index fed08cf5784c..52e5eb84b8e3 100644
--- a/configure.in
+++ b/configure.in
@@ -488,7 +488,7 @@ case "$target" in
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         elif test "$_CC_MAJOR_VERSION" = "17"; then
             _CC_SUITE=11
-            _MSVS_VERSION=2011
+            _MSVS_VERSION=2012
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         else
@@ -1033,7 +1033,6 @@ ASM_SUFFIX=s
 IMPORT_LIB_SUFFIX=
 TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
-WIN_TOP_SRC=
 MOZ_USER_DIR=".mozilla"
 
 MOZ_JPEG_CFLAGS=
@@ -2991,6 +2990,8 @@ case $target in
 	;;
 esac
 
+MOZ_LINUX_PERF_EVENT
+
 dnl Checks for libraries.
 dnl ========================================================
 case $target in
@@ -3252,6 +3253,7 @@ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
                                  [ struct timespec ts;
                                    clock_gettime(CLOCK_MONOTONIC, &ts); ],
                                  ac_cv_clock_monotonic=$libs
+                                 LIBS="$_SAVE_LIBS"
                                  break,
                                  ac_cv_clock_monotonic=no)
                     LIBS="$_SAVE_LIBS"
@@ -3859,7 +3861,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then
                 AC_MSG_ERROR([system NSPR does not support PR_UINT64 or including prtypes.h does not provide it]))
     CFLAGS=$_SAVE_CFLAGS
 else
-    if test "$OS_ARCH" = "WINNT"; then
+    if test -z "$LIBXUL_SDK"; then
         NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
         if test -n "$GNU_CC"; then
             NSPR_LIBS="-L${LIBXUL_DIST}/lib -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}"
@@ -3867,8 +3869,8 @@ else
             NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
         fi
     else
-        NSPR_CFLAGS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
-        NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+        NSPR_CFLAGS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --includedir="${LIBXUL_DIST}/include/nspr" --cflags`
+        NSPR_LIBS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --libdir="${LIBXUL_DIST}"/lib --libs`
     fi
 fi
 
@@ -4794,7 +4796,7 @@ MOZ_ARG_DISABLE_BOOL(pango,
 dnl ========================================================
 dnl = Pango
 dnl ========================================================
-if test "$MOZ_ENABLE_GTK2"
+if test "$MOZ_ENABLE_GTK2" -o "$MOZ_ENABLE_QT"
 then
     AC_SUBST(MOZ_PANGO)
 
@@ -4807,30 +4809,12 @@ then
     then
         AC_DEFINE(MOZ_PANGO)
     else
-        PKG_CHECK_MODULES(FT2, freetype2 > 6.1.0 fontconfig)
+        PKG_CHECK_MODULES(FT2, freetype2 > 6.1.0)
         AC_SUBST(FT2_CFLAGS)
         AC_SUBST(FT2_LIBS)
     fi
 fi
 
-if test "$MOZ_ENABLE_QT"
-then
-    if test "$MOZ_PANGO"
-    then
-        PKG_CHECK_MODULES(MOZ_PANGO, [pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION],
-        [
-            AC_SUBST(MOZ_PANGO_CFLAGS)
-            AC_SUBST(MOZ_PANGO_LIBS)
-            AC_DEFINE(MOZ_PANGO)
-        ],
-        [
-            echo "Pango library not found, will use FT2 font engine"
-            MOZ_PANGO=
-        ])
-    fi
-    AC_SUBST(MOZ_PANGO)
-fi
-
 dnl ========================================================
 dnl = GnomeVFS, GIO and GConf support module
 dnl ========================================================
@@ -7804,6 +7788,17 @@ MOZ_ENABLE_SKIA=1,
 MOZ_ENABLE_SKIA=)
 
 if test "$USE_FC_FREETYPE"; then
+    PKG_CHECK_MODULES(_FONTCONFIG, fontconfig,
+    [
+        if test "$MOZ_PANGO"; then
+            MOZ_PANGO_CFLAGS="$MOZ_PANGO_CFLAGS $_FONTCONFIG_CFLAGS"
+            MOZ_PANGO_LIBS="$MOZ_PANGO_LIBS $_FONTCONFIG_LIBS"
+        else
+            FT2_CFLAGS="$FT2_CFLAGS $_FONTCONFIG_CFLAGS"
+            FT2_LIBS="$FT2_LIBS $_FONTCONFIG_LIBS"
+        fi
+    ])
+
     if test "$COMPILE_ENVIRONMENT"; then
         dnl ========================================================
         dnl = Check for freetype2 and its functionality
@@ -7983,12 +7978,10 @@ if test "$MOZ_TREE_CAIRO"; then
     MOZ_CAIRO_OSLIBS='${CAIRO_FT_OSLIBS}'
 
     if test "$MOZ_X11"; then
-        MOZ_CAIRO_OSLIBS="$MOZ_CAIRO_OSLIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig"
+        MOZ_CAIRO_OSLIBS="$MOZ_CAIRO_OSLIBS $XLDFLAGS -lXrender"
     fi
 
     CAIRO_FEATURES_H=gfx/cairo/cairo/src/cairo-features.h
-    mv -f $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig 2> /dev/null
-
 else
     PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION)
     MOZ_CAIRO_CFLAGS="$CAIRO_CFLAGS"
@@ -8110,6 +8103,7 @@ NECKO_PROTOCOLS=`${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}`
 AC_SUBST(NECKO_PROTOCOLS)
 for p in $NECKO_PROTOCOLS; do
     AC_DEFINE_UNQUOTED(NECKO_PROTOCOL_$p)
+    _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_PROTOCOL_$p"
 done
 
 dnl
@@ -8142,6 +8136,7 @@ fi
 
 if test "$NECKO_WIFI"; then
   AC_DEFINE(NECKO_WIFI)
+  _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
 fi
 AC_SUBST(NECKO_WIFI)
 
@@ -8155,6 +8150,7 @@ MOZ_ARG_DISABLE_BOOL(cookies,
 AC_SUBST(NECKO_COOKIES)
 if test "$NECKO_COOKIES"; then
     AC_DEFINE(NECKO_COOKIES)
+    _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
 fi
 
 dnl
@@ -8169,9 +8165,6 @@ if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
 fi
 
-dnl NECKO_ configuration options are not global
-_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_"
-
 dnl Build Places if required
 if test "$MOZ_PLACES"; then
   AC_DEFINE(MOZ_PLACES)
@@ -8671,14 +8664,6 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK2" ; then
     AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
 fi
 
-case "$host_os" in
-mingw*)
-    WIN_TOP_SRC=`cd $srcdir; pwd -W`
-    ;;
-esac
-
-AC_SUBST(WIN_TOP_SRC)
-
 AC_SUBST(MOZILLA_VERSION)
 
 AC_SUBST(ac_configure_args)
@@ -8696,6 +8681,7 @@ HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR
 HAVE_CPP_PARTIAL_SPECIALIZATION
 HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
 HAVE_STATVFS
+HAVE_STATVFS64
 NEED_CPP_UNUSED_IMPLEMENTATIONS
 NEW_H
 HAVE_GETPAGESIZE
@@ -8729,80 +8715,6 @@ case "$host" in
     ;;
 esac
 
-# Save the defines header file before autoconf removes it.
-# (Do not add AC_DEFINE calls after this line.)
-  _CONFIG_TMP=confdefs-tmp.h
-  _CONFIG_DEFS_H=mozilla-config.h
-
-  cat > $_CONFIG_TMP <<\EOF
-/* List of defines generated by configure. Included with preprocessor flag,
- * -include, to avoid long list of -D defines on the compile command-line.
- * Do not edit.
- */
-
-#ifndef _MOZILLA_CONFIG_H_
-#define _MOZILLA_CONFIG_H_
-EOF
-
-_EGREP_PATTERN='^#define ('
-if test -n "$_NON_GLOBAL_ACDEFINES"; then
-    for f in $_NON_GLOBAL_ACDEFINES; do
-        _EGREP_PATTERN="${_EGREP_PATTERN}$f|"
-    done
-fi
-_EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
-
-  sort confdefs.h | $FIXED_EGREP -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
-
-  if test "$?" != 0; then
-    AC_MSG_ERROR([Error outputting config definitions])
-  fi
-
-  cat >> $_CONFIG_TMP <<\EOF
-
-/* The c99 defining the limit macros (UINT32_MAX for example), says:
- * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
- * is defined before <stdint.h> is included. */
-#define __STDC_LIMIT_MACROS
-
-/* Force-include hunspell_alloc_hooks.h for hunspell, so that we don't need to
- * modify it directly.
- *
- * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in,
- * unless --enable-system-hunspell is defined.
- */
-#if defined(HUNSPELL_STATIC)
-#include "hunspell_alloc_hooks.h"
-#endif
-
-#endif /* _MOZILLA_CONFIG_H_ */
-
-EOF
-
-  # Only write mozilla-config.h when something changes (or it doesn't exist)
-  if cmp -s $_CONFIG_TMP $_CONFIG_DEFS_H; then
-    rm $_CONFIG_TMP
-  else
-    AC_MSG_RESULT("creating $_CONFIG_DEFS_H")
-    mv -f $_CONFIG_TMP $_CONFIG_DEFS_H
-
-    echo ==== $_CONFIG_DEFS_H =================================
-    cat $_CONFIG_DEFS_H
-  fi
-
-dnl Probably shouldn't call this manually but we always want the output of DEFS
-rm -f confdefs.h.save
-mv confdefs.h confdefs.h.save
-$FIXED_EGREP -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
-if test "$?" != 0; then
-  AC_MSG_ERROR([Error outputting confdefs.h])
-fi
-AC_OUTPUT_MAKE_DEFS()
-ACDEFINES=$DEFS
-AC_SUBST(ACDEFINES)
-rm -f confdefs.h
-mv confdefs.h.save confdefs.h
-
 dnl Create a virtualenv where we can install local Python packages
 AC_MSG_RESULT([Creating Python virtualenv])
 rm -rf _virtualenv
@@ -8832,27 +8744,9 @@ dnl Load the list of Makefiles to generate.
 dnl   To add new Makefiles, edit allmakefiles.sh.
 dnl   allmakefiles.sh sets the variable, MAKEFILES.
 . ${srcdir}/allmakefiles.sh
-dnl
-dnl Run a perl script to quickly create the makefiles.
-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
-dnl   for the files it cannot handle correctly. This way, config.status
-dnl   will handle these files.
-dnl If it fails, nothing is set and config.status will run as usual.
-dnl
-dnl This does not change the $MAKEFILES variable.
-dnl
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
-res="$?"
-if test "$res" != 0; then
-    exit $res
-fi
-. ./conftest.sh
-rm conftest.sh
 
 echo $MAKEFILES > unallmakefiles
 
-mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
-
 AC_OUTPUT($MAKEFILES)
 
 # Generate Makefiles for WebRTC directly from .gyp files
@@ -8912,16 +8806,6 @@ else
   mv -f ./mozinfo.json.tmp ./mozinfo.json
 fi
 
-dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
-if test "$CAIRO_FEATURES_H"; then
-  if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
-    echo "$CAIRO_FEATURES_H is unchanged"
-    mv -f "$CAIRO_FEATURES_H".orig "$CAIRO_FEATURES_H" 2> /dev/null
-  else
-    rm -f "$CAIRO_FEATURES_H".orig 2> /dev/null
-  fi
-fi
-
 # Run jemalloc configure script
 
 if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
@@ -9074,18 +8958,6 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi
 
-if test -z "$MOZ_NATIVE_NSPR"; then
-    # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
-    AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
-    if test "$OS_ARCH" != "WINNT"; then
-       NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
-       $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
-       NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
-       $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk
-    fi
-    rm -f config/autoconf.mk.bak
-fi
-
 dnl ========================================================
 dnl = Setup a nice relatively clean build environment for
 dnl = sub-configures.
@@ -9142,13 +9014,3 @@ AC_OUTPUT_SUBDIRS(js/src)
 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 
 fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
-
-dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
-dnl Needs to be at the end to respect possible changes from NSPR configure
-if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
-  echo "config/autoconf.mk is unchanged"
-  mv -f config/autoconf.mk.orig config/autoconf.mk 2> /dev/null
-else
-  rm -f config/autoconf.mk.orig 2> /dev/null
-fi
-
diff --git a/content/Makefile.in b/content/Makefile.in
index 07007eb0c41c..3f8d39f99319 100644
--- a/content/Makefile.in
+++ b/content/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/base/Makefile.in b/content/base/Makefile.in
index 088c05137cc9..32be0f70ecce 100644
--- a/content/base/Makefile.in
+++ b/content/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/base/public/Makefile.in b/content/base/public/Makefile.in
index 532c68bac148..49c521897795 100644
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 1b93358cafbb..4163b4e2937b 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -2019,6 +2019,44 @@ public:
    */
   static bool IsJavaScriptLanguage(const nsString& aName, PRUint32 *aVerFlags);
 
+  /**
+   * Returns the JSVersion for a string of the form '1.n', n = 0, ..., 8, and
+   * JSVERSION_UNKNOWN for other strings.
+   */
+  static JSVersion ParseJavascriptVersion(const nsAString& aVersionStr);
+
+  static bool IsJavascriptMIMEType(const nsAString& aMIMEType)
+  {
+    // Table ordered from most to least likely JS MIME types.
+    static const char* jsTypes[] = {
+      "text/javascript",
+      "text/ecmascript",
+      "application/javascript",
+      "application/ecmascript",
+      "application/x-javascript",
+      "application/x-ecmascript",
+      "text/javascript1.0",
+      "text/javascript1.1",
+      "text/javascript1.2",
+      "text/javascript1.3",
+      "text/javascript1.4",
+      "text/javascript1.5",
+      "text/jscript",
+      "text/livescript",
+      "text/x-ecmascript",
+      "text/x-javascript",
+      nullptr
+    };
+
+    for (PRUint32 i = 0; jsTypes[i]; ++i) {
+      if (aMIMEType.LowerCaseEqualsASCII(jsTypes[i])) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   static void SplitMimeType(const nsAString& aValue, nsString& aType,
                             nsString& aParams);
 
diff --git a/content/base/public/nsISelectionPrivate.idl b/content/base/public/nsISelectionPrivate.idl
index 0c505d37c413..fe5d554bfbd4 100644
--- a/content/base/public/nsISelectionPrivate.idl
+++ b/content/base/public/nsISelectionPrivate.idl
@@ -16,13 +16,12 @@ interface nsINode;
 
 %{C++
 class nsFrameSelection;
-class nsIFrame;
 class nsIPresShell;
 struct nsTextRangeStyle;
 struct nsPoint;
 struct ScrollAxis;
-#include "nsIFrame.h"
 #include "nsTArray.h"
+#include "nsIFrame.h"
 %}
 
 [ptr] native nsFrameSelection(nsFrameSelection);
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 50ba685fac6f..fdec933a82b7 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/base/src/nsAttrAndChildArray.cpp b/content/base/src/nsAttrAndChildArray.cpp
index d35eaa820f42..c223eaa64ac5 100644
--- a/content/base/src/nsAttrAndChildArray.cpp
+++ b/content/base/src/nsAttrAndChildArray.cpp
@@ -444,10 +444,8 @@ nsAttrAndChildArray::RemoveAttrAt(PRUint32 aPos, nsAttrValue& aValue)
       return NS_OK;
     }
 
-    nsRefPtr<nsMappedAttributes> mapped;
-    nsresult rv = GetModifiableMapped(nullptr, nullptr, false,
-                                      getter_AddRefs(mapped));
-    NS_ENSURE_SUCCESS(rv, rv);
+    nsRefPtr<nsMappedAttributes> mapped =
+      GetModifiableMapped(nullptr, nullptr, false);
 
     mapped->RemoveAttrAt(aPos, aValue);
 
@@ -558,18 +556,15 @@ nsAttrAndChildArray::SetAndTakeMappedAttr(nsIAtom* aLocalName,
                                           nsMappedAttributeElement* aContent,
                                           nsHTMLStyleSheet* aSheet)
 {
-  nsRefPtr<nsMappedAttributes> mapped;
-
   bool willAdd = true;
   if (mImpl && mImpl->mMappedAttrs) {
-    willAdd = mImpl->mMappedAttrs->GetAttr(aLocalName) == nullptr;
+    willAdd = !mImpl->mMappedAttrs->GetAttr(aLocalName);
   }
 
-  nsresult rv = GetModifiableMapped(aContent, aSheet, willAdd,
-                                    getter_AddRefs(mapped));
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsRefPtr<nsMappedAttributes> mapped =
+    GetModifiableMapped(aContent, aSheet, willAdd);
 
-  rv = mapped->SetAndTakeAttr(aLocalName, aValue);
+  nsresult rv = mapped->SetAndTakeAttr(aLocalName, aValue);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return MakeMappedUnique(mapped);
@@ -584,10 +579,8 @@ nsAttrAndChildArray::DoSetMappedAttrStyleSheet(nsHTMLStyleSheet* aSheet)
     return NS_OK;
   }
 
-  nsRefPtr<nsMappedAttributes> mapped;
-  nsresult rv = GetModifiableMapped(nullptr, nullptr, false, 
-                                    getter_AddRefs(mapped));
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsRefPtr<nsMappedAttributes> mapped =
+    GetModifiableMapped(nullptr, nullptr, false);
 
   mapped->SetStyleSheet(aSheet);
 
@@ -697,33 +690,20 @@ nsAttrAndChildArray::MappedAttrCount() const
   return mImpl && mImpl->mMappedAttrs ? (PRUint32)mImpl->mMappedAttrs->Count() : 0;
 }
 
-nsresult
+nsMappedAttributes*
 nsAttrAndChildArray::GetModifiableMapped(nsMappedAttributeElement* aContent,
                                          nsHTMLStyleSheet* aSheet,
-                                         bool aWillAddAttr,
-                                         nsMappedAttributes** aModifiable)
+                                         bool aWillAddAttr)
 {
-  *aModifiable = nullptr;
-
   if (mImpl && mImpl->mMappedAttrs) {
-    *aModifiable = mImpl->mMappedAttrs->Clone(aWillAddAttr);
-    NS_ENSURE_TRUE(*aModifiable, NS_ERROR_OUT_OF_MEMORY);
-
-    NS_ADDREF(*aModifiable);
-    
-    return NS_OK;
+    return mImpl->mMappedAttrs->Clone(aWillAddAttr);
   }
 
-  NS_ASSERTION(aContent, "Trying to create modifiable without content");
+  MOZ_ASSERT(aContent, "Trying to create modifiable without content");
 
   nsMapRuleToAttributesFunc mapRuleFunc =
     aContent->GetAttributeMappingFunction();
-  *aModifiable = new nsMappedAttributes(aSheet, mapRuleFunc);
-  NS_ENSURE_TRUE(*aModifiable, NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ADDREF(*aModifiable);
-
-  return NS_OK;
+  return new nsMappedAttributes(aSheet, mapRuleFunc);
 }
 
 nsresult
diff --git a/content/base/src/nsAttrAndChildArray.h b/content/base/src/nsAttrAndChildArray.h
index 390571f74ca1..0dd4d3128ec3 100644
--- a/content/base/src/nsAttrAndChildArray.h
+++ b/content/base/src/nsAttrAndChildArray.h
@@ -127,10 +127,11 @@ private:
   PRUint32 NonMappedAttrCount() const;
   PRUint32 MappedAttrCount() const;
 
-  nsresult GetModifiableMapped(nsMappedAttributeElement* aContent,
-                               nsHTMLStyleSheet* aSheet,
-                               bool aWillAddAttr,
-                               nsMappedAttributes** aModifiable);
+  // Returns a non-null zero-refcount object.
+  nsMappedAttributes*
+  GetModifiableMapped(nsMappedAttributeElement* aContent,
+                      nsHTMLStyleSheet* aSheet,
+                      bool aWillAddAttr);
   nsresult MakeMappedUnique(nsMappedAttributes* aAttributes);
 
   PRUint32 AttrSlotsSize() const
diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp
index 8a0baeb7c036..6fe719088d71 100644
--- a/content/base/src/nsContentAreaDragDrop.cpp
+++ b/content/base/src/nsContentAreaDragDrop.cpp
@@ -19,7 +19,6 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMDragEvent.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMDocument.h"
@@ -57,7 +56,7 @@
 class NS_STACK_CLASS DragDataProducer
 {
 public:
-  DragDataProducer(nsIDOMWindow* aWindow,
+  DragDataProducer(nsPIDOMWindow* aWindow,
                    nsIContent* aTarget,
                    nsIContent* aSelectionTargetNode,
                    bool aIsAltKeyPressed);
@@ -85,7 +84,7 @@ private:
   static void GetSelectedLink(nsISelection* inSelection,
                               nsIContent **outLinkNode);
 
-  nsCOMPtr<nsIDOMWindow> mWindow;
+  nsCOMPtr<nsPIDOMWindow> mWindow;
   nsCOMPtr<nsIContent> mTarget;
   nsCOMPtr<nsIContent> mSelectionTargetNode;
   bool mIsAltKeyPressed;
@@ -105,7 +104,7 @@ private:
 
 
 nsresult
-nsContentAreaDragDrop::GetDragData(nsIDOMWindow* aWindow,
+nsContentAreaDragDrop::GetDragData(nsPIDOMWindow* aWindow,
                                    nsIContent* aTarget,
                                    nsIContent* aSelectionTargetNode,
                                    bool aIsAltKeyPressed,
@@ -239,7 +238,7 @@ nsContentAreaDragDropDataProvider::GetFlavorData(nsITransferable *aTransferable,
   return rv;
 }
 
-DragDataProducer::DragDataProducer(nsIDOMWindow* aWindow,
+DragDataProducer::DragDataProducer(nsPIDOMWindow* aWindow,
                                    nsIContent* aTarget,
                                    nsIContent* aSelectionTargetNode,
                                    bool aIsAltKeyPressed)
@@ -649,9 +648,7 @@ DragDataProducer::Produce(nsDOMDataTransfer* aDataTransfer,
     mInfoString.Truncate();
     mTitleString.Truncate();
 
-    nsCOMPtr<nsIDOMDocument> domDoc;
-    mWindow->GetDocument(getter_AddRefs(domDoc));
-    nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
+    nsCOMPtr<nsIDocument> doc = mWindow->GetDoc();
     NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
     // if we have selected text, use it in preference to the node
diff --git a/content/base/src/nsContentAreaDragDrop.h b/content/base/src/nsContentAreaDragDrop.h
index 2e2eeb62f257..704f4d6f53e4 100644
--- a/content/base/src/nsContentAreaDragDrop.h
+++ b/content/base/src/nsContentAreaDragDrop.h
@@ -14,7 +14,7 @@
 #include "nsITransferable.h"
 
 class nsIDOMNode;
-class nsIDOMWindow;
+class nsPIDOMWindow;
 class nsIDOMDragEvent;
 class nsISelection;
 class nsITransferable;
@@ -49,7 +49,7 @@ public:
    * aDragNode - [out] the link, image or area being dragged, or null if the
    *             drag occurred on another element.
    */
-  static nsresult GetDragData(nsIDOMWindow* aWindow,
+  static nsresult GetDragData(nsPIDOMWindow* aWindow,
                               nsIContent* aTarget,
                               nsIContent* aSelectionTargetNode,
                               bool aIsAltKeyPressed,
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 4e48af843aa8..784932541de5 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -88,7 +88,6 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsContentErrors.h"
 #include "nsUnicharUtilCIID.h"
 #include "nsINativeKeyBindings.h"
-#include "nsIDOMNSEvent.h"
 #include "nsXULPopupManager.h"
 #include "nsIPermissionManager.h"
 #include "nsIScriptObjectPrincipal.h"
@@ -845,6 +844,28 @@ nsContentUtils::IsJavaScriptLanguage(const nsString& aName, PRUint32 *aFlags)
   return true;
 }
 
+JSVersion
+nsContentUtils::ParseJavascriptVersion(const nsAString& aVersionStr)
+{
+  if (aVersionStr.Length() != 3 || aVersionStr[0] != '1' ||
+      aVersionStr[1] != '.') {
+    return JSVERSION_UNKNOWN;
+  }
+
+  switch (aVersionStr[2]) {
+  case '0': return JSVERSION_1_0;
+  case '1': return JSVERSION_1_1;
+  case '2': return JSVERSION_1_2;
+  case '3': return JSVERSION_1_3;
+  case '4': return JSVERSION_1_4;
+  case '5': return JSVERSION_1_5;
+  case '6': return JSVERSION_1_6;
+  case '7': return JSVERSION_1_7;
+  case '8': return JSVERSION_1_8;
+  default:  return JSVERSION_UNKNOWN;
+  }
+}
+
 void
 nsContentUtils::SplitMimeType(const nsAString& aValue, nsString& aType,
                               nsString& aParams)
@@ -4667,14 +4688,13 @@ nsContentUtils::DOMEventToNativeKeyEvent(nsIDOMKeyEvent* aKeyEvent,
                                          nsNativeKeyEvent* aNativeEvent,
                                          bool aGetCharCode)
 {
-  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(aKeyEvent);
   bool defaultPrevented;
-  nsevent->GetPreventDefault(&defaultPrevented);
+  aKeyEvent->GetPreventDefault(&defaultPrevented);
   if (defaultPrevented)
     return false;
 
   bool trusted = false;
-  nsevent->GetIsTrusted(&trusted);
+  aKeyEvent->GetIsTrusted(&trusted);
   if (!trusted)
     return false;
 
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index 05a3e5d11dc6..748f99744088 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -12,6 +12,7 @@
 #include "nsDOMError.h"
 #include "nsICharsetDetector.h"
 #include "nsICharsetConverterManager.h"
+#include "nsIClassInfo.h"
 #include "nsIConverterInputStream.h"
 #include "nsIDocument.h"
 #include "nsIFileStreams.h"
@@ -45,7 +46,9 @@ using namespace mozilla::dom;
 // from NS_NewByteInputStream is held alive as long as the
 // stream is.  We do that by passing back this class instead.
 class DataOwnerAdapter MOZ_FINAL : public nsIInputStream,
-                                   public nsISeekableStream
+                                   public nsISeekableStream,
+                                   public nsIIPCSerializable,
+                                   public nsIClassInfo
 {
   typedef nsDOMMemoryFile::DataOwner DataOwner;
 public:
@@ -56,15 +59,22 @@ public:
 
   NS_DECL_ISUPPORTS
 
+  // These are mandatory.
   NS_FORWARD_NSIINPUTSTREAM(mStream->)
-
   NS_FORWARD_NSISEEKABLESTREAM(mSeekableStream->)
 
+  // These are optional. We use a conditional QI to keep them from being called
+  // if the underlying stream doesn't QI to either interface.
+  NS_FORWARD_NSIIPCSERIALIZABLE(mSerializable->)
+  NS_FORWARD_NSICLASSINFO(mClassInfo->)
+
 private:
   DataOwnerAdapter(DataOwner* aDataOwner,
                    nsIInputStream* aStream)
     : mDataOwner(aDataOwner), mStream(aStream),
-      mSeekableStream(do_QueryInterface(aStream))
+      mSeekableStream(do_QueryInterface(aStream)),
+      mSerializable(do_QueryInterface(aStream)),
+      mClassInfo(do_QueryInterface(aStream))
   {
     NS_ASSERTION(mSeekableStream, "Somebody gave us the wrong stream!");
   }
@@ -72,11 +82,20 @@ private:
   nsRefPtr<DataOwner> mDataOwner;
   nsCOMPtr<nsIInputStream> mStream;
   nsCOMPtr<nsISeekableStream> mSeekableStream;
+  nsCOMPtr<nsIIPCSerializable> mSerializable;
+  nsCOMPtr<nsIClassInfo> mClassInfo;
 };
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(DataOwnerAdapter,
-                              nsIInputStream,
-                              nsISeekableStream)
+NS_IMPL_THREADSAFE_ADDREF(DataOwnerAdapter)
+NS_IMPL_THREADSAFE_RELEASE(DataOwnerAdapter)
+
+NS_INTERFACE_MAP_BEGIN(DataOwnerAdapter)
+  NS_INTERFACE_MAP_ENTRY(nsIInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsISeekableStream)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIIPCSerializable, mSerializable)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIClassInfo, mClassInfo)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIInputStream)
+NS_INTERFACE_MAP_END
 
 nsresult DataOwnerAdapter::Create(DataOwner* aDataOwner,
                                   PRUint32 aStart,
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index bb85ecae2fe5..643fb2e05b44 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -2262,7 +2262,6 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
   // is probably the right thing to do.
 
   // Now reset our inline style and attribute sheets.
-  nsresult rv = NS_OK;
   if (mAttrStyleSheet) {
     // Remove this sheet from all style sets
     nsCOMPtr<nsIPresShell> shell = GetShell();
@@ -2272,11 +2271,8 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
     }
     mAttrStyleSheet->Reset(aURI);
   } else {
-    rv = NS_NewHTMLStyleSheet(&mAttrStyleSheet, aURI, this);
-    if (NS_FAILED(rv)) {
-      NS_IF_RELEASE(mAttrStyleSheet);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
+    mAttrStyleSheet = new nsHTMLStyleSheet(aURI, this);
+    NS_ADDREF(mAttrStyleSheet);
   }
 
   // Don't use AddStyleSheet, since it'll put the sheet into style
@@ -2293,8 +2289,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
     mStyleAttrStyleSheet->Reset(aURI);
   } else {
     mStyleAttrStyleSheet = new nsHTMLCSSStyleSheet();
-    NS_ENSURE_TRUE(mStyleAttrStyleSheet, NS_ERROR_OUT_OF_MEMORY);
-    rv = mStyleAttrStyleSheet->Init(aURI, this);
+    nsresult rv = mStyleAttrStyleSheet->Init(aURI, this);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
@@ -2308,7 +2303,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
     FillStyleSet(shell->StyleSet());
   }
 
-  return rv;
+  return NS_OK;
 }
 
 void
@@ -6419,15 +6414,44 @@ nsDocument::IsScriptEnabled()
 }
 
 nsRadioGroupStruct*
-nsDocument::GetRadioGroup(const nsAString& aName)
+nsDocument::GetRadioGroupInternal(const nsAString& aName) const
+{
+#ifdef DEBUG
+  if (IsHTML()) {
+    nsAutoString lcName;
+    ToLowerCase(aName, lcName);
+    MOZ_ASSERT(aName == lcName);
+  }
+#endif
+
+  nsRadioGroupStruct* radioGroup;
+  if (!mRadioGroups.Get(aName, &radioGroup)) {
+    return nullptr;
+  }
+
+  return radioGroup;
+}
+
+nsRadioGroupStruct*
+nsDocument::GetRadioGroup(const nsAString& aName) const
 {
   nsAutoString tmKey(aName);
   if (IsHTML()) {
     ToLowerCase(tmKey); //should case-insensitive.
   }
 
-  nsRadioGroupStruct* radioGroup;
-  if (mRadioGroups.Get(tmKey, &radioGroup)) {
+  return GetRadioGroupInternal(tmKey);
+}
+
+nsRadioGroupStruct*
+nsDocument::GetOrCreateRadioGroup(const nsAString& aName)
+{
+  nsAutoString tmKey(aName);
+  if (IsHTML()) {
+    ToLowerCase(tmKey); //should case-insensitive.
+  }
+
+  if (nsRadioGroupStruct* radioGroup = GetRadioGroupInternal(tmKey)) {
     return radioGroup;
   }
 
@@ -6437,27 +6461,18 @@ nsDocument::GetRadioGroup(const nsAString& aName)
   return newRadioGroup.forget();
 }
 
-NS_IMETHODIMP
+void
 nsDocument::SetCurrentRadioButton(const nsAString& aName,
                                   nsIDOMHTMLInputElement* aRadio)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-  NS_ENSURE_TRUE(radioGroup, NS_OK);
-
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
   radioGroup->mSelectedRadioButton = aRadio;
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDocument::GetCurrentRadioButton(const nsAString& aName,
-                                  nsIDOMHTMLInputElement** aRadio)
+nsIDOMHTMLInputElement*
+nsDocument::GetCurrentRadioButton(const nsAString& aName)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-  NS_ENSURE_TRUE(radioGroup, NS_OK);
-
-  *aRadio = radioGroup->mSelectedRadioButton;
-  NS_IF_ADDREF(*aRadio);
-  return NS_OK;
+  return GetOrCreateRadioGroup(aName)->mSelectedRadioButton;
 }
 
 NS_IMETHODIMP
@@ -6472,8 +6487,7 @@ nsDocument::GetNextRadioButton(const nsAString& aName,
   //     opposed to nsHTMLDocument?
   *aRadioOut = nullptr;
 
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-  NS_ENSURE_TRUE(radioGroup, NS_ERROR_FAILURE);
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
 
   // Return the radio button relative to the focused radio button.
   // If no radio is focused, get the radio relative to the selected one.
@@ -6514,13 +6528,11 @@ nsDocument::GetNextRadioButton(const nsAString& aName,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsDocument::AddToRadioGroup(const nsAString& aName,
                             nsIFormControl* aRadio)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-  NS_ENSURE_TRUE(radioGroup, NS_OK);
-
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
   radioGroup->mRadioButtons.AppendObject(aRadio);
 
   nsCOMPtr<nsIContent> element = do_QueryInterface(aRadio);
@@ -6528,16 +6540,13 @@ nsDocument::AddToRadioGroup(const nsAString& aName,
   if (element->HasAttr(kNameSpaceID_None, nsGkAtoms::required)) {
     radioGroup->mRequiredRadioCount++;
   }
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsDocument::RemoveFromRadioGroup(const nsAString& aName,
                                  nsIFormControl* aRadio)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-  NS_ENSURE_TRUE(radioGroup, NS_OK);
-
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
   radioGroup->mRadioButtons.RemoveObject(aRadio);
 
   nsCOMPtr<nsIContent> element = do_QueryInterface(aRadio);
@@ -6547,7 +6556,6 @@ nsDocument::RemoveFromRadioGroup(const nsAString& aName,
                  "mRequiredRadioCount about to wrap below 0!");
     radioGroup->mRequiredRadioCount--;
   }
-  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -6555,8 +6563,7 @@ nsDocument::WalkRadioGroup(const nsAString& aName,
                            nsIRadioVisitor* aVisitor,
                            bool aFlushContent)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-  NS_ENSURE_TRUE(radioGroup, NS_OK);
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
 
   for (int i = 0; i < radioGroup->mRadioButtons.Count(); i++) {
     if (!aVisitor->Visit(radioGroup->mRadioButtons[i])) {
@@ -6570,26 +6577,14 @@ nsDocument::WalkRadioGroup(const nsAString& aName,
 PRUint32
 nsDocument::GetRequiredRadioCount(const nsAString& aName) const
 {
-  nsRadioGroupStruct* radioGroup = nullptr;
-  // TODO: we should call GetRadioGroup here (and make it const) but for that
-  // we would need to have an explicit CreateRadioGroup() instead of create
-  // one when GetRadioGroup is called. See bug 636123.
-  nsAutoString tmKey(aName);
-  if (IsHTML())
-     ToLowerCase(tmKey); //should case-insensitive.
-  mRadioGroups.Get(tmKey, &radioGroup);
-
+  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
   return radioGroup ? radioGroup->mRequiredRadioCount : 0;
 }
 
 void
 nsDocument::RadioRequiredChanged(const nsAString& aName, nsIFormControl* aRadio)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-
-  if (!radioGroup) {
-    return;
-  }
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
 
   nsCOMPtr<nsIContent> element = do_QueryInterface(aRadio);
   NS_ASSERTION(element, "radio controls have to be content elements");
@@ -6605,27 +6600,14 @@ nsDocument::RadioRequiredChanged(const nsAString& aName, nsIFormControl* aRadio)
 bool
 nsDocument::GetValueMissingState(const nsAString& aName) const
 {
-  nsRadioGroupStruct* radioGroup = nullptr;
-  // TODO: we should call GetRadioGroup here (and make it const) but for that
-  // we would need to have an explicit CreateRadioGroup() instead of create
-  // one when GetRadioGroup is called. See bug 636123.
-  nsAutoString tmKey(aName);
-  if (IsHTML())
-     ToLowerCase(tmKey); //should case-insensitive.
-  mRadioGroups.Get(tmKey, &radioGroup);
-
+  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
   return radioGroup && radioGroup->mGroupSuffersFromValueMissing;
 }
 
 void
 nsDocument::SetValueMissingState(const nsAString& aName, bool aValue)
 {
-  nsRadioGroupStruct* radioGroup = GetRadioGroup(aName);
-
-  if (!radioGroup) {
-    return;
-  }
-
+  nsRadioGroupStruct* radioGroup = GetOrCreateRadioGroup(aName);
   radioGroup->mGroupSuffersFromValueMissing = aValue;
 }
 
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index d22f4ea0fa78..bbe012601d80 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -704,18 +704,17 @@ public:
   NS_IMETHOD WalkRadioGroup(const nsAString& aName,
                             nsIRadioVisitor* aVisitor,
                             bool aFlushContent);
-  NS_IMETHOD SetCurrentRadioButton(const nsAString& aName,
-                                   nsIDOMHTMLInputElement* aRadio);
-  NS_IMETHOD GetCurrentRadioButton(const nsAString& aName,
-                                   nsIDOMHTMLInputElement** aRadio);
+  virtual void SetCurrentRadioButton(const nsAString& aName,
+                                     nsIDOMHTMLInputElement* aRadio);
+  virtual nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName);
   NS_IMETHOD GetNextRadioButton(const nsAString& aName,
                                 const bool aPrevious,
                                 nsIDOMHTMLInputElement*  aFocusedRadio,
                                 nsIDOMHTMLInputElement** aRadioOut);
-  NS_IMETHOD AddToRadioGroup(const nsAString& aName,
-                             nsIFormControl* aRadio);
-  NS_IMETHOD RemoveFromRadioGroup(const nsAString& aName,
-                                  nsIFormControl* aRadio);
+  virtual void AddToRadioGroup(const nsAString& aName,
+                               nsIFormControl* aRadio);
+  virtual void RemoveFromRadioGroup(const nsAString& aName,
+                                    nsIFormControl* aRadio);
   virtual PRUint32 GetRequiredRadioCount(const nsAString& aName) const;
   virtual void RadioRequiredChanged(const nsAString& aName,
                                     nsIFormControl* aRadio);
@@ -723,8 +722,13 @@ public:
   virtual void SetValueMissingState(const nsAString& aName, bool aValue);
 
   // for radio group
-  nsRadioGroupStruct* GetRadioGroup(const nsAString& aName);
+  nsRadioGroupStruct* GetRadioGroup(const nsAString& aName) const;
+  nsRadioGroupStruct* GetOrCreateRadioGroup(const nsAString& aName);
 
+private:
+  nsRadioGroupStruct* GetRadioGroupInternal(const nsAString& aName) const;
+
+public:
   // nsIDOMNode
   NS_DECL_NSIDOMNODE
 
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index 323bb1acfaf2..8339b4ae7ee8 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -437,10 +437,11 @@ nsINode::RemoveChild(nsINode *aOldChild)
   }
 
   if (IsNodeOfType(eDATA_NODE)) {
-    return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
+    // aOldChild can't be one of our children.
+    return NS_ERROR_DOM_NOT_FOUND_ERR;
   }
 
-  if (aOldChild && aOldChild->GetNodeParent() == this) {
+  if (aOldChild->GetNodeParent() == this) {
     nsContentUtils::MaybeFireNodeRemoved(aOldChild, this, OwnerDoc());
   }
 
diff --git a/content/base/src/nsMappedAttributes.cpp b/content/base/src/nsMappedAttributes.cpp
index 6e5e148090fe..d8dcfc18f0e6 100644
--- a/content/base/src/nsMappedAttributes.cpp
+++ b/content/base/src/nsMappedAttributes.cpp
@@ -68,9 +68,7 @@ void* nsMappedAttributes::operator new(size_t aSize, PRUint32 aAttrCount) CPP_TH
                                   aAttrCount * sizeof(InternalAttr));
 
 #ifdef DEBUG
-  if (newAttrs) {
-    static_cast<nsMappedAttributes*>(newAttrs)->mBufferSize = aAttrCount;
-  }
+  static_cast<nsMappedAttributes*>(newAttrs)->mBufferSize = aAttrCount;
 #endif
 
   return newAttrs;
diff --git a/content/base/src/nsMappedAttributes.h b/content/base/src/nsMappedAttributes.h
index f4824185563b..b9f59bfeb691 100644
--- a/content/base/src/nsMappedAttributes.h
+++ b/content/base/src/nsMappedAttributes.h
@@ -26,8 +26,8 @@ public:
   nsMappedAttributes(nsHTMLStyleSheet* aSheet,
                      nsMapRuleToAttributesFunc aMapRuleFunc);
 
+  // Do not return null.
   void* operator new(size_t size, PRUint32 aAttrCount = 1) CPP_THROW_NEW;
-
   nsMappedAttributes* Clone(bool aWillAddAttr);
 
   NS_DECL_ISUPPORTS
diff --git a/content/base/src/nsObjectLoadingContent.h b/content/base/src/nsObjectLoadingContent.h
index 704bb4909fc9..cf7e3f62cab9 100644
--- a/content/base/src/nsObjectLoadingContent.h
+++ b/content/base/src/nsObjectLoadingContent.h
@@ -20,9 +20,9 @@
 #include "nsIChannelEventSink.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsIRunnable.h"
-#include "nsIFrame.h"
 #include "nsPluginInstanceOwner.h"
 #include "nsIThreadInternal.h"
+#include "nsIFrame.h"
 
 class nsAsyncInstantiateEvent;
 class nsStopPluginRunnable;
diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index 7a092fe21671..d3cf42984fe4 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -1839,7 +1839,7 @@ nsRange::CompareBoundaryPoints(PRUint16 aHow, nsIDOMRange* aOtherRange,
       break;
     default:
       // We were passed an illegal value
-      return NS_ERROR_ILLEGAL_VALUE;
+      return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
   }
 
   if (mRoot != otherRange->GetRoot())
diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp
index d0ed7136253b..4510a70cf8fb 100644
--- a/content/base/src/nsScriptLoader.cpp
+++ b/content/base/src/nsScriptLoader.cpp
@@ -352,6 +352,50 @@ public:
   }
 };
 
+static inline bool
+ParseTypeAttribute(const nsAString& aType, JSVersion* aVersion)
+{
+  MOZ_ASSERT(!aType.IsEmpty());
+  MOZ_ASSERT(aVersion);
+  MOZ_ASSERT(*aVersion == JSVERSION_DEFAULT);
+
+  nsContentTypeParser parser(aType);
+
+  nsAutoString mimeType;
+  nsresult rv = parser.GetType(mimeType);
+  NS_ENSURE_SUCCESS(rv, false);
+
+  if (!nsContentUtils::IsJavascriptMIMEType(mimeType)) {
+    return false;
+  }
+
+  // Get the version string, and ensure the language supports it.
+  nsAutoString versionName;
+  rv = parser.GetParameter("version", versionName);
+
+  if (NS_SUCCEEDED(rv)) {
+    *aVersion = nsContentUtils::ParseJavascriptVersion(versionName);
+  } else if (rv != NS_ERROR_INVALID_ARG) {
+    return false;
+  }
+
+  nsAutoString value;
+  rv = parser.GetParameter("e4x", value);
+  if (NS_SUCCEEDED(rv)) {
+    if (value.Length() == 1 && value[0] == '1') {
+      // This happens in about 2 web pages. Enable E4X no matter what JS
+      // version number was selected.  We do this by turning on the "moar
+      // XML" version bit.  This is OK even if version has
+      // JSVERSION_UNKNOWN (-1).
+      *aVersion = js::VersionSetMoarXML(*aVersion, true);
+    }
+  } else if (rv != NS_ERROR_INVALID_ARG) {
+    return false;
+  }
+
+  return true;
+}
+
 bool
 nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement)
 {
@@ -393,126 +437,38 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement)
     return false;
   }
 
-  PRUint32 typeID = nsIProgrammingLanguage::JAVASCRIPT;
-  PRUint32 version = 0;
-  nsAutoString language, type, src;
-  nsresult rv = NS_OK;
+  JSVersion version = JSVERSION_DEFAULT;
 
   // Check the type attribute to determine language and version.
   // If type exists, it trumps the deprecated 'language='
+  nsAutoString type;
   aElement->GetScriptType(type);
   if (!type.IsEmpty()) {
-    nsContentTypeParser parser(type);
-
-    nsAutoString mimeType;
-    rv = parser.GetType(mimeType);
-    NS_ENSURE_SUCCESS(rv, false);
-
-    // Javascript keeps the fast path, optimized for most-likely type
-    // Table ordered from most to least likely JS MIME types.
-    // See bug 62485, feel free to add <script type="..."> survey data to it,
-    // or to a new bug once 62485 is closed.
-    static const char *jsTypes[] = {
-      "text/javascript",
-      "text/ecmascript",
-      "application/javascript",
-      "application/ecmascript",
-      "application/x-javascript",
-      nullptr
-    };
-
-    bool isJavaScript = false;
-    for (PRInt32 i = 0; jsTypes[i]; i++) {
-      if (mimeType.LowerCaseEqualsASCII(jsTypes[i])) {
-        isJavaScript = true;
-        break;
-      }
-    }
-
-    if (!isJavaScript) {
-      typeID = nsIProgrammingLanguage::UNKNOWN;
-    }
-
-    if (typeID != nsIProgrammingLanguage::UNKNOWN) {
-      // Get the version string, and ensure the language supports it.
-      nsAutoString versionName;
-      rv = parser.GetParameter("version", versionName);
-      if (NS_FAILED(rv)) {
-        // no version attribute - version remains 0.
-        if (rv != NS_ERROR_INVALID_ARG)
-          return false;
-      } else {
-        nsCOMPtr<nsIScriptRuntime> runtime;
-        rv = NS_GetJSRuntime(getter_AddRefs(runtime));
-        if (NS_FAILED(rv)) {
-          NS_ERROR("Failed to locate the language with this ID");
-          return false;
-        }
-        rv = runtime->ParseVersion(versionName, &version);
-        if (NS_FAILED(rv)) {
-          NS_WARNING("This script language version is not supported - ignored");
-          typeID = nsIProgrammingLanguage::UNKNOWN;
-        }
-      }
-    }
-
-    // Some js specifics yet to be abstracted.
-    if (typeID == nsIProgrammingLanguage::JAVASCRIPT) {
-      nsAutoString value;
-      rv = parser.GetParameter("e4x", value);
-      if (NS_FAILED(rv)) {
-        if (rv != NS_ERROR_INVALID_ARG)
-          return false;
-      } else {
-        if (value.Length() == 1 && value[0] == '1')
-          // This happens in about 2 web pages. Enable E4X no matter what JS
-          // version number was selected.  We do this by turning on the "moar
-          // XML" version bit.  This is OK even if version has
-          // JSVERSION_UNKNOWN (-1).
-          version = js::VersionSetMoarXML(JSVersion(version), true);
-      }
-    }
+    NS_ENSURE_TRUE(ParseTypeAttribute(type, &version), false);
   } else {
     // no 'type=' element
     // "language" is a deprecated attribute of HTML, so we check it only for
     // HTML script elements.
     if (scriptContent->IsHTML()) {
+      nsAutoString language;
       scriptContent->GetAttr(kNameSpaceID_None, nsGkAtoms::language, language);
       if (!language.IsEmpty()) {
-        if (nsContentUtils::IsJavaScriptLanguage(language, &version))
-          typeID = nsIProgrammingLanguage::JAVASCRIPT;
-        else
-          typeID = nsIProgrammingLanguage::UNKNOWN;
         // IE, Opera, etc. do not respect language version, so neither should
         // we at this late date in the browser wars saga.  Note that this change
         // affects HTML but not XUL or SVG (but note also that XUL has its own
         // code to check nsContentUtils::IsJavaScriptLanguage -- that's probably
         // a separate bug, one we may not be able to fix short of XUL2).  See
         // bug 255895 (https://bugzilla.mozilla.org/show_bug.cgi?id=255895).
-        NS_ASSERTION(JSVERSION_DEFAULT == 0,
-                     "We rely on all languages having 0 as a version default");
-        version = 0;
+        PRUint32 dummy;
+        if (!nsContentUtils::IsJavaScriptLanguage(language, &dummy)) {
+          return false;
+        }
       }
     }
   }
 
-  // If we don't know the language, we don't know how to evaluate
-  if (typeID == nsIProgrammingLanguage::UNKNOWN) {
-    return false;
-  }
-  // If not from a chrome document (which is always trusted), we need some way 
-  // of checking the language is "safe".  Currently the only other language 
-  // impl is Python, and that is *not* safe in untrusted code - so fixing 
-  // this isn't a priority.!
-  // See also similar code in nsXULContentSink.cpp
-  if (typeID != nsIProgrammingLanguage::JAVASCRIPT &&
-      !nsContentUtils::IsChromeDoc(mDocument)) {
-    NS_WARNING("Untrusted language called from non-chrome - ignored");
-    return false;
-  }
-
   // Step 14. in the HTML5 spec
-
+  nsresult rv = NS_OK;
   nsRefPtr<nsScriptLoadRequest> request;
   if (aElement->GetScriptExternal()) {
     // external script
diff --git a/content/base/src/nsTreeSanitizer.cpp b/content/base/src/nsTreeSanitizer.cpp
index 8d8a1abacb56..20a004da5fcd 100644
--- a/content/base/src/nsTreeSanitizer.cpp
+++ b/content/base/src/nsTreeSanitizer.cpp
@@ -1120,9 +1120,7 @@ nsTreeSanitizer::SanitizeStyleSheet(const nsAString& aOriginal,
   // -moz-binding is blacklisted.
   bool didSanitize = false;
   // Create a sheet to hold the parsed CSS
-  nsRefPtr<nsCSSStyleSheet> sheet;
-  rv = NS_NewCSSStyleSheet(getter_AddRefs(sheet));
-  NS_ENSURE_SUCCESS(rv, true);
+  nsRefPtr<nsCSSStyleSheet> sheet = new nsCSSStyleSheet();
   sheet->SetURIs(aDocument->GetDocumentURI(), nullptr, aBaseURI);
   sheet->SetPrincipal(aDocument->NodePrincipal());
   // Create the CSS parser, and parse the CSS text.
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index aca47ce80dba..bf787d09c0aa 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -480,7 +480,7 @@ nsXMLHttpRequest::~nsXMLHttpRequest()
 }
 
 void
-nsXMLHttpRequest::RootResultArrayBuffer()
+nsXMLHttpRequest::RootJSResultObjects()
 {
   nsContentUtils::PreserveWrapper(
     static_cast<nsIDOMEventTarget*>(
@@ -977,6 +977,8 @@ nsXMLHttpRequest::CreateResponseParsedJSON(JSContext* aCx)
   if (!aCx) {
     return NS_ERROR_FAILURE;
   }
+  RootJSResultObjects();
+
   // The Unicode converter has already zapped the BOM if there was one
   if (!JS_ParseJSON(aCx,
                     static_cast<const jschar*>(mResponseText.get()),
@@ -1198,7 +1200,7 @@ nsXMLHttpRequest::GetResponse(JSContext* aCx, ErrorResult& aRv)
     }
 
     if (!mResultArrayBuffer) {
-      RootResultArrayBuffer();
+      RootJSResultObjects();
       aRv = nsContentUtils::CreateArrayBuffer(aCx, mResponseBody,
                                               &mResultArrayBuffer);
       if (aRv.Failed()) {
@@ -3173,15 +3175,21 @@ nsXMLHttpRequest::Send(nsIVariant* aVariant, const Nullable<RequestBody>& aBody)
 }
 
 /* void setRequestHeader (in AUTF8String header, in AUTF8String value); */
+// http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-setrequestheader
 NS_IMETHODIMP
 nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
                                    const nsACString& value)
 {
-  nsresult rv;
+  // Step 1 and 2
+  if (!(mState & XML_HTTP_REQUEST_OPENED)) {
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
+  }
+  NS_ASSERTION(mChannel, "mChannel must be valid if we're OPENED.");
 
+  // Step 3
   // Make sure we don't store an invalid header name in mCORSUnsafeHeaders
-  if (!IsValidHTTPToken(header)) {
-    return NS_ERROR_FAILURE;
+  if (!IsValidHTTPToken(header)) { // XXX nsHttp::IsValidToken?
+    return NS_ERROR_DOM_SYNTAX_ERR;
   }
 
   // Check that we haven't already opened the channel. We can't rely on
@@ -3189,7 +3197,7 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
   // still be waiting for mCORSPreflightChannel to actually open mChannel
   if (mCORSPreflightChannel) {
     bool pending;
-    rv = mCORSPreflightChannel->IsPending(&pending);
+    nsresult rv = mCORSPreflightChannel->IsPending(&pending);
     NS_ENSURE_SUCCESS(rv, rv);
     
     if (pending) {
@@ -3197,13 +3205,10 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
     }
   }
 
-  if (!(mState & XML_HTTP_REQUEST_OPENED))
-    return NS_ERROR_IN_PROGRESS;
-
   if (!mChannel)             // open() initializes mChannel, and open()
     return NS_ERROR_FAILURE; // must be called before first setRequestHeader()
 
-  nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
+  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
   if (!httpChannel) {
     return NS_OK;
   }
@@ -3212,12 +3217,11 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
   // the executing script has UniversalXPConnect.
 
   bool privileged;
-  rv = IsCapabilityEnabled("UniversalXPConnect", &privileged);
-  if (NS_FAILED(rv))
+  if (NS_FAILED(IsCapabilityEnabled("UniversalXPConnect", &privileged)))
     return NS_ERROR_FAILURE;
 
   if (!privileged) {
-    // Check for dangerous headers
+    // Step 5: Check for dangerous headers.
     const char *kInvalidHeaders[] = {
       "accept-charset", "accept-encoding", "access-control-request-headers",
       "access-control-request-method", "connection", "content-length",
@@ -3262,7 +3266,10 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
   }
 
   // We need to set, not add to, the header.
-  rv = httpChannel->SetRequestHeader(header, value, false);
+  nsresult rv = httpChannel->SetRequestHeader(header, value, false);
+  if (rv == NS_ERROR_INVALID_ARG) {
+    return NS_ERROR_DOM_SYNTAX_ERR;
+  }
   if (NS_SUCCEEDED(rv)) {
     // We'll want to duplicate this header for any replacement channels (eg. on redirect)
     RequestHeader reqHeader = {
@@ -3270,7 +3277,6 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
     };
     mModifiedRequestHeaders.AppendElement(reqHeader);
   }
-
   return rv;
 }
 
@@ -4009,7 +4015,6 @@ DOMCI_DATA(XMLHttpProgressEvent, nsXMLHttpProgressEvent)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpProgressEvent)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMProgressEvent)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEvent, nsIDOMProgressEvent)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMNSEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMProgressEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMLSProgressEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLHttpProgressEvent)
diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
index b23f3e772970..18dd332aba6a 100644
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -26,7 +26,6 @@
 #include "nsTArray.h"
 #include "nsIJSNativeInitializer.h"
 #include "nsIDOMLSProgressEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsITimer.h"
 #include "nsDOMProgressEvent.h"
 #include "nsDOMEventTargetHelper.h"
@@ -35,12 +34,12 @@
 #include "nsDOMBlobBuilder.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptObjectPrincipal.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/XMLHttpRequestBinding.h"
-#include "mozilla/dom/XMLHttpRequestUploadBinding.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/TypedArray.h"
+#include "mozilla/dom/XMLHttpRequestBinding.h"
+#include "mozilla/dom/XMLHttpRequestUploadBinding.h"
 
 class nsILoadGroup;
 class AsyncVerifyRedirectCallbackForwarder;
@@ -493,7 +492,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_INHERITED(nsXMLHttpRequest,
                                                                    nsXHREventTarget)
   bool AllowUploadProgress();
-  void RootResultArrayBuffer();
+  void RootJSResultObjects();
 
   virtual void DisconnectFromOwner();
 protected:
@@ -710,8 +709,7 @@ protected:
 // helper class to expose a progress DOM Event
 
 class nsXMLHttpProgressEvent : public nsIDOMProgressEvent,
-                               public nsIDOMLSProgressEvent,
-                               public nsIDOMNSEvent
+                               public nsIDOMLSProgressEvent
 {
 public:
   nsXMLHttpProgressEvent(nsIDOMProgressEvent* aInner,
@@ -721,9 +719,8 @@ public:
   virtual ~nsXMLHttpProgressEvent();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXMLHttpProgressEvent, nsIDOMNSEvent)
+  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXMLHttpProgressEvent, nsIDOMProgressEvent)
   NS_FORWARD_NSIDOMEVENT(mInner->)
-  NS_FORWARD_NSIDOMNSEVENT(mInner->)
   NS_FORWARD_NSIDOMPROGRESSEVENT(mInner->)
   NS_DECL_NSIDOMLSPROGRESSEVENT
 
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index cb91ee3b4d46..a73aa0f5fedc 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/base/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/base/test/chrome/Makefile.in b/content/base/test/chrome/Makefile.in
index 34f6662758be..3d3ecd6f5bf3 100644
--- a/content/base/test/chrome/Makefile.in
+++ b/content/base/test/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = content/base/test/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/base/test/websocket_hybi/Makefile.in b/content/base/test/websocket_hybi/Makefile.in
index 4c0eda8435ff..f7732dad7f5f 100644
--- a/content/base/test/websocket_hybi/Makefile.in
+++ b/content/base/test/websocket_hybi/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/base/test/websocket_hybi
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/canvas/Makefile.in b/content/canvas/Makefile.in
index e36f949cd1e0..66325f16ee36 100644
--- a/content/canvas/Makefile.in
+++ b/content/canvas/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/canvas/public/Makefile.in b/content/canvas/public/Makefile.in
index bf5ec3042dc3..1cc2de112084 100644
--- a/content/canvas/public/Makefile.in
+++ b/content/canvas/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index d62fca00c5ee..b1f73eebb4ea 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 4a0003a47c7b..a28bbeed440c 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -26,7 +26,6 @@
 #include "nsIVariant.h"
 
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "nsIScriptError.h"
 
diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 65edc5ac57ac..8d63d33730c9 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/canvas/test
+relativesrcdir  = @relativesrcdir@
 DIRS		+= webgl crossorigin
 
 include $(DEPTH)/config/autoconf.mk
diff --git a/content/canvas/test/crossorigin/Makefile.in b/content/canvas/test/crossorigin/Makefile.in
index 4f281e8666ee..eea7f8c69406 100644
--- a/content/canvas/test/crossorigin/Makefile.in
+++ b/content/canvas/test/crossorigin/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/canvas/test/crossorigin
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
diff --git a/content/canvas/test/webgl/Makefile.in b/content/canvas/test/webgl/Makefile.in
index 53f11bc6f4cb..ce07fc92283f 100644
--- a/content/canvas/test/webgl/Makefile.in
+++ b/content/canvas/test/webgl/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/canvas/test/webgl
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
diff --git a/content/events/Makefile.in b/content/events/Makefile.in
index 6f33b85e5af8..64e267416bdd 100644
--- a/content/events/Makefile.in
+++ b/content/events/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/events/public/Makefile.in b/content/events/public/Makefile.in
index 58c797c003a4..b159cee970ad 100644
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index ae815bea2f14..0a8fd5e6cb54 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 9230f480162f..844ef12df31e 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -175,7 +175,6 @@ DOMCI_DATA(Event, nsDOMEvent)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEvent)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMEvent)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMNSEvent)
   NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Event)
 NS_INTERFACE_MAP_END
@@ -536,7 +535,7 @@ NS_IMETHODIMP
 nsDOMEvent::InitEvent(const nsAString& aEventTypeArg, bool aCanBubbleArg, bool aCancelableArg)
 {
   // Make sure this event isn't already being dispatched.
-  NS_ENSURE_TRUE(!NS_IS_EVENT_IN_DISPATCH(mEvent), NS_ERROR_INVALID_ARG);
+  NS_ENSURE_TRUE(!NS_IS_EVENT_IN_DISPATCH(mEvent), NS_OK);
 
   if (NS_IS_TRUSTED_EVENT(mEvent)) {
     // Ensure the caller is permitted to dispatch trusted DOM events.
diff --git a/content/events/src/nsDOMEvent.h b/content/events/src/nsDOMEvent.h
index abc7ca7cfcef..c01d57b56b90 100644
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@@ -7,7 +7,6 @@
 #define nsDOMEvent_h__
 
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMEventTarget.h"
@@ -24,7 +23,6 @@ struct JSContext;
 struct JSObject;
  
 class nsDOMEvent : public nsIDOMEvent,
-                   public nsIDOMNSEvent,
                    public nsIJSNativeInitializer
 {
 public:
@@ -191,9 +189,6 @@ public:
   // nsIDOMEvent Interface
   NS_DECL_NSIDOMEVENT
 
-  // nsIDOMNSEvent Interface
-  NS_DECL_NSIDOMNSEVENT
-
   // nsIJSNativeInitializer
   NS_IMETHOD Initialize(nsISupports* aOwner, JSContext* aCx, JSObject* aObj,
                         PRUint32 aArgc, jsval* aArgv);
@@ -251,6 +246,12 @@ protected:
   NS_IMETHOD InitEvent(const nsAString & eventTypeArg, bool canBubbleArg, bool cancelableArg) { return _to InitEvent(eventTypeArg, canBubbleArg, cancelableArg); } \
   NS_IMETHOD GetDefaultPrevented(bool *aDefaultPrevented) { return _to GetDefaultPrevented(aDefaultPrevented); } \
   NS_IMETHOD StopImmediatePropagation(void) { return _to StopImmediatePropagation(); } \
+  NS_IMETHOD GetOriginalTarget(nsIDOMEventTarget** aOriginalTarget) { return _to GetOriginalTarget(aOriginalTarget); } \
+  NS_IMETHOD GetExplicitOriginalTarget(nsIDOMEventTarget** aExplicitOriginalTarget) { return _to GetExplicitOriginalTarget(aExplicitOriginalTarget); } \
+  NS_IMETHOD PreventBubble() { return _to PreventBubble(); } \
+  NS_IMETHOD PreventCapture() { return _to PreventCapture(); } \
+  NS_IMETHOD GetPreventDefault(bool* aRetval) { return _to GetPreventDefault(aRetval); } \
+  NS_IMETHOD GetIsTrusted(bool* aIsTrusted) { return _to GetIsTrusted(aIsTrusted); } \
   NS_IMETHOD SetTarget(nsIDOMEventTarget *aTarget) { return _to SetTarget(aTarget); } \
   NS_IMETHOD_(bool) IsDispatchStopped(void) { return _to IsDispatchStopped(); } \
   NS_IMETHOD_(nsEvent *) GetInternalNSEvent(void) { return _to GetInternalNSEvent(); } \
diff --git a/content/events/src/nsDOMUIEvent.h b/content/events/src/nsDOMUIEvent.h
index a23b69f3a8a3..125a0e5250b5 100644
--- a/content/events/src/nsDOMUIEvent.h
+++ b/content/events/src/nsDOMUIEvent.h
@@ -29,8 +29,6 @@ public:
   NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
   NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
 
-  NS_FORWARD_NSIDOMNSEVENT(nsDOMEvent::)
-
   virtual nsresult InitFromCtor(const nsAString& aType,
                                 JSContext* aCx, jsval* aVal);
 
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index 9a62e5f07be9..7268e8c07a7e 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -545,7 +545,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
     return NS_ERROR_FAILURE;
   }
 
-  // Make sure that nsIDOMEvent::target and nsIDOMNSEvent::originalTarget
+  // Make sure that nsIDOMEvent::target and nsIDOMEvent::originalTarget
   // point to the last item in the chain.
   if (!aEvent->target) {
     // Note, CurrentTarget() points always to the object returned by
@@ -682,10 +682,8 @@ nsEventDispatcher::DispatchDOMEvent(nsISupports* aTarget,
     if (innerEvent->flags & NS_EVENT_DISPATCHED) {
       innerEvent->target = nullptr;
       innerEvent->originalTarget = nullptr;
-    }
-    else {
-      nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aDOMEvent));
-      nsevent->GetIsTrusted(&dontResetTrusted);
+    } else {
+      aDOMEvent->GetIsTrusted(&dontResetTrusted);
     }
 
     if (!dontResetTrusted) {
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 4738fc071040..78697870fded 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -14,7 +14,6 @@
 #include "nsDOMEvent.h"
 #include "nsEventListenerManager.h"
 #include "nsCaret.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsITextControlFrame.h"
 #include "nsGkAtoms.h"
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 06673c38b3fc..6885cbc99723 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -65,7 +65,6 @@
 #include "nsCaret.h"
 
 #include "nsSubDocumentFrame.h"
-#include "nsIFrameTraversal.h"
 #include "nsLayoutCID.h"
 #include "nsLayoutUtils.h"
 #include "nsIInterfaceRequestorUtils.h"
@@ -112,8 +111,6 @@ using namespace mozilla::dom;
 
 #define NS_USER_INTERACTION_INTERVAL 5000 // ms
 
-static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
-
 static bool sLeftClickOnly = true;
 static bool sKeyCausesActivation = true;
 static PRUint32 sESMInstanceCount = 0;
@@ -2292,7 +2289,7 @@ nsEventStateManager::DetermineDragTarget(nsPresContext* aPresContext,
   *aTargetNode = nullptr;
 
   nsCOMPtr<nsISupports> container = aPresContext->GetContainer();
-  nsCOMPtr<nsIDOMWindow> window = do_GetInterface(container);
+  nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(container);
   if (!window)
     return;
 
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 9a39c845b56c..3d400f14f965 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -17,7 +17,6 @@
 #include "nsIDocument.h"
 #include "nsCOMArray.h"
 #include "nsIFrameLoader.h"
-#include "nsIFrame.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIScrollableFrame.h"
@@ -26,6 +25,7 @@
 #include "nsEventStates.h"
 #include "mozilla/TimeStamp.h"
 #include "nsContentUtils.h"
+#include "nsIFrame.h"
 
 class nsIPresShell;
 class nsIDocShell;
@@ -34,6 +34,7 @@ class nsIDocShellTreeItem;
 class imgIContainer;
 class nsDOMDataTransfer;
 class MouseEnterLeaveDispatcher;
+class nsIFrame;
 
 namespace mozilla {
 namespace dom {
diff --git a/content/events/src/nsIMEStateManager.cpp b/content/events/src/nsIMEStateManager.cpp
index 000dfbc8d6b1..6387a73046cb 100644
--- a/content/events/src/nsIMEStateManager.cpp
+++ b/content/events/src/nsIMEStateManager.cpp
@@ -17,7 +17,6 @@
 #include "nsPresContext.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsContentUtils.h"
 #include "nsINode.h"
 #include "nsIFrame.h"
@@ -202,8 +201,7 @@ nsIMEStateManager::OnClickInEditor(nsPresContext* aPresContext,
   NS_ENSURE_TRUE(widget, );
 
   bool isTrusted;
-  nsCOMPtr<nsIDOMNSEvent> NSEvent = do_QueryInterface(aMouseEvent);
-  nsresult rv = NSEvent->GetIsTrusted(&isTrusted);
+  nsresult rv = aMouseEvent->GetIsTrusted(&isTrusted);
   NS_ENSURE_SUCCESS(rv, );
   if (!isTrusted) {
     return; // ignore untrusted event.
diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index 2c0901cafaea..9beb007a24ca 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/events/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -84,8 +84,9 @@ MOCHITEST_FILES = \
 		test_bug741666.html \
 		test_dom_keyboard_event.html \
 		test_dom_mouse_event.html \
-		test_bug742376.html \
 		test_bug603008.html \
+		test_bug716822.html \
+		test_bug742376.html \
 		$(NULL)
 
 #bug 585630
diff --git a/content/events/test/test_bug238987.html b/content/events/test/test_bug238987.html
index 9fe2b261c9d7..4903aa364573 100644
--- a/content/events/test/test_bug238987.html
+++ b/content/events/test/test_bug238987.html
@@ -53,7 +53,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238987
         shouldStop = true;
       }
     } else if (e.target.id == "end") {
-      modifier = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+      modifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
     } else if (modifier) {
       var expected = backwardFocusArray.pop();
       ok(expected == e.target.id,
diff --git a/content/events/test/test_bug409604.html b/content/events/test/test_bug409604.html
index 433b492a8186..e8653039ef00 100644
--- a/content/events/test/test_bug409604.html
+++ b/content/events/test/test_bug409604.html
@@ -19,8 +19,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=409604
 
   /** Test for Bug 409604 **/
 
-  var modifier = Components.interfaces.nsIDOMNSEvent.ALT_MASK |
-                 Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+  var modifier = Components.interfaces.nsIDOMEvent.ALT_MASK |
+                 Components.interfaces.nsIDOMEvent.SHIFT_MASK;
   var expectedFocus = "a,c,d,e,f,g,h,i,j,k,l,m,n,p,x,y";
   // XXX the "map" test is causing trouble, see bug 433089
   var focusArray = expectedFocus.split(",");
diff --git a/content/events/test/test_bug617528.xul b/content/events/test/test_bug617528.xul
index dfe6315d9717..83038b36be87 100644
--- a/content/events/test/test_bug617528.xul
+++ b/content/events/test/test_bug617528.xul
@@ -81,7 +81,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=617528
       browser.removeEventListener("contextmenu", onContextMenu1, false);
 
       browser.addEventListener("contextmenu", onContextMenu2, false);
-      var shiftMask = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+      var shiftMask = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
       wu.sendMouseEvent("contextmenu", left, top, 2, 1, shiftMask);
       browser.removeEventListener("contextmenu", onContextMenu2, false);
 
diff --git a/content/events/test/test_bug716822.html b/content/events/test/test_bug716822.html
new file mode 100644
index 000000000000..37fe4f6694d4
--- /dev/null
+++ b/content/events/test/test_bug716822.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=716822
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 716822</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=716822">Mozilla Bug 716822</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+/** Test for Bug 716822 **/
+for (var p in window.NSEvent) {
+  ok(p in window.Event, p + " should be in Event.");
+  is(window.NSEvent[p], window.Event[p], "Value of " + p);
+}
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/Makefile.in b/content/html/Makefile.in
index a946b9a3f895..a0c848c436cb 100644
--- a/content/html/Makefile.in
+++ b/content/html/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/html/content/Makefile.in b/content/html/content/Makefile.in
index eed058863a9c..64e267416bdd 100644
--- a/content/html/content/Makefile.in
+++ b/content/html/content/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/html/content/public/Makefile.in b/content/html/content/public/Makefile.in
index 26d19e54adf7..4aecefde6edd 100644
--- a/content/html/content/public/Makefile.in
+++ b/content/html/content/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/content/html/content/public/nsHTMLCanvasElement.h b/content/html/content/public/nsHTMLCanvasElement.h
index 53cf697390f5..f09df374975a 100644
--- a/content/html/content/public/nsHTMLCanvasElement.h
+++ b/content/html/content/public/nsHTMLCanvasElement.h
@@ -10,7 +10,6 @@
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsSize.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "nsNodeInfoManager.h"
 
diff --git a/content/html/content/public/nsIRadioGroupContainer.h b/content/html/content/public/nsIRadioGroupContainer.h
index f0a92c66bb70..0ee8dd69bfa9 100644
--- a/content/html/content/public/nsIRadioGroupContainer.h
+++ b/content/html/content/public/nsIRadioGroupContainer.h
@@ -41,16 +41,15 @@ public:
    * @param aName the group name
    * @param aRadio the currently selected radio button
    */
-  NS_IMETHOD SetCurrentRadioButton(const nsAString& aName,
-                                   nsIDOMHTMLInputElement* aRadio) = 0;
+  virtual void SetCurrentRadioButton(const nsAString& aName, 
+                                     nsIDOMHTMLInputElement* aRadio) = 0;
 
   /**
    * Get the current radio button in a group
    * @param aName the group name
-   * @param aRadio the currently selected radio button [OUT]
+   * @return the currently selected radio button
    */
-  NS_IMETHOD GetCurrentRadioButton(const nsAString& aName,
-                                   nsIDOMHTMLInputElement** aRadio) = 0;
+  virtual nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName) = 0;
 
   /**
    * Get the next/prev radio button in a group
@@ -73,8 +72,7 @@ public:
    * @param aName radio group's name
    * @param aRadio radio button's pointer
    */
-  NS_IMETHOD AddToRadioGroup(const nsAString& aName,
-                             nsIFormControl* aRadio) = 0;
+  virtual void AddToRadioGroup(const nsAString& aName, nsIFormControl* aRadio) = 0;
 
   /**
    * Remove radio button from radio group
@@ -85,8 +83,7 @@ public:
    * @param aName radio group's name
    * @param aRadio radio button's pointer
    */
-  NS_IMETHOD RemoveFromRadioGroup(const nsAString& aName,
-                                  nsIFormControl* aRadio) = 0;
+  virtual void RemoveFromRadioGroup(const nsAString& aName, nsIFormControl* aRadio) = 0;
 
   virtual PRUint32 GetRequiredRadioCount(const nsAString& aName) const = 0;
   virtual void RadioRequiredChanged(const nsAString& aName,
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 3ddd16436c80..946658715a49 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 2b997389b631..2f502f79a2cd 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -58,7 +58,6 @@
 #include "nsGkAtoms.h"
 #include "nsEventStateManager.h"
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsDOMCSSDeclaration.h"
 #include "nsITextControlFrame.h"
 #include "nsIForm.h"
diff --git a/content/html/content/src/nsHTMLBodyElement.cpp b/content/html/content/src/nsHTMLBodyElement.cpp
index eae64b4c2d0b..dc6ba4d658cd 100644
--- a/content/html/content/src/nsHTMLBodyElement.cpp
+++ b/content/html/content/src/nsHTMLBodyElement.cpp
@@ -18,7 +18,6 @@
 #include "nsIMarkupDocumentViewer.h"
 #include "nsMappedAttributes.h"
 #include "nsRuleData.h"
-#include "nsIFrame.h"
 #include "nsIDocShell.h"
 #include "nsIEditorDocShell.h"
 #include "nsRuleWalker.h"
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 282d1f8b844d..ee3bc25d9df7 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -19,7 +19,6 @@
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDocument.h"
 #include "nsGUIEvent.h"
 #include "nsUnicharUtils.h"
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index c9b35d833dc4..51e6597825fa 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -11,7 +11,6 @@
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsDOMError.h"
 #include "nsContentUtils.h"
@@ -1868,22 +1867,17 @@ nsHTMLFormElement::IndexOfControl(nsIFormControl* aControl)
   return mControls->IndexOfControl(aControl, &index) == NS_OK ? index : 0;
 }
 
-NS_IMETHODIMP
+void
 nsHTMLFormElement::SetCurrentRadioButton(const nsAString& aName,
                                          nsIDOMHTMLInputElement* aRadio)
 {
   mSelectedRadioButtons.Put(aName, aRadio);
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsHTMLFormElement::GetCurrentRadioButton(const nsAString& aName,
-                                         nsIDOMHTMLInputElement** aRadio)
+nsIDOMHTMLInputElement*
+nsHTMLFormElement::GetCurrentRadioButton(const nsAString& aName)
 {
-  mSelectedRadioButtons.Get(aName, aRadio);
-
-  return NS_OK;
+  return mSelectedRadioButtons.GetWeak(aName);
 }
 
 NS_IMETHODIMP
@@ -2009,7 +2003,7 @@ nsHTMLFormElement::WalkRadioGroup(const nsAString& aName,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsHTMLFormElement::AddToRadioGroup(const nsAString& aName,
                                    nsIFormControl* aRadio)
 {
@@ -2020,11 +2014,9 @@ nsHTMLFormElement::AddToRadioGroup(const nsAString& aName,
     mRequiredRadioButtonCounts.Put(aName,
                                    mRequiredRadioButtonCounts.Get(aName)+1);
   }
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsHTMLFormElement::RemoveFromRadioGroup(const nsAString& aName,
                                         nsIFormControl* aRadio)
 {
@@ -2042,8 +2034,6 @@ nsHTMLFormElement::RemoveFromRadioGroup(const nsAString& aName,
       mRequiredRadioButtonCounts.Put(aName, requiredNb-1);
     }
   }
-
-  return NS_OK;
 }
 
 PRUint32
diff --git a/content/html/content/src/nsHTMLFormElement.h b/content/html/content/src/nsHTMLFormElement.h
index 0ca9077c2d9e..ed1ad5e1a210 100644
--- a/content/html/content/src/nsHTMLFormElement.h
+++ b/content/html/content/src/nsHTMLFormElement.h
@@ -62,20 +62,17 @@ public:
   NS_IMETHOD_(nsIFormControl*) GetDefaultSubmitElement() const;
 
   // nsIRadioGroupContainer
-  NS_IMETHOD SetCurrentRadioButton(const nsAString& aName,
-                                   nsIDOMHTMLInputElement* aRadio);
-  NS_IMETHOD GetCurrentRadioButton(const nsAString& aName,
-                                   nsIDOMHTMLInputElement** aRadio);
+  void SetCurrentRadioButton(const nsAString& aName,
+                             nsIDOMHTMLInputElement* aRadio);
+  nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName);
   NS_IMETHOD GetNextRadioButton(const nsAString& aName,
                                 const bool aPrevious,
                                 nsIDOMHTMLInputElement*  aFocusedRadio,
                                 nsIDOMHTMLInputElement** aRadioOut);
   NS_IMETHOD WalkRadioGroup(const nsAString& aName, nsIRadioVisitor* aVisitor,
                             bool aFlushContent);
-  NS_IMETHOD AddToRadioGroup(const nsAString& aName,
-                             nsIFormControl* aRadio);
-  NS_IMETHOD RemoveFromRadioGroup(const nsAString& aName,
-                                  nsIFormControl* aRadio);
+  void AddToRadioGroup(const nsAString& aName, nsIFormControl* aRadio);
+  void RemoveFromRadioGroup(const nsAString& aName, nsIFormControl* aRadio);
   virtual PRUint32 GetRequiredRadioCount(const nsAString& aName) const;
   virtual void RadioRequiredChanged(const nsAString& aName,
                                     nsIFormControl* aRadio);
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 5e26f096acc6..d029f3976724 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -46,7 +46,6 @@
 #include "nsPresState.h"
 #include "nsLayoutErrors.h"
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsLinebreakConverter.h" //to strip out carriage returns
@@ -1656,10 +1655,11 @@ nsHTMLInputElement::SetCheckedChangedInternal(bool aCheckedChanged)
 NS_IMETHODIMP
 nsHTMLInputElement::SetChecked(bool aChecked)
 {
-  return DoSetChecked(aChecked, true, true);
+  DoSetChecked(aChecked, true, true);
+  return NS_OK;
 }
 
-nsresult
+void
 nsHTMLInputElement::DoSetChecked(bool aChecked, bool aNotify,
                                  bool aSetValueChanged)
 {
@@ -1674,18 +1674,19 @@ nsHTMLInputElement::DoSetChecked(bool aChecked, bool aNotify,
   // screw up state actually, especially when you are setting radio button to
   // false)
   if (mChecked == aChecked) {
-    return NS_OK;
+    return;
   }
 
   // Set checked
   if (mType != NS_FORM_INPUT_RADIO) {
     SetCheckedInternal(aChecked, aNotify);
-    return NS_OK;
+    return;
   }
 
   // For radio button, we need to do some extra fun stuff
   if (aChecked) {
-    return RadioSetChecked(aNotify);
+    RadioSetChecked(aNotify);
+    return;
   }
 
   nsIRadioGroupContainer* container = GetRadioGroupContainer();
@@ -1698,10 +1699,9 @@ nsHTMLInputElement::DoSetChecked(bool aChecked, bool aNotify,
   // validity state. We have to be sure the radio group container knows
   // the currently selected radio.
   SetCheckedInternal(false, aNotify);
-  return NS_OK;
 }
 
-nsresult
+void
 nsHTMLInputElement::RadioSetChecked(bool aNotify)
 {
   // Find the selected radio button so we can deselect it
@@ -1716,22 +1716,16 @@ nsHTMLInputElement::RadioSetChecked(bool aNotify)
   }
 
   // Let the group know that we are now the One True Radio Button
-  nsresult rv = NS_OK;
   nsIRadioGroupContainer* container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
     GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-    rv = container->SetCurrentRadioButton(name, this);
+    container->SetCurrentRadioButton(name, this);
   }
 
   // SetCheckedInternal is going to ask all radios to update their
-  // validity state. We have to be sure the radio group container knows
-  // the currently selected radio.
-  if (NS_SUCCEEDED(rv)) {
-    SetCheckedInternal(true, aNotify);
-  }
-
-  return rv;
+  // validity state. 
+  SetCheckedInternal(true, aNotify);
 }
 
 nsIRadioGroupContainer*
@@ -1765,8 +1759,7 @@ nsHTMLInputElement::GetSelectedRadioButton()
   nsAutoString name;
   GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
-  nsCOMPtr<nsIDOMHTMLInputElement> selected;
-  container->GetCurrentRadioButton(name, getter_AddRefs(selected));
+  nsCOMPtr<nsIDOMHTMLInputElement> selected = container->GetCurrentRadioButton(name);
   return selected.forget();
 }
 
@@ -3143,7 +3136,8 @@ nsHTMLInputElement::Reset()
     case VALUE_MODE_VALUE:
       return SetDefaultValueAsValue();
     case VALUE_MODE_DEFAULT_ON:
-      return DoSetChecked(DefaultChecked(), true, false);
+      DoSetChecked(DefaultChecked(), true, false);
+      return NS_OK;
     case VALUE_MODE_FILENAME:
       ClearFiles(false);
       return NS_OK;
@@ -3659,8 +3653,7 @@ nsHTMLInputElement::IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, PRInt32
   nsAutoString name;
   GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
-  nsCOMPtr<nsIDOMHTMLInputElement> currentRadio;
-  container->GetCurrentRadioButton(name, getter_AddRefs(currentRadio));
+  nsCOMPtr<nsIDOMHTMLInputElement> currentRadio = container->GetCurrentRadioButton(name);
   if (currentRadio) {
     *aTabIndex = -1;
   }
diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h
index 501ef72ffbd7..8418f3e11462 100644
--- a/content/html/content/src/nsHTMLInputElement.h
+++ b/content/html/content/src/nsHTMLInputElement.h
@@ -400,7 +400,7 @@ protected:
    * Do all the work that |SetChecked| does (radio button handling, etc.), but
    * take an |aNotify| parameter.
    */
-  nsresult DoSetChecked(bool aValue, bool aNotify, bool aSetValueChanged);
+  void DoSetChecked(bool aValue, bool aNotify, bool aSetValueChanged);
 
   /**
    * Do all the work that |SetCheckedChanged| does (radio button handling,
@@ -415,7 +415,7 @@ protected:
    */
   void SetCheckedInternal(bool aValue, bool aNotify);
 
-  nsresult RadioSetChecked(bool aNotify);
+  void RadioSetChecked(bool aNotify);
   void SetCheckedChanged(bool aCheckedChanged);
 
   /**
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 6cd8824be17f..47d696317b72 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -2617,11 +2617,11 @@ void nsHTMLMediaElement::EndMediaStreamPlayback()
   VideoFrameContainer* container = GetVideoFrameContainer();
   if (container) {
     GetMediaStream()->RemoveVideoOutput(container);
+    container->GetImageContainer()->SetCurrentImage(nullptr);
   }
   if (mPaused) {
     GetMediaStream()->ChangeExplicitBlockerCount(-1);
   }
-  mVideoFrameContainer->GetImageContainer()->SetCurrentImage(nullptr);
   if (mPausedForInactiveDocument) {
     GetMediaStream()->ChangeExplicitBlockerCount(-1);
   }
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
index c5027fda57cc..5d707ad851c7 100644
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -20,7 +20,6 @@
 // Notify/query select frame for selected state
 #include "nsIFormControlFrame.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsNodeInfoManager.h"
 #include "nsCOMPtr.h"
diff --git a/content/html/content/src/nsHTMLVideoElement.cpp b/content/html/content/src/nsHTMLVideoElement.cpp
index 96a0d77126e0..8ba83cd0f173 100644
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -12,7 +12,6 @@
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsSize.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "nsNodeInfoManager.h"
 #include "plbase64.h"
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 2fef42fabbdf..8a8a2054f246 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = content/html/content/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/html/content/test/bug649134/Makefile.in b/content/html/content/test/bug649134/Makefile.in
index 8b1e124ab946..dd3064c72a7f 100644
--- a/content/html/content/test/bug649134/Makefile.in
+++ b/content/html/content/test/bug649134/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = content/html/content/test/bug649134
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in
index 57d6c2b27dbe..da9296ced884 100644
--- a/content/html/content/test/forms/Makefile.in
+++ b/content/html/content/test/forms/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = content/html/content/test/forms
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/html/document/Makefile.in b/content/html/document/Makefile.in
index eed058863a9c..64e267416bdd 100644
--- a/content/html/document/Makefile.in
+++ b/content/html/document/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/html/document/public/Makefile.in b/content/html/document/public/Makefile.in
index f392f52ed5d7..5c104300340a 100644
--- a/content/html/document/public/Makefile.in
+++ b/content/html/document/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in
index dd35dda5f531..1cea15000b79 100644
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in
index 6f5762f9b5ae..68c60c833c68 100644
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/html/document/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in
index b962a18cb306..0dae527c63ff 100644
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 9ad742a1b40b..956afa6ca8d6 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in
index 5504b5f1c8b5..ce115dc2917a 100644
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
index 31015dfc9ea2..118729c033f2 100644
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -984,7 +984,7 @@ nsBufferedAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFormat aF
     mBytesPerFrame = sizeof(short) * aNumChannels;
     break;
   case FORMAT_FLOAT32:
-    params.format = CUBEB_SAMPLE_FLOAT32LE;
+    params.format = CUBEB_SAMPLE_FLOAT32NE;
     mBytesPerFrame = sizeof(float) * aNumChannels;
     break;
   default:
diff --git a/content/media/nsBuiltinDecoder.h b/content/media/nsBuiltinDecoder.h
index b210db12165e..87f53a91850b 100644
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@@ -186,7 +186,6 @@ destroying the nsBuiltinDecoder object.
 #include "nsIThread.h"
 #include "nsIChannel.h"
 #include "nsIObserver.h"
-#include "nsIFrame.h"
 #include "nsAutoPtr.h"
 #include "nsSize.h"
 #include "prlog.h"
diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in
index cc4921d557eb..cb0f53799ab5 100644
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in
index e8420a3eb630..a436b9adc0b4 100644
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in
index cadf204eb82e..2d1c48848550 100644
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index f02c8d82c444..5a8df18587d0 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= content/media/test
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index 56b45eef5d10..914712e53477 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
index 76e38a059bbf..02f93aca4846 100644
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in
index ed6fdb6e6f8d..3deb47bb261b 100644
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
index c303fd4b6f17..5fe10eaf9518 100644
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/smil/test/Makefile.in b/content/smil/test/Makefile.in
index b32e18de6281..6278a0c8f08f 100644
--- a/content/smil/test/Makefile.in
+++ b/content/smil/test/Makefile.in
@@ -1,11 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/smil/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/svg/Makefile.in b/content/svg/Makefile.in
index 94746e88adcc..ea9fe8754315 100644
--- a/content/svg/Makefile.in
+++ b/content/svg/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/svg/content/Makefile.in b/content/svg/content/Makefile.in
index 1e6cf6277ba7..bb512f1cf115 100644
--- a/content/svg/content/Makefile.in
+++ b/content/svg/content/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
index 53b9e6f754e4..0ba7dd70c816 100644
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/svg/content/src/nsSVGGradientElement.cpp b/content/svg/content/src/nsSVGGradientElement.cpp
index 1f5395540db5..240b5871be34 100644
--- a/content/svg/content/src/nsSVGGradientElement.cpp
+++ b/content/svg/content/src/nsSVGGradientElement.cpp
@@ -14,7 +14,6 @@
 #include "nsSVGStylableElement.h"
 #include "nsGkAtoms.h"
 #include "nsSVGGradientElement.h"
-#include "nsIFrame.h"
 
 using namespace mozilla;
 
diff --git a/content/svg/content/src/nsSVGPatternElement.cpp b/content/svg/content/src/nsSVGPatternElement.cpp
index 751281b5f031..5c5b933a0600 100644
--- a/content/svg/content/src/nsSVGPatternElement.cpp
+++ b/content/svg/content/src/nsSVGPatternElement.cpp
@@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
 #include "nsSVGPatternElement.h"
-#include "nsIFrame.h"
 
 using namespace mozilla;
 
diff --git a/content/svg/content/src/nsSVGTextElement.cpp b/content/svg/content/src/nsSVGTextElement.cpp
index 4084bfec19cc..5544c2c4a2df 100644
--- a/content/svg/content/src/nsSVGTextElement.cpp
+++ b/content/svg/content/src/nsSVGTextElement.cpp
@@ -11,7 +11,6 @@
 #include "nsCOMPtr.h"
 #include "nsSVGSVGElement.h"
 #include "nsSVGTextPositioningElement.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "SVGAnimatedLengthList.h"
 #include "DOMSVGAnimatedLengthList.h"
diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in
index e54dc6d5b942..c5ba583c0f2c 100644
--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/svg/content/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in
index 84869f18f87c..859792a10d96 100644
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/test/Makefile.in b/content/test/Makefile.in
index 85d0ca34940a..2d45b105d1a6 100644
--- a/content/test/Makefile.in
+++ b/content/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = content/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xbl/Makefile.in b/content/xbl/Makefile.in
index ad03223313bb..946e6c687ba6 100644
--- a/content/xbl/Makefile.in
+++ b/content/xbl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in
index 394bd82a9708..c3a670f75716 100644
--- a/content/xbl/builtin/Makefile.in
+++ b/content/xbl/builtin/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/builtin/emacs/Makefile.in b/content/xbl/builtin/emacs/Makefile.in
index 3a71a2fdf7b0..955c2ba8abcf 100644
--- a/content/xbl/builtin/emacs/Makefile.in
+++ b/content/xbl/builtin/emacs/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/builtin/mac/Makefile.in b/content/xbl/builtin/mac/Makefile.in
index 3a71a2fdf7b0..955c2ba8abcf 100644
--- a/content/xbl/builtin/mac/Makefile.in
+++ b/content/xbl/builtin/mac/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/builtin/unix/Makefile.in b/content/xbl/builtin/unix/Makefile.in
index 3a71a2fdf7b0..955c2ba8abcf 100644
--- a/content/xbl/builtin/unix/Makefile.in
+++ b/content/xbl/builtin/unix/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/builtin/win/Makefile.in b/content/xbl/builtin/win/Makefile.in
index 3a71a2fdf7b0..955c2ba8abcf 100644
--- a/content/xbl/builtin/win/Makefile.in
+++ b/content/xbl/builtin/win/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in
index 0476aa5f8c8d..66e350620308 100644
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xbl/src/nsXBLEventHandler.cpp b/content/xbl/src/nsXBLEventHandler.cpp
index aa3fdf9a3361..1e0103b5d71a 100644
--- a/content/xbl/src/nsXBLEventHandler.cpp
+++ b/content/xbl/src/nsXBLEventHandler.cpp
@@ -10,7 +10,6 @@
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsXBLPrototypeHandler.h"
-#include "nsIDOMNSEvent.h"
 #include "nsGUIEvent.h"
 #include "nsContentUtils.h"
 
@@ -86,10 +85,8 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent,
                                              PRUint32 aCharCode,
                                              bool aIgnoreShiftKey)
 {
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
   bool trustedEvent = false;
-  if (domNSEvent)
-    domNSEvent->GetIsTrusted(&trustedEvent);
+  aKeyEvent->GetIsTrusted(&trustedEvent);
 
   nsCOMPtr<nsIDOMEventTarget> target;
   aKeyEvent->GetCurrentTarget(getter_AddRefs(target));
diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp
index dd7412cf1adf..24f6fc5e79ba 100644
--- a/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -27,7 +27,6 @@
 #include "nsEventListenerManager.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMEventListener.h"
-#include "nsIDOMNSEvent.h"
 #include "nsPIDOMWindow.h"
 #include "nsPIWindowRoot.h"
 #include "nsIDOMWindow.h"
@@ -210,11 +209,8 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventTarget* aTarget,
   // XUL handlers and commands shouldn't be triggered by non-trusted
   // events.
   if (isXULKey || isXBLCommand) {
-    nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aEvent);
     bool trustedEvent = false;
-    if (domNSEvent) {
-      domNSEvent->GetIsTrusted(&trustedEvent);
-    }
+    aEvent->GetIsTrusted(&trustedEvent);
 
     if (!trustedEvent)
       return NS_OK;
@@ -360,20 +356,17 @@ nsXBLPrototypeHandler::DispatchXBLCommand(nsIDOMEventTarget* aTarget, nsIDOMEven
   // This is a special-case optimization to make command handling fast.
   // It isn't really a part of XBL, but it helps speed things up.
 
-  // See if preventDefault has been set.  If so, don't execute.
-  bool preventDefault = false;
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aEvent);
-  if (domNSEvent) {
-    domNSEvent->GetPreventDefault(&preventDefault);
-  }
-
-  if (preventDefault)
-    return NS_OK;
-
   if (aEvent) {
-    bool dispatchStopped = aEvent->IsDispatchStopped();
-    if (dispatchStopped)
+    // See if preventDefault has been set.  If so, don't execute.
+    bool preventDefault = false;
+    aEvent->GetPreventDefault(&preventDefault);
+    if (preventDefault) {
       return NS_OK;
+    }
+    bool dispatchStopped = aEvent->IsDispatchStopped();
+    if (dispatchStopped) {
+      return NS_OK;
+    }
   }
 
   // Instead of executing JS, let's get the controller for the bound
diff --git a/content/xbl/src/nsXBLWindowKeyHandler.cpp b/content/xbl/src/nsXBLWindowKeyHandler.cpp
index ab2573022fe8..613a9cad7d74 100644
--- a/content/xbl/src/nsXBLWindowKeyHandler.cpp
+++ b/content/xbl/src/nsXBLWindowKeyHandler.cpp
@@ -10,7 +10,6 @@
 #include "nsIAtom.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIDOMNSEvent.h"
 #include "nsXBLService.h"
 #include "nsIServiceManager.h"
 #include "nsGkAtoms.h"
@@ -280,17 +279,14 @@ DoCommandCallback(const char *aCommand, void *aData)
 nsresult
 nsXBLWindowKeyHandler::WalkHandlers(nsIDOMKeyEvent* aKeyEvent, nsIAtom* aEventType)
 {
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
   bool prevent;
-  domNSEvent->GetPreventDefault(&prevent);
+  aKeyEvent->GetPreventDefault(&prevent);
   if (prevent)
     return NS_OK;
 
   bool trustedEvent = false;
-  if (domNSEvent) {
-    //Don't process the event if it was not dispatched from a trusted source
-    domNSEvent->GetIsTrusted(&trustedEvent);
-  }
+  // Don't process the event if it was not dispatched from a trusted source
+  aKeyEvent->GetIsTrusted(&trustedEvent);
 
   if (!trustedEvent)
     return NS_OK;
@@ -303,7 +299,7 @@ nsXBLWindowKeyHandler::WalkHandlers(nsIDOMKeyEvent* aKeyEvent, nsIAtom* aEventTy
   if (!el) {
     if (mUserHandler) {
       WalkHandlersInternal(aKeyEvent, aEventType, mUserHandler);
-      domNSEvent->GetPreventDefault(&prevent);
+      aKeyEvent->GetPreventDefault(&prevent);
       if (prevent)
         return NS_OK; // Handled by the user bindings. Our work here is done.
     }
diff --git a/content/xbl/test/Makefile.in b/content/xbl/test/Makefile.in
index f68c7872a29d..bc91c117678d 100644
--- a/content/xbl/test/Makefile.in
+++ b/content/xbl/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/xbl/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xml/Makefile.in b/content/xml/Makefile.in
index e523cf178599..c418161d4f9f 100644
--- a/content/xml/Makefile.in
+++ b/content/xml/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
index 1e7e72d83222..fd7f24c083e9 100644
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xml/document/Makefile.in b/content/xml/document/Makefile.in
index 3e4ecf65e0e8..f30f13c0a953 100644
--- a/content/xml/document/Makefile.in
+++ b/content/xml/document/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xml/document/public/Makefile.in b/content/xml/document/public/Makefile.in
index 4a022fc14edf..3e4c6b501cb9 100644
--- a/content/xml/document/public/Makefile.in
+++ b/content/xml/document/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xml/document/resources/Makefile.in b/content/xml/document/resources/Makefile.in
index 3b98c61c2039..654736c57b5a 100644
--- a/content/xml/document/resources/Makefile.in
+++ b/content/xml/document/resources/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in
index 0c4c09cc0d13..7962eda9a5cf 100644
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xml/document/test/Makefile.in b/content/xml/document/test/Makefile.in
index 478cfb172fbc..659cc9f26a07 100644
--- a/content/xml/document/test/Makefile.in
+++ b/content/xml/document/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/xml/document/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xslt/Makefile.in b/content/xslt/Makefile.in
index 67fa8c18d09f..9de107fbc081 100644
--- a/content/xslt/Makefile.in
+++ b/content/xslt/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xslt/public/Makefile.in b/content/xslt/public/Makefile.in
index 86b0d3e5ec76..46e28749f8f3 100644
--- a/content/xslt/public/Makefile.in
+++ b/content/xslt/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xslt/src/Makefile.in b/content/xslt/src/Makefile.in
index 49d427f2430b..c16aff0b41cf 100644
--- a/content/xslt/src/Makefile.in
+++ b/content/xslt/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in
index 0ff91456fcbc..73621e1d8281 100644
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in
index 153150d8c87f..b29b3067caa9 100644
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in
index 51409537c8a6..7f9b12a15793 100644
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in
index 944974361ae8..c5c13901f1f9 100644
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index f1470d078c61..900b6a7039e6 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -32,13 +32,13 @@
 #include "mozilla/css/Loader.h"
 #include "mozilla/dom/Element.h"
 #include "nsCharsetAlias.h"
-#include "nsIFrame.h"
 #include "nsContentUtils.h"
 #include "txXMLUtils.h"
 #include "nsContentSink.h"
 #include "nsINode.h"
 #include "nsContentCreatorFunctions.h"
 #include "txError.h"
+#include "nsIFrame.h"
 
 using namespace mozilla::dom;
 
diff --git a/content/xslt/tests/buster/Makefile.in b/content/xslt/tests/buster/Makefile.in
index dbf3bfb8f3ce..8f8ae705dd6e 100644
--- a/content/xslt/tests/buster/Makefile.in
+++ b/content/xslt/tests/buster/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in
index d1f9acdca8db..448cdc08bf26 100644
--- a/content/xslt/tests/mochitest/Makefile.in
+++ b/content/xslt/tests/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/xslt/tests/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xtf/Makefile.in b/content/xtf/Makefile.in
index 5e114e6b6f2c..87fba7d92b89 100644
--- a/content/xtf/Makefile.in
+++ b/content/xtf/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xtf/public/Makefile.in b/content/xtf/public/Makefile.in
index d341108249f3..8e9b27b0a01b 100644
--- a/content/xtf/public/Makefile.in
+++ b/content/xtf/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xtf/src/Makefile.in b/content/xtf/src/Makefile.in
index 1aee8bed4158..9f4db70bc60a 100644
--- a/content/xtf/src/Makefile.in
+++ b/content/xtf/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xtf/test/Makefile.in b/content/xtf/test/Makefile.in
index ae7110e4a416..4cdf11ca4aed 100644
--- a/content/xtf/test/Makefile.in
+++ b/content/xtf/test/Makefile.in
@@ -12,11 +12,11 @@
 #
 
 # Note: DEPTH should be set to the relative path to mozilla/
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = content/xtf/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xul/Makefile.in b/content/xul/Makefile.in
index e0c777f531ab..178ec202a4c6 100644
--- a/content/xul/Makefile.in
+++ b/content/xul/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/content/Makefile.in b/content/xul/content/Makefile.in
index ec5fe2a4d789..3f0c0793ce58 100644
--- a/content/xul/content/Makefile.in
+++ b/content/xul/content/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/content/public/Makefile.in b/content/xul/content/public/Makefile.in
index 9325b255c845..3b31bab33a87 100644
--- a/content/xul/content/public/Makefile.in
+++ b/content/xul/content/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in
index 4606d673c5e8..43abc4f9a7b9 100644
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 844f07bfe978..537ffbc012d1 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -99,7 +99,6 @@
 #include "nsEventDispatcher.h"
 #include "mozAutoDocUpdate.h"
 #include "nsIDOMXULCommandEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsCCUncollectableMarker.h"
 
 namespace css = mozilla::css;
@@ -1136,19 +1135,18 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
                 // pointed to by the command attribute.  The new event's
                 // sourceEvent will be the original command event that we're
                 // handling.
-                nsCOMPtr<nsIDOMNSEvent> nsevent =
-                    do_QueryInterface(aVisitor.mDOMEvent);
-                while (nsevent) {
+                nsCOMPtr<nsIDOMEvent> domEvent = aVisitor.mDOMEvent;
+                while (domEvent) {
                     nsCOMPtr<nsIDOMEventTarget> oTarget;
-                    nsevent->GetOriginalTarget(getter_AddRefs(oTarget));
+                    domEvent->GetOriginalTarget(getter_AddRefs(oTarget));
                     NS_ENSURE_STATE(!SameCOMIdentity(oTarget, commandContent));
-                    nsCOMPtr<nsIDOMEvent> tmp;
                     nsCOMPtr<nsIDOMXULCommandEvent> commandEvent =
-                        do_QueryInterface(nsevent);
+                        do_QueryInterface(domEvent);
                     if (commandEvent) {
-                        commandEvent->GetSourceEvent(getter_AddRefs(tmp));
+                        commandEvent->GetSourceEvent(getter_AddRefs(domEvent));
+                    } else {
+                        domEvent = NULL;
                     }
-                    nsevent = do_QueryInterface(tmp);
                 }
 
                 nsInputEvent* orig =
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 7d59c52a6c5e..19106ca98006 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -25,7 +25,6 @@
 #include "nsIDOMXULDocument.h"
 #include "nsIDocument.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIDOMNSEvent.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"
@@ -93,12 +92,6 @@ nsXULPopupListener::HandleEvent(nsIDOMEvent* aEvent)
     return NS_OK;
   }
 
-  // check if someone has attempted to prevent this action.
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(mouseEvent);
-  if (!domNSEvent) {
-    return NS_OK;
-  }
-
   // Get the node that was clicked on.
   nsCOMPtr<nsIDOMEventTarget> target;
   mouseEvent->GetTarget(getter_AddRefs(target));
@@ -123,7 +116,7 @@ nsXULPopupListener::HandleEvent(nsIDOMEvent* aEvent)
   }
 
   bool preventDefault;
-  domNSEvent->GetPreventDefault(&preventDefault);
+  mouseEvent->GetPreventDefault(&preventDefault);
   if (preventDefault && targetNode && mIsContext) {
     // Someone called preventDefault on a context menu.
     // Let's make sure they are allowed to do so.
@@ -173,8 +166,6 @@ nsXULPopupListener::HandleEvent(nsIDOMEvent* aEvent)
       return NS_OK;
   }
 
-  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(aEvent);
-
   if (mIsContext) {
 #ifndef NS_CONTEXT_MENU_IS_MOUSEUP
     // If the context menu launches on mousedown,
diff --git a/content/xul/content/src/nsXULPopupListener.h b/content/xul/content/src/nsXULPopupListener.h
index 51381193c81f..311e992293ab 100644
--- a/content/xul/content/src/nsXULPopupListener.h
+++ b/content/xul/content/src/nsXULPopupListener.h
@@ -15,7 +15,6 @@
 #include "nsIContent.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIFrame.h"
 #include "nsIDOMEventListener.h"
 #include "nsCycleCollectionParticipant.h"
 
diff --git a/content/xul/content/test/Makefile.in b/content/xul/content/test/Makefile.in
index 70e97224b9f5..9ccde806c885 100644
--- a/content/xul/content/test/Makefile.in
+++ b/content/xul/content/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/xul/content/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xul/document/Makefile.in b/content/xul/document/Makefile.in
index ea2396502d2f..5eda8ed39c0f 100644
--- a/content/xul/document/Makefile.in
+++ b/content/xul/document/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/document/public/Makefile.in b/content/xul/document/public/Makefile.in
index 3f2b18a37a36..0a0ae01aea39 100644
--- a/content/xul/document/public/Makefile.in
+++ b/content/xul/document/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in
index 08138bea2fd5..99083bef8d7c 100644
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp
index e98187cb3607..81572373f107 100644
--- a/content/xul/document/src/nsXULContentSink.cpp
+++ b/content/xul/document/src/nsXULContentSink.cpp
@@ -865,29 +865,7 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes,
               NS_ENSURE_SUCCESS(rv, rv);
           }
 
-          // Javascript keeps the fast path, optimized for most-likely type
-          // Table ordered from most to least likely JS MIME types. For .xul
-          // files that we host, the likeliest type is application/x-javascript.
-          // See bug 62485, feel free to add <script type="..."> survey data to it,
-          // or to a new bug once 62485 is closed.
-          static const char *jsTypes[] = {
-              "application/x-javascript",
-              "text/javascript",
-              "text/ecmascript",
-              "application/javascript",
-              "application/ecmascript",
-              nullptr
-          };
-
-          bool isJavaScript = false;
-          for (PRInt32 i = 0; jsTypes[i]; i++) {
-              if (mimeType.LowerCaseEqualsASCII(jsTypes[i])) {
-                  isJavaScript = true;
-                  break;
-              }
-          }
-
-          if (isJavaScript) {
+          if (nsContentUtils::IsJavascriptMIMEType(mimeType)) {
               langID = nsIProgrammingLanguage::JAVASCRIPT;
               version = JSVERSION_LATEST;
           } else {
@@ -898,20 +876,11 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes,
             // Get the version string, and ensure the language supports it.
             nsAutoString versionName;
             rv = parser.GetParameter("version", versionName);
-            if (NS_FAILED(rv)) {
-              if (rv != NS_ERROR_INVALID_ARG)
-                return rv;
-              // no version specified - version remains the default.
-            } else {
-              nsCOMPtr<nsIScriptRuntime> runtime;
-              rv = NS_GetJSRuntime(getter_AddRefs(runtime));
-              if (NS_FAILED(rv))
-                return rv;
-              rv = runtime->ParseVersion(versionName, &version);
-              if (NS_FAILED(rv)) {
-                NS_WARNING("This script language version is not supported - ignored");
-                langID = nsIProgrammingLanguage::UNKNOWN;
-              }
+
+            if (NS_SUCCEEDED(rv)) {
+              version = nsContentUtils::ParseJavascriptVersion(versionName);
+            } else if (rv != NS_ERROR_INVALID_ARG) {
+              return rv;
             }
           }
           // Some js specifics yet to be abstracted.
diff --git a/content/xul/document/test/Makefile.in b/content/xul/document/test/Makefile.in
index 52f25415839b..4225d36dde2d 100644
--- a/content/xul/document/test/Makefile.in
+++ b/content/xul/document/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/xul/document/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/xul/templates/Makefile.in b/content/xul/templates/Makefile.in
index fe5cce8ec1c1..e95749f69d02 100644
--- a/content/xul/templates/Makefile.in
+++ b/content/xul/templates/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/templates/public/Makefile.in b/content/xul/templates/public/Makefile.in
index 27e9bbcbdf96..2d06176fee62 100644
--- a/content/xul/templates/public/Makefile.in
+++ b/content/xul/templates/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in
index 1a69876f570c..255a68e505c8 100644
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/content/xul/templates/tests/chrome/Makefile.in b/content/xul/templates/tests/chrome/Makefile.in
index 0b064b8732bb..725548373848 100644
--- a/content/xul/templates/tests/chrome/Makefile.in
+++ b/content/xul/templates/tests/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= content/xul/templates/tests/chrome
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index fff6cbb513cb..1201963c8353 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dbm/include/Makefile.in b/dbm/include/Makefile.in
index 343a08807cd6..fe8aebb734d8 100644
--- a/dbm/include/Makefile.in
+++ b/dbm/include/Makefile.in
@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dbm/src/Makefile.in b/dbm/src/Makefile.in
index 2f7476d8c86f..5f93e40c2c19 100644
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dbm/tests/Makefile.in b/dbm/tests/Makefile.in
index ffb83f29b3de..29522cd1a650 100644
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/Makefile.in b/docshell/Makefile.in
index 48064c073a01..c042bd8b43ca 100644
--- a/docshell/Makefile.in
+++ b/docshell/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
index 35b530114eb8..ab683ab95fc6 100644
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 8847f6dca6e4..48fb2dc07230 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -951,11 +951,9 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink)
     }
     else if (aIID.Equals(NS_GET_IID(nsIDocument)) &&
              NS_SUCCEEDED(EnsureContentViewer())) {
-        nsCOMPtr<nsIDOMDocument> domDoc;
-        mContentViewer->GetDOMDocument(getter_AddRefs(domDoc));
-        if (!domDoc)
-            return NS_NOINTERFACE;
-        return domDoc->QueryInterface(aIID, aSink);
+        nsCOMPtr<nsIDocument> doc = mContentViewer->GetDocument();
+        doc.forget(aSink);
+        return *aSink ? NS_OK : NS_NOINTERFACE;
     }
     else if (aIID.Equals(NS_GET_IID(nsIApplicationCacheContainer))) {
         *aSink = nullptr;
diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in
index cdd9d7394495..3e1ab2f3d86a 100644
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/resources/content/Makefile.in b/docshell/resources/content/Makefile.in
index f252ec34874a..0c112ea4ab93 100644
--- a/docshell/resources/content/Makefile.in
+++ b/docshell/resources/content/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/shistory/Makefile.in b/docshell/shistory/Makefile.in
index c0ccf7378ed6..1b95c6c18c38 100644
--- a/docshell/shistory/Makefile.in
+++ b/docshell/shistory/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/shistory/public/Makefile.in b/docshell/shistory/public/Makefile.in
index fceb6697b6b4..1d7ebe6b2bee 100644
--- a/docshell/shistory/public/Makefile.in
+++ b/docshell/shistory/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in
index 893775af3061..23fb78fde9c7 100644
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index 940b9c485e3c..26c6161b2e3c 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = docshell/test
+relativesrcdir  = @relativesrcdir@
 
 MODULE = test_docshell
 
diff --git a/docshell/test/browser/Makefile.in b/docshell/test/browser/Makefile.in
index de5e3d64532c..c3db345371ea 100644
--- a/docshell/test/browser/Makefile.in
+++ b/docshell/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= docshell/test/browser 
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/docshell/test/chrome/Makefile.in b/docshell/test/chrome/Makefile.in
index 8f2992699117..d6aa9e516e6d 100644
--- a/docshell/test/chrome/Makefile.in
+++ b/docshell/test/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= docshell/test/chrome 
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/docshell/test/navigation/Makefile.in b/docshell/test/navigation/Makefile.in
index 53579ea7a595..008ad1417ba6 100644
--- a/docshell/test/navigation/Makefile.in
+++ b/docshell/test/navigation/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = docshell/test/navigation
+relativesrcdir  = @relativesrcdir@
 
 MODULE = test_docshell
 
diff --git a/dom/Makefile.in b/dom/Makefile.in
index c5f3d8a5adb7..c210af5a9c8a 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/activities/Makefile.in b/dom/activities/Makefile.in
index eb8161719e62..51691b343dd9 100644
--- a/dom/activities/Makefile.in
+++ b/dom/activities/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/dom/activities/interfaces/Makefile.in b/dom/activities/interfaces/Makefile.in
index f39d57d42488..8475c61062b2 100644
--- a/dom/activities/interfaces/Makefile.in
+++ b/dom/activities/interfaces/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/dom/activities/src/ActivitiesService.jsm b/dom/activities/src/ActivitiesService.jsm
index 4f00f98dba47..3ca05864b694 100644
--- a/dom/activities/src/ActivitiesService.jsm
+++ b/dom/activities/src/ActivitiesService.jsm
@@ -193,9 +193,9 @@ let Activities = {
       debug(JSON.stringify(aResults));
 
       // We have no matching activity registered, let's fire an error.
-      if (aResults.length === 0) {
+      if (aResults.options.length === 0) {
         ppmm.sendAsyncMessage("Activity:FireError", {
-          "id": aMsg.id, 
+          "id": aMsg.id,
           "error": "NO_PROVIDER"
         });
         return;
@@ -207,7 +207,7 @@ let Activities = {
         // The user has cancelled the choice, fire an error.
         if (aChoice === -1) {
           ppmm.sendAsyncMessage("Activity:FireError", {
-            "id": aMsg.id, 
+            "id": aMsg.id,
             "error": "USER_ABORT"
           });
           return;
diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in
index 25e21e3e9bca..7db40fa0533b 100644
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in
index 1827a9f7e57f..f6a41bcd0682 100644
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/dom/alarm/test/Makefile.in b/dom/alarm/test/Makefile.in
index 8612151384a8..9cb2a24fb01a 100644
--- a/dom/alarm/test/Makefile.in
+++ b/dom/alarm/test/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/alarm/test
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/apps/Makefile.in b/dom/apps/Makefile.in
index 3be6cc082872..8109ad29ded1 100644
--- a/dom/apps/Makefile.in
+++ b/dom/apps/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/apps
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/apps/src/Makefile.in b/dom/apps/src/Makefile.in
index 1ab56232b303..853e584f0105 100644
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/dom/apps/src/Webapps.js b/dom/apps/src/Webapps.js
index 4556b2c4cf1e..5a067bc5318e 100644
--- a/dom/apps/src/Webapps.js
+++ b/dom/apps/src/Webapps.js
@@ -125,6 +125,7 @@ WebappsRegistry.prototype = {
     let requestID = this.getRequestId(request);
     let xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
     xhr.open("GET", aURL, true);
+    xhr.channel.loadFlags |= Ci.nsIRequest.VALIDATE_ALWAYS;
 
     xhr.addEventListener("load", (function() {
       if (xhr.status == 200) {
diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in
index 2d5d09d69193..bb4d99e9f467 100644
--- a/dom/apps/tests/Makefile.in
+++ b/dom/apps/tests/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/apps/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/base/ConsoleAPI.js b/dom/base/ConsoleAPI.js
index 7784274a397c..4a3f845beed5 100644
--- a/dom/base/ConsoleAPI.js
+++ b/dom/base/ConsoleAPI.js
@@ -335,9 +335,9 @@ ConsoleAPI.prototype = {
   /**
    * Process the console API call arguments in order to perform printf-like
    * string substitution.
-   * TODO: object substitution should display an interactive property list (bug
-   * 685815) and width and precision qualifiers should be taken into account
-   * (bug 685813).
+   *
+   * TODO: object substitution should take into account width and precision
+   * qualifiers (bug 685813).
    *
    * @param mixed aArguments
    *        The arguments given to the console API call.
@@ -346,12 +346,18 @@ ConsoleAPI.prototype = {
     if (aArguments.length < 2 || typeof aArguments[0] != "string") {
       return aArguments;
     }
+
     let args = Array.prototype.slice.call(aArguments);
     let format = args.shift();
+    let splitter = "%" + format.length + Date.now() + "%";
+    let objects = [];
+
     // Format specification regular expression.
     let processed = format.replace(ARGUMENT_PATTERN, function CA_PA_substitute(match, submatch) {
       switch (submatch) {
         case "o":
+          objects.push(args.shift());
+          return splitter;
         case "s":
           return String(args.shift());
         case "d":
@@ -363,8 +369,19 @@ ConsoleAPI.prototype = {
           return submatch;
       };
     });
-    args.unshift(processed);
-    return args;
+
+    let result = [];
+    let processedArray = processed.split(splitter);
+    processedArray.forEach(function(aValue, aIndex) {
+      if (aValue !== "") {
+        result.push(aValue);
+      }
+      if (objects[aIndex]) {
+        result.push(objects[aIndex]);
+      }
+    });
+
+    return result.concat(args);
   },
 
   /**
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index 632d2b3474c9..3f1443bb3a0d 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -63,6 +63,7 @@ EXPORTS = \
   nsPIWindowRoot.h \
   nsFocusManager.h \
   nsWrapperCache.h \
+  nsWrapperCacheInlines.h \
   nsContentPermissionHelper.h \
   nsStructuredCloneContainer.h \
   nsWindowMemoryReporter.h \
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 6627874a88a4..d6a2710ca90a 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -64,7 +64,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMXMLDocument.h"
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsContentUtils.h"
@@ -2375,7 +2374,6 @@ nsDOMClassInfo::RegisterExternalClasses()
 
 #define DOM_CLASSINFO_EVENT_MAP_ENTRIES                                       \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEvent)                                      \
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEvent)                                    \
 
 #define DOM_CLASSINFO_UI_EVENT_MAP_ENTRIES                                    \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMUIEvent)                                    \
@@ -6396,14 +6394,6 @@ nsDOMConstructor::ResolveInterfaceConstants(JSContext *cx, JSObject *obj)
   nsresult rv = DefineInterfaceConstants(cx, obj, class_iid);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Special case for |Event|, Event needs constants from NSEvent
-  // too for backwards compatibility.
-  if (class_iid->Equals(NS_GET_IID(nsIDOMEvent))) {
-    rv = DefineInterfaceConstants(cx, obj,
-                                  &NS_GET_IID(nsIDOMNSEvent));
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
   // Special case for |IDBKeyRange| which gets funny "static" functions.
   if (class_iid->Equals(NS_GET_IID(nsIIDBKeyRange)) &&
       !indexedDB::IDBKeyRange::DefineConstructors(cx, obj)) {
@@ -6548,14 +6538,6 @@ ResolvePrototype(nsIXPConnect *aXPConnect, nsGlobalWindow *aWin, JSContext *cx,
     rv = DefineInterfaceConstants(cx, class_obj, primary_iid);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    // Special case for |Event|, Event needs constants from NSEvent
-    // too for backwards compatibility.
-    if (primary_iid->Equals(NS_GET_IID(nsIDOMEvent))) {
-      rv = DefineInterfaceConstants(cx, class_obj,
-                                    &NS_GET_IID(nsIDOMNSEvent));
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
     // Special case for |IDBKeyRange| which gets funny "static" functions.
     if (primary_iid->Equals(NS_GET_IID(nsIIDBKeyRange)) &&
         !indexedDB::IDBKeyRange::DefineConstructors(cx, class_obj)) {
@@ -7387,17 +7369,12 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     }
 
     if (sDocument_id == id) {
-      nsCOMPtr<nsIDOMDocument> document;
-      rv = win->GetDocument(getter_AddRefs(document));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      // FIXME Ideally we'd have an nsIDocument here and get nsWrapperCache
-      //       from it.
-      jsval v;
+      nsCOMPtr<nsIDocument> document = win->GetDoc();
+      JS::Value v;
       nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-      rv = WrapNative(cx, JS_GetGlobalForScopeChain(cx), document,
-                      &NS_GET_IID(nsIDOMDocument), false, &v,
-                      getter_AddRefs(holder));
+      rv = WrapNative(cx, JS_GetGlobalForScopeChain(cx), document, document,
+                      &NS_GET_IID(nsIDOMDocument), &v, getter_AddRefs(holder),
+                      false);
       NS_ENSURE_SUCCESS(rv, rv);
 
       // The PostCreate hook for the document will handle defining the
@@ -10204,16 +10181,16 @@ NS_IMETHODIMP
 nsCSSStyleDeclSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
                             JSObject *globalObj, JSObject **parentObj)
 {
+#ifdef DEBUG
   nsWrapperCache* cache = nullptr;
   CallQueryInterface(nativeObj, &cache);
-  if (!cache) {
-    return nsDOMClassInfo::PreCreate(nativeObj, cx, globalObj, parentObj);
-  }
+  MOZ_ASSERT(cache, "All CSS declarations must be wrappercached");
+#endif
 
   nsICSSDeclaration *declaration = static_cast<nsICSSDeclaration*>(nativeObj);
   nsINode *native_parent = declaration->GetParentObject();
   if (!native_parent) {
-    return NS_ERROR_FAILURE;
+    return nsDOMClassInfo::PreCreate(nativeObj, cx, globalObj, parentObj);
   }
 
   nsresult rv =
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index 616a694d81bb..a0ed3a6ac5f0 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -7,7 +7,7 @@
 #include "nsPresContext.h"
 #include "nsDOMClassInfoID.h"
 #include "nsDOMError.h"
-#include "nsIDOMNSEvent.h"
+#include "nsIDOMEvent.h"
 #include "nsDOMWindowUtils.h"
 #include "nsQueryContentEventResult.h"
 #include "nsGlobalWindow.h"
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 3ea66b22f538..964ecb877ec9 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -32,7 +32,7 @@
 #include "nsLayoutUtils.h"
 #include "nsIPresShell.h"
 #include "nsIContentViewer.h"
-#include "nsFrameTraversal.h"
+#include "nsFrameIterator.h"
 #include "nsObjectFrame.h"
 #include "nsEventDispatcher.h"
 #include "nsEventStateManager.h"
@@ -2271,15 +2271,8 @@ nsFocusManager::GetSelectionLocation(nsIDocument* aDocument,
         if (nodeValue.Length() == (PRUint32)startOffset && !isFormControl &&
             startContent != aDocument->GetRootElement()) {
           // Yes, indeed we were at the end of the last node
-          nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-          nsresult rv = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                             presContext, startFrame,
-                                             eLeaf,
-                                             false, // aVisual
-                                             false, // aLockInScrollView
-                                             true      // aFollowOOFs
-                                             );
-          NS_ENSURE_SUCCESS(rv, rv);
+          nsFrameIterator frameTraversal(presContext, startFrame,
+                                         eLeaf, FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW);
 
           nsIFrame *newCaretFrame = nullptr;
           nsCOMPtr<nsIContent> newCaretContent = startContent;
@@ -2287,11 +2280,11 @@ nsFocusManager::GetSelectionLocation(nsIDocument* aDocument,
           do {
             // Continue getting the next frame until the primary content for the frame
             // we are on changes - we don't want to be stuck in the same place
-            frameTraversal->Next();
-            newCaretFrame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
+            frameTraversal.Next();
+            newCaretFrame = static_cast<nsIFrame*>(frameTraversal.CurrentItem());
             if (nullptr == newCaretFrame)
               break;
-            newCaretContent = newCaretFrame->GetContent();            
+            newCaretContent = newCaretFrame->GetContent();
           } while (!newCaretContent || newCaretContent == startContent);
 
           if (newCaretFrame && newCaretContent) {
@@ -2704,21 +2697,14 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
       continue;
     }
 
-    nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-    nsresult rv = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                       presContext, startFrame,
-                                       ePreOrder,
-                                       false, // aVisual
-                                       false, // aLockInScrollView
-                                       true      // aFollowOOFs
-                                       );
-    NS_ENSURE_SUCCESS(rv, rv);
+    nsFrameIterator frameTraversal(presContext, startFrame,
+                                   ePreOrder, FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW);
 
     if (iterStartContent == aRootContent) {
       if (!aForward) {
-        frameTraversal->Last();
+        frameTraversal.Last();
       } else if (aRootContent->IsFocusable()) {
-        frameTraversal->Next();
+        frameTraversal.Next();
       }
     }
     else if (getNextFrame &&
@@ -2727,13 +2713,13 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
       // Need to do special check in case we're in an imagemap which has multiple
       // content nodes per frame, so don't skip over the starting frame.
       if (aForward)
-        frameTraversal->Next();
+        frameTraversal.Next();
       else
-        frameTraversal->Prev();
+        frameTraversal.Prev();
     }
 
     // Walk frames to find something tabbable matching mCurrentTabIndex
-    nsIFrame* frame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
+    nsIFrame* frame = static_cast<nsIFrame*>(frameTraversal.CurrentItem());
     while (frame) {
       // TabIndex not set defaults to 0 for form elements, anchors and other
       // elements that are normally focusable. Tabindex defaults to -1
@@ -2803,10 +2789,10 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
               Element* rootElement = subdoc->GetRootElement();
               nsIPresShell* subShell = subdoc->GetShell();
               if (rootElement && subShell) {
-                rv = GetNextTabbableContent(subShell, rootElement,
-                                            aOriginalStartContent, rootElement,
-                                            aForward, (aForward ? 1 : 0),
-                                            false, aResultContent);
+                nsresult rv = GetNextTabbableContent(subShell, rootElement,
+                                                     aOriginalStartContent, rootElement,
+                                                     aForward, (aForward ? 1 : 0),
+                                                     false, aResultContent);
                 NS_ENSURE_SUCCESS(rv, rv);
                 if (*aResultContent)
                   return NS_OK;
@@ -2850,10 +2836,10 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
       // again.
       do {
         if (aForward)
-          frameTraversal->Next();
+          frameTraversal.Next();
         else
-          frameTraversal->Prev();
-        frame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
+          frameTraversal.Prev();
+        frame = static_cast<nsIFrame*>(frameTraversal.CurrentItem());
       } while (frame && frame->GetPrevContinuation());
     }
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 2c90f403a267..8eb091e4bd40 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -2830,25 +2830,23 @@ nsGlobalWindow::GetPrincipal()
 // nsGlobalWindow::nsIDOMWindow
 //*****************************************************************************
 
+void
+nsPIDOMWindow::MaybeCreateDoc()
+{
+  MOZ_ASSERT(!mDoc);
+  if (nsIDocShell* docShell = GetDocShell()) {
+    // Note that |document| here is the same thing as our mDocument, but we
+    // don't have to explicitly set the member variable because the docshell
+    // has already called SetNewDocument().
+    nsCOMPtr<nsIDocument> document = do_GetInterface(docShell);
+  }
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::GetDocument(nsIDOMDocument** aDocument)
 {
-  // This method *should* forward calls to the outer window, but since
-  // there's nothing here that *depends* on anything in the outer
-  // (GetDocShell() eliminates that dependency), we won't do that to
-  // avoid the extra virtual function call.
-
-  // lazily instantiate an about:blank document if necessary, and if
-  // we have what it takes to do so. Note that domdoc here is the same
-  // thing as our mDocument, but we don't have to explicitly set the
-  // member variable because the docshell has already called
-  // SetNewDocument().
-  nsIDocShell *docShell;
-  if (!mDocument && (docShell = GetDocShell()))
-    nsCOMPtr<nsIDOMDocument> domdoc(do_GetInterface(docShell));
-
-  NS_IF_ADDREF(*aDocument = mDocument);
-
+  nsCOMPtr<nsIDOMDocument> document = do_QueryInterface(GetDoc());
+  document.forget(aDocument);
   return NS_OK;
 }
 
diff --git a/dom/base/nsIScriptRuntime.h b/dom/base/nsIScriptRuntime.h
index 0a48d052594e..3a89fb0bd087 100644
--- a/dom/base/nsIScriptRuntime.h
+++ b/dom/base/nsIScriptRuntime.h
@@ -8,8 +8,8 @@
 #include "nsIScriptContext.h"
 
 #define NS_ISCRIPTRUNTIME_IID \
-{ 0xb146580f, 0x55f7, 0x4d97, \
-  { 0x8a, 0xbb, 0x4a, 0x50, 0xb0, 0xa8, 0x04, 0x97 } }
+{ 0xfa30d7a8, 0x7f0a, 0x437a, \
+  { 0xa1, 0x0c, 0xc2, 0xbe, 0xa3, 0xdb, 0x4f, 0x4b } }
 
 /**
  * A singleton language environment for an application.  Responsible for
@@ -21,13 +21,6 @@ class nsIScriptRuntime : public nsISupports
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTRUNTIME_IID)
 
-  /* Parses a "version string" for the language into a bit-mask used by
-   * the language implementation.  If the specified version is not supported
-   * an error should be returned.  If the specified version is blank, a default
-   * version should be assumed
-   */
-  virtual nsresult ParseVersion(const nsString &aVersionStr, PRUint32 *verFlags) = 0;
-  
   /* Factory for a new context for this language */
   virtual already_AddRefed<nsIScriptContext> CreateContext() = 0;
   
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 5a96707d52aa..69be047e5bde 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -3666,29 +3666,6 @@ nsJSRuntime::CreateContext()
   return scriptContext.forget();
 }
 
-nsresult
-nsJSRuntime::ParseVersion(const nsString &aVersionStr, PRUint32 *flags)
-{
-    NS_PRECONDITION(flags, "Null flags param?");
-    JSVersion jsVersion = JSVERSION_UNKNOWN;
-    if (aVersionStr.Length() != 3 || aVersionStr[0] != '1' || aVersionStr[1] != '.')
-        jsVersion = JSVERSION_UNKNOWN;
-    else switch (aVersionStr[2]) {
-        case '0': jsVersion = JSVERSION_1_0; break;
-        case '1': jsVersion = JSVERSION_1_1; break;
-        case '2': jsVersion = JSVERSION_1_2; break;
-        case '3': jsVersion = JSVERSION_1_3; break;
-        case '4': jsVersion = JSVERSION_1_4; break;
-        case '5': jsVersion = JSVERSION_1_5; break;
-        case '6': jsVersion = JSVERSION_1_6; break;
-        case '7': jsVersion = JSVERSION_1_7; break;
-        case '8': jsVersion = JSVERSION_1_8; break;
-        default:  jsVersion = JSVERSION_UNKNOWN;
-    }
-    *flags = (PRUint32)jsVersion;
-    return NS_OK;
-}
-
 //static
 void
 nsJSRuntime::Startup()
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 823c356b1c1a..3b0f29ebcff1 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -317,8 +317,6 @@ public:
 
   virtual already_AddRefed<nsIScriptContext> CreateContext();
 
-  virtual nsresult ParseVersion(const nsString &aVersionStr, PRUint32 *flags);
-
   virtual nsresult DropScriptObject(void *object);
   virtual nsresult HoldScriptObject(void *object);
   
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index bc1dc5e78310..1d40ebfba0b3 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -172,6 +172,20 @@ public:
     return mDoc;
   }
 
+  nsIDocument* GetDoc()
+  {
+    if (!mDoc) {
+      MaybeCreateDoc();
+    }
+    return mDoc;
+  }
+
+protected:
+  // Lazily instantiate an about:blank document if necessary, and if
+  // we have what it takes to do so.
+  void MaybeCreateDoc();
+
+public:
   // Internal getter/setter for the frame element, this version of the
   // getter crosses chrome boundaries whereas the public scriptable
   // one doesn't for security reasons.
@@ -603,8 +617,8 @@ public:
   virtual bool IsPartOfApp() = 0;
 
   /**
-   * Returns true of this window is part of an we app, and this window has
-   * the same origin (principal) as the web app.
+   * Returns true if this window is part of a web app and has the same origin
+   * (principal) as the app.
    */
   virtual bool IsInAppOrigin() = 0;
 
diff --git a/dom/base/test/Makefile.in b/dom/base/test/Makefile.in
index 449ee0dff996..24410a46bc16 100644
--- a/dom/base/test/Makefile.in
+++ b/dom/base/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/base/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in
index 4fa72c98171e..9b18371dcc27 100644
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/battery/test/Makefile.in b/dom/battery/test/Makefile.in
index b19dca58466d..017d490a720d 100644
--- a/dom/battery/test/Makefile.in
+++ b/dom/battery/test/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/battery/test
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index a684d8a89b6a..0c4a0fd93584 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -403,13 +403,7 @@ QueryInterface(JSContext* cx, unsigned argc, JS::Value* vp)
 JSBool
 ThrowingConstructor(JSContext* cx, unsigned argc, JS::Value* vp)
 {
-  return Throw<true>(cx, NS_ERROR_FAILURE);
-}
-
-JSBool
-ThrowingConstructorWorkers(JSContext* cx, unsigned argc, JS::Value* vp)
-{
-  return Throw<false>(cx, NS_ERROR_FAILURE);
+  return ThrowErrorMessage(cx, MSG_ILLEGAL_CONSTRUCTOR);
 }
 
 bool
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index 13f292bac9b6..a00e199e3dcb 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -690,8 +690,6 @@ JSBool
 QueryInterface(JSContext* cx, unsigned argc, JS::Value* vp);
 JSBool
 ThrowingConstructor(JSContext* cx, unsigned argc, JS::Value* vp);
-JSBool
-ThrowingConstructorWorkers(JSContext* cx, unsigned argc, JS::Value* vp);
 
 template<class T>
 class NonNull
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 6aa3eb3a4cc6..edb95f9a9a12 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -1118,7 +1118,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
             constructHook = CONSTRUCT_HOOK_NAME
             constructArgs = methodLength(self.descriptor.interface.ctor())
         else:
-            constructHook = "ThrowingConstructorWorkers" if self.descriptor.workers else "ThrowingConstructor"
+            constructHook = "ThrowingConstructor"
             constructArgs = 0
 
         call = CGGeneric(("return dom::CreateInterfaceObjects(aCx, aGlobal, aReceiver, parentProto,\n"
@@ -1213,24 +1213,27 @@ def CheckPref(descriptor, globalName, varName, retval, wrapperCache = None):
     """
     if not descriptor.prefable:
         return ""
+
     if wrapperCache:
        wrapperCache = "      %s->ClearIsDOMBinding();\n" % (wrapperCache)
     else:
         wrapperCache = ""
+
+    failureCode = ("      %s = false;\n" +
+                   "      return %s;") % (varName, retval)
     return """
   {
     XPCWrappedNativeScope* scope =
       XPCWrappedNativeScope::FindInJSObjectScope(aCx, %s);
     if (!scope) {
-      return %s;
+%s
     }
 
     if (!scope->ExperimentalBindingsEnabled()) {
-%s      %s = false;
-      return %s;
+%s%s
     }
   }
-""" % (globalName, retval, wrapperCache, varName, retval)
+""" % (globalName, failureCode, wrapperCache, failureCode)
 
 class CGDefineDOMInterfaceMethod(CGAbstractMethod):
     """
diff --git a/dom/bindings/Errors.msg b/dom/bindings/Errors.msg
index 0ce10da33857..20e66ee86cc2 100644
--- a/dom/bindings/Errors.msg
+++ b/dom/bindings/Errors.msg
@@ -24,3 +24,4 @@ MSG_DEF(MSG_MISSING_ARGUMENTS, 1, "Not enough arguments to {0}.")
 MSG_DEF(MSG_NOT_OBJECT, 0, "Value not an object.")
 MSG_DEF(MSG_DOES_NOT_IMPLEMENT_INTERFACE, 1, "Value does not implement interface {0}.")
 MSG_DEF(MSG_NOT_IN_UNION, 1, "Value could not be converted to any of: {0}.")
+MSG_DEF(MSG_ILLEGAL_CONSTRUCTOR, 0, "Illegal constructor.")
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index c8bdfaff54c4..fa6f29ba06f1 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
@@ -62,15 +62,16 @@ EXPORTS_mozilla = \
   $(NULL)
 
 EXPORTS_$(binding_include_path) = \
+  BindingUtils.h \
   DOMJSClass.h \
   Errors.msg \
+  Nullable.h \
+  PrimitiveConversions.h \
   PrototypeList.h \
   RegisterBindings.h \
-  Nullable.h \
   TypedArray.h \
-  BindingUtils.h \
-  UnionTypes.h \
   UnionConversions.h \
+  UnionTypes.h \
   $(exported_binding_headers) \
   $(NULL)
 
diff --git a/dom/bindings/PrimitiveConversions.h b/dom/bindings/PrimitiveConversions.h
index deff9253412a..3e244291bcb5 100644
--- a/dom/bindings/PrimitiveConversions.h
+++ b/dom/bindings/PrimitiveConversions.h
@@ -91,7 +91,7 @@ struct PrimitiveConversionTraits<int64_t> {
   typedef int64_t jstype;
   typedef int64_t intermediateType;
   static inline bool converter(JSContext* cx, JS::Value v, jstype* retval) {
-    return xpc::ValueToInt64(cx, v, retval);
+    return JS::ToInt64(cx, v, retval);
   }
 };
 
@@ -100,7 +100,7 @@ struct PrimitiveConversionTraits<uint64_t> {
   typedef uint64_t jstype;
   typedef uint64_t intermediateType;
   static inline bool converter(JSContext* cx, JS::Value v, jstype* retval) {
-    return xpc::ValueToUint64(cx, v, retval);
+    return JS::ToUint64(cx, v, retval);
   }
 };
 
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index b4c5b9df876a..5acc1acb2344 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/bindings/test
+relativesrcdir = @relativesrcdir@
 
 MODULE           = dom
 LIBRARY_NAME     = dombindings_test_s
@@ -49,7 +49,8 @@ bindinggen_dependencies := \
   $(GLOBAL_DEPS) \
   $(NULL)
 
-MOCHITEST_FILES = \
+MOCHITEST_FILES := \
+  test_bug773326.html \
   test_enums.html \
   test_integers.html \
   test_interfaceToString.html \
diff --git a/dom/bindings/test/test_bug773326.html b/dom/bindings/test/test_bug773326.html
new file mode 100644
index 000000000000..2e3b1ea304d0
--- /dev/null
+++ b/dom/bindings/test/test_bug773326.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test for Bug 773326</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  new Worker("data:text/javascript,new XMLHttpRequest(42)");
+}, "Should not crash")
+</script>
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
index 2200308a1268..097a79cf8c25 100644
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/bluetooth/nsIDOMBluetoothDeviceEvent.idl b/dom/bluetooth/nsIDOMBluetoothDeviceEvent.idl
index 24ee26138956..cba9736cdb93 100644
--- a/dom/bluetooth/nsIDOMBluetoothDeviceEvent.idl
+++ b/dom/bluetooth/nsIDOMBluetoothDeviceEvent.idl
@@ -8,7 +8,7 @@
 
 interface nsIDOMBluetoothDevice;
 
-[scriptable, builtinclass, uuid(49294da3-b698-4a7f-aca2-3f9bc44c7625)]
+[scriptable, builtinclass, uuid(819b4683-23a9-4af9-96b9-2c40a14ecb0b)]
 interface nsIDOMBluetoothDeviceEvent : nsIDOMEvent
 {
   readonly attribute nsIDOMBluetoothDevice device;
diff --git a/dom/bluetooth/nsIDOMBluetoothPropertyEvent.idl b/dom/bluetooth/nsIDOMBluetoothPropertyEvent.idl
index 4e25e23308ad..4428ffb65cc6 100644
--- a/dom/bluetooth/nsIDOMBluetoothPropertyEvent.idl
+++ b/dom/bluetooth/nsIDOMBluetoothPropertyEvent.idl
@@ -6,7 +6,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(2604ce78-abaa-4af4-b456-daa4c6386a11)]
+[scriptable, builtinclass, uuid(5927bb1f-e8eb-4b40-ae20-cd02f34412ce)]
 interface nsIDOMBluetoothPropertyEvent : nsIDOMEvent
 {
   readonly attribute DOMString property;
diff --git a/dom/browser-element/BrowserElementScrolling.js b/dom/browser-element/BrowserElementScrolling.js
index 0788d4694805..c07a759daf16 100644
--- a/dom/browser-element/BrowserElementScrolling.js
+++ b/dom/browser-element/BrowserElementScrolling.js
@@ -117,20 +117,12 @@ const ContentPanning = {
 
     let nodeContent = node.ownerDocument.defaultView;
     while (!(node instanceof Ci.nsIDOMHTMLBodyElement)) {
-      let style = nodeContent.getComputedStyle(node, null);
-
-      let overflow = [style.getPropertyValue('overflow'),
-                      style.getPropertyValue('overflow-x'),
-                      style.getPropertyValue('overflow-y')];
-
-      let rect = node.getBoundingClientRect();
-      let isAuto = (overflow.indexOf('auto') != -1 &&
-                   (rect.height < node.scrollHeight ||
-                    rect.width < node.scrollWidth));
-
-      let isScroll = (overflow.indexOf('scroll') != -1);
-      if (isScroll || isAuto)
+      if (node.scrollHeight > node.clientHeight ||
+          node.scrollWidth > node.clientWidth ||
+          ('scrollLeftMax' in node && node.scrollLeftMax > 0) ||
+          ('scrollTopMax' in node && node.scrollTopMax > 0)) {
         return [node, this._generateCallback(node)];
+      }
 
       node = node.parentNode;
     }
diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in
index 6226743a0efd..99e227c1754b 100644
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in
index 470d66138dfd..951a1eec3666 100644
--- a/dom/browser-element/mochitest/Makefile.in
+++ b/dom/browser-element/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/browser-element/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in
index a86c3ff75005..071488b66f65 100644
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/contacts/Makefile.in b/dom/contacts/Makefile.in
index cce4f163fcd0..decf53916f86 100644
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH            = \
diff --git a/dom/contacts/tests/Makefile.in b/dom/contacts/tests/Makefile.in
index 3fe1897c04ee..9f53a7ccb2b8 100644
--- a/dom/contacts/tests/Makefile.in
+++ b/dom/contacts/tests/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/contacts/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h
index c039faf94b30..e29b1e3110c2 100644
--- a/dom/devicestorage/DeviceStorage.h
+++ b/dom/devicestorage/DeviceStorage.h
@@ -66,7 +66,7 @@ private:
   enum {
       DEVICE_STORAGE_TYPE_DEFAULT = 0,
       DEVICE_STORAGE_TYPE_SHARED,
-      DEVICE_STORAGE_TYPE_EXTERNAL,
+      DEVICE_STORAGE_TYPE_EXTERNAL
   };
 };
 
diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in
index c45165fa3251..1755647e230a 100644
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/devicestorage/ipc/Makefile.in b/dom/devicestorage/ipc/Makefile.in
index bc03fb322dfb..d843f292944f 100644
--- a/dom/devicestorage/ipc/Makefile.in
+++ b/dom/devicestorage/ipc/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/devicestorage/ipc
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/devicestorage/test/Makefile.in b/dom/devicestorage/test/Makefile.in
index 664ae75ce913..e7791648c1ed 100644
--- a/dom/devicestorage/test/Makefile.in
+++ b/dom/devicestorage/test/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/file/LockedFile.cpp b/dom/file/LockedFile.cpp
index 037c24e172a0..116e585c2ec0 100644
--- a/dom/file/LockedFile.cpp
+++ b/dom/file/LockedFile.cpp
@@ -535,7 +535,7 @@ LockedFile::SetLocation(JSContext* aCx,
   }
 
   uint64_t location;
-  if (!xpc::ValueToUint64(aCx, aLocation, &location)) {
+  if (!JS::ToUint64(aCx, aLocation, &location)) {
     return NS_ERROR_TYPE_ERR;
   }
 
diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in
index 5f53559b1fdd..26753586f96f 100644
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/file/test/Makefile.in b/dom/file/test/Makefile.in
index dd3f5f27b9e4..853285039f79 100644
--- a/dom/file/test/Makefile.in
+++ b/dom/file/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
-relativesrcdir   = dom/file/test
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/identity/Makefile.in b/dom/identity/Makefile.in
index 4b8233e6eb3e..5a32349fbb13 100644
--- a/dom/identity/Makefile.in
+++ b/dom/identity/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/identity
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/identity/tests/Makefile.in b/dom/identity/tests/Makefile.in
index 58e64b396a63..89a9b3cc8f75 100644
--- a/dom/identity/tests/Makefile.in
+++ b/dom/identity/tests/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/identity/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in
index ce70534ad0f3..56de5a5a5d16 100644
--- a/dom/imptests/Makefile.in
+++ b/dom/imptests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -13,6 +13,7 @@ DIRS = \
   failures/editing/selecttest \
   failures/html/tests/submission/Opera/microdata \
   failures/webapps/DOMCore/tests/approved \
+  failures/webapps/DOMCore/tests/submissions/Ms2ger \
   failures/webapps/DOMCore/tests/submissions/Opera \
   failures/webapps/WebStorage/tests/submissions/Infraware \
   failures/webapps/WebStorage/tests/submissions/Ms2ger \
diff --git a/dom/imptests/editing/Makefile.in b/dom/imptests/editing/Makefile.in
index 41055bf9db8f..f29e44efc821 100644
--- a/dom/imptests/editing/Makefile.in
+++ b/dom/imptests/editing/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/editing
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   css \
diff --git a/dom/imptests/editing/conformancetest/Makefile.in b/dom/imptests/editing/conformancetest/Makefile.in
index 67687b295f82..1d5252fee3cf 100644
--- a/dom/imptests/editing/conformancetest/Makefile.in
+++ b/dom/imptests/editing/conformancetest/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/editing/conformancetest
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/editing/css/Makefile.in b/dom/imptests/editing/css/Makefile.in
index 2695b1573ee6..5a3c51fdefa6 100644
--- a/dom/imptests/editing/css/Makefile.in
+++ b/dom/imptests/editing/css/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/editing/css
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/editing/selecttest/Makefile.in b/dom/imptests/editing/selecttest/Makefile.in
index 96663dd89db4..cb0d1e8a67f9 100644
--- a/dom/imptests/editing/selecttest/Makefile.in
+++ b/dom/imptests/editing/selecttest/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/editing/selecttest
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/editing/conformancetest/Makefile.in b/dom/imptests/failures/editing/conformancetest/Makefile.in
index 7774229e77f9..64f5b1b5fb53 100644
--- a/dom/imptests/failures/editing/conformancetest/Makefile.in
+++ b/dom/imptests/failures/editing/conformancetest/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/editing/conformancetest
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/editing/selecttest/Makefile.in b/dom/imptests/failures/editing/selecttest/Makefile.in
index 3f4c5c9bb3bc..208ad34d82b2 100644
--- a/dom/imptests/failures/editing/selecttest/Makefile.in
+++ b/dom/imptests/failures/editing/selecttest/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/editing/selecttest
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/html/tests/submission/Opera/microdata/Makefile.in b/dom/imptests/failures/html/tests/submission/Opera/microdata/Makefile.in
index eb7f21c7a121..82f46798d3ac 100644
--- a/dom/imptests/failures/html/tests/submission/Opera/microdata/Makefile.in
+++ b/dom/imptests/failures/html/tests/submission/Opera/microdata/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/html/tests/submission/Opera/microdata 
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
index 2af8cf71e585..d4d7614de29b 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
+++ b/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/webapps/DOMCore/tests/approved
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/approved/test_Range-compareBoundaryPoints.html.json b/dom/imptests/failures/webapps/DOMCore/tests/approved/test_Range-compareBoundaryPoints.html.json
index c131180c2f58..e983d12a946b 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/approved/test_Range-compareBoundaryPoints.html.json
+++ b/dom/imptests/failures/webapps/DOMCore/tests/approved/test_Range-compareBoundaryPoints.html.json
@@ -1,14 +1,6 @@
 {
   "0,0,0: context range 0 [detached], argument range 0 [detached], how 0": true,
-  "0,0,1: context range 0 [detached], argument range 0 [detached], how 1": true,
-  "0,0,2: context range 0 [detached], argument range 0 [detached], how 2": true,
-  "0,0,3: context range 0 [detached], argument range 0 [detached], how 3": true,
-  "0,0,4: context range 0 [detached], argument range 0 [detached], how -1": true,
-  "0,0,5: context range 0 [detached], argument range 0 [detached], how 4": true,
-  "0,0,6: context range 0 [detached], argument range 0 [detached], how 5": true,
-  "0,0,7: context range 0 [detached], argument range 0 [detached], how NaN": true,
-  "0,0,8: context range 0 [detached], argument range 0 [detached], how -0": true,
-  "0,0,9: context range 0 [detached], argument range 0 [detached], how Infinity": true,
+  "0,0,100: context range 0 [detached], argument range 0 [detached], how \"quasit\"": true,
   "0,0,10: context range 0 [detached], argument range 0 [detached], how -Infinity": true,
   "0,0,11: context range 0 [detached], argument range 0 [detached], how 65535": true,
   "0,0,12: context range 0 [detached], argument range 0 [detached], how 65536": true,
@@ -19,6 +11,7 @@
   "0,0,17: context range 0 [detached], argument range 0 [detached], how -65537": true,
   "0,0,18: context range 0 [detached], argument range 0 [detached], how -65536": true,
   "0,0,19: context range 0 [detached], argument range 0 [detached], how -65535": true,
+  "0,0,1: context range 0 [detached], argument range 0 [detached], how 1": true,
   "0,0,20: context range 0 [detached], argument range 0 [detached], how -65534": true,
   "0,0,21: context range 0 [detached], argument range 0 [detached], how -65533": true,
   "0,0,22: context range 0 [detached], argument range 0 [detached], how -65532": true,
@@ -29,6 +22,7 @@
   "0,0,27: context range 0 [detached], argument range 0 [detached], how 4294967299": true,
   "0,0,28: context range 0 [detached], argument range 0 [detached], how 4294967300": true,
   "0,0,29: context range 0 [detached], argument range 0 [detached], how -0.5": true,
+  "0,0,2: context range 0 [detached], argument range 0 [detached], how 2": true,
   "0,0,30: context range 0 [detached], argument range 0 [detached], how 0.5": true,
   "0,0,31: context range 0 [detached], argument range 0 [detached], how 1.5": true,
   "0,0,32: context range 0 [detached], argument range 0 [detached], how 2.5": true,
@@ -39,6 +33,7 @@
   "0,0,37: context range 0 [detached], argument range 0 [detached], how 0.5": true,
   "0,0,38: context range 0 [detached], argument range 0 [detached], how 1.5": true,
   "0,0,39: context range 0 [detached], argument range 0 [detached], how 2.5": true,
+  "0,0,3: context range 0 [detached], argument range 0 [detached], how 3": true,
   "0,0,40: context range 0 [detached], argument range 0 [detached], how 3.5": true,
   "0,0,41: context range 0 [detached], argument range 0 [detached], how -73.5": true,
   "0,0,42: context range 0 [detached], argument range 0 [detached], how -72.5": true,
@@ -49,6 +44,7 @@
   "0,0,47: context range 0 [detached], argument range 0 [detached], how \"0\"": true,
   "0,0,48: context range 0 [detached], argument range 0 [detached], how \"1\"": true,
   "0,0,49: context range 0 [detached], argument range 0 [detached], how \"2\"": true,
+  "0,0,4: context range 0 [detached], argument range 0 [detached], how -1": true,
   "0,0,50: context range 0 [detached], argument range 0 [detached], how \"3\"": true,
   "0,0,51: context range 0 [detached], argument range 0 [detached], how \"-1\"": true,
   "0,0,52: context range 0 [detached], argument range 0 [detached], how \"4\"": true,
@@ -59,6 +55,7 @@
   "0,0,57: context range 0 [detached], argument range 0 [detached], how \"-Infinity\"": true,
   "0,0,58: context range 0 [detached], argument range 0 [detached], how \"65535\"": true,
   "0,0,59: context range 0 [detached], argument range 0 [detached], how \"65536\"": true,
+  "0,0,5: context range 0 [detached], argument range 0 [detached], how 4": true,
   "0,0,60: context range 0 [detached], argument range 0 [detached], how \"65537\"": true,
   "0,0,61: context range 0 [detached], argument range 0 [detached], how \"65538\"": true,
   "0,0,62: context range 0 [detached], argument range 0 [detached], how \"65539\"": true,
@@ -69,6 +66,7 @@
   "0,0,67: context range 0 [detached], argument range 0 [detached], how \"-65534\"": true,
   "0,0,68: context range 0 [detached], argument range 0 [detached], how \"-65533\"": true,
   "0,0,69: context range 0 [detached], argument range 0 [detached], how \"-65532\"": true,
+  "0,0,6: context range 0 [detached], argument range 0 [detached], how 5": true,
   "0,0,70: context range 0 [detached], argument range 0 [detached], how \"4294967295\"": true,
   "0,0,71: context range 0 [detached], argument range 0 [detached], how \"4294967296\"": true,
   "0,0,72: context range 0 [detached], argument range 0 [detached], how \"4294967297\"": true,
@@ -79,6 +77,7 @@
   "0,0,77: context range 0 [detached], argument range 0 [detached], how \"0.5\"": true,
   "0,0,78: context range 0 [detached], argument range 0 [detached], how \"1.5\"": true,
   "0,0,79: context range 0 [detached], argument range 0 [detached], how \"2.5\"": true,
+  "0,0,7: context range 0 [detached], argument range 0 [detached], how NaN": true,
   "0,0,80: context range 0 [detached], argument range 0 [detached], how \"3.5\"": true,
   "0,0,81: context range 0 [detached], argument range 0 [detached], how \"4.5\"": true,
   "0,0,82: context range 0 [detached], argument range 0 [detached], how \"-1.5\"": true,
@@ -89,6 +88,7 @@
   "0,0,87: context range 0 [detached], argument range 0 [detached], how \"3.5\"": true,
   "0,0,88: context range 0 [detached], argument range 0 [detached], how \"-73.5\"": true,
   "0,0,89: context range 0 [detached], argument range 0 [detached], how \"-72.5\"": true,
+  "0,0,8: context range 0 [detached], argument range 0 [detached], how -0": true,
   "0,0,90: context range 0 [detached], argument range 0 [detached], how \"-71.5\"": true,
   "0,0,91: context range 0 [detached], argument range 0 [detached], how \"-70.5\"": true,
   "0,0,92: context range 0 [detached], argument range 0 [detached], how \"-69.5\"": true,
@@ -99,140 +99,11 @@
   "0,0,97: context range 0 [detached], argument range 0 [detached], how true": true,
   "0,0,98: context range 0 [detached], argument range 0 [detached], how false": true,
   "0,0,99: context range 0 [detached], argument range 0 [detached], how \"\"": true,
-  "0,0,100: context range 0 [detached], argument range 0 [detached], how \"quasit\"": true,
+  "0,0,9: context range 0 [detached], argument range 0 [detached], how Infinity": true,
   "0,1,0: context range 0 [detached], argument range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], how 0": true,
   "0,1,1: context range 0 [detached], argument range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], how 1": true,
   "0,1,2: context range 0 [detached], argument range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], how 2": true,
   "0,1,3: context range 0 [detached], argument range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], how 3": true,
-  "0,2,0: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 0": true,
-  "0,2,1: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 1": true,
-  "0,2,2: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 2": true,
-  "0,2,3: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 3": true,
-  "0,3,0: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 0": true,
-  "0,3,1: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 1": true,
-  "0,3,2: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 2": true,
-  "0,3,3: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 3": true,
-  "0,3,4: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1": true,
-  "0,3,5: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4": true,
-  "0,3,6: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 5": true,
-  "0,3,7: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how NaN": true,
-  "0,3,8: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -0": true,
-  "0,3,9: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how Infinity": true,
-  "0,3,10: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -Infinity": true,
-  "0,3,11: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65535": true,
-  "0,3,12: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65536": true,
-  "0,3,13: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65537": true,
-  "0,3,14: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65538": true,
-  "0,3,15: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65539": true,
-  "0,3,16: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65540": true,
-  "0,3,17: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65537": true,
-  "0,3,18: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65536": true,
-  "0,3,19: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65535": true,
-  "0,3,20: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65534": true,
-  "0,3,21: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65533": true,
-  "0,3,22: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65532": true,
-  "0,3,23: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967295": true,
-  "0,3,24: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967296": true,
-  "0,3,25: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967297": true,
-  "0,3,26: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967298": true,
-  "0,3,27: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967299": true,
-  "0,3,28: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967300": true,
-  "0,3,29: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -0.5": true,
-  "0,3,30: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 0.5": true,
-  "0,3,31: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 1.5": true,
-  "0,3,32: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 2.5": true,
-  "0,3,33: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 3.5": true,
-  "0,3,34: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4.5": true,
-  "0,3,35: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1.5": true,
-  "0,3,36: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -0.5": true,
-  "0,3,37: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 0.5": true,
-  "0,3,38: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 1.5": true,
-  "0,3,39: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 2.5": true,
-  "0,3,40: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 3.5": true,
-  "0,3,41: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -73.5": true,
-  "0,3,42: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -72.5": true,
-  "0,3,43: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -71.5": true,
-  "0,3,44: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -70.5": true,
-  "0,3,45: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -69.5": true,
-  "0,3,46: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -68.5": true,
-  "0,3,47: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0\"": true,
-  "0,3,48: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"1\"": true,
-  "0,3,49: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"2\"": true,
-  "0,3,50: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"3\"": true,
-  "0,3,51: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1\"": true,
-  "0,3,52: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4\"": true,
-  "0,3,53: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"5\"": true,
-  "0,3,54: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"NaN\"": true,
-  "0,3,55: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0\"": true,
-  "0,3,56: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"Infinity\"": true,
-  "0,3,57: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-Infinity\"": true,
-  "0,3,58: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65535\"": true,
-  "0,3,59: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65536\"": true,
-  "0,3,60: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65537\"": true,
-  "0,3,61: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65538\"": true,
-  "0,3,62: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65539\"": true,
-  "0,3,63: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65540\"": true,
-  "0,3,64: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65537\"": true,
-  "0,3,65: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65536\"": true,
-  "0,3,66: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65535\"": true,
-  "0,3,67: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65534\"": true,
-  "0,3,68: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65533\"": true,
-  "0,3,69: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65532\"": true,
-  "0,3,70: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967295\"": true,
-  "0,3,71: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967296\"": true,
-  "0,3,72: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967297\"": true,
-  "0,3,73: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967298\"": true,
-  "0,3,74: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967299\"": true,
-  "0,3,75: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967300\"": true,
-  "0,3,76: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-0.5\"": true,
-  "0,3,77: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0.5\"": true,
-  "0,3,78: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"1.5\"": true,
-  "0,3,79: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"2.5\"": true,
-  "0,3,80: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"3.5\"": true,
-  "0,3,81: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4.5\"": true,
-  "0,3,82: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1.5\"": true,
-  "0,3,83: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-0.5\"": true,
-  "0,3,84: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0.5\"": true,
-  "0,3,85: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"1.5\"": true,
-  "0,3,86: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"2.5\"": true,
-  "0,3,87: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"3.5\"": true,
-  "0,3,88: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-73.5\"": true,
-  "0,3,89: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-72.5\"": true,
-  "0,3,90: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-71.5\"": true,
-  "0,3,91: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-70.5\"": true,
-  "0,3,92: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-69.5\"": true,
-  "0,3,93: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-68.5\"": true,
-  "0,3,94: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"6.5536e4\"": true,
-  "0,3,95: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how null": true,
-  "0,3,96: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how undefined": true,
-  "0,3,97: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how true": true,
-  "0,3,98: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how false": true,
-  "0,3,99: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"\"": true,
-  "0,3,100: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"quasit\"": true,
-  "0,4,0: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 0": true,
-  "0,4,1: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 1": true,
-  "0,4,2: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 2": true,
-  "0,4,3: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 3": true,
-  "0,5,0: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 0": true,
-  "0,5,1: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 1": true,
-  "0,5,2: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 2": true,
-  "0,5,3: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 3": true,
-  "0,6,0: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 0": true,
-  "0,6,1: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 1": true,
-  "0,6,2: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 2": true,
-  "0,6,3: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 3": true,
-  "0,7,0: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 0": true,
-  "0,7,1: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 1": true,
-  "0,7,2: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 2": true,
-  "0,7,3: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 3": true,
-  "0,8,0: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 0": true,
-  "0,8,1: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 1": true,
-  "0,8,2: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 2": true,
-  "0,8,3: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 3": true,
-  "0,9,0: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 0": true,
-  "0,9,1: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 1": true,
-  "0,9,2: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 2": true,
-  "0,9,3: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 3": true,
   "0,10,0: context range 0 [detached], argument range 10 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 1], how 0": true,
   "0,10,1: context range 0 [detached], argument range 10 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 1], how 1": true,
   "0,10,2: context range 0 [detached], argument range 10 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 1], how 2": true,
@@ -273,16 +144,12 @@
   "0,19,1: context range 0 [detached], argument range 19 [document.body, 4, document.body, 5], how 1": true,
   "0,19,2: context range 0 [detached], argument range 19 [document.body, 4, document.body, 5], how 2": true,
   "0,19,3: context range 0 [detached], argument range 19 [document.body, 4, document.body, 5], how 3": true,
+  "0,2,0: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 0": true,
+  "0,2,1: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 1": true,
+  "0,2,2: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 2": true,
+  "0,2,3: context range 0 [detached], argument range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], how 3": true,
   "0,20,0: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 0": true,
-  "0,20,1: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 1": true,
-  "0,20,2: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 2": true,
-  "0,20,3: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 3": true,
-  "0,20,4: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1": true,
-  "0,20,5: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4": true,
-  "0,20,6: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 5": true,
-  "0,20,7: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how NaN": true,
-  "0,20,8: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -0": true,
-  "0,20,9: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how Infinity": true,
+  "0,20,100: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"quasit\"": true,
   "0,20,10: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -Infinity": true,
   "0,20,11: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65535": true,
   "0,20,12: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65536": true,
@@ -293,6 +160,7 @@
   "0,20,17: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65537": true,
   "0,20,18: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65536": true,
   "0,20,19: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65535": true,
+  "0,20,1: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 1": true,
   "0,20,20: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65534": true,
   "0,20,21: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65533": true,
   "0,20,22: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65532": true,
@@ -303,6 +171,7 @@
   "0,20,27: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967299": true,
   "0,20,28: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967300": true,
   "0,20,29: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -0.5": true,
+  "0,20,2: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 2": true,
   "0,20,30: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 0.5": true,
   "0,20,31: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 1.5": true,
   "0,20,32: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 2.5": true,
@@ -313,6 +182,7 @@
   "0,20,37: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 0.5": true,
   "0,20,38: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 1.5": true,
   "0,20,39: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 2.5": true,
+  "0,20,3: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 3": true,
   "0,20,40: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 3.5": true,
   "0,20,41: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -73.5": true,
   "0,20,42: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -72.5": true,
@@ -323,6 +193,7 @@
   "0,20,47: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"0\"": true,
   "0,20,48: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"1\"": true,
   "0,20,49: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"2\"": true,
+  "0,20,4: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1": true,
   "0,20,50: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"3\"": true,
   "0,20,51: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1\"": true,
   "0,20,52: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4\"": true,
@@ -333,6 +204,7 @@
   "0,20,57: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-Infinity\"": true,
   "0,20,58: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65535\"": true,
   "0,20,59: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65536\"": true,
+  "0,20,5: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4": true,
   "0,20,60: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65537\"": true,
   "0,20,61: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65538\"": true,
   "0,20,62: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65539\"": true,
@@ -343,6 +215,7 @@
   "0,20,67: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65534\"": true,
   "0,20,68: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65533\"": true,
   "0,20,69: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65532\"": true,
+  "0,20,6: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 5": true,
   "0,20,70: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967295\"": true,
   "0,20,71: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967296\"": true,
   "0,20,72: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967297\"": true,
@@ -353,6 +226,7 @@
   "0,20,77: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"0.5\"": true,
   "0,20,78: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"1.5\"": true,
   "0,20,79: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"2.5\"": true,
+  "0,20,7: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how NaN": true,
   "0,20,80: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"3.5\"": true,
   "0,20,81: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4.5\"": true,
   "0,20,82: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1.5\"": true,
@@ -363,6 +237,7 @@
   "0,20,87: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"3.5\"": true,
   "0,20,88: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-73.5\"": true,
   "0,20,89: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-72.5\"": true,
+  "0,20,8: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -0": true,
   "0,20,90: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-71.5\"": true,
   "0,20,91: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-70.5\"": true,
   "0,20,92: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-69.5\"": true,
@@ -373,7 +248,7 @@
   "0,20,97: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how true": true,
   "0,20,98: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how false": true,
   "0,20,99: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"\"": true,
-  "0,20,100: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"quasit\"": true,
+  "0,20,9: context range 0 [detached], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how Infinity": true,
   "0,21,0: context range 0 [detached], argument range 21 [foreignDoc.head, 1, foreignDoc.head, 1], how 0": true,
   "0,21,1: context range 0 [detached], argument range 21 [foreignDoc.head, 1, foreignDoc.head, 1], how 1": true,
   "0,21,2: context range 0 [detached], argument range 21 [foreignDoc.head, 1, foreignDoc.head, 1], how 2": true,
@@ -407,15 +282,7 @@
   "0,28,2: context range 0 [detached], argument range 28 [paras[0].firstChild, 0, paras[1].firstChild, 8], how 2": true,
   "0,28,3: context range 0 [detached], argument range 28 [paras[0].firstChild, 0, paras[1].firstChild, 8], how 3": true,
   "0,29,0: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 0": true,
-  "0,29,1: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 1": true,
-  "0,29,2: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 2": true,
-  "0,29,3: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 3": true,
-  "0,29,4: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1": true,
-  "0,29,5: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4": true,
-  "0,29,6: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 5": true,
-  "0,29,7: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how NaN": true,
-  "0,29,8: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -0": true,
-  "0,29,9: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how Infinity": true,
+  "0,29,100: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"quasit\"": true,
   "0,29,10: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -Infinity": true,
   "0,29,11: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65535": true,
   "0,29,12: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65536": true,
@@ -426,6 +293,7 @@
   "0,29,17: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65537": true,
   "0,29,18: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65536": true,
   "0,29,19: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65535": true,
+  "0,29,1: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 1": true,
   "0,29,20: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65534": true,
   "0,29,21: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65533": true,
   "0,29,22: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65532": true,
@@ -436,6 +304,7 @@
   "0,29,27: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967299": true,
   "0,29,28: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967300": true,
   "0,29,29: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -0.5": true,
+  "0,29,2: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 2": true,
   "0,29,30: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 0.5": true,
   "0,29,31: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 1.5": true,
   "0,29,32: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 2.5": true,
@@ -446,6 +315,7 @@
   "0,29,37: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 0.5": true,
   "0,29,38: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 1.5": true,
   "0,29,39: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 2.5": true,
+  "0,29,3: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 3": true,
   "0,29,40: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 3.5": true,
   "0,29,41: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -73.5": true,
   "0,29,42: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -72.5": true,
@@ -456,6 +326,7 @@
   "0,29,47: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"0\"": true,
   "0,29,48: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"1\"": true,
   "0,29,49: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"2\"": true,
+  "0,29,4: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1": true,
   "0,29,50: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"3\"": true,
   "0,29,51: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1\"": true,
   "0,29,52: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4\"": true,
@@ -466,6 +337,7 @@
   "0,29,57: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-Infinity\"": true,
   "0,29,58: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65535\"": true,
   "0,29,59: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65536\"": true,
+  "0,29,5: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4": true,
   "0,29,60: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65537\"": true,
   "0,29,61: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65538\"": true,
   "0,29,62: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65539\"": true,
@@ -476,6 +348,7 @@
   "0,29,67: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65534\"": true,
   "0,29,68: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65533\"": true,
   "0,29,69: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65532\"": true,
+  "0,29,6: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 5": true,
   "0,29,70: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967295\"": true,
   "0,29,71: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967296\"": true,
   "0,29,72: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967297\"": true,
@@ -486,6 +359,7 @@
   "0,29,77: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"0.5\"": true,
   "0,29,78: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"1.5\"": true,
   "0,29,79: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"2.5\"": true,
+  "0,29,7: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how NaN": true,
   "0,29,80: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"3.5\"": true,
   "0,29,81: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4.5\"": true,
   "0,29,82: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1.5\"": true,
@@ -496,6 +370,7 @@
   "0,29,87: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"3.5\"": true,
   "0,29,88: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-73.5\"": true,
   "0,29,89: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-72.5\"": true,
+  "0,29,8: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -0": true,
   "0,29,90: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-71.5\"": true,
   "0,29,91: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-70.5\"": true,
   "0,29,92: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-69.5\"": true,
@@ -506,7 +381,108 @@
   "0,29,97: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how true": true,
   "0,29,98: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how false": true,
   "0,29,99: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"\"": true,
-  "0,29,100: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"quasit\"": true,
+  "0,29,9: context range 0 [detached], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how Infinity": true,
+  "0,3,0: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 0": true,
+  "0,3,100: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"quasit\"": true,
+  "0,3,10: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -Infinity": true,
+  "0,3,11: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65535": true,
+  "0,3,12: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65536": true,
+  "0,3,13: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65537": true,
+  "0,3,14: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65538": true,
+  "0,3,15: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65539": true,
+  "0,3,16: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65540": true,
+  "0,3,17: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65537": true,
+  "0,3,18: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65536": true,
+  "0,3,19: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65535": true,
+  "0,3,1: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 1": true,
+  "0,3,20: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65534": true,
+  "0,3,21: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65533": true,
+  "0,3,22: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65532": true,
+  "0,3,23: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967295": true,
+  "0,3,24: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967296": true,
+  "0,3,25: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967297": true,
+  "0,3,26: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967298": true,
+  "0,3,27: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967299": true,
+  "0,3,28: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967300": true,
+  "0,3,29: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -0.5": true,
+  "0,3,2: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 2": true,
+  "0,3,30: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 0.5": true,
+  "0,3,31: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 1.5": true,
+  "0,3,32: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 2.5": true,
+  "0,3,33: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 3.5": true,
+  "0,3,34: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4.5": true,
+  "0,3,35: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1.5": true,
+  "0,3,36: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -0.5": true,
+  "0,3,37: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 0.5": true,
+  "0,3,38: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 1.5": true,
+  "0,3,39: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 2.5": true,
+  "0,3,3: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 3": true,
+  "0,3,40: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 3.5": true,
+  "0,3,41: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -73.5": true,
+  "0,3,42: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -72.5": true,
+  "0,3,43: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -71.5": true,
+  "0,3,44: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -70.5": true,
+  "0,3,45: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -69.5": true,
+  "0,3,46: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -68.5": true,
+  "0,3,47: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0\"": true,
+  "0,3,48: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"1\"": true,
+  "0,3,49: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"2\"": true,
+  "0,3,4: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1": true,
+  "0,3,50: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"3\"": true,
+  "0,3,51: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1\"": true,
+  "0,3,52: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4\"": true,
+  "0,3,53: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"5\"": true,
+  "0,3,54: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"NaN\"": true,
+  "0,3,55: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0\"": true,
+  "0,3,56: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"Infinity\"": true,
+  "0,3,57: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-Infinity\"": true,
+  "0,3,58: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65535\"": true,
+  "0,3,59: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65536\"": true,
+  "0,3,5: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4": true,
+  "0,3,60: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65537\"": true,
+  "0,3,61: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65538\"": true,
+  "0,3,62: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65539\"": true,
+  "0,3,63: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65540\"": true,
+  "0,3,64: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65537\"": true,
+  "0,3,65: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65536\"": true,
+  "0,3,66: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65535\"": true,
+  "0,3,67: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65534\"": true,
+  "0,3,68: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65533\"": true,
+  "0,3,69: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65532\"": true,
+  "0,3,6: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 5": true,
+  "0,3,70: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967295\"": true,
+  "0,3,71: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967296\"": true,
+  "0,3,72: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967297\"": true,
+  "0,3,73: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967298\"": true,
+  "0,3,74: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967299\"": true,
+  "0,3,75: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967300\"": true,
+  "0,3,76: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-0.5\"": true,
+  "0,3,77: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0.5\"": true,
+  "0,3,78: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"1.5\"": true,
+  "0,3,79: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"2.5\"": true,
+  "0,3,7: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how NaN": true,
+  "0,3,80: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"3.5\"": true,
+  "0,3,81: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4.5\"": true,
+  "0,3,82: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1.5\"": true,
+  "0,3,83: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-0.5\"": true,
+  "0,3,84: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"0.5\"": true,
+  "0,3,85: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"1.5\"": true,
+  "0,3,86: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"2.5\"": true,
+  "0,3,87: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"3.5\"": true,
+  "0,3,88: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-73.5\"": true,
+  "0,3,89: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-72.5\"": true,
+  "0,3,8: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -0": true,
+  "0,3,90: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-71.5\"": true,
+  "0,3,91: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-70.5\"": true,
+  "0,3,92: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-69.5\"": true,
+  "0,3,93: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-68.5\"": true,
+  "0,3,94: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"6.5536e4\"": true,
+  "0,3,95: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how null": true,
+  "0,3,96: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how undefined": true,
+  "0,3,97: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how true": true,
+  "0,3,98: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how false": true,
+  "0,3,99: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"\"": true,
+  "0,3,9: context range 0 [detached], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how Infinity": true,
   "0,30,0: context range 0 [detached], argument range 30 [paras[0], 0, paras[0].firstChild, 7], how 0": true,
   "0,30,1: context range 0 [detached], argument range 30 [paras[0], 0, paras[0].firstChild, 7], how 1": true,
   "0,30,2: context range 0 [detached], argument range 30 [paras[0], 0, paras[0].firstChild, 7], how 2": true,
@@ -544,15 +520,7 @@
   "0,38,2: context range 0 [detached], argument range 38 [comment, 2, comment, 3], how 2": true,
   "0,38,3: context range 0 [detached], argument range 38 [comment, 2, comment, 3], how 3": true,
   "0,39,0: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 0": true,
-  "0,39,1: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 1": true,
-  "0,39,2: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 2": true,
-  "0,39,3: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 3": true,
-  "0,39,4: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -1": true,
-  "0,39,5: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 4": true,
-  "0,39,6: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 5": true,
-  "0,39,7: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how NaN": true,
-  "0,39,8: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -0": true,
-  "0,39,9: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how Infinity": true,
+  "0,39,100: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"quasit\"": true,
   "0,39,10: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -Infinity": true,
   "0,39,11: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 65535": true,
   "0,39,12: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 65536": true,
@@ -563,6 +531,7 @@
   "0,39,17: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -65537": true,
   "0,39,18: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -65536": true,
   "0,39,19: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -65535": true,
+  "0,39,1: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 1": true,
   "0,39,20: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -65534": true,
   "0,39,21: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -65533": true,
   "0,39,22: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -65532": true,
@@ -573,6 +542,7 @@
   "0,39,27: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 4294967299": true,
   "0,39,28: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 4294967300": true,
   "0,39,29: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -0.5": true,
+  "0,39,2: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 2": true,
   "0,39,30: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 0.5": true,
   "0,39,31: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 1.5": true,
   "0,39,32: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 2.5": true,
@@ -583,6 +553,7 @@
   "0,39,37: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 0.5": true,
   "0,39,38: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 1.5": true,
   "0,39,39: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 2.5": true,
+  "0,39,3: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 3": true,
   "0,39,40: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 3.5": true,
   "0,39,41: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -73.5": true,
   "0,39,42: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -72.5": true,
@@ -593,6 +564,7 @@
   "0,39,47: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"0\"": true,
   "0,39,48: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"1\"": true,
   "0,39,49: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"2\"": true,
+  "0,39,4: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -1": true,
   "0,39,50: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"3\"": true,
   "0,39,51: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-1\"": true,
   "0,39,52: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"4\"": true,
@@ -603,6 +575,7 @@
   "0,39,57: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-Infinity\"": true,
   "0,39,58: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"65535\"": true,
   "0,39,59: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"65536\"": true,
+  "0,39,5: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 4": true,
   "0,39,60: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"65537\"": true,
   "0,39,61: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"65538\"": true,
   "0,39,62: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"65539\"": true,
@@ -613,6 +586,7 @@
   "0,39,67: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-65534\"": true,
   "0,39,68: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-65533\"": true,
   "0,39,69: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-65532\"": true,
+  "0,39,6: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how 5": true,
   "0,39,70: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"4294967295\"": true,
   "0,39,71: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"4294967296\"": true,
   "0,39,72: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"4294967297\"": true,
@@ -623,6 +597,7 @@
   "0,39,77: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"0.5\"": true,
   "0,39,78: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"1.5\"": true,
   "0,39,79: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"2.5\"": true,
+  "0,39,7: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how NaN": true,
   "0,39,80: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"3.5\"": true,
   "0,39,81: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"4.5\"": true,
   "0,39,82: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-1.5\"": true,
@@ -633,6 +608,7 @@
   "0,39,87: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"3.5\"": true,
   "0,39,88: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-73.5\"": true,
   "0,39,89: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-72.5\"": true,
+  "0,39,8: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how -0": true,
   "0,39,90: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-71.5\"": true,
   "0,39,91: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-70.5\"": true,
   "0,39,92: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"-69.5\"": true,
@@ -643,7 +619,11 @@
   "0,39,97: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how true": true,
   "0,39,98: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how false": true,
   "0,39,99: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"\"": true,
-  "0,39,100: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how \"quasit\"": true,
+  "0,39,9: context range 0 [detached], argument range 39 [testDiv, 0, comment, 5], how Infinity": true,
+  "0,4,0: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 0": true,
+  "0,4,1: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 1": true,
+  "0,4,2: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 2": true,
+  "0,4,3: context range 0 [detached], argument range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], how 3": true,
   "0,40,0: context range 0 [detached], argument range 40 [paras[2].firstChild, 4, comment, 2], how 0": true,
   "0,40,1: context range 0 [detached], argument range 40 [paras[2].firstChild, 4, comment, 2], how 1": true,
   "0,40,2: context range 0 [detached], argument range 40 [paras[2].firstChild, 4, comment, 2], how 2": true,
@@ -684,6 +664,10 @@
   "0,49,1: context range 0 [detached], argument range 49 [detachedForeignTextNode, 0, detachedForeignTextNode, 8], how 1": true,
   "0,49,2: context range 0 [detached], argument range 49 [detachedForeignTextNode, 0, detachedForeignTextNode, 8], how 2": true,
   "0,49,3: context range 0 [detached], argument range 49 [detachedForeignTextNode, 0, detachedForeignTextNode, 8], how 3": true,
+  "0,5,0: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 0": true,
+  "0,5,1: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 1": true,
+  "0,5,2: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 2": true,
+  "0,5,3: context range 0 [detached], argument range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], how 3": true,
   "0,50,0: context range 0 [detached], argument range 50 [detachedXmlTextNode, 7, detachedXmlTextNode, 7], how 0": true,
   "0,50,1: context range 0 [detached], argument range 50 [detachedXmlTextNode, 7, detachedXmlTextNode, 7], how 1": true,
   "0,50,2: context range 0 [detached], argument range 50 [detachedXmlTextNode, 7, detachedXmlTextNode, 7], how 2": true,
@@ -724,279 +708,30 @@
   "0,59,1: context range 0 [detached], argument range 59 [xmlDocfrag, 0, xmlDocfrag, 0], how 1": true,
   "0,59,2: context range 0 [detached], argument range 59 [xmlDocfrag, 0, xmlDocfrag, 0], how 2": true,
   "0,59,3: context range 0 [detached], argument range 59 [xmlDocfrag, 0, xmlDocfrag, 0], how 3": true,
+  "0,6,0: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 0": true,
+  "0,6,1: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 1": true,
+  "0,6,2: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 2": true,
+  "0,6,3: context range 0 [detached], argument range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], how 3": true,
   "0,60,0: context range 0 [detached], argument range same as first range, how 0": true,
   "0,60,1: context range 0 [detached], argument range same as first range, how 1": true,
   "0,60,2: context range 0 [detached], argument range same as first range, how 2": true,
   "0,60,3: context range 0 [detached], argument range same as first range, how 3": true,
+  "0,7,0: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 0": true,
+  "0,7,1: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 1": true,
+  "0,7,2: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 2": true,
+  "0,7,3: context range 0 [detached], argument range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], how 3": true,
+  "0,8,0: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 0": true,
+  "0,8,1: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 1": true,
+  "0,8,2: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 2": true,
+  "0,8,3: context range 0 [detached], argument range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], how 3": true,
+  "0,9,0: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 0": true,
+  "0,9,1: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 1": true,
+  "0,9,2: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 2": true,
+  "0,9,3: context range 0 [detached], argument range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], how 3": true,
   "1,0,0: context range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], argument range 0 [detached], how 0": true,
   "1,0,1: context range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], argument range 0 [detached], how 1": true,
   "1,0,2: context range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], argument range 0 [detached], how 2": true,
   "1,0,3: context range 1 [paras[0].firstChild, 0, paras[0].firstChild, 0], argument range 0 [detached], how 3": true,
-  "2,0,0: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 0": true,
-  "2,0,1: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 1": true,
-  "2,0,2: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 2": true,
-  "2,0,3: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 3": true,
-  "3,0,0: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 0": true,
-  "3,0,1: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 1": true,
-  "3,0,2: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 2": true,
-  "3,0,3: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 3": true,
-  "3,0,4: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -1": true,
-  "3,0,5: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4": true,
-  "3,0,6: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 5": true,
-  "3,0,7: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how NaN": true,
-  "3,0,8: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -0": true,
-  "3,0,9: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how Infinity": true,
-  "3,0,10: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -Infinity": true,
-  "3,0,11: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65535": true,
-  "3,0,12: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65536": true,
-  "3,0,13: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65537": true,
-  "3,0,14: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65538": true,
-  "3,0,15: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65539": true,
-  "3,0,16: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65540": true,
-  "3,0,17: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65537": true,
-  "3,0,18: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65536": true,
-  "3,0,19: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65535": true,
-  "3,0,20: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65534": true,
-  "3,0,21: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65533": true,
-  "3,0,22: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65532": true,
-  "3,0,23: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967295": true,
-  "3,0,24: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967296": true,
-  "3,0,25: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967297": true,
-  "3,0,26: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967298": true,
-  "3,0,27: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967299": true,
-  "3,0,28: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967300": true,
-  "3,0,29: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -0.5": true,
-  "3,0,30: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 0.5": true,
-  "3,0,31: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 1.5": true,
-  "3,0,32: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 2.5": true,
-  "3,0,33: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 3.5": true,
-  "3,0,34: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4.5": true,
-  "3,0,35: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -1.5": true,
-  "3,0,36: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -0.5": true,
-  "3,0,37: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 0.5": true,
-  "3,0,38: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 1.5": true,
-  "3,0,39: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 2.5": true,
-  "3,0,40: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 3.5": true,
-  "3,0,41: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -73.5": true,
-  "3,0,42: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -72.5": true,
-  "3,0,43: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -71.5": true,
-  "3,0,44: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -70.5": true,
-  "3,0,45: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -69.5": true,
-  "3,0,46: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -68.5": true,
-  "3,0,47: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0\"": true,
-  "3,0,48: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"1\"": true,
-  "3,0,49: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"2\"": true,
-  "3,0,50: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"3\"": true,
-  "3,0,51: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-1\"": true,
-  "3,0,52: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4\"": true,
-  "3,0,53: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"5\"": true,
-  "3,0,54: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"NaN\"": true,
-  "3,0,55: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0\"": true,
-  "3,0,56: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"Infinity\"": true,
-  "3,0,57: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-Infinity\"": true,
-  "3,0,58: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65535\"": true,
-  "3,0,59: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65536\"": true,
-  "3,0,60: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65537\"": true,
-  "3,0,61: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65538\"": true,
-  "3,0,62: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65539\"": true,
-  "3,0,63: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65540\"": true,
-  "3,0,64: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65537\"": true,
-  "3,0,65: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65536\"": true,
-  "3,0,66: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65535\"": true,
-  "3,0,67: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65534\"": true,
-  "3,0,68: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65533\"": true,
-  "3,0,69: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65532\"": true,
-  "3,0,70: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967295\"": true,
-  "3,0,71: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967296\"": true,
-  "3,0,72: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967297\"": true,
-  "3,0,73: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967298\"": true,
-  "3,0,74: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967299\"": true,
-  "3,0,75: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967300\"": true,
-  "3,0,76: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-0.5\"": true,
-  "3,0,77: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0.5\"": true,
-  "3,0,78: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"1.5\"": true,
-  "3,0,79: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"2.5\"": true,
-  "3,0,80: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"3.5\"": true,
-  "3,0,81: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4.5\"": true,
-  "3,0,82: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-1.5\"": true,
-  "3,0,83: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-0.5\"": true,
-  "3,0,84: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0.5\"": true,
-  "3,0,85: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"1.5\"": true,
-  "3,0,86: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"2.5\"": true,
-  "3,0,87: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"3.5\"": true,
-  "3,0,88: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-73.5\"": true,
-  "3,0,89: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-72.5\"": true,
-  "3,0,90: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-71.5\"": true,
-  "3,0,91: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-70.5\"": true,
-  "3,0,92: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-69.5\"": true,
-  "3,0,93: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-68.5\"": true,
-  "3,0,94: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"6.5536e4\"": true,
-  "3,0,95: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how null": true,
-  "3,0,96: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how undefined": true,
-  "3,0,97: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how true": true,
-  "3,0,98: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how false": true,
-  "3,0,99: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"\"": true,
-  "3,0,100: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"quasit\"": true,
-  "3,3,4: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1": true,
-  "3,3,5: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4": true,
-  "3,3,6: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 5": true,
-  "3,3,11: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65535": true,
-  "3,3,16: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65540": true,
-  "3,3,17: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65537": true,
-  "3,3,22: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65532": true,
-  "3,3,23: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967295": true,
-  "3,3,28: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967300": true,
-  "3,3,34: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4.5": true,
-  "3,3,35: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1.5": true,
-  "3,3,41: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -73.5": true,
-  "3,3,42: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -72.5": true,
-  "3,3,43: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -71.5": true,
-  "3,3,44: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -70.5": true,
-  "3,3,45: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -69.5": true,
-  "3,3,46: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -68.5": true,
-  "3,3,51: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1\"": true,
-  "3,3,52: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4\"": true,
-  "3,3,53: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"5\"": true,
-  "3,3,58: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65535\"": true,
-  "3,3,63: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65540\"": true,
-  "3,3,64: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65537\"": true,
-  "3,3,69: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65532\"": true,
-  "3,3,70: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967295\"": true,
-  "3,3,75: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967300\"": true,
-  "3,3,81: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4.5\"": true,
-  "3,3,82: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1.5\"": true,
-  "3,3,88: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-73.5\"": true,
-  "3,3,89: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-72.5\"": true,
-  "3,3,90: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-71.5\"": true,
-  "3,3,91: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-70.5\"": true,
-  "3,3,92: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-69.5\"": true,
-  "3,3,93: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-68.5\"": true,
-  "3,20,4: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1": true,
-  "3,20,5: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4": true,
-  "3,20,6: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 5": true,
-  "3,20,11: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65535": true,
-  "3,20,16: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65540": true,
-  "3,20,17: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65537": true,
-  "3,20,22: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65532": true,
-  "3,20,23: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967295": true,
-  "3,20,28: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967300": true,
-  "3,20,34: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4.5": true,
-  "3,20,35: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1.5": true,
-  "3,20,41: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -73.5": true,
-  "3,20,42: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -72.5": true,
-  "3,20,43: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -71.5": true,
-  "3,20,44: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -70.5": true,
-  "3,20,45: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -69.5": true,
-  "3,20,46: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -68.5": true,
-  "3,20,51: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1\"": true,
-  "3,20,52: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4\"": true,
-  "3,20,53: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"5\"": true,
-  "3,20,58: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65535\"": true,
-  "3,20,63: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65540\"": true,
-  "3,20,64: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65537\"": true,
-  "3,20,69: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65532\"": true,
-  "3,20,70: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967295\"": true,
-  "3,20,75: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967300\"": true,
-  "3,20,81: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4.5\"": true,
-  "3,20,82: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1.5\"": true,
-  "3,20,88: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-73.5\"": true,
-  "3,20,89: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-72.5\"": true,
-  "3,20,90: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-71.5\"": true,
-  "3,20,91: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-70.5\"": true,
-  "3,20,92: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-69.5\"": true,
-  "3,20,93: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-68.5\"": true,
-  "3,29,4: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1": true,
-  "3,29,5: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4": true,
-  "3,29,6: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 5": true,
-  "3,29,11: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65535": true,
-  "3,29,16: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65540": true,
-  "3,29,17: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65537": true,
-  "3,29,22: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65532": true,
-  "3,29,23: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967295": true,
-  "3,29,28: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967300": true,
-  "3,29,34: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4.5": true,
-  "3,29,35: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1.5": true,
-  "3,29,41: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -73.5": true,
-  "3,29,42: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -72.5": true,
-  "3,29,43: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -71.5": true,
-  "3,29,44: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -70.5": true,
-  "3,29,45: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -69.5": true,
-  "3,29,46: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -68.5": true,
-  "3,29,51: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1\"": true,
-  "3,29,52: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4\"": true,
-  "3,29,53: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"5\"": true,
-  "3,29,58: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65535\"": true,
-  "3,29,63: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65540\"": true,
-  "3,29,64: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65537\"": true,
-  "3,29,69: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65532\"": true,
-  "3,29,70: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967295\"": true,
-  "3,29,75: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967300\"": true,
-  "3,29,81: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4.5\"": true,
-  "3,29,82: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1.5\"": true,
-  "3,29,88: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-73.5\"": true,
-  "3,29,89: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-72.5\"": true,
-  "3,29,90: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-71.5\"": true,
-  "3,29,91: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-70.5\"": true,
-  "3,29,92: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-69.5\"": true,
-  "3,29,93: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-68.5\"": true,
-  "3,39,4: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -1": true,
-  "3,39,5: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 4": true,
-  "3,39,6: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 5": true,
-  "3,39,11: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 65535": true,
-  "3,39,16: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 65540": true,
-  "3,39,17: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -65537": true,
-  "3,39,22: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -65532": true,
-  "3,39,23: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 4294967295": true,
-  "3,39,28: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 4294967300": true,
-  "3,39,34: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how 4.5": true,
-  "3,39,35: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -1.5": true,
-  "3,39,41: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -73.5": true,
-  "3,39,42: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -72.5": true,
-  "3,39,43: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -71.5": true,
-  "3,39,44: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -70.5": true,
-  "3,39,45: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -69.5": true,
-  "3,39,46: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how -68.5": true,
-  "3,39,51: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-1\"": true,
-  "3,39,52: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"4\"": true,
-  "3,39,53: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"5\"": true,
-  "3,39,58: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"65535\"": true,
-  "3,39,63: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"65540\"": true,
-  "3,39,64: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-65537\"": true,
-  "3,39,69: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-65532\"": true,
-  "3,39,70: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"4294967295\"": true,
-  "3,39,75: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"4294967300\"": true,
-  "3,39,81: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"4.5\"": true,
-  "3,39,82: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-1.5\"": true,
-  "3,39,88: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-73.5\"": true,
-  "3,39,89: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-72.5\"": true,
-  "3,39,90: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-71.5\"": true,
-  "3,39,91: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-70.5\"": true,
-  "3,39,92: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-69.5\"": true,
-  "3,39,93: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 39 [testDiv, 0, comment, 5], how \"-68.5\"": true,
-  "4,0,0: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 0": true,
-  "4,0,1: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 1": true,
-  "4,0,2: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 2": true,
-  "4,0,3: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 3": true,
-  "5,0,0: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 0": true,
-  "5,0,1: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 1": true,
-  "5,0,2: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 2": true,
-  "5,0,3: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 3": true,
-  "6,0,0: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 0": true,
-  "6,0,1: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 1": true,
-  "6,0,2: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 2": true,
-  "6,0,3: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 3": true,
-  "7,0,0: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 0": true,
-  "7,0,1: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 1": true,
-  "7,0,2: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 2": true,
-  "7,0,3: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 3": true,
-  "8,0,0: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 0": true,
-  "8,0,1: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 1": true,
-  "8,0,2: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 2": true,
-  "8,0,3: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 3": true,
-  "9,0,0: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 0": true,
-  "9,0,1: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 1": true,
-  "9,0,2: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 2": true,
-  "9,0,3: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 3": true,
   "10,0,0: context range 10 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 1], argument range 0 [detached], how 0": true,
   "10,0,1: context range 10 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 1], argument range 0 [detached], how 1": true,
   "10,0,2: context range 10 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 1], argument range 0 [detached], how 2": true,
@@ -1037,16 +772,12 @@
   "19,0,1: context range 19 [document.body, 4, document.body, 5], argument range 0 [detached], how 1": true,
   "19,0,2: context range 19 [document.body, 4, document.body, 5], argument range 0 [detached], how 2": true,
   "19,0,3: context range 19 [document.body, 4, document.body, 5], argument range 0 [detached], how 3": true,
+  "2,0,0: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 0": true,
+  "2,0,1: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 1": true,
+  "2,0,2: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 2": true,
+  "2,0,3: context range 2 [paras[0].firstChild, 0, paras[0].firstChild, 1], argument range 0 [detached], how 3": true,
   "20,0,0: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 0": true,
-  "20,0,1: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 1": true,
-  "20,0,2: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 2": true,
-  "20,0,3: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 3": true,
-  "20,0,4: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -1": true,
-  "20,0,5: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 4": true,
-  "20,0,6: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 5": true,
-  "20,0,7: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how NaN": true,
-  "20,0,8: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -0": true,
-  "20,0,9: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how Infinity": true,
+  "20,0,100: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"quasit\"": true,
   "20,0,10: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -Infinity": true,
   "20,0,11: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 65535": true,
   "20,0,12: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 65536": true,
@@ -1057,6 +788,7 @@
   "20,0,17: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -65537": true,
   "20,0,18: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -65536": true,
   "20,0,19: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -65535": true,
+  "20,0,1: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 1": true,
   "20,0,20: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -65534": true,
   "20,0,21: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -65533": true,
   "20,0,22: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -65532": true,
@@ -1067,6 +799,7 @@
   "20,0,27: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 4294967299": true,
   "20,0,28: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 4294967300": true,
   "20,0,29: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -0.5": true,
+  "20,0,2: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 2": true,
   "20,0,30: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 0.5": true,
   "20,0,31: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 1.5": true,
   "20,0,32: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 2.5": true,
@@ -1077,6 +810,7 @@
   "20,0,37: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 0.5": true,
   "20,0,38: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 1.5": true,
   "20,0,39: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 2.5": true,
+  "20,0,3: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 3": true,
   "20,0,40: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 3.5": true,
   "20,0,41: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -73.5": true,
   "20,0,42: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -72.5": true,
@@ -1087,6 +821,7 @@
   "20,0,47: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"0\"": true,
   "20,0,48: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"1\"": true,
   "20,0,49: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"2\"": true,
+  "20,0,4: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -1": true,
   "20,0,50: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"3\"": true,
   "20,0,51: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-1\"": true,
   "20,0,52: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"4\"": true,
@@ -1097,6 +832,7 @@
   "20,0,57: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-Infinity\"": true,
   "20,0,58: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"65535\"": true,
   "20,0,59: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"65536\"": true,
+  "20,0,5: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 4": true,
   "20,0,60: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"65537\"": true,
   "20,0,61: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"65538\"": true,
   "20,0,62: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"65539\"": true,
@@ -1107,6 +843,7 @@
   "20,0,67: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-65534\"": true,
   "20,0,68: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-65533\"": true,
   "20,0,69: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-65532\"": true,
+  "20,0,6: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how 5": true,
   "20,0,70: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"4294967295\"": true,
   "20,0,71: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"4294967296\"": true,
   "20,0,72: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"4294967297\"": true,
@@ -1117,6 +854,7 @@
   "20,0,77: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"0.5\"": true,
   "20,0,78: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"1.5\"": true,
   "20,0,79: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"2.5\"": true,
+  "20,0,7: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how NaN": true,
   "20,0,80: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"3.5\"": true,
   "20,0,81: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"4.5\"": true,
   "20,0,82: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-1.5\"": true,
@@ -1127,6 +865,7 @@
   "20,0,87: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"3.5\"": true,
   "20,0,88: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-73.5\"": true,
   "20,0,89: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-72.5\"": true,
+  "20,0,8: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how -0": true,
   "20,0,90: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-71.5\"": true,
   "20,0,91: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-70.5\"": true,
   "20,0,92: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"-69.5\"": true,
@@ -1137,143 +876,7 @@
   "20,0,97: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how true": true,
   "20,0,98: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how false": true,
   "20,0,99: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"\"": true,
-  "20,0,100: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how \"quasit\"": true,
-  "20,3,4: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1": true,
-  "20,3,5: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4": true,
-  "20,3,6: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 5": true,
-  "20,3,11: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65535": true,
-  "20,3,16: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65540": true,
-  "20,3,17: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65537": true,
-  "20,3,22: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65532": true,
-  "20,3,23: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967295": true,
-  "20,3,28: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967300": true,
-  "20,3,34: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4.5": true,
-  "20,3,35: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1.5": true,
-  "20,3,41: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -73.5": true,
-  "20,3,42: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -72.5": true,
-  "20,3,43: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -71.5": true,
-  "20,3,44: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -70.5": true,
-  "20,3,45: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -69.5": true,
-  "20,3,46: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -68.5": true,
-  "20,3,51: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1\"": true,
-  "20,3,52: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4\"": true,
-  "20,3,53: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"5\"": true,
-  "20,3,58: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65535\"": true,
-  "20,3,63: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65540\"": true,
-  "20,3,64: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65537\"": true,
-  "20,3,69: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65532\"": true,
-  "20,3,70: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967295\"": true,
-  "20,3,75: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967300\"": true,
-  "20,3,81: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4.5\"": true,
-  "20,3,82: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1.5\"": true,
-  "20,3,88: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-73.5\"": true,
-  "20,3,89: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-72.5\"": true,
-  "20,3,90: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-71.5\"": true,
-  "20,3,91: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-70.5\"": true,
-  "20,3,92: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-69.5\"": true,
-  "20,3,93: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-68.5\"": true,
-  "20,20,4: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1": true,
-  "20,20,5: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4": true,
-  "20,20,6: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 5": true,
-  "20,20,11: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65535": true,
-  "20,20,16: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65540": true,
-  "20,20,17: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65537": true,
-  "20,20,22: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65532": true,
-  "20,20,23: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967295": true,
-  "20,20,28: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967300": true,
-  "20,20,34: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4.5": true,
-  "20,20,35: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1.5": true,
-  "20,20,41: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -73.5": true,
-  "20,20,42: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -72.5": true,
-  "20,20,43: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -71.5": true,
-  "20,20,44: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -70.5": true,
-  "20,20,45: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -69.5": true,
-  "20,20,46: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -68.5": true,
-  "20,20,51: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1\"": true,
-  "20,20,52: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4\"": true,
-  "20,20,53: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"5\"": true,
-  "20,20,58: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65535\"": true,
-  "20,20,63: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65540\"": true,
-  "20,20,64: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65537\"": true,
-  "20,20,69: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65532\"": true,
-  "20,20,70: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967295\"": true,
-  "20,20,75: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967300\"": true,
-  "20,20,81: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4.5\"": true,
-  "20,20,82: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1.5\"": true,
-  "20,20,88: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-73.5\"": true,
-  "20,20,89: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-72.5\"": true,
-  "20,20,90: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-71.5\"": true,
-  "20,20,91: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-70.5\"": true,
-  "20,20,92: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-69.5\"": true,
-  "20,20,93: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-68.5\"": true,
-  "20,29,4: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1": true,
-  "20,29,5: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4": true,
-  "20,29,6: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 5": true,
-  "20,29,11: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65535": true,
-  "20,29,16: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65540": true,
-  "20,29,17: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65537": true,
-  "20,29,22: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65532": true,
-  "20,29,23: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967295": true,
-  "20,29,28: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967300": true,
-  "20,29,34: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4.5": true,
-  "20,29,35: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1.5": true,
-  "20,29,41: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -73.5": true,
-  "20,29,42: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -72.5": true,
-  "20,29,43: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -71.5": true,
-  "20,29,44: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -70.5": true,
-  "20,29,45: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -69.5": true,
-  "20,29,46: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -68.5": true,
-  "20,29,51: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1\"": true,
-  "20,29,52: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4\"": true,
-  "20,29,53: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"5\"": true,
-  "20,29,58: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65535\"": true,
-  "20,29,63: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65540\"": true,
-  "20,29,64: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65537\"": true,
-  "20,29,69: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65532\"": true,
-  "20,29,70: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967295\"": true,
-  "20,29,75: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967300\"": true,
-  "20,29,81: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4.5\"": true,
-  "20,29,82: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1.5\"": true,
-  "20,29,88: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-73.5\"": true,
-  "20,29,89: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-72.5\"": true,
-  "20,29,90: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-71.5\"": true,
-  "20,29,91: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-70.5\"": true,
-  "20,29,92: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-69.5\"": true,
-  "20,29,93: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-68.5\"": true,
-  "20,39,4: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -1": true,
-  "20,39,5: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 4": true,
-  "20,39,6: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 5": true,
-  "20,39,11: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 65535": true,
-  "20,39,16: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 65540": true,
-  "20,39,17: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -65537": true,
-  "20,39,22: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -65532": true,
-  "20,39,23: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 4294967295": true,
-  "20,39,28: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 4294967300": true,
-  "20,39,34: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how 4.5": true,
-  "20,39,35: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -1.5": true,
-  "20,39,41: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -73.5": true,
-  "20,39,42: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -72.5": true,
-  "20,39,43: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -71.5": true,
-  "20,39,44: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -70.5": true,
-  "20,39,45: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -69.5": true,
-  "20,39,46: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how -68.5": true,
-  "20,39,51: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-1\"": true,
-  "20,39,52: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"4\"": true,
-  "20,39,53: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"5\"": true,
-  "20,39,58: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"65535\"": true,
-  "20,39,63: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"65540\"": true,
-  "20,39,64: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-65537\"": true,
-  "20,39,69: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-65532\"": true,
-  "20,39,70: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"4294967295\"": true,
-  "20,39,75: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"4294967300\"": true,
-  "20,39,81: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"4.5\"": true,
-  "20,39,82: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-1.5\"": true,
-  "20,39,88: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-73.5\"": true,
-  "20,39,89: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-72.5\"": true,
-  "20,39,90: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-71.5\"": true,
-  "20,39,91: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-70.5\"": true,
-  "20,39,92: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-69.5\"": true,
-  "20,39,93: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 39 [testDiv, 0, comment, 5], how \"-68.5\"": true,
+  "20,0,9: context range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], argument range 0 [detached], how Infinity": true,
   "21,0,0: context range 21 [foreignDoc.head, 1, foreignDoc.head, 1], argument range 0 [detached], how 0": true,
   "21,0,1: context range 21 [foreignDoc.head, 1, foreignDoc.head, 1], argument range 0 [detached], how 1": true,
   "21,0,2: context range 21 [foreignDoc.head, 1, foreignDoc.head, 1], argument range 0 [detached], how 2": true,
@@ -1307,15 +910,7 @@
   "28,0,2: context range 28 [paras[0].firstChild, 0, paras[1].firstChild, 8], argument range 0 [detached], how 2": true,
   "28,0,3: context range 28 [paras[0].firstChild, 0, paras[1].firstChild, 8], argument range 0 [detached], how 3": true,
   "29,0,0: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 0": true,
-  "29,0,1: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 1": true,
-  "29,0,2: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 2": true,
-  "29,0,3: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 3": true,
-  "29,0,4: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -1": true,
-  "29,0,5: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 4": true,
-  "29,0,6: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 5": true,
-  "29,0,7: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how NaN": true,
-  "29,0,8: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -0": true,
-  "29,0,9: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how Infinity": true,
+  "29,0,100: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"quasit\"": true,
   "29,0,10: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -Infinity": true,
   "29,0,11: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 65535": true,
   "29,0,12: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 65536": true,
@@ -1326,6 +921,7 @@
   "29,0,17: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -65537": true,
   "29,0,18: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -65536": true,
   "29,0,19: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -65535": true,
+  "29,0,1: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 1": true,
   "29,0,20: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -65534": true,
   "29,0,21: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -65533": true,
   "29,0,22: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -65532": true,
@@ -1336,6 +932,7 @@
   "29,0,27: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 4294967299": true,
   "29,0,28: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 4294967300": true,
   "29,0,29: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -0.5": true,
+  "29,0,2: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 2": true,
   "29,0,30: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 0.5": true,
   "29,0,31: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 1.5": true,
   "29,0,32: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 2.5": true,
@@ -1346,6 +943,7 @@
   "29,0,37: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 0.5": true,
   "29,0,38: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 1.5": true,
   "29,0,39: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 2.5": true,
+  "29,0,3: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 3": true,
   "29,0,40: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 3.5": true,
   "29,0,41: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -73.5": true,
   "29,0,42: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -72.5": true,
@@ -1356,6 +954,7 @@
   "29,0,47: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"0\"": true,
   "29,0,48: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"1\"": true,
   "29,0,49: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"2\"": true,
+  "29,0,4: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -1": true,
   "29,0,50: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"3\"": true,
   "29,0,51: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-1\"": true,
   "29,0,52: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"4\"": true,
@@ -1366,6 +965,7 @@
   "29,0,57: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-Infinity\"": true,
   "29,0,58: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"65535\"": true,
   "29,0,59: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"65536\"": true,
+  "29,0,5: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 4": true,
   "29,0,60: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"65537\"": true,
   "29,0,61: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"65538\"": true,
   "29,0,62: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"65539\"": true,
@@ -1376,6 +976,7 @@
   "29,0,67: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-65534\"": true,
   "29,0,68: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-65533\"": true,
   "29,0,69: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-65532\"": true,
+  "29,0,6: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how 5": true,
   "29,0,70: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"4294967295\"": true,
   "29,0,71: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"4294967296\"": true,
   "29,0,72: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"4294967297\"": true,
@@ -1386,6 +987,7 @@
   "29,0,77: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"0.5\"": true,
   "29,0,78: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"1.5\"": true,
   "29,0,79: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"2.5\"": true,
+  "29,0,7: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how NaN": true,
   "29,0,80: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"3.5\"": true,
   "29,0,81: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"4.5\"": true,
   "29,0,82: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-1.5\"": true,
@@ -1396,6 +998,7 @@
   "29,0,87: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"3.5\"": true,
   "29,0,88: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-73.5\"": true,
   "29,0,89: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-72.5\"": true,
+  "29,0,8: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how -0": true,
   "29,0,90: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-71.5\"": true,
   "29,0,91: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-70.5\"": true,
   "29,0,92: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"-69.5\"": true,
@@ -1406,143 +1009,108 @@
   "29,0,97: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how true": true,
   "29,0,98: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how false": true,
   "29,0,99: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"\"": true,
-  "29,0,100: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how \"quasit\"": true,
-  "29,3,4: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1": true,
-  "29,3,5: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4": true,
-  "29,3,6: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 5": true,
-  "29,3,11: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65535": true,
-  "29,3,16: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65540": true,
-  "29,3,17: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65537": true,
-  "29,3,22: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65532": true,
-  "29,3,23: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967295": true,
-  "29,3,28: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967300": true,
-  "29,3,34: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4.5": true,
-  "29,3,35: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1.5": true,
-  "29,3,41: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -73.5": true,
-  "29,3,42: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -72.5": true,
-  "29,3,43: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -71.5": true,
-  "29,3,44: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -70.5": true,
-  "29,3,45: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -69.5": true,
-  "29,3,46: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -68.5": true,
-  "29,3,51: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1\"": true,
-  "29,3,52: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4\"": true,
-  "29,3,53: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"5\"": true,
-  "29,3,58: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65535\"": true,
-  "29,3,63: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65540\"": true,
-  "29,3,64: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65537\"": true,
-  "29,3,69: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65532\"": true,
-  "29,3,70: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967295\"": true,
-  "29,3,75: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967300\"": true,
-  "29,3,81: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4.5\"": true,
-  "29,3,82: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1.5\"": true,
-  "29,3,88: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-73.5\"": true,
-  "29,3,89: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-72.5\"": true,
-  "29,3,90: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-71.5\"": true,
-  "29,3,91: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-70.5\"": true,
-  "29,3,92: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-69.5\"": true,
-  "29,3,93: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-68.5\"": true,
-  "29,20,4: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1": true,
-  "29,20,5: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4": true,
-  "29,20,6: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 5": true,
-  "29,20,11: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65535": true,
-  "29,20,16: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65540": true,
-  "29,20,17: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65537": true,
-  "29,20,22: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65532": true,
-  "29,20,23: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967295": true,
-  "29,20,28: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967300": true,
-  "29,20,34: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4.5": true,
-  "29,20,35: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1.5": true,
-  "29,20,41: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -73.5": true,
-  "29,20,42: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -72.5": true,
-  "29,20,43: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -71.5": true,
-  "29,20,44: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -70.5": true,
-  "29,20,45: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -69.5": true,
-  "29,20,46: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -68.5": true,
-  "29,20,51: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1\"": true,
-  "29,20,52: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4\"": true,
-  "29,20,53: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"5\"": true,
-  "29,20,58: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65535\"": true,
-  "29,20,63: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65540\"": true,
-  "29,20,64: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65537\"": true,
-  "29,20,69: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65532\"": true,
-  "29,20,70: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967295\"": true,
-  "29,20,75: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967300\"": true,
-  "29,20,81: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4.5\"": true,
-  "29,20,82: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1.5\"": true,
-  "29,20,88: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-73.5\"": true,
-  "29,20,89: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-72.5\"": true,
-  "29,20,90: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-71.5\"": true,
-  "29,20,91: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-70.5\"": true,
-  "29,20,92: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-69.5\"": true,
-  "29,20,93: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-68.5\"": true,
-  "29,29,4: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1": true,
-  "29,29,5: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4": true,
-  "29,29,6: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 5": true,
-  "29,29,11: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65535": true,
-  "29,29,16: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65540": true,
-  "29,29,17: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65537": true,
-  "29,29,22: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65532": true,
-  "29,29,23: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967295": true,
-  "29,29,28: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967300": true,
-  "29,29,34: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4.5": true,
-  "29,29,35: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1.5": true,
-  "29,29,41: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -73.5": true,
-  "29,29,42: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -72.5": true,
-  "29,29,43: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -71.5": true,
-  "29,29,44: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -70.5": true,
-  "29,29,45: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -69.5": true,
-  "29,29,46: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -68.5": true,
-  "29,29,51: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1\"": true,
-  "29,29,52: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4\"": true,
-  "29,29,53: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"5\"": true,
-  "29,29,58: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65535\"": true,
-  "29,29,63: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65540\"": true,
-  "29,29,64: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65537\"": true,
-  "29,29,69: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65532\"": true,
-  "29,29,70: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967295\"": true,
-  "29,29,75: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967300\"": true,
-  "29,29,81: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4.5\"": true,
-  "29,29,82: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1.5\"": true,
-  "29,29,88: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-73.5\"": true,
-  "29,29,89: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-72.5\"": true,
-  "29,29,90: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-71.5\"": true,
-  "29,29,91: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-70.5\"": true,
-  "29,29,92: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-69.5\"": true,
-  "29,29,93: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-68.5\"": true,
-  "29,39,4: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -1": true,
-  "29,39,5: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 4": true,
-  "29,39,6: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 5": true,
-  "29,39,11: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 65535": true,
-  "29,39,16: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 65540": true,
-  "29,39,17: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -65537": true,
-  "29,39,22: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -65532": true,
-  "29,39,23: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 4294967295": true,
-  "29,39,28: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 4294967300": true,
-  "29,39,34: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how 4.5": true,
-  "29,39,35: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -1.5": true,
-  "29,39,41: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -73.5": true,
-  "29,39,42: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -72.5": true,
-  "29,39,43: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -71.5": true,
-  "29,39,44: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -70.5": true,
-  "29,39,45: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -69.5": true,
-  "29,39,46: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how -68.5": true,
-  "29,39,51: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-1\"": true,
-  "29,39,52: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"4\"": true,
-  "29,39,53: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"5\"": true,
-  "29,39,58: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"65535\"": true,
-  "29,39,63: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"65540\"": true,
-  "29,39,64: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-65537\"": true,
-  "29,39,69: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-65532\"": true,
-  "29,39,70: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"4294967295\"": true,
-  "29,39,75: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"4294967300\"": true,
-  "29,39,81: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"4.5\"": true,
-  "29,39,82: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-1.5\"": true,
-  "29,39,88: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-73.5\"": true,
-  "29,39,89: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-72.5\"": true,
-  "29,39,90: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-71.5\"": true,
-  "29,39,91: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-70.5\"": true,
-  "29,39,92: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-69.5\"": true,
-  "29,39,93: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 39 [testDiv, 0, comment, 5], how \"-68.5\"": true,
+  "29,0,9: context range 29 [paras[0].firstChild, 3, paras[3], 1], argument range 0 [detached], how Infinity": true,
+  "3,0,0: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 0": true,
+  "3,0,100: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"quasit\"": true,
+  "3,0,10: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -Infinity": true,
+  "3,0,11: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65535": true,
+  "3,0,12: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65536": true,
+  "3,0,13: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65537": true,
+  "3,0,14: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65538": true,
+  "3,0,15: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65539": true,
+  "3,0,16: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 65540": true,
+  "3,0,17: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65537": true,
+  "3,0,18: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65536": true,
+  "3,0,19: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65535": true,
+  "3,0,1: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 1": true,
+  "3,0,20: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65534": true,
+  "3,0,21: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65533": true,
+  "3,0,22: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -65532": true,
+  "3,0,23: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967295": true,
+  "3,0,24: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967296": true,
+  "3,0,25: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967297": true,
+  "3,0,26: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967298": true,
+  "3,0,27: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967299": true,
+  "3,0,28: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4294967300": true,
+  "3,0,29: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -0.5": true,
+  "3,0,2: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 2": true,
+  "3,0,30: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 0.5": true,
+  "3,0,31: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 1.5": true,
+  "3,0,32: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 2.5": true,
+  "3,0,33: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 3.5": true,
+  "3,0,34: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4.5": true,
+  "3,0,35: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -1.5": true,
+  "3,0,36: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -0.5": true,
+  "3,0,37: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 0.5": true,
+  "3,0,38: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 1.5": true,
+  "3,0,39: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 2.5": true,
+  "3,0,3: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 3": true,
+  "3,0,40: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 3.5": true,
+  "3,0,41: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -73.5": true,
+  "3,0,42: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -72.5": true,
+  "3,0,43: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -71.5": true,
+  "3,0,44: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -70.5": true,
+  "3,0,45: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -69.5": true,
+  "3,0,46: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -68.5": true,
+  "3,0,47: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0\"": true,
+  "3,0,48: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"1\"": true,
+  "3,0,49: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"2\"": true,
+  "3,0,4: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -1": true,
+  "3,0,50: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"3\"": true,
+  "3,0,51: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-1\"": true,
+  "3,0,52: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4\"": true,
+  "3,0,53: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"5\"": true,
+  "3,0,54: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"NaN\"": true,
+  "3,0,55: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0\"": true,
+  "3,0,56: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"Infinity\"": true,
+  "3,0,57: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-Infinity\"": true,
+  "3,0,58: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65535\"": true,
+  "3,0,59: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65536\"": true,
+  "3,0,5: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 4": true,
+  "3,0,60: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65537\"": true,
+  "3,0,61: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65538\"": true,
+  "3,0,62: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65539\"": true,
+  "3,0,63: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"65540\"": true,
+  "3,0,64: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65537\"": true,
+  "3,0,65: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65536\"": true,
+  "3,0,66: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65535\"": true,
+  "3,0,67: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65534\"": true,
+  "3,0,68: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65533\"": true,
+  "3,0,69: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-65532\"": true,
+  "3,0,6: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how 5": true,
+  "3,0,70: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967295\"": true,
+  "3,0,71: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967296\"": true,
+  "3,0,72: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967297\"": true,
+  "3,0,73: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967298\"": true,
+  "3,0,74: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967299\"": true,
+  "3,0,75: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4294967300\"": true,
+  "3,0,76: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-0.5\"": true,
+  "3,0,77: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0.5\"": true,
+  "3,0,78: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"1.5\"": true,
+  "3,0,79: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"2.5\"": true,
+  "3,0,7: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how NaN": true,
+  "3,0,80: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"3.5\"": true,
+  "3,0,81: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"4.5\"": true,
+  "3,0,82: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-1.5\"": true,
+  "3,0,83: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-0.5\"": true,
+  "3,0,84: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"0.5\"": true,
+  "3,0,85: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"1.5\"": true,
+  "3,0,86: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"2.5\"": true,
+  "3,0,87: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"3.5\"": true,
+  "3,0,88: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-73.5\"": true,
+  "3,0,89: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-72.5\"": true,
+  "3,0,8: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how -0": true,
+  "3,0,90: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-71.5\"": true,
+  "3,0,91: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-70.5\"": true,
+  "3,0,92: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-69.5\"": true,
+  "3,0,93: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"-68.5\"": true,
+  "3,0,94: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"6.5536e4\"": true,
+  "3,0,95: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how null": true,
+  "3,0,96: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how undefined": true,
+  "3,0,97: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how true": true,
+  "3,0,98: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how false": true,
+  "3,0,99: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how \"\"": true,
+  "3,0,9: context range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], argument range 0 [detached], how Infinity": true,
   "30,0,0: context range 30 [paras[0], 0, paras[0].firstChild, 7], argument range 0 [detached], how 0": true,
   "30,0,1: context range 30 [paras[0], 0, paras[0].firstChild, 7], argument range 0 [detached], how 1": true,
   "30,0,2: context range 30 [paras[0], 0, paras[0].firstChild, 7], argument range 0 [detached], how 2": true,
@@ -1580,15 +1148,7 @@
   "38,0,2: context range 38 [comment, 2, comment, 3], argument range 0 [detached], how 2": true,
   "38,0,3: context range 38 [comment, 2, comment, 3], argument range 0 [detached], how 3": true,
   "39,0,0: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 0": true,
-  "39,0,1: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 1": true,
-  "39,0,2: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 2": true,
-  "39,0,3: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 3": true,
-  "39,0,4: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -1": true,
-  "39,0,5: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 4": true,
-  "39,0,6: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 5": true,
-  "39,0,7: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how NaN": true,
-  "39,0,8: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -0": true,
-  "39,0,9: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how Infinity": true,
+  "39,0,100: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"quasit\"": true,
   "39,0,10: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -Infinity": true,
   "39,0,11: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 65535": true,
   "39,0,12: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 65536": true,
@@ -1599,6 +1159,7 @@
   "39,0,17: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -65537": true,
   "39,0,18: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -65536": true,
   "39,0,19: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -65535": true,
+  "39,0,1: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 1": true,
   "39,0,20: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -65534": true,
   "39,0,21: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -65533": true,
   "39,0,22: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -65532": true,
@@ -1609,6 +1170,7 @@
   "39,0,27: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 4294967299": true,
   "39,0,28: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 4294967300": true,
   "39,0,29: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -0.5": true,
+  "39,0,2: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 2": true,
   "39,0,30: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 0.5": true,
   "39,0,31: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 1.5": true,
   "39,0,32: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 2.5": true,
@@ -1619,6 +1181,7 @@
   "39,0,37: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 0.5": true,
   "39,0,38: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 1.5": true,
   "39,0,39: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 2.5": true,
+  "39,0,3: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 3": true,
   "39,0,40: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 3.5": true,
   "39,0,41: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -73.5": true,
   "39,0,42: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -72.5": true,
@@ -1629,6 +1192,7 @@
   "39,0,47: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"0\"": true,
   "39,0,48: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"1\"": true,
   "39,0,49: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"2\"": true,
+  "39,0,4: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -1": true,
   "39,0,50: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"3\"": true,
   "39,0,51: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-1\"": true,
   "39,0,52: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"4\"": true,
@@ -1639,6 +1203,7 @@
   "39,0,57: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-Infinity\"": true,
   "39,0,58: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"65535\"": true,
   "39,0,59: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"65536\"": true,
+  "39,0,5: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 4": true,
   "39,0,60: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"65537\"": true,
   "39,0,61: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"65538\"": true,
   "39,0,62: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"65539\"": true,
@@ -1649,6 +1214,7 @@
   "39,0,67: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-65534\"": true,
   "39,0,68: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-65533\"": true,
   "39,0,69: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-65532\"": true,
+  "39,0,6: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how 5": true,
   "39,0,70: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"4294967295\"": true,
   "39,0,71: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"4294967296\"": true,
   "39,0,72: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"4294967297\"": true,
@@ -1659,6 +1225,7 @@
   "39,0,77: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"0.5\"": true,
   "39,0,78: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"1.5\"": true,
   "39,0,79: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"2.5\"": true,
+  "39,0,7: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how NaN": true,
   "39,0,80: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"3.5\"": true,
   "39,0,81: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"4.5\"": true,
   "39,0,82: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-1.5\"": true,
@@ -1669,6 +1236,7 @@
   "39,0,87: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"3.5\"": true,
   "39,0,88: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-73.5\"": true,
   "39,0,89: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-72.5\"": true,
+  "39,0,8: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how -0": true,
   "39,0,90: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-71.5\"": true,
   "39,0,91: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-70.5\"": true,
   "39,0,92: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"-69.5\"": true,
@@ -1679,143 +1247,11 @@
   "39,0,97: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how true": true,
   "39,0,98: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how false": true,
   "39,0,99: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"\"": true,
-  "39,0,100: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how \"quasit\"": true,
-  "39,3,4: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1": true,
-  "39,3,5: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4": true,
-  "39,3,6: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 5": true,
-  "39,3,11: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65535": true,
-  "39,3,16: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 65540": true,
-  "39,3,17: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65537": true,
-  "39,3,22: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -65532": true,
-  "39,3,23: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967295": true,
-  "39,3,28: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4294967300": true,
-  "39,3,34: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how 4.5": true,
-  "39,3,35: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -1.5": true,
-  "39,3,41: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -73.5": true,
-  "39,3,42: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -72.5": true,
-  "39,3,43: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -71.5": true,
-  "39,3,44: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -70.5": true,
-  "39,3,45: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -69.5": true,
-  "39,3,46: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how -68.5": true,
-  "39,3,51: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1\"": true,
-  "39,3,52: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4\"": true,
-  "39,3,53: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"5\"": true,
-  "39,3,58: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65535\"": true,
-  "39,3,63: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"65540\"": true,
-  "39,3,64: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65537\"": true,
-  "39,3,69: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-65532\"": true,
-  "39,3,70: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967295\"": true,
-  "39,3,75: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4294967300\"": true,
-  "39,3,81: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"4.5\"": true,
-  "39,3,82: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-1.5\"": true,
-  "39,3,88: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-73.5\"": true,
-  "39,3,89: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-72.5\"": true,
-  "39,3,90: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-71.5\"": true,
-  "39,3,91: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-70.5\"": true,
-  "39,3,92: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-69.5\"": true,
-  "39,3,93: context range 39 [testDiv, 0, comment, 5], argument range 3 [paras[0].firstChild, 2, paras[0].firstChild, 8], how \"-68.5\"": true,
-  "39,20,4: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1": true,
-  "39,20,5: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4": true,
-  "39,20,6: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 5": true,
-  "39,20,11: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65535": true,
-  "39,20,16: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 65540": true,
-  "39,20,17: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65537": true,
-  "39,20,22: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -65532": true,
-  "39,20,23: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967295": true,
-  "39,20,28: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4294967300": true,
-  "39,20,34: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how 4.5": true,
-  "39,20,35: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -1.5": true,
-  "39,20,41: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -73.5": true,
-  "39,20,42: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -72.5": true,
-  "39,20,43: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -71.5": true,
-  "39,20,44: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -70.5": true,
-  "39,20,45: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -69.5": true,
-  "39,20,46: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how -68.5": true,
-  "39,20,51: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1\"": true,
-  "39,20,52: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4\"": true,
-  "39,20,53: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"5\"": true,
-  "39,20,58: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65535\"": true,
-  "39,20,63: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"65540\"": true,
-  "39,20,64: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65537\"": true,
-  "39,20,69: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-65532\"": true,
-  "39,20,70: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967295\"": true,
-  "39,20,75: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4294967300\"": true,
-  "39,20,81: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"4.5\"": true,
-  "39,20,82: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-1.5\"": true,
-  "39,20,88: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-73.5\"": true,
-  "39,20,89: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-72.5\"": true,
-  "39,20,90: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-71.5\"": true,
-  "39,20,91: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-70.5\"": true,
-  "39,20,92: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-69.5\"": true,
-  "39,20,93: context range 39 [testDiv, 0, comment, 5], argument range 20 [foreignDoc.documentElement, 0, foreignDoc.documentElement, 1], how \"-68.5\"": true,
-  "39,29,4: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1": true,
-  "39,29,5: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4": true,
-  "39,29,6: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 5": true,
-  "39,29,11: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65535": true,
-  "39,29,16: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 65540": true,
-  "39,29,17: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65537": true,
-  "39,29,22: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -65532": true,
-  "39,29,23: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967295": true,
-  "39,29,28: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4294967300": true,
-  "39,29,34: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how 4.5": true,
-  "39,29,35: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -1.5": true,
-  "39,29,41: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -73.5": true,
-  "39,29,42: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -72.5": true,
-  "39,29,43: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -71.5": true,
-  "39,29,44: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -70.5": true,
-  "39,29,45: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -69.5": true,
-  "39,29,46: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how -68.5": true,
-  "39,29,51: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1\"": true,
-  "39,29,52: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4\"": true,
-  "39,29,53: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"5\"": true,
-  "39,29,58: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65535\"": true,
-  "39,29,63: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"65540\"": true,
-  "39,29,64: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65537\"": true,
-  "39,29,69: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-65532\"": true,
-  "39,29,70: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967295\"": true,
-  "39,29,75: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4294967300\"": true,
-  "39,29,81: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"4.5\"": true,
-  "39,29,82: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-1.5\"": true,
-  "39,29,88: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-73.5\"": true,
-  "39,29,89: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-72.5\"": true,
-  "39,29,90: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-71.5\"": true,
-  "39,29,91: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-70.5\"": true,
-  "39,29,92: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-69.5\"": true,
-  "39,29,93: context range 39 [testDiv, 0, comment, 5], argument range 29 [paras[0].firstChild, 3, paras[3], 1], how \"-68.5\"": true,
-  "39,39,4: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -1": true,
-  "39,39,5: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 4": true,
-  "39,39,6: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 5": true,
-  "39,39,11: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 65535": true,
-  "39,39,16: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 65540": true,
-  "39,39,17: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -65537": true,
-  "39,39,22: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -65532": true,
-  "39,39,23: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 4294967295": true,
-  "39,39,28: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 4294967300": true,
-  "39,39,34: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how 4.5": true,
-  "39,39,35: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -1.5": true,
-  "39,39,41: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -73.5": true,
-  "39,39,42: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -72.5": true,
-  "39,39,43: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -71.5": true,
-  "39,39,44: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -70.5": true,
-  "39,39,45: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -69.5": true,
-  "39,39,46: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how -68.5": true,
-  "39,39,51: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-1\"": true,
-  "39,39,52: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"4\"": true,
-  "39,39,53: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"5\"": true,
-  "39,39,58: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"65535\"": true,
-  "39,39,63: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"65540\"": true,
-  "39,39,64: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-65537\"": true,
-  "39,39,69: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-65532\"": true,
-  "39,39,70: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"4294967295\"": true,
-  "39,39,75: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"4294967300\"": true,
-  "39,39,81: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"4.5\"": true,
-  "39,39,82: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-1.5\"": true,
-  "39,39,88: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-73.5\"": true,
-  "39,39,89: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-72.5\"": true,
-  "39,39,90: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-71.5\"": true,
-  "39,39,91: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-70.5\"": true,
-  "39,39,92: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-69.5\"": true,
-  "39,39,93: context range 39 [testDiv, 0, comment, 5], argument range 39 [testDiv, 0, comment, 5], how \"-68.5\"": true,
+  "39,0,9: context range 39 [testDiv, 0, comment, 5], argument range 0 [detached], how Infinity": true,
+  "4,0,0: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 0": true,
+  "4,0,1: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 1": true,
+  "4,0,2: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 2": true,
+  "4,0,3: context range 4 [paras[0].firstChild, 2, paras[0].firstChild, 9], argument range 0 [detached], how 3": true,
   "40,0,0: context range 40 [paras[2].firstChild, 4, comment, 2], argument range 0 [detached], how 0": true,
   "40,0,1: context range 40 [paras[2].firstChild, 4, comment, 2], argument range 0 [detached], how 1": true,
   "40,0,2: context range 40 [paras[2].firstChild, 4, comment, 2], argument range 0 [detached], how 2": true,
@@ -1856,6 +1292,10 @@
   "49,0,1: context range 49 [detachedForeignTextNode, 0, detachedForeignTextNode, 8], argument range 0 [detached], how 1": true,
   "49,0,2: context range 49 [detachedForeignTextNode, 0, detachedForeignTextNode, 8], argument range 0 [detached], how 2": true,
   "49,0,3: context range 49 [detachedForeignTextNode, 0, detachedForeignTextNode, 8], argument range 0 [detached], how 3": true,
+  "5,0,0: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 0": true,
+  "5,0,1: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 1": true,
+  "5,0,2: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 2": true,
+  "5,0,3: context range 5 [paras[1].firstChild, 0, paras[1].firstChild, 0], argument range 0 [detached], how 3": true,
   "50,0,0: context range 50 [detachedXmlTextNode, 7, detachedXmlTextNode, 7], argument range 0 [detached], how 0": true,
   "50,0,1: context range 50 [detachedXmlTextNode, 7, detachedXmlTextNode, 7], argument range 0 [detached], how 1": true,
   "50,0,2: context range 50 [detachedXmlTextNode, 7, detachedXmlTextNode, 7], argument range 0 [detached], how 2": true,
@@ -1895,5 +1335,21 @@
   "59,0,0: context range 59 [xmlDocfrag, 0, xmlDocfrag, 0], argument range 0 [detached], how 0": true,
   "59,0,1: context range 59 [xmlDocfrag, 0, xmlDocfrag, 0], argument range 0 [detached], how 1": true,
   "59,0,2: context range 59 [xmlDocfrag, 0, xmlDocfrag, 0], argument range 0 [detached], how 2": true,
-  "59,0,3: context range 59 [xmlDocfrag, 0, xmlDocfrag, 0], argument range 0 [detached], how 3": true
+  "59,0,3: context range 59 [xmlDocfrag, 0, xmlDocfrag, 0], argument range 0 [detached], how 3": true,
+  "6,0,0: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 0": true,
+  "6,0,1: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 1": true,
+  "6,0,2: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 2": true,
+  "6,0,3: context range 6 [paras[1].firstChild, 0, paras[1].firstChild, 1], argument range 0 [detached], how 3": true,
+  "7,0,0: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 0": true,
+  "7,0,1: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 1": true,
+  "7,0,2: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 2": true,
+  "7,0,3: context range 7 [paras[1].firstChild, 2, paras[1].firstChild, 8], argument range 0 [detached], how 3": true,
+  "8,0,0: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 0": true,
+  "8,0,1: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 1": true,
+  "8,0,2: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 2": true,
+  "8,0,3: context range 8 [paras[1].firstChild, 2, paras[1].firstChild, 9], argument range 0 [detached], how 3": true,
+  "9,0,0: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 0": true,
+  "9,0,1: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 1": true,
+  "9,0,2: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 2": true,
+  "9,0,3: context range 9 [detachedPara1.firstChild, 0, detachedPara1.firstChild, 0], argument range 0 [detached], how 3": true
 }
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
new file mode 100644
index 000000000000..9ec06780bc42
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
@@ -0,0 +1,43 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+
+DEPTH = ../../../../../../../..
+
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+relativesrcdir = dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger
+
+DIRS = \
+  $(NULL)
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_FILES = \
+  test_DOMImplementation-createDocument.html.json \
+  test_Document-createElementNS.html.json \
+  test_Document-getElementsByTagName.html.json \
+  test_Element-children.html.json \
+  test_Event-constructors.html.json \
+  test_Event-defaultPrevented.html.json \
+  test_EventTarget-dispatchEvent.html.json \
+  test_Node-appendChild.html.json \
+  test_Node-constants.html.json \
+  test_Node-insertBefore.html.json \
+  test_Node-isEqualNode.xhtml.json \
+  test_Node-removeChild.html.json \
+  test_Node-replaceChild.html.json \
+  test_NodeFilter-constants.html.json \
+  test_Range-attributes.html.json \
+  test_Range-commonAncestorContainer.html.json \
+  test_Range-comparePoint.html.json \
+  test_Range-detach.html.json \
+  test_Range-intersectsNode.html.json \
+  test_attributes.html.json \
+  test_case.html.json \
+  test_historical.html.json \
+  test_interfaces.html.json \
+  $(NULL)
+
+libs:: $(_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocument.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocument.html.json
new file mode 100644
index 000000000000..43c7b2fdf032
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocument.html.json
@@ -0,0 +1,11 @@
+{
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 16": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 31": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 46": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 61": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 76": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 92": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 93": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 95": true,
+  "DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype) 97": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElementNS.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElementNS.html.json
new file mode 100644
index 000000000000..6ab40613b824
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElementNS.html.json
@@ -0,0 +1,3 @@
+{
+  "Invalid Name: \u0300foo": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html.json
new file mode 100644
index 000000000000..d933e3c7cce8
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html.json
@@ -0,0 +1,4 @@
+{
+  "Document.getElementsByTagName 2": true,
+  "Document.getElementsByTagName 3": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-children.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-children.html.json
new file mode 100644
index 000000000000..f2017e746519
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-children.html.json
@@ -0,0 +1,3 @@
+{
+  "HTMLCollection edge cases 1": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constructors.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constructors.html.json
new file mode 100644
index 000000000000..02e5a2d54c19
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constructors.html.json
@@ -0,0 +1,3 @@
+{
+  "Event constructors": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-defaultPrevented.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-defaultPrevented.html.json
new file mode 100644
index 000000000000..94fd3351f4e6
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-defaultPrevented.html.json
@@ -0,0 +1,3 @@
+{
+  "initEvent should unset defaultPrevented.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_EventTarget-dispatchEvent.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_EventTarget-dispatchEvent.html.json
new file mode 100644
index 000000000000..ae087d1719de
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_EventTarget-dispatchEvent.html.json
@@ -0,0 +1,3 @@
+{
+  "If the event's dispatch flag is set, an InvalidStateError must be thrown.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-appendChild.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-appendChild.html.json
new file mode 100644
index 000000000000..995287daba7b
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-appendChild.html.json
@@ -0,0 +1,3 @@
+{
+  "Node.appendChild": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-constants.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-constants.html.json
new file mode 100644
index 000000000000..759b661702b8
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-constants.html.json
@@ -0,0 +1,4 @@
+{
+  "Constants for createDocumentPosition on [object DOM Constructor.prototype].": true,
+  "Constants for nodeType on [object DOM Constructor.prototype].": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-insertBefore.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-insertBefore.html.json
new file mode 100644
index 000000000000..9a192eafc160
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-insertBefore.html.json
@@ -0,0 +1,7 @@
+{
+  "Calling insertBefore with a non-Node first argument must throw TypeError.": true,
+  "Calling insertBefore with a non-Node first argument on a leaf node Comment node <!--Foo--> must throw TypeError.": true,
+  "Calling insertBefore with a non-Node first argument on a leaf node DocumentType node must throw TypeError.": true,
+  "Calling insertBefore with a non-Node first argument on a leaf node ProcessingInstruction node with target \"foo\" and data \"bar\" must throw TypeError.": true,
+  "Calling insertBefore with a non-Node first argument on a leaf node Text node \"Foo\" must throw TypeError.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-isEqualNode.xhtml.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-isEqualNode.xhtml.json
new file mode 100644
index 000000000000..45ac3ca1b1d0
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-isEqualNode.xhtml.json
@@ -0,0 +1,3 @@
+{
+  "isEqualNode should return true when only the internal subsets of DocumentTypes differ.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-removeChild.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-removeChild.html.json
new file mode 100644
index 000000000000..640713f4b8c3
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-removeChild.html.json
@@ -0,0 +1,3 @@
+{
+  "Passing a value that is not a Node reference to removeChild should throw TypeError.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-replaceChild.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-replaceChild.html.json
new file mode 100644
index 000000000000..dbcf86b8dddc
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-replaceChild.html.json
@@ -0,0 +1,4 @@
+{
+  "If the context node is not a node that can contain children, a NotFoundError exception should be thrown": true,
+  "Passing null to replaceChild should throw a TypeError.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_NodeFilter-constants.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_NodeFilter-constants.html.json
new file mode 100644
index 000000000000..a6c9ccef518d
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_NodeFilter-constants.html.json
@@ -0,0 +1,4 @@
+{
+  "Constants for acceptNode on undefined.": true,
+  "Constants for whatToShow on undefined.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-attributes.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-attributes.html.json
new file mode 100644
index 000000000000..5e4e20839949
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-attributes.html.json
@@ -0,0 +1,3 @@
+{
+  "Range attributes": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-commonAncestorContainer.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-commonAncestorContainer.html.json
new file mode 100644
index 000000000000..a8609e51b12d
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-commonAncestorContainer.html.json
@@ -0,0 +1,3 @@
+{
+  "Detached Range": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-comparePoint.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-comparePoint.html.json
new file mode 100644
index 000000000000..456283f7ac70
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-comparePoint.html.json
@@ -0,0 +1,4 @@
+{
+  "Range.comparePoint": true,
+  "Range.comparePoint 1": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-detach.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-detach.html.json
new file mode 100644
index 000000000000..61c49bd75bc5
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-detach.html.json
@@ -0,0 +1,3 @@
+{
+  "Range.detach": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html.json
new file mode 100644
index 000000000000..d39eb64b63b9
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html.json
@@ -0,0 +1,5 @@
+{
+  "Range.intersectsNode": true,
+  "Range.intersectsNode 1": true,
+  "Range.intersectsNode 2": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_attributes.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_attributes.html.json
new file mode 100644
index 000000000000..e1acdc1efb13
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_attributes.html.json
@@ -0,0 +1,6 @@
+{
+  "AttrExodus": true,
+  "First set attribute is returned by setAttribute": true,
+  "First set attribute is returned with mapped attribute set first": true,
+  "setAttribute should throw a NAMESPACE_ERR when qualifiedName starts with 'xmlns'": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_case.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_case.html.json
new file mode 100644
index 000000000000..42cbaf0995e9
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_case.html.json
@@ -0,0 +1,7 @@
+{
+  "getElementsByTagName ABC": true,
+  "getElementsByTagName Abc": true,
+  "getElementsByTagName abc": true,
+  "getElementsByTagName \u00c4": true,
+  "getElementsByTagName \u00e4": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_historical.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_historical.html.json
new file mode 100644
index 000000000000..27b4c7108758
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_historical.html.json
@@ -0,0 +1,18 @@
+{
+  "DocumentType member must be nuked: internalSubset": true,
+  "Historical DOM features must be removed: CDATASection": true,
+  "Historical DOM features must be removed: NamedNodeMap": true,
+  "Historical DOM features must be removed: UserDataHandler": true,
+  "Historical DOM features must be removed: createAttribute": true,
+  "Historical DOM features must be removed: createAttributeNS": true,
+  "Historical DOM features must be removed: createCDATASection": true,
+  "Historical DOM features must be removed: getAttributeNode": true,
+  "Historical DOM features must be removed: getAttributeNodeNS": true,
+  "Historical DOM features must be removed: inputEncoding": true,
+  "Historical DOM features must be removed: removeAttributeNode": true,
+  "Historical DOM features must be removed: setAttributeNode": true,
+  "Node member must be nuked: getUserData": true,
+  "Node member must be nuked: hasAttributes": true,
+  "Node member must be nuked: isSupported": true,
+  "Node member must be nuked: setUserData": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_interfaces.html.json b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_interfaces.html.json
new file mode 100644
index 000000000000..0896f9ffac99
--- /dev/null
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_interfaces.html.json
@@ -0,0 +1,6 @@
+{
+  "Should be able to delete CharacterData.": true,
+  "Should be able to delete Document.": true,
+  "Should be able to delete Node.": true,
+  "Should be able to delete NodeFilter.": true
+}
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
index 4f3c1154c267..84f6a0024efa 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
index a59de29d4ac0..1ef10a3d900e 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
index c9bc42a38eac..3f9e28dc1693 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
index 18618da73b95..a4149cf44b55 100644
--- a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
@@ -1,9 +1,9 @@
-DEPTH = ../../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
@@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES = \
   test_interfaces.html.json \
-  test_setrequestheader-invalid-arguments.htm.json \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/test_setrequestheader-invalid-arguments.htm.json b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/test_setrequestheader-invalid-arguments.htm.json
deleted file mode 100644
index ff251f55816a..000000000000
--- a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/test_setrequestheader-invalid-arguments.htm.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "XMLHttpRequest: setRequestHeader() with invalid arguments": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 1": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 2": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 3": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 4": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 5": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 6": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 7": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 8": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 9": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 10": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 11": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 12": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 13": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 14": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 15": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 16": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 17": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 18": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 19": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 20": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 21": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 22": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 23": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 24": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 25": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 26": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 27": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 28": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 29": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 30": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 31": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 32": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 33": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 34": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 35": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 36": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 37": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 38": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 39": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 40": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 41": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 42": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 43": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 44": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 45": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 46": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 47": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 48": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 49": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 50": true,
-  "XMLHttpRequest: setRequestHeader() with invalid arguments 51": true
-}
diff --git a/dom/imptests/html/tests/submission/Mozilla/Makefile.in b/dom/imptests/html/tests/submission/Mozilla/Makefile.in
index e2af23bca100..334e741b1d72 100644
--- a/dom/imptests/html/tests/submission/Mozilla/Makefile.in
+++ b/dom/imptests/html/tests/submission/Mozilla/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/html/tests/submission/Mozilla
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/html/tests/submission/Opera/microdata/Makefile.in b/dom/imptests/html/tests/submission/Opera/microdata/Makefile.in
index 2edf7a941ade..90f92fbf115b 100644
--- a/dom/imptests/html/tests/submission/Opera/microdata/Makefile.in
+++ b/dom/imptests/html/tests/submission/Opera/microdata/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/html/tests/submission/Opera/microdata
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/idlharness.js b/dom/imptests/idlharness.js
index ac9fd008ca63..08545ea20e82 100644
--- a/dom/imptests/idlharness.js
+++ b/dom/imptests/idlharness.js
@@ -779,11 +779,11 @@ IdlException.prototype.test_members = function()
                 assert_throws(new TypeError(), function()
                 {
                     window[this.name].prototype[member.name];
-                }, "getting property on prototype object must throw TypeError");
+                }.bind(this), "getting property on prototype object must throw TypeError");
                 assert_throws(new TypeError(), function()
                 {
                     desc.get.call({});
-                }, "calling getter on wrong object type must throw TypeError");
+                }.bind(this), "calling getter on wrong object type must throw TypeError");
             }.bind(this), this.name + " exception: field " + member.name + " on exception interface prototype object");
         }
     }
@@ -946,11 +946,11 @@ IdlInterface.prototype.test_self = function()
             assert_throws(new TypeError(), function()
             {
                 window[this.name]();
-            }, "interface object didn't throw TypeError when called as a function");
+            }.bind(this), "interface object didn't throw TypeError when called as a function");
             assert_throws(new TypeError(), function()
             {
                 new window[this.name]();
-            }, "interface object didn't throw TypeError when called as a constructor");
+            }.bind(this), "interface object didn't throw TypeError when called as a constructor");
         }
     }.bind(this), this.name + " interface: existence and properties of interface object");
 
@@ -1367,7 +1367,7 @@ IdlInterface.prototype.test_interface_of = function(desc, obj, exception, expect
                     assert_throws(new TypeError(), function()
                     {
                         obj[member.name].apply(obj, args);
-                    }, "Called with " + i + " arguments");
+                    }.bind(this), "Called with " + i + " arguments");
 
                     args.push(create_suitable_object(member.arguments[i].type));
                 }
diff --git a/dom/imptests/testharness.css b/dom/imptests/testharness.css
index 341386dde0bb..365084f3f821 100644
--- a/dom/imptests/testharness.css
+++ b/dom/imptests/testharness.css
@@ -72,7 +72,7 @@ tr.notrun > td:first-child {
     color:blue;
 }
 
-.pass .fail .timeout .notrun > td:first-child {
+.pass > td:first-child, .fail > td:first-child, .timeout > td:first-child, .notrun > td:first-child {
     font-variant:small-caps;
 }
 
diff --git a/dom/imptests/testharness.js b/dom/imptests/testharness.js
index 825f040e7ed4..490581d40388 100644
--- a/dom/imptests/testharness.js
+++ b/dom/imptests/testharness.js
@@ -290,6 +290,14 @@ policies and contribution forms [3].
  *   asserts if called. Used to ensure that some codepath is *not* taken e.g.
  *   an event does not fire.
  *
+ * assert_any(assert_func, actual, expected_array, extra_arg_1, ... extra_arg_N)
+ *   asserts that one assert_func(actual, expected_array_N, extra_arg1, ..., extra_arg_N)
+ *   is true for some expected_array_N in expected_array. This only works for assert_func
+ *   with signature assert_func(actual, expected, args_1, ..., args_N). Note that tests
+ *   with multiple allowed pass conditions are bad practice unless the spec specifically
+ *   allows multiple behaviours. Test authors should not use this method simply to hide 
+ *   UA bugs.
+ *
  * assert_exists(object, property_name, description)
  *   *** deprecated ***
  *   asserts that object has an own property property_name
@@ -442,6 +450,7 @@ policies and contribution forms [3].
         switch (typeof val)
         {
         case "string":
+            val = val.replace("\\", "\\\\");
             for (var i = 0; i < 32; i++)
             {
                 var replace = "\\";
@@ -584,6 +593,13 @@ policies and contribution forms [3].
           * Test if two primitives are equal or two objects
           * are the same object
           */
+        if (typeof actual != typeof expected)
+        {
+            assert(false, "assert_equals", description,
+                          "expected (" + typeof expected + ") ${expected} but got (" + typeof actual + ") ${actual}",
+                          {expected:expected, actual:actual});
+            return;
+        }
         assert(same_value(actual, expected), "assert_equals", description,
                                              "expected ${expected} but got ${actual}",
                                              {expected:expected, actual:actual});
@@ -889,6 +905,27 @@ policies and contribution forms [3].
     }
     expose(assert_unreached, "assert_unreached");
 
+    function assert_any(assert_func, actual, expected_array) 
+    {
+        var args = [].slice.call(arguments, 3)
+        var errors = []
+        var passed = false;
+        forEach(expected_array, 
+                function(expected)
+                {
+                    try {
+                        assert_func.apply(this, [actual, expected].concat(args))
+                        passed = true;
+                    } catch(e) {
+                        errors.push(e.message);
+                    }
+                });
+        if (!passed) {
+            throw new AssertionError(errors.join("\n\n"));
+        }
+    }
+    expose(assert_any, "assert_any");
+
     function Test(name, properties)
     {
         this.name = name;
@@ -980,6 +1017,23 @@ policies and contribution forms [3].
         };
     };
 
+    Test.prototype.step_func_done = function(func, this_obj)
+    {
+        var test_this = this;
+
+        if (arguments.length === 1)
+        {
+            this_obj = test_this;
+        }
+
+        return function()
+        {
+            test_this.step.apply(test_this, [func, this_obj].concat(
+                Array.prototype.slice.call(arguments)));
+            test_this.done();
+        };
+    };
+
     Test.prototype.set_timeout = function()
     {
         var this_obj = this;
@@ -1520,7 +1574,7 @@ policies and contribution forms [3].
             return '';
         }
         
-        log.appendChild(document.createElement("section"));
+        log.appendChild(document.createElementNS(xhtml_ns, "section"));
         var assertions = has_assertions();
         var html = "<h2>Details</h2><table id='results' " + (assertions ? "class='assertions'" : "" ) + ">"
             + "<thead><tr><th>Result</th><th>Test Name</th>"
@@ -1864,4 +1918,4 @@ policies and contribution forms [3].
  }
 
 })();
-// vim: set expandtab shiftwidth=4 tabstop=4:
\ No newline at end of file
+// vim: set expandtab shiftwidth=4 tabstop=4:
diff --git a/dom/imptests/webapps.mk b/dom/imptests/webapps.mk
index db3aff17a6c0..374824fca5cc 100644
--- a/dom/imptests/webapps.mk
+++ b/dom/imptests/webapps.mk
@@ -1,5 +1,6 @@
 DIRS += \
   webapps/DOMCore/tests/approved \
+  webapps/DOMCore/tests/submissions/Ms2ger \
   webapps/DOMCore/tests/submissions/Opera \
   webapps/WebStorage/tests/submissions \
   webapps/XMLHttpRequest/tests/submissions/Ms2ger \
diff --git a/dom/imptests/webapps.txt b/dom/imptests/webapps.txt
index 2f4948c93db2..14072e16d168 100644
--- a/dom/imptests/webapps.txt
+++ b/dom/imptests/webapps.txt
@@ -1,5 +1,6 @@
 https://dvcs.w3.org/hg/webapps|webapps
 DOMCore/tests/approved
+DOMCore/tests/submissions/Ms2ger
 DOMCore/tests/submissions/Opera
 WebStorage/tests/submissions
 XMLHttpRequest/tests/submissions/Ms2ger
diff --git a/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in b/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
index 02fcfb03acf8..dee7736cea19 100644
--- a/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
+++ b/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/DOMCore/tests/approved
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Document-createProcessingInstruction.js b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Document-createProcessingInstruction.js
new file mode 100644
index 000000000000..114ac35d9f82
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Document-createProcessingInstruction.js
@@ -0,0 +1,39 @@
+test(function() {
+  var invalid = [
+        ["A", "?>"],
+        ["\u00B7A", "x"],
+        ["\u00D7A", "x"],
+        ["A\u00D7", "x"],
+        ["\\A", "x"],
+        ["\f", "x"],
+        [0, "x"],
+        ["0", "x"]
+      ],
+      valid = [
+        ["xml:fail", "x"],
+        ["A\u00B7A", "x"],
+        ["a0", "x"]
+      ]
+
+  for (var i = 0, il = invalid.length; i < il; i++) {
+    test(function() {
+      assert_throws("INVALID_CHARACTER_ERR", function() {
+        document.createProcessingInstruction(invalid[i][0], invalid[i][1])
+      })
+    }, "Should throw an INVALID_CHARACTER_ERR for target " +
+       format_value(invalid[i][0]) + " and data " +
+       format_value(invalid[i][1]) + ".")
+  }
+  for (var i = 0, il = valid.length; i < il; ++i) {
+    test(function() {
+      var pi = document.createProcessingInstruction(valid[i][0], valid[i][1]);
+      assert_equals(pi.target, valid[i][0]);
+      assert_equals(pi.data, valid[i][1]);
+      assert_equals(pi.ownerDocument, document);
+      assert_true(pi instanceof ProcessingInstruction);
+      assert_true(pi instanceof Node);
+    }, "Should get a ProcessingInstruction for target " +
+      format_value(valid[i][0]) + " and data " +
+      format_value(valid[i][1]) + ".")
+  }
+})
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
new file mode 100644
index 000000000000..093338ca9c44
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
@@ -0,0 +1,115 @@
+# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
+
+DEPTH = ../../../../../../..
+
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+relativesrcdir = dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger
+
+DIRS = \
+  $(NULL)
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_FILES = \
+  test_attributes.html \
+  test_case.html \
+  test_CharacterData-appendData.html \
+  test_CharacterData-deleteData.html \
+  test_CharacterData-insertData.html \
+  test_CharacterData-replaceData.html \
+  test_Document-adoptNode.html \
+  test_Document-createComment.html \
+  test_Document-createElement.html \
+  test_Document-createElementNS.html \
+  test_Document-createEvent.html \
+  test_Document-createProcessingInstruction.html \
+  test_Document-createProcessingInstruction-literal-1.xhtml \
+  test_Document-createProcessingInstruction-literal-2.xhtml \
+  test_Document-createProcessingInstruction.xhtml \
+  test_Document-getElementById.html \
+  test_Document-getElementsByTagName.html \
+  test_Document-getElementsByTagNameNS.html \
+  test_Document-importNode.html \
+  test_DOMException-constants.html \
+  test_DOMImplementation-createDocument.html \
+  test_DOMImplementation-createDocumentType.html \
+  test_DOMImplementation-createHTMLDocument.html \
+  test_DOMImplementation-hasFeature.html \
+  test_Element-childElementCount-dynamic-add.html \
+  test_Element-childElementCount-dynamic-add.svg \
+  test_Element-childElementCount-dynamic-add.xhtml \
+  test_Element-childElementCount-dynamic-remove.html \
+  test_Element-childElementCount-dynamic-remove.svg \
+  test_Element-childElementCount-dynamic-remove.xhtml \
+  test_Element-childElementCount.html \
+  test_Element-childElementCount-nochild.html \
+  test_Element-childElementCount-nochild.svg \
+  test_Element-childElementCount-nochild.xhtml \
+  test_Element-childElementCount.svg \
+  test_Element-childElementCount.xhtml \
+  test_Element-childElement-null.html \
+  test_Element-childElement-null.svg \
+  test_Element-childElement-null.xhtml \
+  test_Element-children.html \
+  test_Element-firstElementChild-entity.svg \
+  test_Element-firstElementChild-entity.xhtml \
+  test_Element-firstElementChild.html \
+  test_Element-firstElementChild-namespace.html \
+  test_Element-firstElementChild-namespace.svg \
+  test_Element-firstElementChild-namespace.xhtml \
+  test_Element-firstElementChild.svg \
+  test_Element-firstElementChild.xhtml \
+  test_Element-getElementsByClassName.html \
+  test_Element-lastElementChild.html \
+  test_Element-lastElementChild.svg \
+  test_Element-lastElementChild.xhtml \
+  test_Element-nextElementSibling.html \
+  test_Element-nextElementSibling.svg \
+  test_Element-nextElementSibling.xhtml \
+  test_Element-previousElementSibling.html \
+  test_Element-previousElementSibling.svg \
+  test_Element-previousElementSibling.xhtml \
+  test_Element-removeAttributeNS.html \
+  test_Element-siblingElement-null.html \
+  test_Element-siblingElement-null.svg \
+  test_Element-siblingElement-null.xhtml \
+  test_Element-tagName.html \
+  test_Event-constants.html \
+  test_Event-constructors.html \
+  test_Event-defaultPrevented.html \
+  test_Event-initEvent.html \
+  test_EventTarget-dispatchEvent.html \
+  test_historical.html \
+  test_interfaces.html \
+  test_Node-appendChild.html \
+  test_Node-cloneNode.html \
+  test_Node-constants.html \
+  test_Node-insertBefore.html \
+  test_Node-isEqualNode.xhtml \
+  test_Node-lookupPrefix.xhtml \
+  test_Node-nodeName.html \
+  test_Node-nodeName.xhtml \
+  test_Node-normalize.html \
+  test_Node-parentElement.html \
+  test_Node-parentNode.html \
+  test_Node-removeChild.html \
+  test_Node-replaceChild.html \
+  test_NodeFilter-constants.html \
+  test_Range-attributes.html \
+  test_Range-commonAncestorContainer.html \
+  test_Range-comparePoint.html \
+  test_Range-detach.html \
+  test_Range-intersectsNode.html \
+  attributes.js \
+  case.js \
+  creators.js \
+  constants.js \
+  Document-createProcessingInstruction.js \
+  productions.js \
+  $(NULL)
+
+libs:: $(_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/attributes.js b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/attributes.js
new file mode 100644
index 000000000000..3fbb6d769288
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/attributes.js
@@ -0,0 +1,14 @@
+function attr_is(attr, v, ln, ns, p, n) {
+  assert_equals(attr.value, v)
+  assert_equals(attr.localName, ln)
+  assert_equals(attr.namespaceURI, ns)
+  assert_equals(attr.prefix, p)
+  assert_equals(attr.name, n)
+}
+
+function attributes_are(el, l) {
+  for (var i = 0, il = l.length; i < il; i++) {
+    attr_is(el.attributes[i], l[i][1], l[i][0], (l[i].length < 3) ? null : l[i][2], null, l[i][0])
+//    assert_equals(el.attributes[i].ownerElement, el)
+  }
+}
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/case.js b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/case.js
new file mode 100644
index 000000000000..3d37b702ecf2
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/case.js
@@ -0,0 +1,178 @@
+/*
+ * document.createElement(NS)
+ *
+ * document.getElementsByTagName(NS)
+ *
+ * Element.setAttribute(NS)
+ *
+ * Element.getAttribute(NS)
+ * Element.hasAttribute(NS)
+ * Element.getElementsByTagName(NS)
+ */
+
+var tests = [];
+setup(function() {
+        var name_inputs = ["abc", "Abc", "ABC", "ä", "Ä"];
+        var namespaces = ["http://www.w3.org/1999/xhtml", "http://www.w3.org/2000/svg", "http://FOO"];
+        name_inputs.forEach(function(x) {
+                              tests.push(["createElement " + x, test_create_element, [x]]);
+                              tests.push(["setAttribute " +x, test_set_attribute, [x]]);
+                              tests.push(["getAttribute " +x, test_get_attribute, [x]]);
+                              tests.push(["getElementsByTagName " +x, test_get_elements_tag_name,
+                                          [outer_product(namespaces, ["a"], name_inputs),
+                                           x]]);
+                            });
+        outer_product(namespaces, name_inputs, name_inputs).forEach(function(x) {
+                                                                      tests.push(["createElementNS " + x, test_create_element_ns, x]);
+                                                                      tests.push(["setAttributeNS " + x, test_set_attribute_ns, x]);
+                                                                      tests.push(["getAttributeNS " + x, test_get_attribute_ns, x]);
+                                                                    });
+        outer_product([null].concat(namespaces), name_inputs).forEach(function(x) {
+                                                                        tests.push(["getElementsByTagNameNS " + x, test_get_elements_tag_name_ns,
+                                                                        outer_product(namespaces, name_inputs), x]);
+                                                                      });
+        name_inputs.forEach(function(x) {
+                              tests.push(["createElementNS " + x, test_create_element_ns, [null, null, x]]);
+                              tests.push(["setAttributeNS " + x, test_set_attribute_ns, [null, null, x]]);
+                              tests.push(["getAttributeNS " + x, test_get_attribute_ns, [null, null, x]]);
+                            });
+
+      });
+function outer_product() {
+  var rv = [];
+  function compute_outer_product() {
+    var args = Array.prototype.slice.call(arguments);
+    var index = args[0];
+    if (index < args.length) {
+      args[index].forEach(function(x) {
+                           compute_outer_product.apply(this, [index+1].concat(args.slice(1, index), x, args.slice(index+1)));
+                          });
+    } else {
+      rv.push(args.slice(1));
+    }
+  }
+  compute_outer_product.apply(this, [1].concat(Array.prototype.slice.call(arguments)));
+  return rv;
+}
+
+function expected_case(input) {
+  //is_html gets set by a global on the page loading the tests
+  if (is_html) {
+    return ascii_lowercase(input);
+  } else {
+    return input;
+  }
+}
+
+function ascii_lowercase(input) {
+  return input.replace(/[A-Z]/g, function(x) {
+                         return x.toLowerCase();
+                       });
+}
+
+function test_create_element(name) {
+  var node = document.createElement(name);
+  assert_equals(node.localName, expected_case(name));
+}
+
+function test_create_element_ns(namespace, prefix, local_name) {
+  var qualified_name = prefix ? prefix + ":" + local_name : local_name;
+  var node = document.createElementNS(namespace, qualified_name);
+  assert_equals(node.prefix, prefix, "prefix");
+  assert_equals(node.localName, local_name, "localName");
+}
+
+function test_set_attribute(name) {
+  var node = document.createElement("div");
+  node.setAttribute(name, "test");
+  assert_equals(node.attributes[0].localName, expected_case(name));
+}
+
+function test_set_attribute_ns(namespace, prefix, local_name) {
+  var qualified_name = prefix ? prefix + ":" + local_name : local_name;
+  var node = document.createElement("div");
+  node.setAttributeNS(namespace, qualified_name, "test");
+  var attr = node.attributes[0];
+  assert_equals(attr.prefix, prefix, "prefix");
+  assert_equals(attr.localName, local_name, "localName");
+}
+
+function test_get_attribute(name) {
+  var node = document.createElement("div");
+  node.setAttribute(name, "test");
+  var expected_name = expected_case(name);
+  assert_equals(node.getAttribute(expected_name), "test");
+  if (expected_name != name) {
+    assert_equals(node.getAttribute(expected_name), "test");
+  } else if (name !== ascii_lowercase(name)) {
+    assert_equals(node.getAttribute(ascii_lowercase(name)), null);
+  }
+}
+
+function test_get_attribute_ns(namespace, prefix, local_name) {
+  var qualified_name = prefix ? prefix + ":" + local_name : local_name;
+  var node = document.createElement("div");
+  node.setAttributeNS(namespace, qualified_name, "test");
+  var expected_name = local_name;
+  assert_equals(node.getAttributeNS(namespace, expected_name), "test");
+  if (local_name !== ascii_lowercase(local_name)) {
+    assert_equals(node.getAttributeNS(namespace, ascii_lowercase(local_name)), null);
+  }
+}
+
+function test_get_elements_tag_name(elements_to_create, search_string) {
+  var container = document.createElement("div");
+  elements_to_create.forEach(function(x) {
+                               var qualified_name = x[1] ? x[1] + ":" + x[2] : x[2];
+                               var element = document.createElementNS(x[0], qualified_name);
+                               container.appendChild(element);
+                             });
+  var expected = Array.prototype.filter.call(container.childNodes,
+                                            function(node) {
+                                              if (is_html && node.namespaceURI === "http://www.w3.org/1999/xhtml") {
+                                                return expected_case(node.localName) === expected_case(search_string);
+                                              } else {
+                                                return node.localName === expected_case(search_string);
+                                              }
+                                            });
+  document.documentElement.appendChild(container);
+  try {
+    assert_array_equals(document.getElementsByTagName(search_string), expected);
+  } catch(e) {
+    throw e;
+  } finally {
+    document.documentElement.removeChild(container);
+  }
+}
+
+function test_get_elements_tag_name_ns(elements_to_create, search_input) {
+  var search_uri = search_input[0];
+  var search_name = search_input[1];
+  var container = document.createElement("div");
+  elements_to_create.forEach(function(x) {
+                               var qualified_name = x[1] ? x[1] + ":" + x[2] : x[2];
+                               var element = document.createElementNS(x[0], qualified_name);
+                               container.appendChild(element);
+                             });
+  var expected = Array.prototype.filter.call(container.childNodes,
+                                            function(node) {
+                                              return node.namespaceURI === search_uri;
+                                              return node.localName === search_name;
+                                            });
+  document.documentElement.appendChild(container);
+  try {
+    assert_array_equals(document.getElementsByTagNameNS(search_uri, search_name), expected);
+  } catch(e) {
+    throw e;
+  } finally {
+    document.documentElement.removeChild(container);
+  }
+}
+
+function test_func() {
+  var func = arguments[0];
+  var rest = arguments[1];
+  func.apply(this, rest);
+}
+
+generate_tests(test_func, tests);
\ No newline at end of file
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/constants.js b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/constants.js
new file mode 100644
index 000000000000..645f097cfaeb
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/constants.js
@@ -0,0 +1,10 @@
+function testConstants(objects, constants, msg) {
+  objects.forEach(function(o) {
+    test(function() {
+      constants.forEach(function(d) {
+        assert_true(d[0] in o, "Object " + o + " doesn't have " + d[0])
+        assert_equals(o[d[0]], d[1], "Object " + o + " value for " + d[0] + " is wrong")
+      })
+    }, "Constants for " + msg + " on " + o + ".")
+  })
+}
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/creators.js b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/creators.js
new file mode 100644
index 000000000000..8b7415d13f09
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/creators.js
@@ -0,0 +1,5 @@
+var creators = {
+  "element": "createElement",
+  "text": "createTextNode",
+  "comment": "createComment"
+};
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/productions.js b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/productions.js
new file mode 100644
index 000000000000..fcee668f248a
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/productions.js
@@ -0,0 +1,3 @@
+var invalid_names = ["\\", "'", '"', "0", "0:a"] // XXX
+var valid_names = ["x", ":", "a:0"]
+var invalid_qnames = [":a", "b:", "x:y:z"] // XXX
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-appendData.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-appendData.html
new file mode 100644
index 000000000000..661b38ff06c8
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-appendData.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CharacterData.appendData</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testNode(node) {
+  test(function() {
+    assert_equals(node.data, "test")
+    node.appendData("test")
+    assert_equals(node.data, "testtest")
+  })
+}
+test(function() {
+  testNode(document.createTextNode("test"))
+  testNode(document.createComment("test"))
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-deleteData.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-deleteData.html
new file mode 100644
index 000000000000..1a9ee92e5717
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-deleteData.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CharacterData.deleteData</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testNode(node) {
+  test(function() {
+    assert_throws("INDEX_SIZE_ERR", function() { node.deleteData(5, 10) })
+    assert_throws("INDEX_SIZE_ERR", function() { node.deleteData(5, 0) })
+    node.deleteData(2, 10)
+    assert_equals(node.data, "te")
+    node.data = "test"
+    node.deleteData(1, 1)
+    assert_equals(node.data, "tst")
+  })
+}
+test(function() {
+  testNode(document.createTextNode("test"))
+  testNode(document.createComment("test"))
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-insertData.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-insertData.html
new file mode 100644
index 000000000000..ac66c274d5dc
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-insertData.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CharacterData.insertData</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testNode(node) {
+  test(function() {
+    assert_throws("INDEX_SIZE_ERR", function() { node.insertData(5, "x") })
+    assert_throws("INDEX_SIZE_ERR", function() { node.insertData(5, "") })
+    node.insertData(2, "X")
+    assert_equals(node.data, "teXst")
+    node.data = "test"
+    node.insertData(4, "ing")
+    assert_equals(node.data, "testing")
+  })
+}
+test(function() {
+  testNode(document.createTextNode("test"))
+  testNode(document.createComment("test"))
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-replaceData.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-replaceData.html
new file mode 100644
index 000000000000..7f6fc4c3e306
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_CharacterData-replaceData.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<title>CharacterData.replaceData</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testNode(node) {
+  test(function() {
+    assert_throws("INDEX_SIZE_ERR", function() { node.replaceData(5, 1, "x") })
+    assert_throws("INDEX_SIZE_ERR", function() { node.replaceData(5, 0, "") })
+    node.replaceData(2, 10, "yo")
+    assert_equals(node.data, "teyo")
+    node.data = "test"
+    node.replaceData(1, 1, "waddup")
+    assert_equals(node.data, "twaddupst")
+    node.replaceData(1, 1, "yup")
+    assert_equals(node.data, "tyupaddupst")
+  })
+}
+test(function() {
+  testNode(document.createTextNode("test"))
+  testNode(document.createComment("test"))
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMException-constants.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMException-constants.html
new file mode 100644
index 000000000000..90b6e175e88a
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMException-constants.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<title>DOMException constants</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var constants = [
+    "INDEX_SIZE_ERR",
+    "DOMSTRING_SIZE_ERR",
+    "HIERARCHY_REQUEST_ERR",
+    "WRONG_DOCUMENT_ERR",
+    "INVALID_CHARACTER_ERR",
+    "NO_DATA_ALLOWED_ERR",
+    "NO_MODIFICATION_ALLOWED_ERR",
+    "NOT_FOUND_ERR",
+    "NOT_SUPPORTED_ERR",
+    "INUSE_ATTRIBUTE_ERR",
+    "INVALID_STATE_ERR",
+    "SYNTAX_ERR",
+    "INVALID_MODIFICATION_ERR",
+    "NAMESPACE_ERR",
+    "INVALID_ACCESS_ERR",
+    "VALIDATION_ERR",
+    "TYPE_MISMATCH_ERR",
+    "SECURITY_ERR",
+    "NETWORK_ERR",
+    "ABORT_ERR",
+    "URL_MISMATCH_ERR",
+    "QUOTA_EXCEEDED_ERR",
+    "TIMEOUT_ERR",
+    "INVALID_NODE_TYPE_ERR",
+    "DATA_CLONE_ERR"
+  ]
+  for (var i = 0; i < constants.length; i++) {
+    var name = constants[i];
+    if (name)
+      assert_equals(DOMException[name], i + 1, name)
+  }
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocument.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocument.html
new file mode 100644
index 000000000000..d810457542bf
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocument.html
@@ -0,0 +1,155 @@
+<!doctype html>
+<title>DOMImplementation.createDocument(namespaceURI, qualifiedName, doctype)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var tests = [
+    [null, null, null, null],
+    [null, "", null, null],
+    [null, "foo", null, null],
+    [null, "1foo", null, "INVALID_CHARACTER_ERR"],
+    [null, "f1oo", null, null],
+    [null, "foo1", null, null],
+    [null, ":foo", null, "NAMESPACE_ERR"],
+    [null, "f:oo", null, "NAMESPACE_ERR"],
+    [null, "foo:", null, "NAMESPACE_ERR"],
+    [null, "xml", null, null],
+    [null, "xmlns", null, "NAMESPACE_ERR"],
+    [null, "xmlfoo", null, null],
+    [null, "xml:foo", null, "NAMESPACE_ERR"],
+    [null, "xmlns:foo", null, "NAMESPACE_ERR"],
+    [null, "xmlfoo:bar", null, "NAMESPACE_ERR"],
+    ["http://example.com/", null, null, null],
+    ["http://example.com/", "", null, null],
+    ["http://example.com/", "foo", null, null],
+    ["http://example.com/", "1foo", null, "INVALID_CHARACTER_ERR"],
+    ["http://example.com/", "f1oo", null, null],
+    ["http://example.com/", "foo1", null, null],
+    ["http://example.com/", ":foo", null, "NAMESPACE_ERR"],
+    ["http://example.com/", "f:oo", null, null],
+    ["http://example.com/", "foo:", null, "NAMESPACE_ERR"],
+    ["http://example.com/", "xml", null, null],
+    ["http://example.com/", "xmlns", null, "NAMESPACE_ERR"],
+    ["http://example.com/", "xmlfoo", null, null],
+    ["http://example.com/", "xml:foo", null, "NAMESPACE_ERR"],
+    ["http://example.com/", "xmlns:foo", null, "NAMESPACE_ERR"],
+    ["http://example.com/", "xmlfoo:bar", null, null],
+    ["/", null, null, null],
+    ["/", "", null, null],
+    ["/", "foo", null, null],
+    ["/", "1foo", null, "INVALID_CHARACTER_ERR"],
+    ["/", "f1oo", null, null],
+    ["/", "foo1", null, null],
+    ["/", ":foo", null, "NAMESPACE_ERR"],
+    ["/", "f:oo", null, null],
+    ["/", "foo:", null, "NAMESPACE_ERR"],
+    ["/", "xml", null, null],
+    ["/", "xmlns", null, "NAMESPACE_ERR"],
+    ["/", "xmlfoo", null, null],
+    ["/", "xml:foo", null, "NAMESPACE_ERR"],
+    ["/", "xmlns:foo", null, "NAMESPACE_ERR"],
+    ["/", "xmlfoo:bar", null, null],
+    ["http://www.w3.org/XML/1998/namespace", null, null, null],
+    ["http://www.w3.org/XML/1998/namespace", "", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "foo", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "1foo", null, "INVALID_CHARACTER_ERR"],
+    ["http://www.w3.org/XML/1998/namespace", "f1oo", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "foo1", null, null],
+    ["http://www.w3.org/XML/1998/namespace", ":foo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/XML/1998/namespace", "f:oo", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "foo:", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/XML/1998/namespace", "xml", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "xmlns", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/XML/1998/namespace", "xmlfoo", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "xml:foo", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "xmlns:foo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/XML/1998/namespace", "xmlfoo:bar", null, null],
+    ["http://www.w3.org/2000/xmlns/", null, null, null],
+    ["http://www.w3.org/2000/xmlns/", "", null, null],
+    ["http://www.w3.org/2000/xmlns/", "foo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "1foo", null, "INVALID_CHARACTER_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "f1oo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "foo1", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", ":foo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "f:oo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "foo:", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "xml", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "xmlns", null, null],
+    ["http://www.w3.org/2000/xmlns/", "xmlfoo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "xml:foo", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "xmlns:foo", null, null],
+    ["http://www.w3.org/2000/xmlns/", "xmlfoo:bar", null, "NAMESPACE_ERR"],
+    ["foo:", null, null, null],
+    ["foo:", "", null, null],
+    ["foo:", "foo", null, null],
+    ["foo:", "1foo", null, "INVALID_CHARACTER_ERR"],
+    ["foo:", "f1oo", null, null],
+    ["foo:", "foo1", null, null],
+    ["foo:", ":foo", null, "NAMESPACE_ERR"],
+    ["foo:", "f:oo", null, null],
+    ["foo:", "foo:", null, "NAMESPACE_ERR"],
+    ["foo:", "xml", null, null],
+    ["foo:", "xmlns", null, "NAMESPACE_ERR"],
+    ["foo:", "xmlfoo", null, null],
+    ["foo:", "xml:foo", null, "NAMESPACE_ERR"],
+    ["foo:", "xmlns:foo", null, "NAMESPACE_ERR"],
+    ["foo:", "xmlfoo:bar", null, null],
+  ]
+
+  try { // XXX merge?!
+    var tempTests = tests.concat([
+      [null, null, document.implementation.createDocumentType("foo", "", ""), null],
+      [null, null, document.doctype, "WRONG_DOCUMENT_ERR"], // This causes a horrible WebKit bug (now fixed in trunk).
+      [null, null, function() {
+          var foo = document.implementation.createDocumentType("foo", "", "");
+          document.implementation.createDocument(null, null, foo);
+          return foo;
+       }(), "WRONG_DOCUMENT_ERR"], // DOCTYPE already associated with a document.
+      [null, null, function() {
+          var bar = document.implementation.createDocument(null, null, null);
+          return bar.implementation.createDocumentType("bar", "", "");
+       }(), null], // DOCTYPE created by a different implementation.
+      [null, null, function() {
+          var bar = document.implementation.createDocument(null, null, null);
+          var magic = bar.implementation.createDocumentType("bar", "", "");
+          bar.implementation.createDocument(null, null, magic);
+          return magic;
+       }(), "WRONG_DOCUMENT_ERR"], // DOCTYPE created by a different implementation and already associated with a document.
+      [null, "foo", document.implementation.createDocumentType("foo", "", ""), null],
+      ["foo", null, document.implementation.createDocumentType("foo", "", ""), null],
+      ["foo", "bar", document.implementation.createDocumentType("foo", "", ""), null],
+    ]);
+    tests = tempTests;
+  } catch (e) {
+    assert_unreached()
+  }
+
+  for (var i in tests) {
+    test(function() {
+      var test = tests[i],
+          namespaceURI = test[0],
+          qualifiedName = test[1],
+          doctype = test[2],
+          expected = test[3]
+      if (expected != null) {
+        assert_throws(expected, function() { document.implementation.createDocument(namespaceURI, qualifiedName, doctype) })
+      } else {
+        var doc = document.implementation.createDocument(namespaceURI, qualifiedName, doctype)
+        assert_equals(doc.nodeType, Node.DOCUMENT_NODE)
+        assert_equals(doc.nodeType, doc.DOCUMENT_NODE)
+        if(!qualifiedName) {
+          assert_equals(doc.documentElement, null)
+        }
+        if(!doctype) {
+          assert_equals(doc.doctype, null)
+        }
+        if(!qualifiedName && !doctype) {
+          assert_equals(doc.childNodes.length, 0)
+        }
+      }
+    })
+  }
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocumentType.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocumentType.html
new file mode 100644
index 000000000000..29dbf8e9b359
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createDocumentType.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<title>DOMImplementation.createDocumentType(qualifiedName, publicId, systemId)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var tests = [
+        ["foo", "", "", null],
+        ["1foo", "", "", "INVALID_CHARACTER_ERR"],
+        ["foo1", "", "", null],
+        ["f1oo", "", "", null],
+        ["@foo", "", "", "INVALID_CHARACTER_ERR"],
+        ["foo@", "", "", "INVALID_CHARACTER_ERR"],
+        ["f@oo", "", "", "INVALID_CHARACTER_ERR"],
+        ["f:oo", "", "", null],
+        [":foo", "", "", "NAMESPACE_ERR"],
+        ["foo:", "", "", "NAMESPACE_ERR"],
+        ["foo", "foo", "", null],
+        ["foo", "", "foo", null],
+        ["foo", "f'oo", "", null],
+        ["foo", "", "f'oo", null],
+        ["foo", 'f"oo', "", null],
+        ["foo", "", 'f"oo', null],
+        ["foo", "f'o\"o", "", null],
+        ["foo", "", "f'o\"o", null],
+        ["foo", "foo>", "", null],
+        ["foo", "", "foo>", null]
+     ]
+
+  var doc = document.implementation.createHTMLDocument("title");
+  var doTest = function(aDocument, aQualifiedName, aPublicId, aSystemId) {
+    var doctype = aDocument.implementation.createDocumentType(aQualifiedName, aPublicId, aSystemId);
+    assert_equals(doctype.name, aQualifiedName, "name")
+    assert_equals(doctype.publicId, aPublicId, "publicId")
+    assert_equals(doctype.systemId, aSystemId, "systemId")
+    assert_equals(doctype.ownerDocument, aDocument, "ownerDocument")
+  }
+  tests.forEach(function(t) {
+    var qualifiedName = t[0], publicId = t[1], systemId = t[2], expected = t[3]
+    test(function() {
+      if (expected) {
+        assert_throws(expected, function() {
+          document.implementation.createDocumentType(qualifiedName, publicId, systemId)
+        })
+      } else {
+        doTest(document, qualifiedName, publicId, systemId);
+        doTest(doc, qualifiedName, publicId, systemId);
+      }
+    }, "createDocumentType(" + format_value(qualifiedName) + ", " + format_value(publicId) + ", " + format_value(systemId) + ") should " +
+       (expected ? "throw " + expected : "work"));
+  });
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createHTMLDocument.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createHTMLDocument.html
new file mode 100644
index 000000000000..4249bee23651
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-createHTMLDocument.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>DOMImplementation.createHTMLDocument</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function checkDoc(title, expectedtitle, normalizedtitle) {
+  test(function() {
+    var doc = document.implementation.createHTMLDocument(title);
+    assert_equals(doc.doctype.name, "html")
+    assert_equals(doc.doctype.publicId, "")
+    assert_equals(doc.doctype.systemId, "")
+    assert_equals(doc.documentElement.localName, "html")
+    assert_equals(doc.documentElement.firstChild.localName, "head")
+    assert_equals(doc.documentElement.firstChild.childNodes.length, 1)
+    assert_equals(doc.documentElement.firstChild.firstChild.localName, "title")
+    assert_equals(doc.documentElement.firstChild.firstChild.firstChild.data,
+    expectedtitle)
+    assert_equals(doc.documentElement.lastChild.localName, "body")
+    assert_equals(doc.documentElement.lastChild.childNodes.length, 0)
+  })
+}
+checkDoc("", "", "")
+checkDoc(null, "null", "null")
+checkDoc(undefined, "undefined", "undefined")
+checkDoc("foo  bar baz", "foo  bar baz", "foo bar baz")
+checkDoc("foo\t\tbar baz", "foo\t\tbar baz", "foo bar baz")
+checkDoc("foo\n\nbar baz", "foo\n\nbar baz", "foo bar baz")
+checkDoc("foo\f\fbar baz", "foo\f\fbar baz", "foo bar baz")
+checkDoc("foo\r\rbar baz", "foo\r\rbar baz", "foo bar baz")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-hasFeature.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-hasFeature.html
new file mode 100644
index 000000000000..9305d85602f4
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_DOMImplementation-hasFeature.html
@@ -0,0 +1,138 @@
+<!doctype html>
+<title>DOMImplementation.hasFeature(feature, version)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var tests = [
+        ["Core", "1.0", false],
+        ["Core", "2.0", true],
+        ["Core", "3.0", false],
+        ["Core", "100.0", false],
+        ["XML", "1.0", true],
+        ["XML", "2.0", true],
+        ["XML", "3.0", false],
+        ["XML", "100.0", false],
+        ["Core", "1", false],
+        ["Core", "2", false],
+        ["Core", "3", false],
+        ["Core", "100", false],
+        ["XML", "1", false],
+        ["XML", "2", false],
+        ["XML", "3", false],
+        ["XML", "100", false],
+        ["Core", "1.1", false],
+        ["Core", "2.1", false],
+        ["Core", "3.1", false],
+        ["Core", "100.1", false],
+        ["XML", "1.1", false],
+        ["XML", "2.1", false],
+        ["XML", "3.1", false],
+        ["XML", "100.1", false],
+        ["Core", "", true],
+        ["XML", "", true],
+        ["core", "", true],
+        ["xml", "", true],
+        ["CoRe", "", true],
+        ["XmL", "", true],
+        [" Core", "", false],
+        [" XML", "", false],
+        ["Core ", "", false],
+        ["XML ", "", false],
+        ["Co re", "", false],
+        ["XM L", "", false],
+        ["aCore", "", false],
+        ["aXML", "", false],
+        ["Corea", "", false],
+        ["XMLa", "", false],
+        ["Coare", "", false],
+        ["XMaL", "", false],
+        ["Core", " ", false],
+        ["XML", " ", false],
+        ["Core", " 1.0", false],
+        ["Core", " 2.0", false],
+        ["Core", " 3.0", false],
+        ["Core", " 100.0", false],
+        ["XML", " 1.0", false],
+        ["XML", " 2.0", false],
+        ["XML", " 3.0", false],
+        ["XML", " 100.0", false],
+        ["Core", "1.0 ", false],
+        ["Core", "2.0 ", false],
+        ["Core", "3.0 ", false],
+        ["Core", "100.0 ", false],
+        ["XML", "1.0 ", false],
+        ["XML", "2.0 ", false],
+        ["XML", "3.0 ", false],
+        ["XML", "100.0 ", false],
+        ["Core", "1. 0", false],
+        ["Core", "2. 0", false],
+        ["Core", "3. 0", false],
+        ["Core", "100. 0", false],
+        ["XML", "1. 0", false],
+        ["XML", "2. 0", false],
+        ["XML", "3. 0", false],
+        ["XML", "100. 0", false],
+        ["Core", "a1.0", false],
+        ["Core", "a2.0", false],
+        ["Core", "a3.0", false],
+        ["Core", "a100.0", false],
+        ["XML", "a1.0", false],
+        ["XML", "a2.0", false],
+        ["XML", "a3.0", false],
+        ["XML", "a100.0", false],
+        ["Core", "1.0a", false],
+        ["Core", "2.0a", false],
+        ["Core", "3.0a", false],
+        ["Core", "100.0a", false],
+        ["XML", "1.0a", false],
+        ["XML", "2.0a", false],
+        ["XML", "3.0a", false],
+        ["XML", "100.0a", false],
+        ["Core", "1.a0", false],
+        ["Core", "2.a0", false],
+        ["Core", "3.a0", false],
+        ["Core", "100.a0", false],
+        ["XML", "1.a0", false],
+        ["XML", "2.a0", false],
+        ["XML", "3.a0", false],
+        ["XML", "100.a0", false],
+        ["Core", 1, false],
+        ["Core", 2, false],
+        ["Core", 3, false],
+        ["Core", 100, false],
+        ["XML", 1, false],
+        ["XML", 2, false],
+        ["XML", 3, false],
+        ["XML", 100, false],
+        ["Core", null, true],
+        ["XML", null, true],
+        ["core", null, true],
+        ["xml", null, true],
+        ["CoRe", null, true],
+        ["XmL", null, true],
+        [" Core", null, false],
+        [" XML", null, false],
+        ["Core ", null, false],
+        ["XML ", null, false],
+        ["Co re", null, false],
+        ["XM L", null, false],
+        ["aCore", null, false],
+        ["aXML", null, false],
+        ["Corea", null, false],
+        ["XMLa", null, false],
+        ["Coare", null, false],
+        ["XMaL", null, false],
+        ["Core", undefined, false],
+        ["XML", undefined, false],
+        ["This is filler text.", "", false],
+        [null, "", false],
+        [undefined, "", false],
+      ]
+  for (var i in tests) {
+    var test = tests[i]
+    assert_equals(document.implementation.hasFeature(test[0], test[1]), test[2], test[0] + " " + test[1])
+  }
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-adoptNode.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-adoptNode.html
new file mode 100644
index 000000000000..c4253b50afaa
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-adoptNode.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<html>
+<head>
+<title>Document.adoptNode</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<!--creates an element with local name "x<": --><x<>x</x<>
+<script>
+test(function() {
+  var y = document.getElementsByTagName("x<")[0]
+  assert_equals(y.parentNode, document.body)
+  assert_equals(y.ownerDocument, document)
+  document.adoptNode(y)
+  assert_equals(y.parentNode, null)
+  assert_equals(y.ownerDocument, document)
+  var doc = document.implementation.createDocument(null, null, null)
+  doc.adoptNode(y)
+  assert_equals(y.parentNode, null)
+  assert_equals(y.ownerDocument, doc)
+}, "Adopting an Element called 'x<' should work.")
+test(function() {
+  var x = document.createElement(":good:times:")
+  document.adoptNode(x)
+  var doc = document.implementation.createDocument(null, null, null)
+  doc.adoptNode(x)
+  assert_equals(x.parentNode, null)
+  assert_equals(x.ownerDocument, doc)
+}, "Adopting an Element called ':good:times:' should work.")
+test(function() {
+  var doctype = document.doctype;
+  assert_equals(doctype.parentNode, document)
+  assert_equals(doctype.ownerDocument, document)
+  document.adoptNode(doctype)
+  assert_equals(doctype.parentNode, null)
+  assert_equals(doctype.ownerDocument, document)
+}, "Explicitly adopting a DocumentType should work.")
+test(function() {
+  var doc = document.implementation.createDocument(null, null, null)
+  assert_throws("NOT_SUPPORTED_ERR", function() { document.adoptNode(doc) })
+}, "Adopting a Document should throw.")
+</script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createComment.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createComment.html
new file mode 100644
index 000000000000..1f4bcab149c8
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createComment.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>Document.createComment</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var c = document.createComment("a -- b");
+  assert_true(c instanceof Comment);
+  assert_true(c instanceof Node);
+  assert_equals(c.ownerDocument, document);
+  assert_equals(c.data, "a -- b");
+  assert_equals(c.nodeValue, "a -- b");
+  assert_equals(c.textContent, "a -- b");
+  assert_equals(c.length, 6);
+  assert_equals(c.nodeType, 8);
+  assert_equals(c.nodeName, "#comment");
+  assert_equals(c.hasChildNodes(), false);
+  assert_equals(c.childNodes.length, 0);
+  assert_equals(c.firstChild, null);
+  assert_equals(c.lastChild, null);
+});
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElement.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElement.html
new file mode 100644
index 000000000000..69c43f73fb06
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElement.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<title>Document.createElement</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var HTMLNS = "http://www.w3.org/1999/xhtml",
+      valid = [
+        //[input, localName],
+        [undefined, "undefined"],
+        ["foo", "foo"],
+        ["f1oo", "f1oo"],
+        ["foo1", "foo1"],
+        ["f\u0300oo", "f\u0300oo"],
+        ["foo\u0300", "foo\u0300"],
+        [":foo", ":foo"],
+        ["f:oo", "f:oo"],
+        ["foo:", "foo:"],
+        ["xml", "xml"],
+        ["xmlns", "xmlns"],
+        ["xmlfoo", "xmlfoo"],
+        ["xml:foo", "xml:foo"],
+        ["xmlns:foo", "xmlns:foo"],
+        ["xmlfoo:bar", "xmlfoo:bar"],
+        ["svg", "svg"],
+        ["math", "math"],
+        ["FOO", "foo"]
+     ],
+     invalid = [
+       "",
+       "1foo",
+       "\u0300foo",
+       "}foo",
+       "f}oo",
+       "foo}",
+       "\ufffffoo",
+       "f\uffffoo",
+       "foo\uffff",
+       "<foo",
+       "foo>",
+       "<foo>",
+       "f<oo"
+     ]
+
+  for (var i = 0, il = valid.length; i < il; i++) {
+    var test = valid[i],
+        elt = document.createElement(test[0])
+    assert_true(elt instanceof Element)
+    assert_equals(elt.localName, test[1])
+    assert_equals(elt.tagName, test[1].toUpperCase())
+    assert_equals(elt.prefix, null)
+    assert_equals(elt.namespaceURI, HTMLNS)
+  }
+  for (var i = 0, il = invalid.length; i < il; i++) {
+    assert_throws("INVALID_CHARACTER_ERR", function() { document.createElement(invalid[i]) })
+  }
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElementNS.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElementNS.html
new file mode 100644
index 000000000000..d82a306c1722
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createElementNS.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>Document.createElementNS</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var invalidNames = [
+    "",
+    "1foo",
+    "\u0300foo",
+    "}foo",
+    "f}oo",
+    "foo}",
+    "\ufffffoo",
+    "f\uffffoo",
+    "foo\uffff",
+    "<foo",
+    "foo>",
+    "<foo>",
+    "f<oo"
+  ],
+  invalidNSQNameCombinations = [
+    ["", ":foo"],
+    ["", "foo:"],
+    ["", "foo:foo"],
+    ["http://oops/", "xml:foo"],
+    ["http://oops/", "xmlns"],
+    ["http://oops/", "xmlns:foo"],
+    ["http://www.w3.org/2000/xmlns/", "xml:foo"],
+    ["http://www.w3.org/2000/xmlns/", "foo:xmlns"]
+  ];
+
+  invalidNames.forEach(function(name) {
+    test(function() {
+      assert_throws("INVALID_CHARACTER_ERR", function() { document.createElementNS("", name) });
+    }, "Invalid Name: " + name)
+  })
+
+  invalidNSQNameCombinations.forEach(function(a) {
+    test(function() {
+      assert_throws("NAMESPACE_ERR", function() { document.createElementNS(a[0], a[1]) });
+    }, "Invalid namespace " + a[0] + " and QName " + a[1])
+  })
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createEvent.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createEvent.html
new file mode 100644
index 000000000000..92bc68e00b1d
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createEvent.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>Document.createEvent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testAlias(arg, iface) {
+  test(function() {
+    if (iface in window) {
+      var ev = document.createEvent(arg);
+      assert_true(ev instanceof window[iface]);
+    }
+  }, arg + " should be an alias for " + iface + ".");
+}
+[
+  ["Events", "Event"],
+  ["HTMLEvents", "Event"],
+  ["MouseEvents", "MouseEvent"],
+  ["MutationEvents", "MutationEvent"],
+  ["UIEvents", "UIEvent"]
+].forEach(function(alias) {
+  testAlias(alias[0], alias[1]);
+  testAlias(alias[0].toLowerCase(), alias[1]);
+  testAlias(alias[0].toUpperCase(), alias[1]);
+});
+
+test(function() {
+  assert_throws("NOT_SUPPORTED_ERR", function() {
+    var evt = document.createEvent("foo");
+  });
+}, "Should throw NOT_SUPPORTED_ERR for unrecognized arguments");
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction-literal-1.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction-literal-1.xhtml
new file mode 100644
index 000000000000..4eaf86cbdcea
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction-literal-1.xhtml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>&lt;?xml?> is not a ProcessingInstruction</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+test(function() {
+  assert_equals(document.firstChild, document.documentElement)
+})
+</script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction-literal-2.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction-literal-2.xhtml
new file mode 100644
index 000000000000..aff420ec3f0d
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction-literal-2.xhtml
@@ -0,0 +1,19 @@
+<?xml-stylesheet href="support/style.css" type="text/css"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Document.createProcessingInstruction</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+test(function() {
+  var pienc = document.firstChild;
+  assert_true(pienc instanceof ProcessingInstruction)
+  assert_equals(pienc.target, "xml-stylesheet")
+  assert_equals(pienc.data, 'href="support/style.css" type="text/css"')
+})
+</script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction.html
new file mode 100644
index 000000000000..43d5b19d3633
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<title>Document.createProcessingInstruction in HTML documents</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script src="Document-createProcessingInstruction.js"></script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction.xhtml
new file mode 100644
index 000000000000..6c2b8e332c96
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-createProcessingInstruction.xhtml
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Document.createProcessingInstruction in XML documents</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script src="Document-createProcessingInstruction.js"/>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementById.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementById.html
new file mode 100644
index 000000000000..03cb5a4959b9
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementById.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Document.getElementById with an empty string</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="log"></div>
+<div id=""></div>
+<script>
+test(function() {
+  assert_equals(document.getElementById(""), null)
+  // XXX needs more tests
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html
new file mode 100644
index 000000000000..13d15623252f
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>Document.getElementsByTagName</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="log"></div>
+<script>
+test(function() {
+  assert_false(document.getElementsByTagName("html") instanceof NodeList, "NodeList")
+  assert_true(document.getElementsByTagName("html") instanceof HTMLCollection, "HTMLCollection")
+  assert_true(document.getElementsByTagName("html") !== document.getElementsByTagName("html") ||
+              document.getElementsByTagName("html") === document.getElementsByTagName("html"),
+              "Caching is allowed.")
+})
+test(function() {
+  var l = document.getElementsByTagName("nosuchtag")
+  l[5] = "foopy"
+  assert_equals(l[5], undefined)
+  assert_equals(l.item(5), null)
+}, "Shouldn't be able to set unsigned properties on a HTMLCollection")
+test(function() {
+  assert_equals(document.createElementNS("http://www.w3.org/1999/xhtml", "i").localName, "i") // Sanity
+  var i = document.body.appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "I"))
+  assert_equals(i.localName, "I")
+  assert_equals(i.tagName, "I")
+  assert_equals(document.getElementsByTagName("I").length, 0)
+  assert_equals(document.getElementsByTagName("i").length, 0)
+  assert_equals(document.body.getElementsByTagName("I").length, 0)
+  assert_equals(document.body.getElementsByTagName("i").length, 0)
+  document.body.removeChild(i)
+})
+test(function() {
+  var t = document.body.appendChild(document.createElementNS("test", "te:st"))
+  assert_equals(document.getElementsByTagName("st").length, 1)
+  assert_equals(document.getElementsByTagName("st")[0], t)
+  assert_equals(document.getElementsByTagName("te:st").length, 0)
+  document.body.removeChild(t)
+})
+test(function() {
+  var h = document.body.appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "te:st"))
+  assert_equals(document.getElementsByTagName("st")[0], h)
+  assert_equals(document.getElementsByTagName("TE:ST").length, 0)
+  document.body.removeChild(h)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagNameNS.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagNameNS.html
new file mode 100644
index 000000000000..7127f66302ab
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagNameNS.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>Document.getElementsByTagNameNS</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="log"></div>
+<script>
+test(function() {
+  assert_false(document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "html") instanceof NodeList, "NodeList")
+  assert_true(document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "html") instanceof HTMLCollection, "HTMLCollection")
+  assert_true(document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "html") !==
+              document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "html") ||
+              document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "html") ===
+              document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "html"), "Caching is allowed.")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-importNode.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-importNode.html
new file mode 100644
index 000000000000..3b6d1e91066a
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-importNode.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>Document.importNode</title>
+<link rel="stylesheet" href="/resources/testharness.css">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var doc = document.implementation.createHTMLDocument("Title");
+  var div = doc.body.appendChild(doc.createElement("div"));
+  div.appendChild(doc.createElement("span"));
+  assert_equals(div.ownerDocument, doc);
+  assert_equals(div.firstChild.ownerDocument, doc);
+  var newDiv = document.importNode(div);
+  assert_equals(div.ownerDocument, doc);
+  assert_equals(div.firstChild.ownerDocument, doc);
+  assert_equals(newDiv.ownerDocument, document);
+  assert_equals(newDiv.firstChild.ownerDocument, document);
+}, "No 'deep' argument.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("Title");
+  var div = doc.body.appendChild(doc.createElement("div"));
+  div.appendChild(doc.createElement("span"));
+  assert_equals(div.ownerDocument, doc);
+  assert_equals(div.firstChild.ownerDocument, doc);
+  var newDiv = document.importNode(div, true);
+  assert_equals(div.ownerDocument, doc);
+  assert_equals(div.firstChild.ownerDocument, doc);
+  assert_equals(newDiv.ownerDocument, document);
+  assert_equals(newDiv.firstChild.ownerDocument, document);
+}, "True 'deep' argument.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("Title");
+  var div = doc.body.appendChild(doc.createElement("div"));
+  div.appendChild(doc.createElement("span"));
+  assert_equals(div.ownerDocument, doc);
+  assert_equals(div.firstChild.ownerDocument, doc);
+  var newDiv = document.importNode(div, false);
+  assert_equals(div.ownerDocument, doc);
+  assert_equals(div.firstChild.ownerDocument, doc);
+  assert_equals(newDiv.ownerDocument, document);
+  assert_equals(newDiv.firstChild, null);
+}, "False 'deep' argument.")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.html
new file mode 100644
index 000000000000..1863a41da57f
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Null test</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of firstElementChild and lastChildElement returning null</h1>
+<div id="log"></div>
+<p id="parentEl" style="font-weight:bold;">Test.</p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_equals(parentEl.firstElementChild, null)
+  assert_equals(parentEl.lastElementChild, null)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.svg
new file mode 100644
index 000000000000..491a22b78a21
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>Null test</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of firstElementChild and lastChildElement returning null</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle" font-weight="bold">Test</text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_equals(parentEl.firstElementChild, null)
+  assert_equals(parentEl.lastElementChild, null)
+})
+]]></h:script>	
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.xhtml
new file mode 100644
index 000000000000..daedab6d971f
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElement-null.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Null Test</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of firstElementChild and lastChildElement returning null</h1>
+<div id="log"></div>
+<p id="parentEl" style="font-weight:bold;">Test.</p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_equals(parentEl.firstElementChild, null)
+  assert_equals(parentEl.lastElementChild, null)
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.html
new file mode 100644
index 000000000000..3e7490b21d6c
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Dynamic Adding of Elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of Dynamic Adding of Elements</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">logged above.</span></p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var newChild = document.createElement("span");
+  parentEl.appendChild(newChild);
+  assert_equals(parentEl.childElementCount, 2)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.svg
new file mode 100644
index 000000000000..d149f1ea3f15
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>Dynamic Adding of Elements</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of Dynamic Adding of Elements</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of this test is
+<tspan id="first_element_child" font-weight="bold">unknown.</tspan></text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var newChild = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+  parentEl.appendChild(newChild);
+  assert_equals(parentEl.childElementCount, 2)
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.xhtml
new file mode 100644
index 000000000000..c97ed1965b54
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-add.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Dynamic Adding of Elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of Dynamic Adding of Elements</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">logged above.</span></p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var newChild = document.createElement("span");
+  parentEl.appendChild(newChild);
+  assert_equals(parentEl.childElementCount, 2)
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.html
new file mode 100644
index 000000000000..3f7e7c7eadca
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Dynamic Removal of Elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of Dynamic Removal of Elements</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">unknown.</span><span id="last_element_child"> </span></p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = parentEl.lastElementChild;
+  parentEl.removeChild(lec);
+  assert_equals(parentEl.childElementCount, 1)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.svg
new file mode 100644
index 000000000000..bf99de65aa96
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>Dynamic Removal of Elements</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of Dynamic Removal of Elements</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of this test is
+<tspan id="first_element_child" font-weight="bold">unknown.</tspan><tspan id="last_element_child"> </tspan></text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = parentEl.lastElementChild;
+  parentEl.removeChild(lec);
+  assert_equals(parentEl.childElementCount, 1)
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.xhtml
new file mode 100644
index 000000000000..f0009b0a7780
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-dynamic-remove.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Dynamic Removal of Elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of Removal Adding of Elements</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">logged above.</span><span id="last_element_child"> </span></p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = parentEl.lastElementChild;
+  parentEl.removeChild(lec);
+  assert_equals(parentEl.childElementCount, 1)
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.html
new file mode 100644
index 000000000000..fb52fb205c8e
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>childElementCount without Child Element Nodes</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of childElementCount with No Child Element Nodes</h1>
+<div id="log"></div>
+<p id="parentEl" style="font-weight:bold;">Test.</p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_equals(parentEl.childElementCount, 0)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.svg
new file mode 100644
index 000000000000..8ba574360700
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>childElementCount</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of childElementCount with No Child Element Nodes</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle" font-weight="bold">Test</text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_equals(parentEl.childElementCount, 0)
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.xhtml
new file mode 100644
index 000000000000..f567a20c234b
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount-nochild.xhtml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>childElementCount without Child Element Nodes</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of childElementCount with No Child Element Nodes</h1>
+<div id="log"></div>
+<p id="parentEl" style="font-weight:bold;">Test.</p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_equals(parentEl.childElementCount, 0)
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.html
new file mode 100644
index 000000000000..8cfe567f9142
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>childElementCount</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of childElementCount</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child"><span>this</span> <span>test</span></span> is
+<span id="middle_element_child" style="font-weight:bold;">given above.</span>
+
+
+
+<span id="last_element_child" style="display:none;">fnord</span> </p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_true("childElementCount" in parentEl)
+  assert_equals(parentEl.childElementCount, 3)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.svg
new file mode 100644
index 000000000000..8d2973af1154
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>childElementCount</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of childElementCount</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of <tspan id="first_element_child"><tspan>this</tspan> <tspan>test</tspan></tspan> is 
+<tspan id="middle_element_child" font-weight="bold">unknown.</tspan>  
+
+
+
+<tspan id="last_element_child" style="display:none;">fnord</tspan> </text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_true("childElementCount" in parentEl)
+  assert_equals(parentEl.childElementCount, 3)
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.xhtml
new file mode 100644
index 000000000000..0391c17fa875
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-childElementCount.xhtml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>childElementCount</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of childElementCount</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child"><span>this</span> <span>test</span></span> is 
+<span id="middle_element_child" style="font-weight:bold;">unknown.</span>
+
+
+
+<span id="last_element_child" style="display:none;">fnord</span> </p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  assert_true("childElementCount" in parentEl)
+  assert_equals(parentEl.childElementCount, 3)
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-children.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-children.html
new file mode 100644
index 000000000000..9ebe683afeae
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-children.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>HTMLCollection edge cases</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div id="test"><img><img id=foo><img id=foo></div>
+<script>
+test(function() {
+  var container = document.getElementById("test");
+  var result = container.children.item("foo");
+  assert_true(result instanceof Element, "Expected an Element.");
+  assert_false(result.hasAttribute("id"), "Expected the IDless Element.")
+})
+test(function() {
+  var container = document.getElementById("test");
+  var list = container.children;
+  var result = [];
+  for (var p in list) {
+    if (list.hasOwnProperty(p)) {
+      result.push(p);
+    }
+  }
+  assert_array_equals(result, ['0', '1', '2', 'foo']);
+});
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-entity.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-entity.svg
new file mode 100644
index 000000000000..3a20ea79ab01
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-entity.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"
+[
+<!ENTITY tree "<tspan id='first_element_child' font-weight='bold'>unknown.</tspan>">
+]>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>Entity References</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of Entity References</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of this test is &tree;</text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-entity.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-entity.xhtml
new file mode 100644
index 000000000000..f28005e9c89f
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-entity.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+[
+<!ENTITY tree "<span id='first_element_child' style='font-weight:bold;'>unknown.</span>">
+]>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Entity References</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of Entity References</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is &tree;</p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.html
new file mode 100644
index 000000000000..629deab3ae05
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>firstElementChild with namespaces</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of firstElementChild with namespaces</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is a unknown.</p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl")
+  var el = document.createElementNS("http://ns.example.org/pickle", "pickle:dill")
+  el.setAttribute("id", "first_element_child")
+  parentEl.appendChild(el)
+  var fec = parentEl.firstElementChild
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+  assert_equals(fec.localName, "dill")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.svg
new file mode 100644
index 000000000000..d42c08777c89
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     xmlns:pickle="http://ns.example.org/pickle"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>firstElementChild with namespaces</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of firstElementChild with namespaces</text>
+<g id="parentEl">
+  <pickle:dill id="first_element_child"/>
+</g>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+  assert_equals(fec.localName, "dill")
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.xhtml
new file mode 100644
index 000000000000..29441d2786aa
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild-namespace.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:pickle="http://ns.example.org/pickle">
+<head>
+<title>firstElementChild with namespaces</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of firstElementChild with namespaces</h1>
+<div id="parentEl">
+  <pickle:dill id="first_element_child"/>
+</div>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">logged above.</span></p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+  assert_equals(fec.localName, "dill")
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.html
new file mode 100644
index 000000000000..12a0c5946e5c
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>firstElementChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of firstElementChild</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">logged above.</span></p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.svg
new file mode 100644
index 000000000000..359c5b82ca29
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>firstElementChild</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of firstElementChild</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of this test is
+<tspan id="first_element_child" font-weight="bold">unknown.</tspan></text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.xhtml
new file mode 100644
index 000000000000..302052b0fc73
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-firstElementChild.xhtml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>firstElementChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of firstElementChild</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is
+<span id="first_element_child" style="font-weight:bold;">logged above.</span></p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = parentEl.firstElementChild;
+  assert_true(!!fec)
+  assert_equals(fec.nodeType, 1)
+  assert_equals(fec.getAttribute("id"), "first_element_child")
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-getElementsByClassName.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-getElementsByClassName.html
new file mode 100644
index 000000000000..332c3060f1a9
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-getElementsByClassName.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>Element.getElementsByClassName</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var a = document.createElement("a"), b = document.createElement("b")
+  b.className = "foo"
+  a.appendChild(b)
+  var list = a.getElementsByClassName("foo")
+  assert_array_equals(list, [b])
+  var secondList = a.getElementsByClassName("foo")
+  assert_true(list === secondList || list !== secondList, "Caching is allowed.")
+}, "getElementsByClassName should work on disconnected subtrees.")
+test(function() {
+  var list = document.getElementsByClassName("foo")
+  assert_false(list instanceof NodeList, "NodeList")
+  assert_true(list instanceof HTMLCollection, "HTMLCollection")
+}, "Interface should be correct.")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.html
new file mode 100644
index 000000000000..de7aebdf2416
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>lastElementChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of lastElementChild</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child">this test</span> is <span id="last_element_child" style="font-weight:bold;">logged</span> above.</p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = parentEl.lastElementChild;
+  assert_true(!!lec)
+  assert_equals(lec.nodeType, 1)
+  assert_equals(lec.getAttribute("id"), "last_element_child")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.svg
new file mode 100644
index 000000000000..1cec4a13084d
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>lastElementChild</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of lastElementChild</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of <tspan id="first_element_child">this test</tspan> is <tspan id="last_element_child" font-weight="bold">not</tspan> known.</text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = parentEl.lastElementChild;
+  assert_true(!!lec)
+  assert_equals(lec.nodeType, 1)
+  assert_equals(lec.getAttribute("id"), "last_element_child")
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.xhtml
new file mode 100644
index 000000000000..3150b92a42cb
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-lastElementChild.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>firstElementChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of firstElementChild</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child">this test</span> is <span id="last_element_child" style="font-weight:bold;">logged</span> above.</p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = parentEl.lastElementChild;
+  assert_true(!!lec)
+  assert_equals(lec.nodeType, 1)
+  assert_equals(lec.getAttribute("id"), "last_element_child")
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.html
new file mode 100644
index 000000000000..985c602f4186
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>nextElementSibling</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of nextElementSibling</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child">this test</span> is <span id="last_element_child" style="font-weight:bold;">unknown.</span></p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = document.getElementById("first_element_child");
+  var nes = fec.nextElementSibling;
+  assert_true(!!nes)
+  assert_equals(nes.nodeType, 1)
+  assert_equals(nes.getAttribute("id"), "last_element_child")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.svg
new file mode 100644
index 000000000000..3e17cad20c45
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>nextElementSibling</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of nextElementSibling</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of <tspan id="first_element_child">this test</tspan> is <tspan id="last_element_child" font-weight="bold">unknown.</tspan></text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = document.getElementById("first_element_child");
+  var nes = fec.nextElementSibling;
+  assert_true(!!nes)
+  assert_equals(nes.nodeType, 1)
+  assert_equals(nes.getAttribute("id"), "last_element_child")
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.xhtml
new file mode 100644
index 000000000000..915209bda264
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-nextElementSibling.xhtml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>nextElementSibling</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of nextElementSibling</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child">this test</span> is <span id="last_element_child" style="font-weight:bold;">unknown.</span></p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var fec = document.getElementById("first_element_child");
+  var nes = fec.nextElementSibling;
+  assert_true(!!nes)
+  assert_equals(nes.nodeType, 1)
+  assert_equals(nes.getAttribute("id"), "last_element_child")
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.html
new file mode 100644
index 000000000000..02c7b16df574
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>previousElementSibling</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of previousElementSibling</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child">this test</span> is
+<span id="middle_element_child" style="font-weight:bold;">unknown.</span>
+
+
+
+<span id="last_element_child" style="display:none;">fnord</span> </p>
+<script>
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = document.getElementById("last_element_child");
+  var pes = lec.previousElementSibling;
+  assert_true(!!pes)
+  assert_equals(pes.nodeType, 1)
+  assert_equals(pes.getAttribute("id"), "middle_element_child")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.svg
new file mode 100644
index 000000000000..0baf11abefb5
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>previousElementSibling</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of previousElementSibling</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of <tspan id="first_element_child">this test</tspan> is 
+<tspan id="middle_element_child" font-weight="bold">unknown.</tspan>  
+
+
+
+<tspan id="last_element_child" display="none">fnord</tspan> </text>
+
+<h:script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = document.getElementById("last_element_child");
+  var pes = lec.previousElementSibling;
+  assert_true(!!pes)
+  assert_equals(pes.nodeType, 1)
+  assert_equals(pes.getAttribute("id"), "middle_element_child")
+})
+]]></h:script>
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.xhtml
new file mode 100644
index 000000000000..a981fa762a51
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-previousElementSibling.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>previousElementSibling</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of previousElementSibling</h1>
+<div id="log"></div>
+<p id="parentEl">The result of <span id="first_element_child">this test</span> is 
+<span id="middle_element_child" style="font-weight:bold;">unknown.</span>  
+
+
+
+<span id="last_element_child" style="display:none;">fnord</span> </p>
+<script><![CDATA[
+test(function() {
+  var parentEl = document.getElementById("parentEl");
+  var lec = document.getElementById("last_element_child");
+  var pes = lec.previousElementSibling;
+  assert_true(!!pes)
+  assert_equals(pes.nodeType, 1)
+  assert_equals(pes.getAttribute("id"), "middle_element_child")
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-removeAttributeNS.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-removeAttributeNS.html
new file mode 100644
index 000000000000..a2773e6f1e06
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-removeAttributeNS.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>Element.removeAttributeNS</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="attributes.js"></script>
+<div id="log"></div>
+<script>
+var XML = "http://www.w3.org/XML/1998/namespace"
+
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS(XML, "a:bb", "pass")
+  attr_is(el.attributes[0], "pass", "bb", XML, "a", "a:bb")
+  el.removeAttributeNS(XML, "a:bb")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "pass", "bb", XML, "a", "a:bb")
+}, "removeAttributeNS should take a local name.")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.html
new file mode 100644
index 000000000000..a7920b4fb898
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Null test</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<h1>Test of previousElementSibling and nextElementSibling returning null</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is <span id="first_element_child" style="font-weight:bold;">unknown.</span></p>
+<script>
+test(function() {
+  var fec = document.getElementById("first_element_child");
+  assert_equals(fec.previousElementSibling, null)
+  assert_equals(fec.nextElementSibling, null)
+})
+</script>
+
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.svg b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.svg
new file mode 100644
index 000000000000..7ea54c706105
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml"
+     version="1.1"
+     width="100%" height="100%" viewBox="0 0 400 400">
+<title>Null test</title>
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+
+<text x="200" y="40" font-size="25" fill="black" text-anchor="middle">Test of previousElementSibling and nextElementSibling returning null</text>
+<text id="parentEl" x="200" y="70" font-size="20" fill="black" text-anchor="middle">The result of this test is <tspan id="first_element_child" font-weight="bold">unknown.</tspan></text>
+
+<h:script><![CDATA[
+test(function() {
+  var fec = document.getElementById("first_element_child");
+  assert_equals(fec.previousElementSibling, null)
+  assert_equals(fec.nextElementSibling, null)
+})
+]]></h:script>	
+</svg>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.xhtml
new file mode 100644
index 000000000000..fcf4d54ff9f5
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-siblingElement-null.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Null Test</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<h1>Test of previousElementSibling and nextElementSibling returning null</h1>
+<div id="log"></div>
+<p id="parentEl">The result of this test is <span id="first_element_child" style="font-weight:bold;">unknown.</span></p>
+<script><![CDATA[
+test(function() {
+  var fec = document.getElementById("first_element_child");
+  assert_equals(fec.previousElementSibling, null)
+  assert_equals(fec.nextElementSibling, null)
+})
+]]></script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-tagName.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-tagName.html
new file mode 100644
index 000000000000..84080a9ef2fb
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Element-tagName.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>Element.tagName</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var HTMLNS = "http://www.w3.org/1999/xhtml",
+      SVGNS = "http://www.w3.org/2000/svg"
+  assert_equals(document.createElementNS(HTMLNS, "I").tagName, "I")
+  assert_equals(document.createElementNS(HTMLNS, "i").tagName, "I")
+  assert_equals(document.createElementNS(SVGNS, "svg").tagName, "svg")
+  assert_equals(document.createElementNS(SVGNS, "SVG").tagName, "SVG")
+  assert_equals(document.createElementNS(HTMLNS, "x:b").tagName, "X:B")
+})
+test(function() {
+  if ("DOMParser" in window) {
+    var xmlel = new DOMParser()
+      .parseFromString('<div xmlns="http://www.w3.org/1999/xhtml">Test</div>', 'text/xml')
+      .documentElement;
+    assert_equals(xmlel.tagName, "div", "tagName should be lowercase in XML")
+    var htmlel = document.importNode(xmlel, true)
+    assert_equals(htmlel.tagName, "DIV", "tagName should be uppercase in HTML")
+  }
+}, "tagName should be updated when changing ownerDocument")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constants.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constants.html
new file mode 100644
index 000000000000..a3b30f7f0dd6
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constants.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>Event constants</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="constants.js"></script>
+<div id="log"></div>
+<script>
+var objects = [
+  Event,
+  Event.prototype,
+  document.createEvent("Event"),
+  document.createEvent("CustomEvent")
+]
+testConstants(objects, [
+  ["NONE", 0],
+  ["CAPTURING_PHASE", 1],
+  ["AT_TARGET", 2],
+  ["BUBBLING_PHASE", 3]
+], "eventPhase")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constructors.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constructors.html
new file mode 100644
index 000000000000..87653d7020d1
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-constructors.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<title>Event constructors</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  var ev = new Event("test")
+  assert_equals(ev.type, "test")
+  assert_equals(ev.target, null)
+  assert_equals(ev.currentTarget, null)
+  assert_equals(ev.eventPhase, Event.AT_TARGET)
+  assert_equals(ev.bubbles, false)
+  assert_equals(ev.cancelable, false)
+  assert_equals(ev.defaultPrevented, false)
+  assert_equals(ev.isTrusted, false)
+  assert_true(ev.timeStamp > 0)
+  assert_true("initEvent" in ev)
+})
+test(function() {
+  var ev = new Event("I am an event", { bubbles: true, cancelable: false})
+  assert_equals(ev.type, "I am an event")
+  assert_equals(ev.bubbles, true)
+  assert_equals(ev.cancelable, false)
+})
+test(function() {
+  var ev = new Event("@", { bubblesIGNORED: true, cancelable: true})
+  assert_equals(ev.type, "@")
+  assert_equals(ev.bubbles, false)
+  assert_equals(ev.cancelable, true)
+})
+test(function() {
+  var ev = new Event("Xx", { cancelable: true})
+  assert_equals(ev.type, "Xx")
+  assert_equals(ev.bubbles, false)
+  assert_equals(ev.cancelable, true)
+})
+test(function() {
+  var ev = new Event("Xx", {})
+  assert_equals(ev.type, "Xx")
+  assert_equals(ev.bubbles, false)
+  assert_equals(ev.cancelable, false)
+})
+test(function() {
+  var ev = new Event("Xx", {bubbles: true, cancelable: false, sweet: "x"})
+  assert_equals(ev.type, "Xx")
+  assert_equals(ev.bubbles, true)
+  assert_equals(ev.cancelable, false)
+  assert_equals(ev.sweet, undefined)
+})
+test(function() {
+  var ev = new CustomEvent("$", {detail: 54, sweet: "x", sweet2: "x", cancelable:true})
+  assert_equals(ev.type, "$")
+  assert_equals(ev.bubbles, false)
+  assert_equals(ev.cancelable, true)
+  assert_equals(ev.sweet, undefined)
+  assert_equals(ev.detail, 54)
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-defaultPrevented.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-defaultPrevented.html
new file mode 100644
index 000000000000..dfcd4389e102
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-defaultPrevented.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<title>Event.defaultPrevented</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+var ev;
+test(function() {
+  ev = document.createEvent("Event");
+  assert_equals(ev.defaultPrevented, false, "defaultPrevented");
+}, "When an event is created, defaultPrevented should be initialized to false.");
+test(function() {
+  ev.initEvent("foo", true, false);
+  assert_equals(ev.bubbles, true, "bubbles");
+  assert_equals(ev.cancelable, false, "cancelable");
+  assert_equals(ev.defaultPrevented, false, "defaultPrevented");
+}, "initEvent should work correctly (not cancelable).");
+test(function() {
+  assert_equals(ev.cancelable, false, "cancelable (before)");
+  ev.preventDefault();
+  assert_equals(ev.cancelable, false, "cancelable (after)");
+  assert_equals(ev.defaultPrevented, false, "defaultPrevented");
+}, "preventDefault() should not change defaultPrevented if cancelable is false.");
+test(function() {
+  ev.initEvent("foo", true, true);
+  assert_equals(ev.bubbles, true, "bubbles");
+  assert_equals(ev.cancelable, true, "cancelable");
+  assert_equals(ev.defaultPrevented, false, "defaultPrevented");
+}, "initEvent should work correctly (cancelable).");
+test(function() {
+  assert_equals(ev.cancelable, true, "cancelable (before)");
+  ev.preventDefault();
+  assert_equals(ev.cancelable, true, "cancelable (after)");
+  assert_equals(ev.defaultPrevented, true, "defaultPrevented");
+}, "preventDefault() should change defaultPrevented if cancelable is false.");
+test(function() {
+  ev.initEvent("foo", true, true);
+  assert_equals(ev.bubbles, true, "bubbles");
+  assert_equals(ev.cancelable, true, "cancelable");
+  assert_equals(ev.defaultPrevented, false, "defaultPrevented");
+}, "initEvent should unset defaultPrevented.");
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-initEvent.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-initEvent.html
new file mode 100644
index 000000000000..78e252cf3ff8
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Event-initEvent.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Event.initEvent</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+var t = async_test("Calling initEvent must not have an effect during dispatching.")
+t.step(function() {
+  // https://www.w3.org/Bugs/Public/show_bug.cgi?id=17715
+
+  var e = document.createEvent("Event")
+  e.initEvent("type", false, false)
+  assert_equals(e.type, "type", "type (first init)")
+  assert_equals(e.bubbles, false, "bubbles (first init)")
+  assert_equals(e.cancelable, false, "cancelable (first init)")
+
+  var target = document.createElement("div")
+  target.addEventListener("type", t.step_func(function() {
+    e.initEvent("fail", true, true)
+    assert_equals(e.type, "type", "type (second init)")
+    assert_equals(e.bubbles, false, "bubbles (second init)")
+    assert_equals(e.cancelable, false, "cancelable (second init)")
+  }), false)
+
+  assert_equals(target.dispatchEvent(e), true, "dispatchEvent must return true")
+
+  t.done()
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_EventTarget-dispatchEvent.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_EventTarget-dispatchEvent.html
new file mode 100644
index 000000000000..3a66ee238818
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_EventTarget-dispatchEvent.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>EventTarget.dispatchEvent</title>
+<link rel="author" title="Olli Pettay" href="mailto:Olli.Pettay@gmail.com">
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var e = document.createEvent("Event")
+  assert_equals(e.type, "", "Event type should be empty string before initialization")
+  assert_throws("InvalidStateError", function() { document.dispatchEvent(e) })
+}, "If the event's initialized flag is not set, an InvalidStateError must be thrown.")
+
+var dispatch_dispatch = async_test("If the event's dispatch flag is set, an InvalidStateError must be thrown.")
+dispatch_dispatch.step(function() {
+  var e = document.createEvent("Event")
+  e.initEvent("type", false, false)
+
+  var target = document.createElement("div")
+  target.addEventListener("type", dispatch_dispatch.step_func(function() {
+    assert_throws("InvalidStateError", function() {
+      target.dispatchEvent(e)
+    })
+    assert_throws("InvalidStateError", function() {
+      document.dispatchEvent(e)
+    })
+  }), false)
+
+  assert_equals(target.dispatchEvent(e), true, "dispatchEvent must return true")
+
+  dispatch_dispatch.done()
+})
+
+test(function() {
+  // https://www.w3.org/Bugs/Public/show_bug.cgi?id=17713
+  // https://www.w3.org/Bugs/Public/show_bug.cgi?id=17714
+
+  var e = document.createEvent("Event")
+  e.initEvent("type", false, false)
+
+  var target = document.createElement("div")
+  target.addEventListener("type", function() {
+    throw new Error()
+  }, false);
+
+  assert_equals(target.dispatchEvent(e), true, "dispatchEvent must return true")
+}, "Exceptions from event listeners must not be propagated.")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-appendChild.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-appendChild.html
new file mode 100644
index 000000000000..2578f32916b5
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-appendChild.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Node.appendChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<iframe src=about:blank></iframe>
+<script>
+function testHRE(node) {
+  test(function() {
+    assert_throws("HIERARCHY_REQUEST_ERR", function() { node.appendChild(document.createTextNode("fail")) })
+    assert_throws(new TypeError(), function() { node.appendChild(null) })
+  })
+}
+test(function() {
+  var frameDoc = frames[0].document
+  var s = frameDoc.createElement("a")
+  assert_equals(s.ownerDocument, frameDoc)
+  document.body.appendChild(s)
+  assert_equals(s.ownerDocument, document)
+
+  assert_throws("HIERARCHY_REQUEST_ERR", function() { document.body.appendChild(frameDoc) })
+
+  s = frameDoc.createElement("b")
+  frameDoc.body.appendChild(s)
+  assert_equals(s.ownerDocument, frameDoc)
+  document.body.appendChild(s)
+  assert_equals(s.ownerDocument, document)
+
+  assert_throws(new TypeError(), function() { document.body.appendChild(null) })
+
+  assert_throws(new TypeError(), function() { document.body.appendChild({'a':'b'}) })
+
+  testHRE(document.createTextNode("Foo"));
+  testHRE(document.createComment("Foo"));
+  testHRE(document.doctype);
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-cloneNode.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-cloneNode.html
new file mode 100644
index 000000000000..ac0731c8234b
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-cloneNode.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>Node.cloneNode</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+test(function() {
+  var el = document.createElement("foo");
+  el.appendChild(document.createElement("bar"));
+  el.setAttribute("a", "b");
+  el.setAttribute("c", "d");
+  var c = el.cloneNode(false);
+  assert_true(c.attributes != el.attributes);
+  assert_true(c.attributes !== el.attributes);
+  assert_equals(c.attributes.length, el.attributes.length);
+  for (var i = 0, il = el.attributes.length; i < il; ++i) {
+    assert_not_equals(c.attributes[i], el.attributes[i]);
+    assert_equals(c.attributes[i].name, el.attributes[i].name);
+    assert_equals(c.attributes[i].prefix, el.attributes[i].prefix);
+    assert_equals(c.attributes[i].namespaceURI, el.attributes[i].namespaceURI);
+    assert_equals(c.attributes[i].value, el.attributes[i].value);
+  }
+  assert_equals(c.childNodes.length, 0);
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-constants.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-constants.html
new file mode 100644
index 000000000000..ee7953b59a99
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-constants.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<title>Node constants</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="constants.js"></script>
+<div id="log"></div>
+<script>
+var objects = [
+  Node,
+  Node.prototype,
+  document.createElement("foo"),
+  document.createTextNode("bar")
+]
+testConstants(objects, [
+  ["ELEMENT_NODE", 1],
+  ["ATTRIBUTE_NODE", 2],
+  ["TEXT_NODE", 3],
+  ["CDATA_SECTION_NODE", 4],
+  ["ENTITY_REFERENCE_NODE", 5],
+  ["ENTITY_NODE", 6],
+  ["PROCESSING_INSTRUCTION_NODE", 7],
+  ["COMMENT_NODE", 8],
+  ["DOCUMENT_NODE", 9],
+  ["DOCUMENT_TYPE_NODE", 10],
+  ["DOCUMENT_FRAGMENT_NODE", 11],
+  ["NOTATION_NODE", 12]
+], "nodeType")
+testConstants(objects, [
+  ["DOCUMENT_POSITION_DISCONNECTED", 0x01],
+  ["DOCUMENT_POSITION_PRECEDING", 0x02],
+  ["DOCUMENT_POSITION_FOLLOWING", 0x04],
+  ["DOCUMENT_POSITION_CONTAINS", 0x08],
+  ["DOCUMENT_POSITION_CONTAINED_BY", 0x10],
+  ["DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC", 0x20]
+], "createDocumentPosition")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-insertBefore.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-insertBefore.html
new file mode 100644
index 000000000000..2aa1dc47a17a
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-insertBefore.html
@@ -0,0 +1,307 @@
+<!DOCTYPE html>
+<title>Node.insertBefore</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testLeafNode(node) {
+  test(function() {
+    assert_throws(new TypeError(), function() { node.insertBefore(null, null) })
+  }, "Calling insertBefore with a non-Node first argument on a leaf node " + format_value(node) + " must throw TypeError.")
+  test(function() {
+    assert_throws("HIERARCHY_REQUEST_ERR", function() { node.insertBefore(document.createTextNode("fail"), null) })
+    // Would be step 2.
+    assert_throws("HIERARCHY_REQUEST_ERR", function() { node.insertBefore(node, null) })
+    // Would be step 3.
+    assert_throws("HIERARCHY_REQUEST_ERR", function() { node.insertBefore(node, document.createTextNode("child")) })
+  }, "Calling insertBefore an a leaf node " + format_value(node) + " must throw HIERARCHY_REQUEST_ERR.")
+}
+
+test(function() {
+  // WebIDL.
+  assert_throws(new TypeError(), function() { document.body.insertBefore(null, null) })
+  assert_throws(new TypeError(), function() { document.body.insertBefore(null, document.body.firstChild) })
+  assert_throws(new TypeError(), function() { document.body.insertBefore({'a':'b'}, document.body.firstChild) })
+}, "Calling insertBefore with a non-Node first argument must throw TypeError.")
+
+test(function() {
+  // Step 1.
+  testLeafNode(document.doctype)
+  testLeafNode(document.createTextNode("Foo"))
+  testLeafNode(document.createComment("Foo"))
+  testLeafNode(document.createProcessingInstruction("foo", "bar"))
+}, "Must be able to create all leaf nodes in HTML documents.")
+
+test(function() {
+  // Step 2.
+  assert_throws("HIERARCHY_REQUEST_ERR", function() { document.body.insertBefore(document.body, document.getElementById("log")) })
+  assert_throws("HIERARCHY_REQUEST_ERR", function() { document.body.insertBefore(document.documentElement, document.getElementById("log")) })
+}, "Calling insertBefore with an inclusive ancestor of the context object must throw HIERARCHY_REQUEST_ERR.")
+
+// Step 3.
+test(function() {
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  var c = document.createElement("div");
+  assert_throws("NotFoundError", function() {
+    a.insertBefore(b, c);
+  });
+}, "Calling insertBefore with a reference child whose parent is not the context node must throw a NotFoundError.")
+
+// Step 4.1.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var doc2 = document.implementation.createHTMLDocument("title2");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doc2, doc.documentElement);
+  });
+
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doc.createTextNode("text"), doc.documentElement);
+  });
+}, "If the context node is a document, inserting a document or text node should throw a HierarchyRequestError.")
+
+// Step 4.2.1.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  doc.removeChild(doc.documentElement);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  df.appendChild(doc.createElement("b"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, null);
+  });
+
+  df = doc.createDocumentFragment();
+  df.appendChild(doc.createTextNode("text"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, null);
+  });
+
+  df = doc.createDocumentFragment();
+  df.appendChild(doc.createComment("comment"));
+  df.appendChild(doc.createTextNode("text"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, null);
+  });
+}, "If the context node is a document, appending a DocumentFragment that contains a text node or too many elements should throw a HierarchyRequestError.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  doc.removeChild(doc.documentElement);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  df.appendChild(doc.createElement("b"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, doc.firstChild);
+  });
+
+  df = doc.createDocumentFragment();
+  df.appendChild(doc.createTextNode("text"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, doc.firstChild);
+  });
+
+  df = doc.createDocumentFragment();
+  df.appendChild(doc.createComment("comment"));
+  df.appendChild(doc.createTextNode("text"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, doc.firstChild);
+  });
+}, "If the context node is a document, inserting a DocumentFragment that contains a text node or too many elements should throw a HierarchyRequestError.")
+
+// Step 4.2.2.
+test(function() {
+  // The context node has an element child.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  assert_array_equals(doc.childNodes, [doc.doctype, doc.documentElement, comment]);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, doc.doctype);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, doc.documentElement);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, comment);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, null);
+  });
+}, "If the context node is a document, inserting a DocumentFragment with an element if there already is an element child should throw a HierarchyRequestError.")
+test(function() {
+  // /child/ is a doctype.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  doc.removeChild(doc.documentElement);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype]);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, doc.doctype);
+  });
+}, "If the context node is a document and a doctype is following the reference child, inserting a DocumentFragment with an element should throw a HierarchyRequestError.")
+test(function() {
+  // /child/ is not null and a doctype is following /child/.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  doc.removeChild(doc.documentElement);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype]);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(df, comment);
+  });
+}, "If the context node is a document, inserting a DocumentFragment with an element before the doctype should throw a HierarchyRequestError.")
+
+// Step 4.3.
+test(function() {
+  // The context node has an element child.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  assert_array_equals(doc.childNodes, [doc.doctype, doc.documentElement, comment]);
+
+  var a = doc.createElement("a");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(a, doc.doctype);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(a, doc.documentElement);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(a, comment);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(a, null);
+  });
+}, "If the context node is a document, inserting an element if there already is an element child should throw a HierarchyRequestError.")
+test(function() {
+  // /child/ is a doctype.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  doc.removeChild(doc.documentElement);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype]);
+
+  var a = doc.createElement("a");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(a, doc.doctype);
+  });
+}, "If the context node is a document, inserting an element before the doctype should throw a HierarchyRequestError.")
+test(function() {
+  // /child/ is not null and a doctype is following /child/.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  doc.removeChild(doc.documentElement);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype]);
+
+  var a = doc.createElement("a");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(a, comment);
+  });
+}, "If the context node is a document and a doctype is following the reference child, inserting an element should throw a HierarchyRequestError.")
+
+// Step 4.4.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype, doc.documentElement]);
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doctype, comment);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doctype, doc.doctype);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doctype, doc.documentElement);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doctype, null);
+  });
+}, "If the context node is a document, inserting a doctype if there already is a doctype child should throw a HierarchyRequestError.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  doc.removeChild(doc.doctype);
+  assert_array_equals(doc.childNodes, [doc.documentElement, comment]);
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doctype, comment);
+  });
+}, "If the context node is a document, inserting a doctype after the document element should throw a HierarchyRequestError.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  doc.removeChild(doc.doctype);
+  assert_array_equals(doc.childNodes, [doc.documentElement, comment]);
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    doc.insertBefore(doctype, null);
+  });
+}, "If the context node is a document with and element child, appending a doctype should throw a HierarchyRequestError.")
+
+// Step 5.
+test(function() {
+  var df = document.createDocumentFragment();
+  var a = df.appendChild(document.createElement("a"));
+
+  var doc = document.implementation.createHTMLDocument("title");
+  assert_throws("HierarchyRequestError", function() {
+    df.insertBefore(doc, a);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    df.insertBefore(doc, null);
+  });
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    df.insertBefore(doctype, a);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    df.insertBefore(doctype, null);
+  });
+}, "If the context node is a DocumentFragment, inserting a document or a doctype should throw a HierarchyRequestError.")
+test(function() {
+  var el = document.createElement("div");
+  var a = el.appendChild(document.createElement("a"));
+
+  var doc = document.implementation.createHTMLDocument("title");
+  assert_throws("HierarchyRequestError", function() {
+    el.insertBefore(doc, a);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    el.insertBefore(doc, null);
+  });
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    el.insertBefore(doctype, a);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    el.insertBefore(doctype, null);
+  });
+}, "If the context node is an element, inserting a document or a doctype should throw a HierarchyRequestError.")
+
+// Step 7.
+test(function() {
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  var c = document.createElement("div");
+  a.appendChild(b);
+  a.appendChild(c);
+  assert_array_equals(a.childNodes, [b, c]);
+  assert_equals(a.replaceChild(b, b), b);
+  assert_array_equals(a.childNodes, [b, c]);
+  assert_equals(a.replaceChild(c, c), c);
+  assert_array_equals(a.childNodes, [b, c]);
+}, "Inserting a node before itself should not move the node");
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-isEqualNode.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-isEqualNode.xhtml
new file mode 100644
index 000000000000..09bbc8ca8f32
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-isEqualNode.xhtml
@@ -0,0 +1,59 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Node.isEqualNode</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+function testNullHandling(node) {
+  test(function() {
+    assert_false(node.isEqualNode(null))
+    assert_false(node.isEqualNode(undefined))
+  })
+}
+[
+  document.createElement("foo"),
+  document.createTextNode("foo"),
+  document.createProcessingInstruction("foo", "bar"),
+  document.createComment("foo"),
+  document,
+  document.implementation.createDocumentType("html", "", ""),
+  document.createDocumentFragment()
+].forEach(testNullHandling)
+
+test(function() {
+  var a = document.createElement("foo")
+  a.setAttribute("a", "bar")
+  a.setAttribute("b", "baz")
+  var b = document.createElement("foo")
+  b.setAttribute("b", "baz")
+  b.setAttribute("a", "bar")
+  assert_true(a.isEqualNode(b))
+}, "isEqualNode should return true when the attributes are in a different order")
+
+test(function() {
+  var a = document.createElement("foo")
+  a.setAttributeNS("ns", "x:a", "bar")
+  var b = document.createElement("foo")
+  b.setAttributeNS("ns", "y:a", "bar")
+  assert_true(a.isEqualNode(b))
+}, "isEqualNode should return true when the attributes have different prefixes")
+var internalSubset = async_test("isEqualNode should return true when only the internal subsets of DocumentTypes differ.")
+var wait = 2;
+function iframeLoaded() {
+  if (!--wait) {
+    internalSubset.step(function() {
+      var doc1 = document.getElementById("subset1").contentDocument
+      var doc2 = document.getElementById("subset2").contentDocument
+      assert_true(doc1.doctype.isEqualNode(doc2.doctype), "doc1.doctype.isEqualNode(doc2.doctype)")
+      assert_true(doc1.isEqualNode(doc2), "doc1.isEqualNode(doc2)")
+    })
+  }
+}
+</script>
+<iframe id="subset1" onload="iframeLoaded()" src="data:application/xml,&lt;!DOCTYPE foo [ &lt;!ELEMENT foo (%23PCDATA)> ]>&lt;foo/>" />
+<iframe id="subset2" onload="iframeLoaded()" src="data:application/xml,&lt;!DOCTYPE foo [ &lt;!ELEMENT foo EMPTY> ]>&lt;foo/>" />
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-lookupPrefix.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-lookupPrefix.xhtml
new file mode 100644
index 000000000000..50a487c58c6d
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-lookupPrefix.xhtml
@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:x="test">
+<head>
+<title>Node.lookupPrefix</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body xmlns:s="test">
+<div id="log"/>
+<x xmlns:t="test"><!--comment--><?test test?>TEST<x/></x>
+<script>
+function lookupPrefix(node, ns, prefix) {
+  test(function() {
+    assert_equals(node.lookupPrefix(ns), prefix)
+  })
+}
+var x = document.getElementsByTagName("x")[0];
+lookupPrefix(document, "test", "x") // XXX add test for when there is no documentElement
+lookupPrefix(document, null, null)
+lookupPrefix(x, "http://www.w3.org/1999/xhtml", null)
+lookupPrefix(x, "something", null)
+lookupPrefix(x, null, null)
+lookupPrefix(x, "test", "t")
+lookupPrefix(x.parentNode, "test", "s")
+lookupPrefix(x.firstChild, "test", "t")
+lookupPrefix(x.childNodes[1], "test", "t")
+lookupPrefix(x.childNodes[2], "test", "t")
+lookupPrefix(x.lastChild, "test", "t")
+x.parentNode.removeChild(x)
+</script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-nodeName.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-nodeName.html
new file mode 100644
index 000000000000..911f93455c75
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-nodeName.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>Node.nodeName</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var HTMLNS = "http://www.w3.org/1999/xhtml",
+      SVGNS = "http://www.w3.org/2000/svg"
+  assert_equals(document.createElementNS(HTMLNS, "I").nodeName, "I")
+  assert_equals(document.createElementNS(HTMLNS, "i").nodeName, "I")
+  assert_equals(document.createElementNS(SVGNS, "svg").nodeName, "svg")
+  assert_equals(document.createElementNS(SVGNS, "SVG").nodeName, "SVG")
+  assert_equals(document.createElementNS(HTMLNS, "x:b").nodeName, "X:B")
+}, "For Element nodes, nodeName should return the same as tagName.")
+test(function() {
+  assert_equals(document.createTextNode("foo").nodeName, "#text")
+}, "For Text nodes, nodeName should return \"#text\".")
+test(function() {
+  assert_equals(document.createComment("foo").nodeName, "#comment")
+}, "For Comment nodes, nodeName should return \"#comment\".")
+test(function() {
+  assert_equals(document.nodeName, "#document")
+}, "For Document nodes, nodeName should return \"#document\".")
+test(function() {
+  assert_equals(document.doctype.nodeName, "html")
+}, "For DocumentType nodes, nodeName should return the name.")
+test(function() {
+  assert_equals(document.createDocumentFragment().nodeName,
+                "#document-fragment")
+}, "For DocumentFragment nodes, nodeName should return \"#document-fragment\".")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-nodeName.xhtml b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-nodeName.xhtml
new file mode 100644
index 000000000000..bc478af8b684
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-nodeName.xhtml
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Node.nodeName</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+test(function() {
+  var HTMLNS = "http://www.w3.org/1999/xhtml",
+      SVGNS = "http://www.w3.org/2000/svg"
+  assert_equals(document.createElementNS(HTMLNS, "I").nodeName, "I")
+  assert_equals(document.createElementNS(HTMLNS, "i").nodeName, "i")
+  assert_equals(document.createElementNS(SVGNS, "svg").nodeName, "svg")
+  assert_equals(document.createElementNS(SVGNS, "SVG").nodeName, "SVG")
+  assert_equals(document.createElementNS(HTMLNS, "x:b").nodeName, "x:b")
+}, "For Element nodes, nodeName should return the same as tagName.")
+test(function() {
+  assert_equals(document.createTextNode("foo").nodeName, "#text")
+}, "For Text nodes, nodeName should return \"#text\".")
+test(function() {
+  assert_equals(document.createProcessingInstruction("foo", "bar").nodeName,
+                "foo")
+}, "For ProcessingInstruction nodes, nodeName should return the target.")
+test(function() {
+  assert_equals(document.createComment("foo").nodeName, "#comment")
+}, "For Comment nodes, nodeName should return \"#comment\".")
+test(function() {
+  assert_equals(document.nodeName, "#document")
+}, "For Document nodes, nodeName should return \"#document\".")
+test(function() {
+  assert_equals(document.doctype.nodeName, "html")
+}, "For DocumentType nodes, nodeName should return the name.")
+test(function() {
+  assert_equals(document.createDocumentFragment().nodeName,
+                "#document-fragment")
+}, "For DocumentFragment nodes, nodeName should return \"#document-fragment\".")
+</script>
+</body>
+</html>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-normalize.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-normalize.html
new file mode 100644
index 000000000000..b5e390f6d0d9
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-normalize.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Node.normalize()</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+test(function() {
+  var df = document.createDocumentFragment(),
+      t1 = document.createTextNode("1"),
+      t2 = document.createTextNode("2"),
+      t3 = document.createTextNode("3"),
+      t4 = document.createTextNode("4")
+  df.appendChild(t1)
+  df.appendChild(t2)
+  assert_equals(df.childNodes.length, 2)
+  assert_equals(df.textContent, "12")
+  var el = document.createElement('x')
+  df.appendChild(el)
+  el.appendChild(t3)
+  el.appendChild(t4)
+  document.normalize()
+  assert_equals(el.childNodes.length, 2)
+  assert_equals(el.textContent, "34")
+  assert_equals(df.childNodes.length, 3)
+  assert_equals(t1.data, "1")
+  df.normalize()
+  assert_equals(df.childNodes.length, 2)
+  assert_equals(df.firstChild, t1)
+  assert_equals(t1.data, "12")
+  assert_equals(t2.data, "2")
+  assert_equals(el.firstChild, t3)
+  assert_equals(t3.data, "34")
+  assert_equals(t4.data, "4")
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-parentElement.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-parentElement.html
new file mode 100644
index 000000000000..8aedbc0960df
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-parentElement.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<title>Node.parentElement</title>
+<link rel="stylesheet" href="/resources/testharness.css">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  assert_equals(document.parentElement, null)
+}, "When the parent is null, parentElement should be null")
+test(function() {
+  assert_equals(document.doctype.parentElement, null)
+}, "When the parent is a document, parentElement should be null (doctype)")
+test(function() {
+  assert_equals(document.documentElement.parentElement, null)
+}, "When the parent is a document, parentElement should be null (element)")
+test(function() {
+  var comment = document.appendChild(document.createComment("foo"))
+  assert_equals(comment.parentElement, null)
+}, "When the parent is a document, parentElement should be null (comment)")
+test(function() {
+  var df = document.createDocumentFragment()
+  assert_equals(df.parentElement, null)
+  var el = document.createElement("div")
+  assert_equals(el.parentElement, null)
+  df.appendChild(el)
+  assert_equals(el.parentNode, df)
+  assert_equals(el.parentElement, null)
+}, "parentElement should return null for children of DocumentFragments (element)")
+test(function() {
+  var df = document.createDocumentFragment()
+  assert_equals(df.parentElement, null)
+  var text = document.createTextNode("bar")
+  assert_equals(text.parentElement, null)
+  df.appendChild(text)
+  assert_equals(text.parentNode, df)
+  assert_equals(text.parentElement, null)
+}, "parentElement should return null for children of DocumentFragments (text)")
+test(function() {
+  var df = document.createDocumentFragment()
+  var parent = document.createElement("div")
+  df.appendChild(parent)
+  var el = document.createElement("div")
+  assert_equals(el.parentElement, null)
+  parent.appendChild(el)
+  assert_equals(el.parentElement, parent)
+}, "parentElement should work correctly with DocumentFragments (element)")
+test(function() {
+  var df = document.createDocumentFragment()
+  var parent = document.createElement("div")
+  df.appendChild(parent)
+  var text = document.createTextNode("bar")
+  assert_equals(text.parentElement, null)
+  parent.appendChild(text)
+  assert_equals(text.parentElement, parent)
+}, "parentElement should work correctly with DocumentFragments (text)")
+test(function() {
+  var parent = document.createElement("div")
+  var el = document.createElement("div")
+  assert_equals(el.parentElement, null)
+  parent.appendChild(el)
+  assert_equals(el.parentElement, parent)
+}, "parentElement should work correctly in disconnected subtrees (element)")
+test(function() {
+  var parent = document.createElement("div")
+  var text = document.createTextNode("bar")
+  assert_equals(text.parentElement, null)
+  parent.appendChild(text)
+  assert_equals(text.parentElement, parent)
+}, "parentElement should work correctly in disconnected subtrees (text)")
+test(function() {
+  var el = document.createElement("div")
+  assert_equals(el.parentElement, null)
+  document.body.appendChild(el)
+  assert_equals(el.parentElement, document.body)
+}, "parentElement should work correctly in a document (element)")
+test(function() {
+  var text = document.createElement("div")
+  assert_equals(text.parentElement, null)
+  document.body.appendChild(text)
+  assert_equals(text.parentElement, document.body)
+}, "parentElement should work correctly in a document (text)")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-parentNode.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-parentNode.html
new file mode 100644
index 000000000000..8f14ccdad524
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-parentNode.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>Node.parentNode</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+// XXX need to test for more node types
+test(function() {
+  assert_equals(document.parentNode, null)
+}, "Document")
+test(function() {
+  assert_equals(document.doctype.parentNode, document)
+}, "Doctype")
+test(function() {
+  assert_equals(document.documentElement.parentNode, document)
+}, "Root element")
+test(function() {
+  var el = document.createElement("div")
+  assert_equals(el.parentNode, null)
+  document.body.appendChild(el)
+  assert_equals(el.parentNode, document.body)
+}, "Element")
+var t = async_test("Removed iframe");
+function testIframe(iframe) {
+  t.step(function() {
+    var doc = iframe.contentDocument;
+    iframe.parentNode.removeChild(iframe);
+    assert_equals(doc.firstChild.parentNode, doc);
+  });
+  t.done();
+}
+</script>
+<iframe id=a src="data:text/html,<a name='c'>c</a>" onload="testIframe(this)"></iframe>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-removeChild.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-removeChild.html
new file mode 100644
index 000000000000..693a7c03d7e1
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-removeChild.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Node.removeChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="creators.js"></script>
+<div id="log"></div>
+<iframe src=about:blank></iframe>
+<script>
+var frameDoc = frames[0].document;
+for (var p in creators) {
+  var creator = creators[p];
+  test(function() {
+    var s = frameDoc[creator]("a")
+    assert_equals(s.ownerDocument, frameDoc)
+    assert_throws("NOT_FOUND_ERR", function() { document.body.removeChild(s) })
+    assert_equals(s.ownerDocument, frameDoc)
+  }, "Passing a detached " + p + " with a different node document to removeChild should not affect it.")
+  test(function() {
+    var s = frameDoc[creator]("b")
+    frameDoc.body.appendChild(s)
+    assert_equals(s.ownerDocument, frameDoc)
+    assert_throws("NOT_FOUND_ERR", function() { document.body.removeChild(s) })
+    assert_equals(s.ownerDocument, frameDoc)
+  }, "Passing a non-detached " + p + " with a different node document to removeChild should not affect it.")
+  test(function() {
+    var s = frameDoc[creator]("test")
+    frameDoc.body.appendChild(s)
+    assert_equals(s.ownerDocument, frameDoc)
+    assert_throws("NOT_FOUND_ERR", function() { s.removeChild(frameDoc) })
+    assert_throws("NOT_FOUND_ERR", function() { s.removeChild(document) })
+  }, "Calling removeChild on a " + p + " with no children should throw NOT_FOUND_ERR.")
+}
+test(function() {
+  assert_throws(new TypeError(), function() { document.body.removeChild(null) })
+  assert_throws(new TypeError(), function() { document.body.removeChild({'a':'b'}) })
+}, "Passing a value that is not a Node reference to removeChild should throw TypeError.")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-replaceChild.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-replaceChild.html
new file mode 100644
index 000000000000..911c144ffd30
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Node-replaceChild.html
@@ -0,0 +1,322 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Node.replaceChild</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body><a><b></b><c></c></a>
+<div id="log"></div>
+<script>
+// IDL.
+test(function() {
+  var a = document.createElement("div");
+  assert_throws(new TypeError(), function() {
+    a.replaceChild(null, null);
+  });
+
+  var b = document.createElement("div");
+  assert_throws(new TypeError(), function() {
+    a.replaceChild(b, null);
+  });
+  assert_throws(new TypeError(), function() {
+    a.replaceChild(null, b);
+  });
+}, "Passing null to replaceChild should throw a TypeError.")
+
+// Step 1.
+test(function() {
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  var c = document.createElement("div");
+  assert_throws("NotFoundError", function() {
+    a.replaceChild(b, c);
+  });
+
+  var d = document.createElement("div");
+  d.appendChild(b);
+  assert_throws("NotFoundError", function() {
+    a.replaceChild(b, c);
+  });
+  assert_throws("NotFoundError", function() {
+    a.replaceChild(a, c);
+  });
+  assert_throws("NotFoundError", function() {
+    a.replaceChild(b, a);
+  });
+  assert_throws("NotFoundError", function() {
+    a.replaceChild(a, a);
+  });
+}, "If child's parent is not the context node, a NotFoundError exception should be thrown")
+test(function() {
+  // TODO: https://www.w3.org/Bugs/Public/show_bug.cgi?id=17318
+  var nodes = [
+    document.implementation.createDocumentType("html", "", ""),
+    document.createTextNode("text"),
+    document.implementation.createDocument(null, "foo", null).createProcessingInstruction("foo", "bar"),
+    document.createComment("comment")
+  ];
+
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  nodes.forEach(function(node) {
+    assert_throws("NotFoundError", function() {
+      node.replaceChild(a, b);
+    });
+  });
+}, "If the context node is not a node that can contain children, a NotFoundError exception should be thrown")
+
+// Step 2.
+test(function() {
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  a.appendChild(b);
+  assert_throws("HierarchyRequestError", function() {
+    a.replaceChild(a, b);
+  });
+
+  var c = document.createElement("div");
+  c.appendChild(a);
+  assert_throws("HierarchyRequestError", function() {
+    a.replaceChild(c, b);
+  });
+}, "If node is an inclusive ancestor of the context node, a HierarchyRequestError should be thrown.")
+
+// Step 3.1.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var doc2 = document.implementation.createHTMLDocument("title2");
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(doc2, doc.documentElement);
+  });
+
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(doc.createTextNode("text"), doc.documentElement);
+  });
+}, "If the context node is a document, inserting a document or text node should throw a HierarchyRequestError.")
+
+// Step 3.2.1.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  df.appendChild(doc.createElement("b"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, doc.documentElement);
+  });
+
+  df = doc.createDocumentFragment();
+  df.appendChild(doc.createTextNode("text"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, doc.documentElement);
+  });
+
+  df = doc.createDocumentFragment();
+  df.appendChild(doc.createComment("comment"));
+  df.appendChild(doc.createTextNode("text"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, doc.documentElement);
+  });
+}, "If the context node is a document, inserting a DocumentFragment that contains a text node or too many elements should throw a HierarchyRequestError.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  doc.removeChild(doc.documentElement);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  df.appendChild(doc.createElement("b"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, doc.doctype);
+  });
+}, "If the context node is a document (without element children), inserting a DocumentFragment that contains multiple elements should throw a HierarchyRequestError.")
+
+// Step 3.2.2.
+test(function() {
+  // The context node has an element child that is not /child/.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  assert_array_equals(doc.childNodes, [doc.doctype, doc.documentElement, comment]);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, comment);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, doc.doctype);
+  });
+}, "If the context node is a document, inserting a DocumentFragment with an element if there already is an element child should throw a HierarchyRequestError.")
+test(function() {
+  // A doctype is following /child/.
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  doc.removeChild(doc.documentElement);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype]);
+
+  var df = doc.createDocumentFragment();
+  df.appendChild(doc.createElement("a"));
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(df, comment);
+  });
+}, "If the context node is a document, inserting a DocumentFragment with an element before the doctype should throw a HierarchyRequestError.")
+
+// Step 3.3.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  assert_array_equals(doc.childNodes, [doc.doctype, doc.documentElement, comment]);
+
+  var a = doc.createElement("a");
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(a, comment);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(a, doc.doctype);
+  });
+}, "If the context node is a document, inserting an element if there already is an element child should throw a HierarchyRequestError.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  doc.removeChild(doc.documentElement);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype]);
+
+  var a = doc.createElement("a");
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(a, comment);
+  });
+}, "If the context node is a document, inserting an element before the doctype should throw a HierarchyRequestError.")
+
+// Step 3.4.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.insertBefore(doc.createComment("foo"), doc.firstChild);
+  assert_array_equals(doc.childNodes, [comment, doc.doctype, doc.documentElement]);
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(doctype, comment);
+  });
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(doctype, doc.documentElement);
+  });
+}, "If the context node is a document, inserting a doctype if there already is a doctype child should throw a HierarchyRequestError.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var comment = doc.appendChild(doc.createComment("foo"));
+  doc.removeChild(doc.doctype);
+  assert_array_equals(doc.childNodes, [doc.documentElement, comment]);
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    doc.replaceChild(doctype, comment);
+  });
+}, "If the context node is a document, inserting a doctype after the document element should throw a HierarchyRequestError.")
+
+// Step 4.
+test(function() {
+  var df = document.createDocumentFragment();
+  var a = df.appendChild(document.createElement("a"));
+
+  var doc = document.implementation.createHTMLDocument("title");
+  assert_throws("HierarchyRequestError", function() {
+    df.replaceChild(doc, a);
+  });
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    df.replaceChild(doctype, a);
+  });
+}, "If the context node is a DocumentFragment, inserting a document or a doctype should throw a HierarchyRequestError.")
+test(function() {
+  var el = document.createElement("div");
+  var a = el.appendChild(document.createElement("a"));
+
+  var doc = document.implementation.createHTMLDocument("title");
+  assert_throws("HierarchyRequestError", function() {
+    el.replaceChild(doc, a);
+  });
+
+  var doctype = document.implementation.createDocumentType("html", "", "");
+  assert_throws("HierarchyRequestError", function() {
+    el.replaceChild(doctype, a);
+  });
+}, "If the context node is an element, inserting a document or a doctype should throw a HierarchyRequestError.")
+
+// Step 6.
+test(function() {
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  var c = document.createElement("div");
+  a.appendChild(b);
+  a.appendChild(c);
+  assert_array_equals(a.childNodes, [b, c]);
+  assert_equals(a.replaceChild(c, b), b);
+  assert_array_equals(a.childNodes, [c]);
+}, "Replacing a node with its next sibling should work (2 children)");
+test(function() {
+  var a = document.createElement("div");
+  var b = document.createElement("div");
+  var c = document.createElement("div");
+  var d = document.createElement("div");
+  var e = document.createElement("div");
+  a.appendChild(b);
+  a.appendChild(c);
+  a.appendChild(d);
+  a.appendChild(e);
+  assert_array_equals(a.childNodes, [b, c, d, e]);
+  assert_equals(a.replaceChild(d, c), c);
+  assert_array_equals(a.childNodes, [b, d, e]);
+}, "Replacing a node with its next sibling should work (4 children)");
+
+// Step 7.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var doctype = doc.doctype;
+  assert_array_equals(doc.childNodes, [doctype, doc.documentElement]);
+
+  var doc2 = document.implementation.createHTMLDocument("title2");
+  var doctype2 = doc2.doctype;
+  assert_array_equals(doc2.childNodes, [doctype2, doc2.documentElement]);
+
+  doc.replaceChild(doc2.doctype, doc.doctype);
+  assert_array_equals(doc.childNodes, [doctype2, doc.documentElement]);
+  assert_array_equals(doc2.childNodes, [doc2.documentElement]);
+  assert_equals(doctype.parentNode, null);
+  assert_equals(doctype.ownerDocument, doc);
+  assert_equals(doctype2.parentNode, doc);
+  assert_equals(doctype2.ownerDocument, doc);
+}, "If the context node is a document, inserting a new doctype should work.")
+
+// Bugs.
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var df = doc.createDocumentFragment();
+  var a = df.appendChild(doc.createElement("a"));
+  assert_equals(doc.documentElement, doc.replaceChild(df, doc.documentElement));
+  assert_array_equals(doc.childNodes, [doc.doctype, a]);
+}, "Replacing the document element with a DocumentFragment containing a single element should work.");
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var df = doc.createDocumentFragment();
+  var a = df.appendChild(doc.createComment("a"));
+  var b = df.appendChild(doc.createElement("b"));
+  var c = df.appendChild(doc.createComment("c"));
+  assert_equals(doc.documentElement, doc.replaceChild(df, doc.documentElement));
+  assert_array_equals(doc.childNodes, [doc.doctype, a, b, c]);
+}, "Replacing the document element with a DocumentFragment containing a single element and comments should work.");
+test(function() {
+  var doc = document.implementation.createHTMLDocument("title");
+  var a = doc.createElement("a");
+  assert_equals(doc.documentElement, doc.replaceChild(a, doc.documentElement));
+  assert_array_equals(doc.childNodes, [doc.doctype, a]);
+}, "Replacing the document element with a single element should work.");
+test(function() {
+  document.addEventListener("DOMNodeRemoved", function(e) {
+    document.body.appendChild(document.createElement("x"));
+  }, false);
+  var a = document.body.firstChild, b = a.firstChild, c = b.nextSibling;
+  assert_equals(a.replaceChild(c, b), b);
+  assert_equals(b.parentNode, null);
+  assert_equals(a.firstChild, c);
+  assert_equals(c.parentNode, a);
+}, "replaceChild should work in the presence of mutation events.")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_NodeFilter-constants.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_NodeFilter-constants.html
new file mode 100644
index 000000000000..5b81f18a56dd
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_NodeFilter-constants.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<title>NodeFilter constants</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="constants.js"></script>
+<div id="log"></div>
+<script>
+var objects = [
+  NodeFilter,
+  NodeFilter.prototype
+]
+testConstants(objects, [
+  ["FILTER_ACCEPT", 1],
+  ["FILTER_REJECT", 2],
+  ["FILTER_SKIP", 3]
+], "acceptNode")
+testConstants(objects, [
+  ["SHOW_ALL", 0xFFFFFFFF],
+  ["SHOW_ELEMENT", 0x1],
+  ["SHOW_ATTRIBUTE", 0x2],
+  ["SHOW_TEXT", 0x4],
+  ["SHOW_CDATA_SECTION", 0x8],
+  ["SHOW_ENTITY_REFERENCE", 0x10],
+  ["SHOW_ENTITY", 0x20],
+  ["SHOW_PROCESSING_INSTRUCTION", 0x40],
+  ["SHOW_COMMENT", 0x80],
+  ["SHOW_DOCUMENT", 0x100],
+  ["SHOW_DOCUMENT_TYPE", 0x200],
+  ["SHOW_DOCUMENT_FRAGMENT", 0x400],
+  ["SHOW_NOTATION", 0x800]
+], "whatToShow")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-attributes.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-attributes.html
new file mode 100644
index 000000000000..6795167fc9f6
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-attributes.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>Range attributes</title>
+<link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  var r = document.createRange();
+  assert_equals(r.startContainer, document)
+  assert_equals(r.endContainer, document)
+  assert_equals(r.startOffset, 0)
+  assert_equals(r.endOffset, 0)
+  assert_true(r.collapsed)
+  r.detach()
+  assert_throws("INVALID_STATE_ERR", function() { r.startContainer })
+  assert_throws("INVALID_STATE_ERR", function() { r.startOffset })
+  assert_throws("INVALID_STATE_ERR", function() { r.endContainer })
+  assert_throws("INVALID_STATE_ERR", function() { r.endOffset })
+  assert_throws("INVALID_STATE_ERR", function() { r.collapsed })
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-commonAncestorContainer.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-commonAncestorContainer.html
new file mode 100644
index 000000000000..3dc4a61f43a2
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-commonAncestorContainer.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<title>Range.commonAncestorContainer</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  var range = document.createRange();
+  range.detach();
+  assert_throws("INVALID_STATE_ERR", function() {
+    range.commonAncestorContainer();
+  }, "Detached Range must throw INVALID_STATE_ERR on accessing commonAncestorContainer");
+}, "Detached Range")
+test(function() {
+  var df = document.createDocumentFragment();
+  var foo = df.appendChild(document.createElement("foo"));
+  foo.appendChild(document.createTextNode("Foo"));
+  var bar = df.appendChild(document.createElement("bar"));
+  bar.appendChild(document.createComment("Bar"));
+  [
+    // start node, start offset, end node, end offset, expected cAC
+    [foo, 0, bar, 0, df],
+    [foo, 0, foo.firstChild, 3, foo],
+    [foo.firstChild, 0, bar, 0, df],
+    [foo.firstChild, 3, bar.firstChild, 2, df]
+  ].forEach(function(t) {
+    test(function() {
+      var range = document.createRange();
+      range.setStart(t[0], t[1]);
+      range.setEnd(t[2], t[3]);
+      assert_equals(range.commonAncestorContainer, t[4]);
+    })
+  });
+}, "Normal Ranges")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-comparePoint.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-comparePoint.html
new file mode 100644
index 000000000000..cb6b9c5fb13e
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-comparePoint.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>Range.comparePoint</title>
+<link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  var r = document.createRange();
+  r.detach()
+  assert_throws("INVALID_STATE_ERR", function() { r.comparePoint(document.body, 0) })
+})
+test(function() {
+  var r = document.createRange();
+  assert_throws(new TypeError(), function() { r.comparePoint(null, 0) })
+})
+test(function() {
+  var doc = document.implementation.createHTMLDocument("tralala")
+  var r = document.createRange();
+  assert_throws("WRONG_DOCUMENT_ERR", function() { r.comparePoint(doc.body, 0) })
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-detach.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-detach.html
new file mode 100644
index 000000000000..0600a3d25630
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-detach.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Range.detach</title>
+<link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  var r = document.createRange();
+  r.detach()
+  assert_throws("INVALID_STATE_ERR", function() { r.detach() })
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html
new file mode 100644
index 000000000000..303707916ea9
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<title>Range.intersectsNode</title>
+<link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+  var r = document.createRange();
+  assert_throws(new TypeError(), function() { r.intersectsNode(null); });
+  r.detach();
+  assert_throws(new TypeError(), function() { r.intersectsNode(null); });
+  assert_throws("INVALID_STATE_ERR", function() { r.intersectsNode(document); });
+})
+test(function() { // Step 2
+  var r = document.createRange();
+  assert_throws("INVALID_NODE_TYPE_ERR",
+                function() { r.intersectsNode(document); });
+  if (document.createAttribute) {
+    assert_throws("INVALID_NODE_TYPE_ERR",
+                  function() { r.intersectsNode(document.createAttribute("foo")); });
+  }
+})
+test(function() { // Step 3
+  var r = document.createRange();
+  assert_throws("NOT_FOUND_ERR",
+                function() { r.intersectsNode(document.createElement("div")); });
+})
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_attributes.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_attributes.html
new file mode 100644
index 000000000000..82b744a5bb0b
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_attributes.html
@@ -0,0 +1,353 @@
+<!DOCTYPE html>
+<title>Attributes tests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="attributes.js"></script>
+<script src="productions.js"></script>
+<div id="log"></div>
+<span id="test1"></span>
+<span class="&amp;&lt;&gt;foo"></span>
+<script>
+var XML = "http://www.w3.org/XML/1998/namespace"
+var XMLNS = "http://www.w3.org/2000/xmlns/"
+
+// AttrExodus
+test(function() {
+  document.body.setAttribute("abc", "pass")
+  var attr = document.body.attributes[0]
+  assert_true(attr instanceof Attr)
+  assert_false(attr instanceof Node)
+  assert_throws(new TypeError(), function() { attr.appendChild(document.createTextNode("fail")) })
+  assert_throws(new TypeError(), function() { attr.appendChild(null) })
+  assert_equals(attr.value, "pass")
+  assert_false("childNodes" in attr)
+}, "AttrExodus")
+
+// setAttribute exhaustive tests
+// Step 1
+test(function() {
+  var el = document.createElement("foo")
+  for (var i = 0; i < invalid_names.length; i++) {
+    assert_throws("INVALID_CHARACTER_ERR", function() { el.setAttribute(invalid_names[i], "test") })
+  }
+}, "When qualifiedName does not match the Name production, an " +
+   "INVALID_CHARACTER_ERR exception is to be thrown.")
+
+// Step 2
+test(function() {
+  var el = document.createElement("div")
+  el.setAttribute("ALIGN", "left")
+  assert_equals(el.getAttributeNS("", "ALIGN"), null)
+  assert_equals(el.getAttributeNS("", "align"), "left")
+  assert_equals(el.getAttribute("align"), "left")
+}, "setAttribute should lowercase its name argument")
+test(function() {
+  var el = document.createElement("div")
+  el.setAttribute("CHEEseCaKe", "tasty")
+  assert_equals(el.getAttributeNS("", "CHEEseCaKe"), null)
+  assert_equals(el.getAttributeNS("", "cheesecake"), "tasty")
+  assert_equals(el.getAttribute("cheesecake"), "tasty")
+}, "setAttribute should lowercase its name argument")
+
+// Step 3
+test(function() {
+  var el = document.createElement("foo")
+  var tests = ["xmlns", "xmlns:a", "xmlnsx", "xmlns0"]
+  for (var i = 0; i < tests.length; i++) {
+    assert_throws("NAMESPACE_ERR",
+                  function() { el.setAttribute(tests[i], "fail") },
+                  "Expected exception for " + tests[i] + ".")
+  }
+}, "setAttribute should throw a NAMESPACE_ERR when qualifiedName starts with 'xmlns'")
+
+// Step 4
+test(function() {
+  var el = document.createElement("foo")
+  for (var i = 0; i < valid_names.length; i++) {
+    el.setAttribute(valid_names[i], "test")
+    assert_equals(el.getAttribute(valid_names[i]), "test")
+  }
+}, "Basic functionality should be intact.")
+
+// Step 5
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttribute("a", "1")
+  el.setAttribute("b", "2")
+  el.setAttribute("a", "3")
+  el.setAttribute("c", "4")
+  attributes_are(el, [["a", "3"],
+                      ["b", "2"],
+                      ["c", "4"]])
+}, "setAttribute should not change the order of previously set attributes.")
+test(function() {
+  var el = document.createElement("baz")
+  el.setAttributeNS("ab", "attr", "fail")
+  el.setAttributeNS("kl", "attr", "pass")
+  el.setAttribute("attr", "pass")
+  attributes_are(el, [["attr", "pass", "ab"],
+                      ["attr", "pass", "kl"]])
+}, "setAttribute should set the first attribute with the given name")
+test(function() {
+  // Based on a test by David Flanagan.
+  var el = document.createElement("baz")
+  el.setAttributeNS("foo", "foo:bar", "1");
+  assert_equals(el.getAttribute("foo:bar"), "1")
+  attr_is(el.attributes[0], "1", "bar", "foo", "foo", "foo:bar")
+  el.setAttribute("foo:bar", "2");
+  assert_equals(el.getAttribute("foo:bar"), "2")
+  attr_is(el.attributes[0], "2", "bar", "foo", "foo", "foo:bar")
+}, "setAttribute should set the attribute with the given qualified name")
+
+// setAttributeNS exhaustive tests
+// Step 1
+test(function() {
+  var el = document.createElement("foo")
+  for (var i = 0, il = invalid_names.length; i < il; ++i) {
+    assert_throws("INVALID_CHARACTER_ERR",
+                  function() { el.setAttributeNS("a", invalid_names[i], "fail") })
+  }
+}, "When qualifiedName does not match the Name production, an " +
+   "INVALID_CHARACTER_ERR exception is to be thrown.")
+
+// Step 2
+test(function() {
+  var el = document.createElement("foo")
+  for (var i = 0, il = invalid_qnames.length; i < il; ++i) {
+    assert_throws("NAMESPACE_ERR",
+                  function() { el.setAttributeNS("a", invalid_qnames[i], "fail") },
+                  "Expected exception for " + invalid_qnames[i] + ".")
+  }
+}, "When qualifiedName does not match the QName production, an " +
+   "NAMESPACE_ERR exception is to be thrown.")
+
+// Step 3
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS(null, "aa", "bb")
+  el.setAttributeNS("", "xx", "bb")
+  attributes_are(el, [["aa", "bb"],
+                      ["xx", "bb"]])
+}, "null and the empty string should result in a null namespace.")
+
+// Step 4
+test(function() {
+  var el = document.createElement("foo")
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS("", "aa:bb", "fail") })
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS(null, "aa:bb", "fail") })
+}, "A namespace is required to use a prefix.")
+
+// Step 5
+test(function() {
+  var el = document.createElement("foo")
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS("a", "xml:bb", "fail") })
+}, "The xml prefix should not be allowed for arbitrary namespaces")
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS(XML, "a:bb", "pass")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "pass", "bb", XML, "a", "a:bb")
+}, "XML-namespaced attributes don't need an xml prefix")
+
+// Step 6
+test(function() {
+  var el = document.createElement("foo")
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS("a", "xmlns:bb", "fail") })
+}, "The xmlns prefix should not be allowed for arbitrary namespaces")
+test(function() {
+  var el = document.createElement("foo")
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS("a", "xmlns", "fail") })
+}, "The xmlns qualified name should not be allowed for arbitrary namespaces")
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS("ns", "a:xmlns", "pass")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "pass", "xmlns", "ns", "a", "a:xmlns")
+}, "xmlns should be allowed as local name")
+
+// Step 7
+test(function() {
+  var el = document.createElement("foo")
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS(XMLNS, "a:xmlns", "fail") })
+  assert_throws("NAMESPACE_ERR",
+                function() { el.setAttributeNS(XMLNS, "b:foo", "fail") })
+}, "The XMLNS namespace should require xmlns as prefix or qualified name")
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS(XMLNS, "xmlns:a", "pass")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "pass", "a", XMLNS, "xmlns", "xmlns:a")
+}, "xmlns should be allowed as prefix in the XMLNS namespace")
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS(XMLNS, "xmlns", "pass")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "pass", "xmlns", XMLNS, null, "xmlns")
+}, "xmlns should be allowed as qualified name in the XMLNS namespace")
+
+// Step 8-9
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttributeNS("a", "foo:bar", "X")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "X", "bar", "a", "foo", "foo:bar")
+
+  el.setAttributeNS("a", "quux:bar", "Y")
+  assert_equals(el.attributes.length, 1)
+  attr_is(el.attributes[0], "Y", "bar", "a", "foo", "foo:bar")
+  el.removeAttributeNS("a", "bar")
+}, "Setting the same attribute with another prefix should not change the prefix")
+
+// Miscellaneous tests
+test(function() {
+  var el = document.createElement("iframe")
+  el.setAttribute("src", "file:///home")
+  assert_equals(el.getAttribute("src"), "file:///home")
+}, "setAttribute should not throw even if a load is not allowed")
+test(function() {
+  var docFragment = document.createDocumentFragment()
+  var newOne = document.createElement("newElement")
+  newOne.setAttribute("newdomestic", "Yes")
+  docFragment.appendChild(newOne)
+  var domesticNode = docFragment.firstChild
+  var attr = domesticNode.attributes.item(0)
+  attr_is(attr, "Yes", "newdomestic", null, null, "newdomestic")
+}, "Attributes should work in document fragments.")
+test(function() {
+  var el = document.createElement("foo")
+  el.setAttribute("x", "y")
+  var attr = el.attributes[0]
+  attr.value = "Y&lt;"
+  attr_is(attr, "Y&lt;", "x", null, null, "x")
+  assert_equals(el.getAttribute("x"), "Y&lt;")
+}, "Attribute values should not be parsed.")
+test(function() {
+  var el = document.getElementsByTagName("span")[0]
+  attr_is(el.attributes[0], "test1", "id", null, null, "id")
+}, "Specified attributes should be accessible.")
+test(function() {
+  var el = document.getElementsByTagName("span")[1]
+  attr_is(el.attributes[0], "&<>foo", "class", null, null, "class")
+}, "Entities in attributes should have been expanded while parsing.")
+
+test(function() {
+  var el = document.createElement("div")
+  assert_equals(el.hasAttribute("bar"), false)
+  assert_equals(el.hasAttributeNS(null, "bar"), false)
+  assert_equals(el.hasAttributeNS("", "bar"), false)
+  assert_equals(el.getAttribute("bar"), null)
+  assert_equals(el.getAttributeNS(null, "bar"), null)
+  assert_equals(el.getAttributeNS("", "bar"), null)
+}, "Unset attributes return null")
+test(function() {
+  var el = document.createElement("div")
+  el.setAttributeNS("ab", "attr", "t1")
+  el.setAttributeNS("kl", "attr", "t2")
+  assert_equals(el.hasAttribute("attr"), true)
+  assert_equals(el.hasAttributeNS("ab", "attr"), true)
+  assert_equals(el.hasAttributeNS("kl", "attr"), true)
+  assert_equals(el.getAttribute("attr"), "t2")
+  assert_equals(el.getAttributeNS("ab", "attr"), "t1")
+  assert_equals(el.getAttributeNS("kl", "attr"), "t2")
+  assert_equals(el.getAttributeNS(null, "attr"), null)
+  assert_equals(el.getAttributeNS("", "attr"), null)
+}, "First set attribute is returned by setAttribute")
+test(function() {
+  var el = document.createElement("div")
+  el.setAttribute("style", "color:#fff;")
+  assert_equals(el.hasAttribute("style"), true)
+  assert_equals(el.hasAttributeNS(null, "style"), true)
+  assert_equals(el.hasAttributeNS("", "style"), true)
+  assert_equals(el.getAttribute("style"), "color:#fff;")
+  assert_equals(el.getAttributeNS(null, "style"), "color:#fff;")
+  assert_equals(el.getAttributeNS("", "style"), "color:#fff;")
+}, "Style attributes are not normalized")
+test(function() {
+  var el = document.createElement("div")
+  el.setAttributeNS("", "ALIGN", "left")
+  assert_equals(el.hasAttribute("ALIGN"), false)
+  assert_equals(el.hasAttribute("align"), false)
+  assert_equals(el.hasAttributeNS(null, "ALIGN"), true)
+  assert_equals(el.hasAttributeNS(null, "align"), false)
+  assert_equals(el.hasAttributeNS("", "ALIGN"), true)
+  assert_equals(el.hasAttributeNS("", "align"), false)
+  assert_equals(el.getAttribute("ALIGN"), null)
+  assert_equals(el.getAttribute("align"), null)
+  assert_equals(el.getAttributeNS(null, "ALIGN"), "left")
+  assert_equals(el.getAttributeNS("", "ALIGN"), "left")
+  assert_equals(el.getAttributeNS(null, "align"), null)
+  assert_equals(el.getAttributeNS("", "align"), null)
+  el.removeAttributeNS("", "ALIGN")
+}, "Only lowercase attributes are returned on HTML elements")
+test(function() {
+  var el = document.createElement("div")
+  el.setAttributeNS("", "CHEEseCaKe", "tasty")
+  assert_equals(el.hasAttribute("CHEESECAKE"), false)
+  assert_equals(el.hasAttribute("CHEEseCaKe"), false)
+  assert_equals(el.hasAttribute("cheesecake"), false)
+  assert_equals(el.hasAttributeNS("", "CHEESECAKE"), false)
+  assert_equals(el.hasAttributeNS("", "CHEEseCaKe"), true)
+  assert_equals(el.hasAttributeNS("", "cheesecake"), false)
+  assert_equals(el.hasAttributeNS(null, "CHEESECAKE"), false)
+  assert_equals(el.hasAttributeNS(null, "CHEEseCaKe"), true)
+  assert_equals(el.hasAttributeNS(null, "cheesecake"), false)
+  assert_equals(el.getAttribute("CHEESECAKE"), null)
+  assert_equals(el.getAttribute("CHEEseCaKe"), null)
+  assert_equals(el.getAttribute("cheesecake"), null)
+  assert_equals(el.getAttributeNS(null, "CHEESECAKE"), null)
+  assert_equals(el.getAttributeNS("", "CHEESECAKE"), null)
+  assert_equals(el.getAttributeNS(null, "CHEEseCaKe"), "tasty")
+  assert_equals(el.getAttributeNS("", "CHEEseCaKe"), "tasty")
+  assert_equals(el.getAttributeNS(null, "cheesecake"), null)
+  assert_equals(el.getAttributeNS("", "cheesecake"), null)
+  el.removeAttributeNS("", "CHEEseCaKe")
+}, "Only lowercase attributes are returned on HTML elements")
+test(function() {
+  var el = document.createElement("div")
+  document.body.appendChild(el)
+  el.setAttributeNS("", "align", "left")
+  el.setAttributeNS("xx", "align", "right")
+  el.setAttributeNS("", "foo", "left")
+  el.setAttributeNS("xx", "foo", "right")
+  assert_equals(el.hasAttribute("align"), true)
+  assert_equals(el.hasAttribute("foo"), true)
+  assert_equals(el.hasAttributeNS("xx", "align"), true)
+  assert_equals(el.hasAttributeNS(null, "foo"), true)
+  assert_equals(el.getAttribute("align"), "left")
+  assert_equals(el.getAttribute("foo"), "left")
+  assert_equals(el.getAttributeNS("xx", "align"), "right")
+  assert_equals(el.getAttributeNS(null, "foo"), "left")
+  assert_equals(el.getAttributeNS("", "foo"), "left")
+  el.removeAttributeNS("", "align")
+  el.removeAttributeNS("xx", "align")
+  el.removeAttributeNS("", "foo")
+  el.removeAttributeNS("xx", "foo")
+  document.body.removeChild(el)
+}, "First set attribute is returned with mapped attribute set first")
+test(function() {
+  var el = document.createElement("div")
+  el.setAttributeNS("xx", "align", "right")
+  el.setAttributeNS("", "align", "left")
+  el.setAttributeNS("xx", "foo", "right")
+  el.setAttributeNS("", "foo", "left")
+  assert_equals(el.hasAttribute("align"), true)
+  assert_equals(el.hasAttribute("foo"), true)
+  assert_equals(el.hasAttributeNS("xx", "align"), true)
+  assert_equals(el.hasAttributeNS(null, "foo"), true)
+  assert_equals(el.getAttribute("align"), "right")
+  assert_equals(el.getAttribute("foo"), "right")
+  assert_equals(el.getAttributeNS("xx", "align"), "right")
+  assert_equals(el.getAttributeNS(null, "foo"), "left")
+  assert_equals(el.getAttributeNS("", "foo"), "left")
+  el.removeAttributeNS("", "align")
+  el.removeAttributeNS("xx", "align")
+  el.removeAttributeNS("", "foo")
+  el.removeAttributeNS("xx", "foo")
+}, "First set attribute is returned with mapped attribute set later")
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_case.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_case.html
new file mode 100644
index 000000000000..96d3ac337608
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_case.html
@@ -0,0 +1,6 @@
+<meta charset=utf8>
+<script>is_html=true;</script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="case.js"></script>
+<div id="log"></div>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_historical.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_historical.html
new file mode 100644
index 000000000000..c5cae702b885
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_historical.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<title>Historical DOM features must be removed</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+function isInterfaceNuked(name) {
+  test(function() {
+    assert_equals(window[name], undefined)
+  }, "Historical DOM features must be removed: " + name)
+}
+var nukedInterfaces = [
+  "CDATASection",
+  "DOMConfiguration",
+  "DOMErrorHandler",
+  "DOMImplementationList",
+  "DOMImplementationSource",
+  "DOMLocator",
+  "DOMObject",
+  "DOMUserData",
+  "Entity",
+  "EntityReference",
+  "EventException", // DOM Events
+  "NamedNodeMap",
+  "NameList",
+  "Notation",
+  "TypeInfo",
+  "UserDataHandler",
+  "RangeException" // DOM Range
+]
+nukedInterfaces.forEach(isInterfaceNuked)
+
+function isNukedFromDocument(name) {
+  test(function() {
+    var doc = document.implementation.createDocument(null,null,null)
+    assert_equals(document[name], undefined)
+    assert_equals(doc[name], undefined)
+  }, "Historical DOM features must be removed: " + name)
+}
+var documentNuked = [
+  "createCDATASection",
+  "createAttribute",
+  "createAttributeNS",
+  "createEntityReference",
+  "inputEncoding",
+  "xmlEncoding",
+  "xmlStandalone",
+  "xmlVersion",
+  "strictErrorChecking",
+  "domConfig",
+  "normalizeDocument",
+  "renameNode",
+  "charset",
+  "defaultCharset",
+  "height",
+  "width"
+]
+documentNuked.forEach(isNukedFromDocument)
+
+test(function() {
+  assert_equals(document.implementation["getFeature"], undefined)
+}, "DOMImplementation.getFeature() must be nuked.")
+
+function isNukedFromElement(name) {
+  test(function() {
+    var ele = document.createElementNS("test", "test")
+    assert_equals(document.body[name], undefined)
+    assert_equals(ele[name], undefined)
+  }, "Historical DOM features must be removed: " + name)
+}
+var elementNuked = [
+  "getAttributeNode",
+  "getAttributeNodeNS",
+  "setAttributeNode",
+  "removeAttributeNode",
+  "schemaTypeInfo",
+  "setIdAttribute",
+  "setIdAttributeNS",
+  "setIdAttributeNode"
+]
+elementNuked.forEach(isNukedFromElement)
+
+function isNukedFromDoctype(name) {
+  test(function() {
+    var doctype = document.implementation.createDocumentType("test", "", "")
+    assert_equals(doctype[name], undefined)
+  }, "DocumentType member must be nuked: " + name)
+}
+var doctypeNuked = [
+  "entities",
+  "notations",
+  "internalSubset"
+]
+doctypeNuked.forEach(isNukedFromDoctype)
+
+function isNukedFromText(name) {
+  test(function() {
+    var text = document.createTextNode("test")
+    assert_equals(text[name], undefined)
+  }, "Text member must be nuked: " + name)
+}
+var textNuked = [
+  "isElementContentWhitespace",
+  "replaceWholeText"
+]
+textNuked.forEach(isNukedFromText)
+
+function isNukedFromNode(name) {
+  test(function() {
+    var doc = document.implementation.createDocument(null,null,null)
+    var doctype = document.implementation.createDocumentType("test", "", "")
+    var text = document.createTextNode("test")
+    assert_equals(doc[name], undefined)
+    assert_equals(doctype[name], undefined)
+    assert_equals(text[name], undefined)
+  }, "Node member must be nuked: " + name)
+}
+var nodeNuked = [
+  "hasAttributes",
+  //"attributes",
+  //"namespaceURI",
+  //"prefix",
+  //"localName",
+  "isSupported",
+  "getFeature",
+  "getUserData",
+  "setUserData"
+]
+nodeNuked.forEach(isNukedFromNode)
+
+function isNukedFromWindow(name) {
+  test(function() {
+    assert_equals(window[name], undefined)
+  }, "Window member must be nuked: " + name)
+}
+var windowNuked = [
+  "attachEvent"
+]
+windowNuked.forEach(isNukedFromWindow)
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_interfaces.html b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_interfaces.html
new file mode 100644
index 000000000000..c0697b566c19
--- /dev/null
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_interfaces.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<title>Interfaces</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function testInterfaceDeletable(iface) {
+  test(function() {
+    assert_true(!!window[iface], "Interface should exist.")
+    assert_true(delete window[iface], "The delete operator should return true.")
+    assert_equals(window[iface], undefined, "Interface should be gone.")
+  }, "Should be able to delete " + iface + ".")
+}
+var interfaces = [
+  "Event",
+  "CustomEvent",
+  "EventTarget",
+  "Node",
+  "Document",
+  "DOMImplementation",
+  "DocumentFragment",
+  "ProcessingInstruction",
+  "DocumentType",
+  "Element",
+  "Attr",
+  "CharacterData",
+  "Text",
+  "Comment",
+  "NodeIterator",
+  "TreeWalker",
+  "NodeFilter",
+  "NodeList",
+  "HTMLCollection",
+  "DOMStringList",
+  "DOMTokenList",
+  "DOMSettableTokenList"
+];
+test(function() {
+  for (var p in window) {
+    interfaces.forEach(function(i) {
+      assert_not_equals(p, i)
+    })
+  }
+}, "Interface objects properties should not be Enumerable")
+interfaces.forEach(testInterfaceDeletable);
+</script>
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
index c7f6ab294256..bc5b2856c649 100644
--- a/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/DOMCore/tests/submissions/Opera
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
index 5e31a046a553..91a0247767d9 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions/Infraware
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   iframe \
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
index 2cbae991da18..6fd27c4ab93e 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in
index 1e1a8f6f29a1..596958233f25 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   Infraware \
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
index 222141b08588..4f877bbe4d66 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
index 19039c57b9bd..f123fd979d2b 100644
--- a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
@@ -1,11 +1,11 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH = ../../../../../../..
+DEPTH = @DEPTH@
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger
+relativesrcdir = @relativesrcdir@
 
 DIRS = \
   $(NULL)
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index abe9b7a82dbc..db32fab22777 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in
index 07f174242a7f..46ad31fd8d8d 100644
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
-relativesrcdir = dom/indexedDB/ipc
+relativesrcdir = @relativesrcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
@@ -31,7 +31,8 @@ LOCAL_INCLUDES += \
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
-MOCHITEST_FILES = test_ipc.html
+# Bug 770046 - Cannot fail.
+# MOCHITEST_FILES = test_ipc.html
 
 # Need to enable these tests sometime soon.
 #XPCSHELL_TESTS = unit
diff --git a/dom/indexedDB/nsIIDBVersionChangeEvent.idl b/dom/indexedDB/nsIIDBVersionChangeEvent.idl
index ce240e173ca4..f17c625e4b44 100644
--- a/dom/indexedDB/nsIIDBVersionChangeEvent.idl
+++ b/dom/indexedDB/nsIIDBVersionChangeEvent.idl
@@ -6,7 +6,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(4eea27c9-a831-40ce-8dbd-e97df9f11b8f)]
+[scriptable, builtinclass, uuid(bb9797ae-6959-47cb-893e-73d3a7018d6d)]
 interface nsIIDBVersionChangeEvent : nsIDOMEvent
 {
   readonly attribute unsigned long long oldVersion;
diff --git a/dom/indexedDB/test/Makefile.in b/dom/indexedDB/test/Makefile.in
index fc1309bcd57a..94acf3fe982c 100644
--- a/dom/indexedDB/test/Makefile.in
+++ b/dom/indexedDB/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/indexedDB/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/indexedDB/test/unit/Makefile.in b/dom/indexedDB/test/unit/Makefile.in
index c58743a3ee11..53e195801967 100644
--- a/dom/indexedDB/test/unit/Makefile.in
+++ b/dom/indexedDB/test/unit/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/indexedDB/test/unit
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/interfaces/apps/Makefile.in b/dom/interfaces/apps/Makefile.in
index daa5441b8d65..f3ab2a92b226 100644
--- a/dom/interfaces/apps/Makefile.in
+++ b/dom/interfaces/apps/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/apps/nsIDOMMozApplicationEvent.idl b/dom/interfaces/apps/nsIDOMMozApplicationEvent.idl
index 50f0a0e00108..39bf6735ee90 100644
--- a/dom/interfaces/apps/nsIDOMMozApplicationEvent.idl
+++ b/dom/interfaces/apps/nsIDOMMozApplicationEvent.idl
@@ -6,7 +6,7 @@
 
 interface mozIDOMApplication;
 
-[scriptable, builtinclass, uuid(8f2bfba8-f10e-4f63-a5e0-7a7056e1dbe6)]
+[scriptable, builtinclass, uuid(dae640fb-0a14-42d8-88d3-541c6f077820)]
 interface nsIDOMMozApplicationEvent : nsIDOMEvent
 {
   readonly attribute mozIDOMApplication application;
diff --git a/dom/interfaces/base/Makefile.in b/dom/interfaces/base/Makefile.in
index 438a69c6fe06..158e544cdea7 100644
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/canvas/Makefile.in b/dom/interfaces/canvas/Makefile.in
index a766eb590f7d..576531800f8d 100644
--- a/dom/interfaces/canvas/Makefile.in
+++ b/dom/interfaces/canvas/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/contacts/Makefile.in b/dom/interfaces/contacts/Makefile.in
index 252adb38d433..503f8844a011 100644
--- a/dom/interfaces/contacts/Makefile.in
+++ b/dom/interfaces/contacts/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/contacts/nsIDOMMozContactChangeEvent.idl b/dom/interfaces/contacts/nsIDOMMozContactChangeEvent.idl
index 1cd604b25f7c..27fa9e8c2628 100644
--- a/dom/interfaces/contacts/nsIDOMMozContactChangeEvent.idl
+++ b/dom/interfaces/contacts/nsIDOMMozContactChangeEvent.idl
@@ -4,7 +4,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(6ed26570-b640-11e1-afa6-0800200c9a66)]
+[scriptable, builtinclass, uuid(b05dd60a-bfb8-4428-982e-c7f20e77b673)]
 interface nsIDOMMozContactChangeEvent : nsIDOMEvent
 {
   readonly attribute DOMString contactID;
diff --git a/dom/interfaces/core/Makefile.in b/dom/interfaces/core/Makefile.in
index 718b5f00d82a..3d546ec06c81 100644
--- a/dom/interfaces/core/Makefile.in
+++ b/dom/interfaces/core/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/css/Makefile.in b/dom/interfaces/css/Makefile.in
index 359ef939b372..4f710e5e1d50 100644
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/devicestorage/Makefile.in b/dom/interfaces/devicestorage/Makefile.in
index be1a9a007d52..689a69d5e35c 100644
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/interfaces/devicestorage/nsIDOMDeviceStorageChangeEvent.idl b/dom/interfaces/devicestorage/nsIDOMDeviceStorageChangeEvent.idl
index f2d3dab1031b..81dc1b13f82d 100644
--- a/dom/interfaces/devicestorage/nsIDOMDeviceStorageChangeEvent.idl
+++ b/dom/interfaces/devicestorage/nsIDOMDeviceStorageChangeEvent.idl
@@ -5,7 +5,7 @@
 #include "domstubs.idl"
 #include "nsIDOMEvent.idl"
 
-[scriptable, uuid(468304d6-aab6-4e1e-8ab2-569d9e703431), builtinclass]
+[scriptable, uuid(49bdda6f-430a-4cf8-b535-b97b5b1ed575), builtinclass]
 interface nsIDOMDeviceStorageChangeEvent : nsIDOMEvent
 {
 
diff --git a/dom/interfaces/events/Makefile.in b/dom/interfaces/events/Makefile.in
index 3ba3459bdc18..96de9e9364ed 100644
--- a/dom/interfaces/events/Makefile.in
+++ b/dom/interfaces/events/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/events/nsIDOMAnimationEvent.idl b/dom/interfaces/events/nsIDOMAnimationEvent.idl
index 812c217220f7..e5e0d41e6224 100644
--- a/dom/interfaces/events/nsIDOMAnimationEvent.idl
+++ b/dom/interfaces/events/nsIDOMAnimationEvent.idl
@@ -11,7 +11,7 @@
  * http://dev.w3.org/csswg/css3-animations/#animation-events-
  */
 
-[scriptable, builtinclass, uuid(861e0be7-695a-4627-919f-13bccb9eb115)]
+[scriptable, builtinclass, uuid(ecb06edb-8e90-43ce-8f4b-3d1021222e3a)]
 interface nsIDOMAnimationEvent : nsIDOMEvent {
   readonly attribute DOMString          animationName;
   readonly attribute float              elapsedTime;
diff --git a/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl b/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
index d8158a4a5d7b..3a96b389b75d 100644
--- a/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
+++ b/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
@@ -15,7 +15,7 @@
  *
  */
 
-[scriptable, builtinclass, uuid(f2aafd86-e3e3-461f-96c4-8ad3b5f10e6a)]
+[scriptable, builtinclass, uuid(e5c281d9-ce73-4f95-bc4d-e00d537b63cb)]
 interface nsIDOMBeforeUnloadEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMCloseEvent.idl b/dom/interfaces/events/nsIDOMCloseEvent.idl
index feb68b9a311d..783ae343005a 100644
--- a/dom/interfaces/events/nsIDOMCloseEvent.idl
+++ b/dom/interfaces/events/nsIDOMCloseEvent.idl
@@ -12,7 +12,7 @@
  * For more information on this interface, please see
  * http://dev.w3.org/html5/websockets/#closeevent
  */
-[scriptable, builtinclass, uuid(0e3f4687-921c-4141-9615-0fca9e3b02f4)]
+[scriptable, builtinclass, uuid(028a92e8-54ab-42ba-938a-9118d339164f)]
 interface nsIDOMCloseEvent : nsIDOMEvent
 {
   readonly attribute boolean wasClean;
diff --git a/dom/interfaces/events/nsIDOMCommandEvent.idl b/dom/interfaces/events/nsIDOMCommandEvent.idl
index fce88a51bf1c..4b57823f2214 100644
--- a/dom/interfaces/events/nsIDOMCommandEvent.idl
+++ b/dom/interfaces/events/nsIDOMCommandEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(588d57f8-e8b0-4abc-b94f-5ba8628b024a)]
+[scriptable, builtinclass, uuid(e2516013-4552-4638-b47b-9f0c24609e02)]
 interface nsIDOMCommandEvent : nsIDOMEvent
 {
   readonly attribute DOMString command;
diff --git a/dom/interfaces/events/nsIDOMCompositionEvent.idl b/dom/interfaces/events/nsIDOMCompositionEvent.idl
index 7943979da8f0..2c5c28e46576 100644
--- a/dom/interfaces/events/nsIDOMCompositionEvent.idl
+++ b/dom/interfaces/events/nsIDOMCompositionEvent.idl
@@ -6,7 +6,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, builtinclass, uuid(681563fa-7b3a-4d1d-a6a4-8f06287560fa)]
+[scriptable, builtinclass, uuid(858d898a-33a8-4c0b-a9ff-fa9a81a5ce09)]
 interface nsIDOMCompositionEvent : nsIDOMUIEvent
 {
   readonly attribute DOMString data;
diff --git a/dom/interfaces/events/nsIDOMCustomEvent.idl b/dom/interfaces/events/nsIDOMCustomEvent.idl
index 5ebc537b5404..b9ee4311b602 100644
--- a/dom/interfaces/events/nsIDOMCustomEvent.idl
+++ b/dom/interfaces/events/nsIDOMCustomEvent.idl
@@ -6,7 +6,7 @@
 #include "nsIDOMEvent.idl"
 interface nsIVariant;
 
-[scriptable, builtinclass, uuid(90277f74-1383-4da8-8748-c7abd420cf06)]
+[scriptable, builtinclass, uuid(86e1b9ee-8080-4217-b3fa-025556d83597)]
 interface nsIDOMCustomEvent : nsIDOMEvent
 {
 
diff --git a/dom/interfaces/events/nsIDOMDataContainerEvent.idl b/dom/interfaces/events/nsIDOMDataContainerEvent.idl
index 1d7faecbf718..e0dcd2edac77 100644
--- a/dom/interfaces/events/nsIDOMDataContainerEvent.idl
+++ b/dom/interfaces/events/nsIDOMDataContainerEvent.idl
@@ -6,7 +6,7 @@
 #include "nsIDOMEvent.idl"
 #include "nsIVariant.idl"
 
-[scriptable, builtinclass, uuid(2bad4fcf-a56c-447f-bf51-fa39efaac1fc)]
+[scriptable, builtinclass, uuid(8d70345a-144d-48d8-a64d-7a61a15b453c)]
 interface nsIDOMDataContainerEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMDeviceLightEvent.idl b/dom/interfaces/events/nsIDOMDeviceLightEvent.idl
index a3bd70460863..998f06e75a50 100644
--- a/dom/interfaces/events/nsIDOMDeviceLightEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceLightEvent.idl
@@ -4,7 +4,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(4d37e578-9469-4067-8de3-34e6f01f11f3)]
+[scriptable, builtinclass, uuid(9cc7684c-a239-428c-b4f1-34c510c98a1c)]
 interface nsIDOMDeviceLightEvent : nsIDOMEvent
 {
   [noscript] void initDeviceLightEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl b/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
index b35b2317f3da..63a4c598f6a5 100644
--- a/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
@@ -21,7 +21,7 @@ interface nsIDOMDeviceRotationRate : nsISupports
 };
 
 
-[scriptable, builtinclass, uuid(cdf9bfef-dd71-4780-889b-edb4780d00da)]
+[scriptable, builtinclass, uuid(1b3d39f2-8f8b-454f-83ad-acbdd32fa2c3)]
 interface nsIDOMDeviceMotionEvent : nsIDOMEvent
 {
   void initDeviceMotionEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl b/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
index 011846a5374f..f2fc73f8e8b3 100644
--- a/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
@@ -4,7 +4,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(a2d63af8-966a-443f-ac78-082b06d2878f)]
+[scriptable, builtinclass, uuid(8e37040a-dbbb-41d8-a019-eb687e5e8ec7)]
 interface nsIDOMDeviceOrientationEvent : nsIDOMEvent
 {
   void initDeviceOrientationEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/events/nsIDOMDeviceProximityEvent.idl b/dom/interfaces/events/nsIDOMDeviceProximityEvent.idl
index c1e79b835455..e994e2c28ce7 100644
--- a/dom/interfaces/events/nsIDOMDeviceProximityEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceProximityEvent.idl
@@ -4,7 +4,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(de5ac415-5ae9-44ce-ab48-a533cbbef37c)]
+[scriptable, builtinclass, uuid(c33bec2d-5a0b-44ae-b035-d74cd519ec16)]
 interface nsIDOMDeviceProximityEvent : nsIDOMEvent
 {
   [noscript] void initDeviceProximityEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/events/nsIDOMDragEvent.idl b/dom/interfaces/events/nsIDOMDragEvent.idl
index 5a17f6e9d689..d81080f8554a 100644
--- a/dom/interfaces/events/nsIDOMDragEvent.idl
+++ b/dom/interfaces/events/nsIDOMDragEvent.idl
@@ -8,7 +8,7 @@
 
 interface nsIDOMDataTransfer;
 
-[scriptable, builtinclass, uuid(25e7df11-dbfe-4b9e-bd75-35090d913865)]
+[scriptable, builtinclass, uuid(2b3b587d-6426-415f-a6f0-4f86eaa562f1)]
 interface nsIDOMDragEvent : nsIDOMMouseEvent
 {
   readonly attribute nsIDOMDataTransfer dataTransfer;
diff --git a/dom/interfaces/events/nsIDOMEvent.idl b/dom/interfaces/events/nsIDOMEvent.idl
index 49bd53deeeee..b66a2b23f7f7 100644
--- a/dom/interfaces/events/nsIDOMEvent.idl
+++ b/dom/interfaces/events/nsIDOMEvent.idl
@@ -11,6 +11,10 @@ interface nsIDOMEventTarget;
 [ptr] native IPCMessagePtr(IPC::Message);
 [ptr] native ConstIPCMessagePtr(const IPC::Message);
 %{C++
+#ifdef ERROR
+#undef ERROR
+#endif
+
 class nsEvent;
 class nsCommandEvent;
 class nsPresContext;
@@ -29,7 +33,7 @@ class Message;
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, builtinclass, uuid(a7dc0284-5832-4034-a8a5-d860ce0f21d3)]
+[scriptable, builtinclass, uuid(270c945b-8a65-4170-bc0b-4ec1443cd39f)]
 interface nsIDOMEvent : nsISupports
 {
   // PhaseType
@@ -165,6 +169,75 @@ interface nsIDOMEvent : nsISupports
    */
   void                       stopImmediatePropagation();
 
+  const long MOUSEDOWN    = 0x00000001;
+  const long MOUSEUP      = 0x00000002;
+  const long MOUSEOVER    = 0x00000004;
+  const long MOUSEOUT     = 0x00000008;
+  const long MOUSEMOVE    = 0x00000010;
+  const long MOUSEDRAG    = 0x00000020;
+  const long CLICK        = 0x00000040;
+  const long DBLCLICK     = 0x00000080;
+  const long KEYDOWN      = 0x00000100;
+  const long KEYUP        = 0x00000200;
+  const long KEYPRESS     = 0x00000400;
+  const long DRAGDROP     = 0x00000800;
+  const long FOCUS        = 0x00001000;
+  const long BLUR         = 0x00002000;
+  const long SELECT       = 0x00004000;
+  const long CHANGE       = 0x00008000;
+  const long RESET        = 0x00010000;
+  const long SUBMIT       = 0x00020000;
+  const long SCROLL       = 0x00040000;
+  const long LOAD         = 0x00080000;
+  const long UNLOAD       = 0x00100000;
+  const long XFER_DONE    = 0x00200000;
+  const long ABORT        = 0x00400000;
+  const long ERROR        = 0x00800000;
+  const long LOCATE       = 0x01000000;
+  const long MOVE         = 0x02000000;
+  const long RESIZE       = 0x04000000;
+  const long FORWARD      = 0x08000000;
+  const long HELP         = 0x10000000;
+  const long BACK         = 0x20000000;
+  const long TEXT         = 0x40000000;
+
+  const long ALT_MASK     = 0x00000001;
+  const long CONTROL_MASK = 0x00000002;
+  const long SHIFT_MASK   = 0x00000004;
+  const long META_MASK    = 0x00000008;
+
+  /** The original target of the event, before any retargetings. */
+  readonly attribute nsIDOMEventTarget  originalTarget;
+  /**
+   * The explicit original target of the event.  If the event was retargeted
+   * for some reason other than an anonymous boundary crossing, this will be set
+   * to the target before the retargeting occurs.  For example, mouse events
+   * are retargeted to their parent node when they happen over text nodes (bug
+   * 185889), and in that case .target will show the parent and
+   * .explicitOriginalTarget will show the text node.
+   * .explicitOriginalTarget differs from .originalTarget in that it will never
+   * contain anonymous content.
+   */
+  readonly attribute nsIDOMEventTarget  explicitOriginalTarget;
+
+  /**
+   * @deprecated Use nsIDOMEvent::stopPropagation.
+   */
+  void                      preventBubble();
+
+  /**
+   * @deprecated Use nsIDOMEvent::stopPropagation.
+   */
+  void                      preventCapture();
+
+  /**
+   * @deprecated Use nsIDOMEvent::defaultPrevented.
+   * To be removed in bug 691151.
+   */
+  boolean                   getPreventDefault();
+
+  readonly attribute boolean isTrusted;
+
   [noscript] void duplicatePrivateData();
   [noscript] void setTarget(in nsIDOMEventTarget aTarget);
   [notxpcom] boolean IsDispatchStopped();
diff --git a/dom/interfaces/events/nsIDOMHashChangeEvent.idl b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
index 9ef86abd1cfd..0110504d3de2 100644
--- a/dom/interfaces/events/nsIDOMHashChangeEvent.idl
+++ b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(83a9bc2d-d82d-45cc-8f11-4c919519f6e0)]
+[scriptable, builtinclass, uuid(bf5ce408-971a-4e74-bc57-178f0f8781f3)]
 interface nsIDOMHashChangeEvent : nsIDOMEvent
 {
   readonly attribute DOMString oldURL;
diff --git a/dom/interfaces/events/nsIDOMKeyEvent.idl b/dom/interfaces/events/nsIDOMKeyEvent.idl
index fd5cdf9f35c7..d202c7f7b5c3 100644
--- a/dom/interfaces/events/nsIDOMKeyEvent.idl
+++ b/dom/interfaces/events/nsIDOMKeyEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, builtinclass, uuid(c43c4852-5bb6-409f-82cd-4f5e842b7208)]
+[scriptable, builtinclass, uuid(5d116380-8432-48cb-a717-200f04c39d2f)]
 interface nsIDOMKeyEvent : nsIDOMUIEvent
 {
   const unsigned long DOM_VK_CANCEL         = 0x03;
diff --git a/dom/interfaces/events/nsIDOMMessageEvent.idl b/dom/interfaces/events/nsIDOMMessageEvent.idl
index da779aa5c4dd..1962b747aa3c 100644
--- a/dom/interfaces/events/nsIDOMMessageEvent.idl
+++ b/dom/interfaces/events/nsIDOMMessageEvent.idl
@@ -12,7 +12,7 @@
  * For more information on this interface, please see
  * http://www.whatwg.org/specs/web-apps/current-work/#messageevent
  */
-[scriptable, builtinclass, uuid(de8ce1da-220b-4a09-bce7-5c65a80f33c3)]
+[scriptable, builtinclass, uuid(ba747c2b-ec12-4e0d-8de4-d749a6b572e6)]
 interface nsIDOMMessageEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMMouseEvent.idl b/dom/interfaces/events/nsIDOMMouseEvent.idl
index cb83b6b45e82..e396c93d0cec 100644
--- a/dom/interfaces/events/nsIDOMMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseEvent.idl
@@ -13,7 +13,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, builtinclass, uuid(6f4bc64b-1aac-4251-82d3-fd2dc76654a0)]
+[scriptable, builtinclass, uuid(796c3436-5f89-4145-be3a-49808c09fdc6)]
 interface nsIDOMMouseEvent : nsIDOMUIEvent
 {
   readonly attribute long               screenX;
diff --git a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
index fa6c744600b9..8221f8d0e58a 100644
--- a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMMouseEvent.idl"
 
-[scriptable, builtinclass, uuid(44281a27-b48f-47bc-96c9-966f1cab6ae0)]
+[scriptable, builtinclass, uuid(bd3ab39d-eca0-4e2f-889d-4641a2e5d87d)]
 interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
 {
   const long HORIZONTAL_AXIS = 1;
diff --git a/dom/interfaces/events/nsIDOMMozTouchEvent.idl b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
index 06cd4473902f..155ccf5aed3a 100644
--- a/dom/interfaces/events/nsIDOMMozTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
@@ -7,7 +7,7 @@
 #include "nsIDOMMouseEvent.idl"
 
 
-[scriptable, builtinclass, uuid(045b4fd3-c15d-4c76-9d28-9df6f870525a)]
+[scriptable, builtinclass, uuid(58795094-bb6c-488e-af4d-ea029b07869a)]
 interface nsIDOMMozTouchEvent : nsIDOMMouseEvent
 {
   readonly attribute unsigned long streamId;
diff --git a/dom/interfaces/events/nsIDOMMutationEvent.idl b/dom/interfaces/events/nsIDOMMutationEvent.idl
index 849e30ed1831..464fc48a4b9b 100644
--- a/dom/interfaces/events/nsIDOMMutationEvent.idl
+++ b/dom/interfaces/events/nsIDOMMutationEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(f5afec28-e7c0-4c1b-9cf4-8f3a5f0634d5)]
+[scriptable, builtinclass, uuid(85e7c0c0-4dbd-40f4-9f58-8050071dcaae)]
 interface nsIDOMMutationEvent : nsIDOMEvent
 {
   const unsigned short      MODIFICATION       = 1;
diff --git a/dom/interfaces/events/nsIDOMNSEvent.idl b/dom/interfaces/events/nsIDOMNSEvent.idl
index e72be50c46aa..afce8db1ec58 100644
--- a/dom/interfaces/events/nsIDOMNSEvent.idl
+++ b/dom/interfaces/events/nsIDOMNSEvent.idl
@@ -11,7 +11,7 @@
 #endif
 %}
 
-[scriptable, uuid(07F905C1-9170-4103-86CA-766374DA149A)]
+[scriptable, uuid(2580b4a2-6d85-4ca6-9be2-98f3406ad296)]
 interface nsIDOMNSEvent : nsISupports
 {
   const long MOUSEDOWN    = 0x00000001;
@@ -50,32 +50,4 @@ interface nsIDOMNSEvent : nsISupports
   const long CONTROL_MASK = 0x00000002;
   const long SHIFT_MASK   = 0x00000004;
   const long META_MASK    = 0x00000008;
-
-  /** The original target of the event, before any retargetings. */
-  readonly attribute nsIDOMEventTarget  originalTarget;
-  /**
-   * The explicit original target of the event.  If the event was retargeted
-   * for some reason other than an anonymous boundary crossing, this will be set
-   * to the target before the retargeting occurs.  For example, mouse events
-   * are retargeted to their parent node when they happen over text nodes (bug
-   * 185889), and in that case .target will show the parent and
-   * .explicitOriginalTarget will show the text node.
-   * .explicitOriginalTarget differs from .originalTarget in that it will never
-   * contain anonymous content.
-   */
-  readonly attribute nsIDOMEventTarget  explicitOriginalTarget;
-
-  /**
-   * @deprecated Use nsIDOMEvent::stopPropagation.
-   */
-  void                      preventBubble();
-
-  /**
-   * @deprecated Use nsIDOMEvent::stopPropagation.
-   */
-  void                      preventCapture();
-
-  boolean                   getPreventDefault();
-
-  readonly attribute boolean isTrusted;
 };
diff --git a/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl b/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
index dad2418671dc..aa4c1ded8483 100644
--- a/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
@@ -7,7 +7,7 @@
 #include "nsIDOMEvent.idl"
 #include "nsIVariant.idl"
 
-[scriptable, builtinclass, uuid(8e69e120-5dfc-4327-99e3-003a905a1504)]
+[scriptable, builtinclass, uuid(34139b4f-ac78-4372-98d3-12d6dcf478ef)]
 interface nsIDOMNotifyAudioAvailableEvent : nsIDOMEvent
 {
   [implicit_jscontext]
diff --git a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
index 83aedd12ce0a..787914a11e83 100644
--- a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
@@ -12,7 +12,7 @@ interface nsIDOMPaintRequestList;
  * event, which fires at a window when painting has happened in
  * that window.
  */
-[scriptable, builtinclass, uuid(de7dc0df-8914-4598-8b2a-8c222f4d52d5)]
+[scriptable, builtinclass, uuid(a61dc375-6631-4404-8205-b551afe826c3)]
 interface nsIDOMNotifyPaintEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMPageTransitionEvent.idl b/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
index c2663d394150..4974e53375ec 100644
--- a/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
+++ b/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
@@ -11,7 +11,7 @@
  * load/unload and saving/restoring a document from session history.
  */
 
-[scriptable, builtinclass, uuid(06910e55-a9fc-4194-bd6e-57a302a7ea2d)]
+[scriptable, builtinclass, uuid(9f3ffe42-bbd2-428d-97f1-6c158c6eb2f9)]
 interface nsIDOMPageTransitionEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMPopStateEvent.idl b/dom/interfaces/events/nsIDOMPopStateEvent.idl
index 1b04512740fa..00a4ca9c235d 100644
--- a/dom/interfaces/events/nsIDOMPopStateEvent.idl
+++ b/dom/interfaces/events/nsIDOMPopStateEvent.idl
@@ -7,7 +7,7 @@
 
 interface nsIVariant;
 
-[scriptable, builtinclass, uuid(f7cfe6a2-da6f-4894-affe-e03b39251767)]
+[scriptable, builtinclass, uuid(17ab1333-6fc7-46f9-8513-a82dc6548642)]
 interface nsIDOMPopStateEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl b/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
index db8f3e55874e..db27926ac7fa 100644
--- a/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
+++ b/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
@@ -12,7 +12,7 @@ interface nsIURI;
  * posted when a popup window is blocked.
  */
 
-[scriptable, builtinclass, uuid(f3a2bae2-291d-43eb-b7f0-bc1b69a890fe)]
+[scriptable, builtinclass, uuid(4eec5417-1687-46ef-9e41-e0a6fbb18927)]
 interface nsIDOMPopupBlockedEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMProgressEvent.idl b/dom/interfaces/events/nsIDOMProgressEvent.idl
index 64fac9d9b8ac..418a90a0ff84 100644
--- a/dom/interfaces/events/nsIDOMProgressEvent.idl
+++ b/dom/interfaces/events/nsIDOMProgressEvent.idl
@@ -13,7 +13,7 @@
  * the specification is complete and is compatible with the WebKit ProgressEvent.
  */
 
-[scriptable, builtinclass, uuid(1b1842f0-b586-4990-9f6a-057e92483a4b)]
+[scriptable, builtinclass, uuid(c5b7ec31-b846-4a9f-b81e-859e76a74f6b)]
 interface nsIDOMProgressEvent : nsIDOMEvent
 {
   readonly attribute boolean lengthComputable;
diff --git a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
index 93a21d0189d8..5180f4a75125 100644
--- a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
+++ b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, builtinclass, uuid(b1febd2a-fc87-40cd-832d-772a74e0d261)]
+[scriptable, builtinclass, uuid(d38655dd-3be4-4c91-a3b1-0818d396ddf0)]
 interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
 {
   // Scroll area client rect
diff --git a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
index 0c8c61bfbd6a..744c053a0f03 100644
--- a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
+++ b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
@@ -69,7 +69,7 @@
  * consuming events.
  */
 
-[scriptable, builtinclass, uuid(5e2a88ce-5032-4758-8578-37c6d7f87d7b)]
+[scriptable, builtinclass, uuid(0748e618-6612-45d7-8d34-1f56d546e04a)]
 interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
 {
   /* Swipe direction constants */
diff --git a/dom/interfaces/events/nsIDOMSmartCardEvent.idl b/dom/interfaces/events/nsIDOMSmartCardEvent.idl
index 955fef222774..6ebac9a59baa 100644
--- a/dom/interfaces/events/nsIDOMSmartCardEvent.idl
+++ b/dom/interfaces/events/nsIDOMSmartCardEvent.idl
@@ -5,7 +5,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(788edd11-0d81-4b2b-aaaa-f7d38246b0de)]
+[scriptable, builtinclass, uuid(88ae203d-12b8-4a85-a69f-6f83a8b5c226)]
 interface nsIDOMSmartCardEvent : nsIDOMEvent
 {
   readonly attribute DOMString   tokenName;
diff --git a/dom/interfaces/events/nsIDOMTouchEvent.idl b/dom/interfaces/events/nsIDOMTouchEvent.idl
index db4bb5257f57..bafecce39ab3 100644
--- a/dom/interfaces/events/nsIDOMTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMTouchEvent.idl
@@ -45,7 +45,7 @@ interface nsIDOMTouchList : nsISupports {
   nsIDOMTouch identifiedTouch(in long identifier);
 };
 
-[scriptable, builtinclass, uuid(57809468-7c03-4e8a-b080-4e30f157db21)]
+[scriptable, builtinclass, uuid(dfaac0c6-9c4a-4a95-8872-1d58f19d5768)]
 interface nsIDOMTouchEvent : nsIDOMUIEvent {
   readonly attribute nsIDOMTouchList touches;
   readonly attribute nsIDOMTouchList targetTouches;
diff --git a/dom/interfaces/events/nsIDOMTransitionEvent.idl b/dom/interfaces/events/nsIDOMTransitionEvent.idl
index e47d342dc04d..2f3dd2ff3b6e 100644
--- a/dom/interfaces/events/nsIDOMTransitionEvent.idl
+++ b/dom/interfaces/events/nsIDOMTransitionEvent.idl
@@ -11,7 +11,7 @@
  * http://dev.w3.org/csswg/css3-transitions/#transition-events-
  */
 
-[scriptable, builtinclass, uuid(208c038e-dbed-42a1-9974-da204e6672f8)]
+[scriptable, builtinclass, uuid(dd6b6318-a69b-4daf-99ad-617876782dfd)]
 interface nsIDOMTransitionEvent : nsIDOMEvent {
   readonly attribute DOMString           propertyName;
   readonly attribute float               elapsedTime;
diff --git a/dom/interfaces/events/nsIDOMUIEvent.idl b/dom/interfaces/events/nsIDOMUIEvent.idl
index c86a4a2de3ee..202a512eb74c 100644
--- a/dom/interfaces/events/nsIDOMUIEvent.idl
+++ b/dom/interfaces/events/nsIDOMUIEvent.idl
@@ -13,7 +13,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, builtinclass, uuid(6e6f00c2-29d9-452c-b804-5abb2dc429f3)]
+[scriptable, builtinclass, uuid(415453e6-132a-4902-9a99-cc480f0311b6)]
 interface nsIDOMUIEvent : nsIDOMEvent
 {
   readonly attribute nsIDOMWindow       view;
diff --git a/dom/interfaces/events/nsIDOMUserProximityEvent.idl b/dom/interfaces/events/nsIDOMUserProximityEvent.idl
index 24ada329e901..0b9911ff1733 100644
--- a/dom/interfaces/events/nsIDOMUserProximityEvent.idl
+++ b/dom/interfaces/events/nsIDOMUserProximityEvent.idl
@@ -4,7 +4,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(caf39525-b0f9-46d1-91d2-59f31dd6e206)]
+[scriptable, builtinclass, uuid(ae59b379-1c58-4baa-bef4-21fca57fc4c2)]
 interface nsIDOMUserProximityEvent : nsIDOMEvent
 {
   [noscript] void initUserProximityEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/geolocation/Makefile.in b/dom/interfaces/geolocation/Makefile.in
index bab70b758652..6876f466dff8 100644
--- a/dom/interfaces/geolocation/Makefile.in
+++ b/dom/interfaces/geolocation/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/html/Makefile.in b/dom/interfaces/html/Makefile.in
index e2c6eefbd8cb..d67bbbb7c3d7 100644
--- a/dom/interfaces/html/Makefile.in
+++ b/dom/interfaces/html/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/json/Makefile.in b/dom/interfaces/json/Makefile.in
index f6aa15f1af38..aa478e65f880 100644
--- a/dom/interfaces/json/Makefile.in
+++ b/dom/interfaces/json/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/load-save/Makefile.in b/dom/interfaces/load-save/Makefile.in
index 82eae894c425..d700e817ad08 100644
--- a/dom/interfaces/load-save/Makefile.in
+++ b/dom/interfaces/load-save/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl b/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
index 30dbe4836103..dc116eb195fb 100644
--- a/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
+++ b/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
@@ -7,7 +7,7 @@
 
 interface nsIDOMLSInput;
 
-[scriptable, builtinclass, uuid(068ddb48-1093-4973-800a-7f475f89b788)]
+[scriptable, builtinclass, uuid(522fb528-f550-4e0c-8745-f784bba7cfbe)]
 interface nsIDOMLSProgressEvent : nsIDOMEvent
 {
   readonly attribute nsIDOMLSInput   input;
diff --git a/dom/interfaces/notification/Makefile.in b/dom/interfaces/notification/Makefile.in
index ef19bb2fca04..fbb6fde5ac4d 100644
--- a/dom/interfaces/notification/Makefile.in
+++ b/dom/interfaces/notification/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/offline/Makefile.in b/dom/interfaces/offline/Makefile.in
index 7f5b175e02d3..29b4abd9c995 100644
--- a/dom/interfaces/offline/Makefile.in
+++ b/dom/interfaces/offline/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/range/Makefile.in b/dom/interfaces/range/Makefile.in
index efeba4f7f16b..8266fabb1fe7 100644
--- a/dom/interfaces/range/Makefile.in
+++ b/dom/interfaces/range/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/settings/Makefile.in b/dom/interfaces/settings/Makefile.in
index 9cbb72a7f0ef..57b28dfaccf7 100644
--- a/dom/interfaces/settings/Makefile.in
+++ b/dom/interfaces/settings/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/settings/nsIDOMMozSettingsEvent.idl b/dom/interfaces/settings/nsIDOMMozSettingsEvent.idl
index 357fb6210f84..0c9b90f77e6e 100644
--- a/dom/interfaces/settings/nsIDOMMozSettingsEvent.idl
+++ b/dom/interfaces/settings/nsIDOMMozSettingsEvent.idl
@@ -5,7 +5,7 @@
 #include "nsIDOMEvent.idl"
 interface nsIVariant;
 
-[scriptable, builtinclass, uuid(5e304193-af49-4546-8329-bf7c9159ed98)]
+[scriptable, builtinclass, uuid(109d5b5c-48b2-4d10-a881-72dcf4c27969)]
 interface nsIDOMMozSettingsEvent : nsIDOMEvent
 {
   readonly attribute DOMString  settingName;
diff --git a/dom/interfaces/sidebar/Makefile.in b/dom/interfaces/sidebar/Makefile.in
index ca8c0afc6a21..d86e27ebc176 100644
--- a/dom/interfaces/sidebar/Makefile.in
+++ b/dom/interfaces/sidebar/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/dom/interfaces/smil/Makefile.in b/dom/interfaces/smil/Makefile.in
index 92b1f96af403..a6be010997ea 100644
--- a/dom/interfaces/smil/Makefile.in
+++ b/dom/interfaces/smil/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/smil/nsIDOMTimeEvent.idl b/dom/interfaces/smil/nsIDOMTimeEvent.idl
index f60bc0013b28..359d066a7ad7 100644
--- a/dom/interfaces/smil/nsIDOMTimeEvent.idl
+++ b/dom/interfaces/smil/nsIDOMTimeEvent.idl
@@ -13,7 +13,7 @@
  * http://www.w3.org/TR/SVG/animate.html#InterfaceTimeEvent
  */
 
-[scriptable, builtinclass, uuid(988c5b1d-55fc-49a3-87a4-7aa588ee7ed3)]
+[scriptable, builtinclass, uuid(a7ddd388-5fdf-4af8-b3ee-7e1baa636b66)]
 interface nsIDOMTimeEvent : nsIDOMEvent
 {
   readonly attribute long detail;
diff --git a/dom/interfaces/storage/Makefile.in b/dom/interfaces/storage/Makefile.in
index 0b60b48c91e3..11b9ae7642fd 100644
--- a/dom/interfaces/storage/Makefile.in
+++ b/dom/interfaces/storage/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/interfaces/storage/nsIDOMStorageEvent.idl b/dom/interfaces/storage/nsIDOMStorageEvent.idl
index 1ca4c9427940..9d56d9fe6a74 100644
--- a/dom/interfaces/storage/nsIDOMStorageEvent.idl
+++ b/dom/interfaces/storage/nsIDOMStorageEvent.idl
@@ -16,7 +16,7 @@
 
 interface nsIDOMStorage;
 
-[scriptable, builtinclass, uuid(acb10e76-860f-4a49-8083-661a152ae1b2)]
+[scriptable, builtinclass, uuid(0929c378-2ad6-4fde-a0db-8cd61bbb080c)]
 interface nsIDOMStorageEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/stylesheets/Makefile.in b/dom/interfaces/stylesheets/Makefile.in
index a04a73be374e..fcd0b5c0e49e 100644
--- a/dom/interfaces/stylesheets/Makefile.in
+++ b/dom/interfaces/stylesheets/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/svg/Makefile.in b/dom/interfaces/svg/Makefile.in
index 1244239fd3a3..591d887411f0 100644
--- a/dom/interfaces/svg/Makefile.in
+++ b/dom/interfaces/svg/Makefile.in
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/svg/nsIDOMSVGEvent.idl b/dom/interfaces/svg/nsIDOMSVGEvent.idl
index 44d57982bfc4..c8005aa91225 100644
--- a/dom/interfaces/svg/nsIDOMSVGEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGEvent.idl
@@ -10,7 +10,7 @@
  * http://www.w3.org/TR/SVG11/script.html#InterfaceSVGEvent
  */
 
-[scriptable, builtinclass, uuid(850f465e-1bb9-4cbd-a973-c1283ec70422)]
+[scriptable, builtinclass, uuid(85c1aba6-6ab1-4b7d-b200-2c8ef39267ad)]
 interface nsIDOMSVGEvent : nsIDOMEvent
 {
 };
diff --git a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
index 5ec1962768b0..7e94b315aec6 100644
--- a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
@@ -13,7 +13,7 @@
 interface nsIDOMSVGRect;
 interface nsIDOMSVGPoint;
 
-[scriptable, builtinclass, uuid(8bd39d5a-6a01-4bcf-bb9b-02653ed6d794)]
+[scriptable, builtinclass, uuid(77a0b46e-54cf-4e6e-a962-a2f52389da34)]
 interface nsIDOMSVGZoomEvent : nsIDOMUIEvent
 {
   readonly attribute nsIDOMSVGRect  zoomRectScreen;
diff --git a/dom/interfaces/traversal/Makefile.in b/dom/interfaces/traversal/Makefile.in
index 5d57c77f7b48..f3f3fe3445cc 100644
--- a/dom/interfaces/traversal/Makefile.in
+++ b/dom/interfaces/traversal/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/xbl/Makefile.in b/dom/interfaces/xbl/Makefile.in
index da440a1a6bbb..0ae2ada19a0d 100644
--- a/dom/interfaces/xbl/Makefile.in
+++ b/dom/interfaces/xbl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/xpath/Makefile.in b/dom/interfaces/xpath/Makefile.in
index 5152b746c6d3..a4e6e6831b1a 100644
--- a/dom/interfaces/xpath/Makefile.in
+++ b/dom/interfaces/xpath/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/xul/Makefile.in b/dom/interfaces/xul/Makefile.in
index 86639bc47434..f7c56b6cc717 100644
--- a/dom/interfaces/xul/Makefile.in
+++ b/dom/interfaces/xul/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
index a6e4f285dc0d..e70c93d17294 100644
--- a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
+++ b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
@@ -11,7 +11,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, builtinclass, uuid(b7b54fe0-9983-49bc-bb79-1d8ffcb2260c)]
+[scriptable, builtinclass, uuid(bb7f2758-9a71-4701-984f-eb66f08c4356)]
 interface nsIDOMXULCommandEvent : nsIDOMUIEvent
 {
   /**
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 3c5b871a3bb4..c86c562e1fe3 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -13,6 +13,7 @@
 #include "mozilla/dom/PMemoryReportRequestParent.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/dom/ipc/Blob.h"
+#include "mozilla/Attributes.h"
 
 #include "nsIObserver.h"
 #include "nsIThreadInternal.h"
@@ -279,7 +280,7 @@ private:
     const nsString mAppManifestURL;
     nsRefPtr<nsFrameMessageManager> mMessageManager;
 
-    class WatchedFile : public nsIFileUpdateListener {
+    class WatchedFile MOZ_FINAL : public nsIFileUpdateListener {
       public:
         WatchedFile(ContentParent* aParent, const nsString& aPath)
           : mParent(aParent)
diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
index 32fab8a2b1e4..d1a96fe9e730 100644
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -40,6 +40,7 @@ EXPORTS_mozilla/dom = \
 
 EXPORTS_mozilla/dom/ipc = \
   Blob.h \
+  ProcessPriorityManager.h \
   nsIRemoteBlob.h \
   $(NULL)
 
@@ -50,6 +51,7 @@ CPPSRCS = \
   ContentChild.cpp \
   CrashReporterParent.cpp \
   CrashReporterChild.cpp \
+  ProcessPriorityManager.cpp \
   StructuredCloneUtils.cpp \
   TabParent.cpp \
   TabChild.cpp \
diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp
new file mode 100644
index 000000000000..9be87ebd149e
--- /dev/null
+++ b/dom/ipc/ProcessPriorityManager.cpp
@@ -0,0 +1,336 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=8 et ft=cpp : */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/ipc/ProcessPriorityManager.h"
+#include "mozilla/Hal.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
+#include "mozilla/HalTypes.h"
+#include "mozilla/TimeStamp.h"
+#include "prlog.h"
+#include "nsWeakPtr.h"
+#include "nsXULAppAPI.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsITimer.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsIDocument.h"
+#include "nsIDOMEventListener.h"
+#include "nsIDOMWindow.h"
+#include "nsIDOMEvent.h"
+#include "nsIDOMEventTarget.h"
+#include "nsIDOMDocument.h"
+#include "nsPIDOMWindow.h"
+
+#ifdef XP_WIN
+#include <process.h>
+#define getpid _getpid
+#else
+#include <unistd.h>
+#endif
+
+using namespace mozilla::hal;
+
+namespace mozilla {
+namespace dom {
+namespace ipc {
+
+namespace {
+static bool sInitialized = false;
+
+// Some header defines a LOG macro, but we don't want it here.
+#ifdef LOG
+#undef LOG
+#endif
+
+// Enable logging by setting
+//
+//   NSPR_LOG_MODULES=ProcessPriorityManager:5
+//
+// in your environment.
+
+#ifdef PR_LOGGING
+static PRLogModuleInfo* logModule = PR_NewLogModule("ProcessPriorityManager");
+#define LOG(fmt, ...) \
+  PR_LOG(logModule, PR_LOG_DEBUG, \
+         ("[%d] ProcessPriorityManager - " fmt, getpid(), ##__VA_ARGS__))
+#else
+#define LOG(fmt, ...)
+#endif
+
+/**
+ * This class listens to window creation and visibilitychange events and
+ * informs the hal back-end when this process transitions between having no
+ * visible top-level windows, and when it has at least one visible top-level
+ * window.
+ *
+ *
+ * An important heuristic here is that we don't mark a process as background
+ * until it's had no visible top-level windows for some amount of time.
+ *
+ * We do this because the notion of visibility is tied to inner windows
+ * (actually, to documents).  When we navigate a page with outer window W, we
+ * first destroy W's inner window and document, then insert a new inner window
+ * and document into W.  If not for our grace period, this transition could
+ * cause us to inform hal that this process quickly transitioned from
+ * foreground to background to foreground again.
+ *
+ */
+class ProcessPriorityManager MOZ_FINAL
+  : public nsIObserver
+  , public nsIDOMEventListener
+{
+public:
+  ProcessPriorityManager();
+  void Init();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+  NS_DECL_NSIDOMEVENTLISTENER
+
+private:
+  void SetPriority(ProcessPriority aPriority);
+  void OnContentDocumentGlobalCreated(nsISupports* aOuterWindow);
+  void OnInnerWindowDestroyed();
+  void OnGracePeriodTimerFired();
+  void RecomputeNumVisibleWindows();
+
+  // mProcessPriority tracks the priority we've given this process in hal,
+  // except that, when the grace period timer is active,
+  // mProcessPriority == BACKGROUND even though hal still thinks we're a
+  // foreground process.
+  ProcessPriority mProcessPriority;
+
+  nsTArray<nsWeakPtr> mWindows;
+  nsCOMPtr<nsITimer> mGracePeriodTimer;
+  TimeStamp mStartupTime;
+};
+
+NS_IMPL_ISUPPORTS2(ProcessPriorityManager, nsIObserver, nsIDOMEventListener);
+
+ProcessPriorityManager::ProcessPriorityManager()
+  : mProcessPriority(PROCESS_PRIORITY_FOREGROUND)
+  , mStartupTime(TimeStamp::Now())
+{
+}
+
+void
+ProcessPriorityManager::Init()
+{
+  LOG("Starting up.");
+
+  // We can't do this in the constructor because we need to hold a strong ref
+  // to |this| before calling these methods.
+  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+  os->AddObserver(this, "content-document-global-created", /* ownsWeak = */ false);
+  os->AddObserver(this, "inner-window-destroyed", /* ownsWeak = */ false);
+
+  SetPriority(PROCESS_PRIORITY_FOREGROUND);
+}
+
+NS_IMETHODIMP
+ProcessPriorityManager::Observe(
+  nsISupports* aSubject,
+  const char* aTopic,
+  const PRUnichar* aData)
+{
+  if (!strcmp(aTopic, "content-document-global-created")) {
+    OnContentDocumentGlobalCreated(aSubject);
+  } else if (!strcmp(aTopic, "inner-window-destroyed")) {
+    OnInnerWindowDestroyed();
+  } else if (!strcmp(aTopic, "timer-callback")) {
+    OnGracePeriodTimerFired();
+  } else {
+    MOZ_ASSERT(false);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ProcessPriorityManager::HandleEvent(
+  nsIDOMEvent* aEvent)
+{
+  LOG("Got visibilitychange.");
+  RecomputeNumVisibleWindows();
+  return NS_OK;
+}
+
+void
+ProcessPriorityManager::OnContentDocumentGlobalCreated(
+  nsISupports* aOuterWindow)
+{
+  // Get the inner window (the topic of content-document-global-created is
+  // the /outer/ window!).
+  nsCOMPtr<nsPIDOMWindow> outerWindow = do_QueryInterface(aOuterWindow);
+  NS_ENSURE_TRUE(outerWindow, );
+  nsCOMPtr<nsPIDOMWindow> innerWindow = outerWindow->GetCurrentInnerWindow();
+  NS_ENSURE_TRUE(innerWindow, );
+
+  // We're only interested in top-level windows.
+  nsCOMPtr<nsIDOMWindow> parentOuterWindow;
+  innerWindow->GetScriptableParent(getter_AddRefs(parentOuterWindow));
+  NS_ENSURE_TRUE(parentOuterWindow, );
+  if (parentOuterWindow != outerWindow) {
+    return;
+  }
+
+  nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(innerWindow);
+  NS_ENSURE_TRUE(target, );
+
+  nsWeakPtr weakWin = do_GetWeakReference(innerWindow);
+  NS_ENSURE_TRUE(weakWin, );
+
+  if (mWindows.Contains(weakWin)) {
+    return;
+  }
+
+  target->AddSystemEventListener(NS_LITERAL_STRING("mozvisibilitychange"),
+                                 this,
+                                 /* useCapture = */ false,
+                                 /* wantsUntrusted = */ false);
+
+  mWindows.AppendElement(weakWin);
+  RecomputeNumVisibleWindows();
+}
+
+void
+ProcessPriorityManager::OnInnerWindowDestroyed()
+{
+  RecomputeNumVisibleWindows();
+}
+
+void
+ProcessPriorityManager::RecomputeNumVisibleWindows()
+{
+  // We could try to be clever and count the number of visible windows, instead
+  // of iterating over mWindows every time one window's visibility state changes.
+  // But experience suggests that iterating over the windows is prone to fewer
+  // errors (and one mistake doesn't mess you up for the entire session).
+  // Moreover, mWindows should be a very short list, since it contains only
+  // top-level content windows.
+
+  bool allHidden = true;
+  for (PRUint32 i = 0; i < mWindows.Length(); i++) {
+    nsCOMPtr<nsIDOMWindow> window = do_QueryReferent(mWindows[i]);
+    if (!window) {
+      mWindows.RemoveElementAt(i);
+      i--;
+      continue;
+    }
+
+    nsCOMPtr<nsIDOMDocument> doc;
+    window->GetDocument(getter_AddRefs(doc));
+    if (!doc) {
+      continue;
+    }
+
+    bool hidden = false;
+    doc->GetMozHidden(&hidden);
+#ifdef DEBUG
+    nsAutoString spec;
+    doc->GetDocumentURI(spec);
+    LOG("Document at %s has visibility %d.", NS_ConvertUTF16toUTF8(spec).get(), !hidden);
+#endif
+
+    allHidden = allHidden && hidden;
+
+    // We could break out early from this loop if
+    //   !hidden && mProcessPriority == BACKGROUND,
+    // but then we might not clean up all the weak refs.
+  }
+
+  SetPriority(allHidden ?
+              PROCESS_PRIORITY_BACKGROUND :
+              PROCESS_PRIORITY_FOREGROUND);
+}
+
+void
+ProcessPriorityManager::SetPriority(ProcessPriority aPriority)
+{
+  if (aPriority == mProcessPriority) {
+    return;
+  }
+
+  if (aPriority == PROCESS_PRIORITY_BACKGROUND) {
+    // If this is a foreground --> background transition, give ourselves a
+    // grace period before informing hal.
+    PRUint32 gracePeriodMS = Preferences::GetUint("dom.ipc.processPriorityManager.gracePeriodMS", 1000);
+    if (mGracePeriodTimer) {
+      LOG("Grace period timer already active.");
+      return;
+    }
+
+    LOG("Initializing grace period timer.");
+    mProcessPriority = aPriority;
+    mGracePeriodTimer = do_CreateInstance("@mozilla.org/timer;1");
+    mGracePeriodTimer->Init(this, gracePeriodMS, nsITimer::TYPE_ONE_SHOT);
+
+  } else if (aPriority == PROCESS_PRIORITY_FOREGROUND) {
+    // If this is a background --> foreground transition, do it immediately, and
+    // cancel the outstanding grace period timer, if there is one.
+    if (mGracePeriodTimer) {
+      mGracePeriodTimer->Cancel();
+      mGracePeriodTimer = nullptr;
+    }
+
+    LOG("Setting priority to %d.", aPriority);
+    mProcessPriority = aPriority;
+    hal::SetProcessPriority(getpid(), aPriority);
+
+  } else {
+    MOZ_ASSERT(false);
+  }
+}
+
+void
+ProcessPriorityManager::OnGracePeriodTimerFired()
+{
+  LOG("Grace period timer fired; setting priority to %d.",
+      PROCESS_PRIORITY_BACKGROUND);
+
+  // mProcessPriority should already be BACKGROUND: We set it in
+  // SetPriority(BACKGROUND), and we canceled this timer if there was an
+  // intervening SetPriority(FOREGROUND) call.
+  MOZ_ASSERT(mProcessPriority == PROCESS_PRIORITY_BACKGROUND);
+
+  mGracePeriodTimer = nullptr;
+  hal::SetProcessPriority(getpid(), PROCESS_PRIORITY_BACKGROUND);
+}
+
+} // anonymous namespace
+
+void
+InitProcessPriorityManager()
+{
+  if (sInitialized) {
+    return;
+  }
+
+  // If IPC tabs aren't enabled at startup, don't bother with any of this.
+  if (!Preferences::GetBool("dom.ipc.processPriorityManager.enabled") ||
+      Preferences::GetBool("dom.ipc.tabs.disabled")) {
+    return;
+  }
+
+  sInitialized = true;
+
+  // If we're the master process, mark ourselves as such and don't create a
+  // ProcessPriorityManager (we never want to mark the master process as
+  // backgrounded).
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    LOG("This is the master process.");
+    hal::SetProcessPriority(getpid(), PROCESS_PRIORITY_MASTER);
+    return;
+  }
+
+  // This object is held alive by the observer service.
+  nsRefPtr<ProcessPriorityManager> mgr = new ProcessPriorityManager();
+  mgr->Init();
+}
+
+} // namespace ipc
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/ipc/ProcessPriorityManager.h b/dom/ipc/ProcessPriorityManager.h
new file mode 100644
index 000000000000..c320611bbbff
--- /dev/null
+++ b/dom/ipc/ProcessPriorityManager.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=8 et ft=cpp : */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_ProcessPriorityManager_h_
+#define mozilla_ProcessPriorityManager_h_
+
+namespace mozilla {
+namespace dom {
+namespace ipc {
+
+/**
+ * Initialize the ProcessPriorityManager.
+ *
+ * The ProcessPriorityManager informs the hal back-end whether this is the root
+ * Gecko process, and, if we're not the root, informs hal when this process
+ * transitions between having no visible top-level windows, and having at least
+ * one visible top-level window.
+ *
+ * Hal may adjust this process's operating system priority (e.g. niceness, on
+ * *nix) according to these notificaitons.
+ *
+ * This function call does nothing if the pref for OOP tabs is not set.
+ */
+void InitProcessPriorityManager();
+
+} // namespace ipc
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index f07e47033513..463dd08fe379 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -33,7 +33,6 @@
 #include "nsIDOMWindowUtils.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsIFrame.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIJSContextStack.h"
diff --git a/dom/ipc/tests/Makefile.in b/dom/ipc/tests/Makefile.in
index 32cc73093212..5f274a06645d 100644
--- a/dom/ipc/tests/Makefile.in
+++ b/dom/ipc/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/ipc/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/locales/Makefile.in b/dom/locales/Makefile.in
index 990e2162f729..2839d474fe52 100644
--- a/dom/locales/Makefile.in
+++ b/dom/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = dom/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/locales/en-US/chrome/layout/htmlparser.properties b/dom/locales/en-US/chrome/layout/htmlparser.properties
index 9210b6b95402..d83e7798becb 100644
--- a/dom/locales/en-US/chrome/layout/htmlparser.properties
+++ b/dom/locales/en-US/chrome/layout/htmlparser.properties
@@ -5,7 +5,7 @@
 # Encoding warnings and errors
 EncNoDeclarationFrame=The character encoding of a framed document was not declared. The document may appear different if viewed without the document framing it.
 EncNoDeclarationPlain=The character encoding of the plain text document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the file needs to be declared in the transfer protocol or file needs to use a byte order mark as an encoding signature.
-EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must to be declared in the document or in the transfer protocol.
+EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must be declared in the document or in the transfer protocol.
 EncLateMetaFrame=The character encoding declaration of the framed HTML document was not found when prescanning the first 1024 bytes of the file. When viewed without the document framing it, the page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMeta=The character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. When viewed in a differently-configured browser, this page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMetaReload=The page was reloaded, because the character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in
index 3905abcc269f..8baceed1a0be 100644
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/media
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/messages/Makefile.in b/dom/messages/Makefile.in
index 51dbc721bd3f..ad683d4a8a65 100644
--- a/dom/messages/Makefile.in
+++ b/dom/messages/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/messages
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/messages/interfaces/Makefile.in b/dom/messages/interfaces/Makefile.in
index fc6cac0a31e3..d14474302d8c 100644
--- a/dom/messages/interfaces/Makefile.in
+++ b/dom/messages/interfaces/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/mms/Makefile.in b/dom/mms/Makefile.in
index ad737b7ce175..f2bfe47a6eae 100644
--- a/dom/mms/Makefile.in
+++ b/dom/mms/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/mms
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/mms/interfaces/Makefile.in b/dom/mms/interfaces/Makefile.in
index 84ac903bf0e0..f524946a04de 100644
--- a/dom/mms/interfaces/Makefile.in
+++ b/dom/mms/interfaces/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/mms/src/Makefile.in b/dom/mms/src/Makefile.in
index 50e97fd1824a..7ff78f3cb278 100644
--- a/dom/mms/src/Makefile.in
+++ b/dom/mms/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = \
diff --git a/dom/network/Makefile.in b/dom/network/Makefile.in
index aed9c69dfbcf..d9a69b750bc8 100644
--- a/dom/network/Makefile.in
+++ b/dom/network/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/network/interfaces/Makefile.in b/dom/network/interfaces/Makefile.in
index b9cc218e82b6..f7626dbec819 100644
--- a/dom/network/interfaces/Makefile.in
+++ b/dom/network/interfaces/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/network/interfaces/nsIDOMUSSDReceivedEvent.idl b/dom/network/interfaces/nsIDOMUSSDReceivedEvent.idl
index 801e95981510..39f356d78c6d 100644
--- a/dom/network/interfaces/nsIDOMUSSDReceivedEvent.idl
+++ b/dom/network/interfaces/nsIDOMUSSDReceivedEvent.idl
@@ -4,7 +4,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(7a6723d3-2165-4aa6-a4a3-697e7b7af673)]
+[scriptable, builtinclass, uuid(1b8ea6e4-8142-4aba-b174-4d580b5bc294)]
 interface nsIDOMUSSDReceivedEvent : nsIDOMEvent
 {
   readonly attribute DOMString message;
diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in
index 748891babe60..075327d5a6b4 100644
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = $(srcdir)
diff --git a/dom/network/tests/Makefile.in b/dom/network/tests/Makefile.in
index 42f1c514ccba..adca89eb2bfd 100644
--- a/dom/network/tests/Makefile.in
+++ b/dom/network/tests/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/network/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in
index 0f9e0ff23078..79c2377504c4 100644
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in
index ca324596fc9e..cd41227c189a 100644
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp
index 85db9f46eefe..4a658ca7c50a 100644
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -1807,7 +1807,11 @@ nsNPObjWrapper::GetNewOrUsed(NPP npp, JSContext *cx, NPObject *npobj)
   if (npobj->_class == &nsJSObjWrapper::sJSObjWrapperNPClass) {
     // npobj is one of our own, return its existing JSObject.
 
-    return ((nsJSObjWrapper *)npobj)->mJSObj;
+    JSObject *obj = ((nsJSObjWrapper *)npobj)->mJSObj;
+    if (!JS_WrapObject(cx, &obj)) {
+      return NULL;
+    }
+    return obj;
   }
 
   if (!npp) {
diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in
index 6ef52b6edc55..07c5cc4db069 100644
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/dom/plugins/ipc/interpose/Makefile.in b/dom/plugins/ipc/interpose/Makefile.in
index a9dfd37bb371..013ee0a8b0ac 100644
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ b/dom/plugins/ipc/interpose/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/dom/plugins/test/Makefile.in b/dom/plugins/test/Makefile.in
index f0a31c2a0ebe..861380707f83 100644
--- a/dom/plugins/test/Makefile.in
+++ b/dom/plugins/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = dom/plugins/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index 03527f455268..d3060838136d 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in
index f9545563a2ba..a117f2e86549 100644
--- a/dom/plugins/test/testplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in
index 9f855b3f8267..e1d2e9ea68df 100644
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/power/test/Makefile.in b/dom/power/test/Makefile.in
index ef2628b4dc6d..e3d2391a67dd 100644
--- a/dom/power/test/Makefile.in
+++ b/dom/power/test/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/power/test
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/settings/Makefile.in b/dom/settings/Makefile.in
index 929f50933a33..7f5018f90335 100644
--- a/dom/settings/Makefile.in
+++ b/dom/settings/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH            = \
diff --git a/dom/settings/tests/Makefile.in b/dom/settings/tests/Makefile.in
index eb709d507bbc..b0f689709a84 100644
--- a/dom/settings/tests/Makefile.in
+++ b/dom/settings/tests/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/settings/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/sms/Makefile.in b/dom/sms/Makefile.in
index 216c42aa7d05..8196e39412c6 100644
--- a/dom/sms/Makefile.in
+++ b/dom/sms/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/sms
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/sms/interfaces/Makefile.in b/dom/sms/interfaces/Makefile.in
index 6f54c06ac26b..56827d662c45 100644
--- a/dom/sms/interfaces/Makefile.in
+++ b/dom/sms/interfaces/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/sms/interfaces/nsIDOMSmsEvent.idl b/dom/sms/interfaces/nsIDOMSmsEvent.idl
index 1c721376f1df..9bfcdf39e458 100644
--- a/dom/sms/interfaces/nsIDOMSmsEvent.idl
+++ b/dom/sms/interfaces/nsIDOMSmsEvent.idl
@@ -7,7 +7,7 @@
 
 interface nsIDOMMozSmsMessage;
 
-[scriptable, builtinclass, uuid(6db4d0d3-6708-47e8-be0f-06e4cdc0b062)]
+[scriptable, builtinclass, uuid(3bde920e-6552-479c-919a-d66589a85a28)]
 interface nsIDOMMozSmsEvent : nsIDOMEvent
 {
   [binaryname(MessageMoz)]
diff --git a/dom/sms/src/Makefile.in b/dom/sms/src/Makefile.in
index 91ad7cfd7799..33685e7f9d5d 100644
--- a/dom/sms/src/Makefile.in
+++ b/dom/sms/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = \
diff --git a/dom/sms/tests/Makefile.in b/dom/sms/tests/Makefile.in
index c51435ca7831..334b801aaa92 100644
--- a/dom/sms/tests/Makefile.in
+++ b/dom/sms/tests/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/sms/tests
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/src/Makefile.in b/dom/src/Makefile.in
index 46ee060791b3..24915b0db4b7 100644
--- a/dom/src/Makefile.in
+++ b/dom/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in
index 2e8cdca325dc..156a6d91feb6 100644
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/src/foo/Makefile.in b/dom/src/foo/Makefile.in
index 6614612d4716..89caac7ae507 100644
--- a/dom/src/foo/Makefile.in
+++ b/dom/src/foo/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/src/foo
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index 94b67aa193d1..aa513f23ce13 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in
index c6c2dd4a8c05..7052e1027bcc 100644
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/src/json/test/Makefile.in b/dom/src/json/test/Makefile.in
index 7d303bebdbd1..62592b16b07f 100644
--- a/dom/src/json/test/Makefile.in
+++ b/dom/src/json/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir  = dom/src/json/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in
index 89316c3a285b..7fceca2a39dd 100644
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/src/jsurl/test/Makefile.in b/dom/src/jsurl/test/Makefile.in
index f1161aadaadf..6104ffa4fa7b 100644
--- a/dom/src/jsurl/test/Makefile.in
+++ b/dom/src/jsurl/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/src/jsurl/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in
index 3eb7e43811af..92bdca25a5d4 100644
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in
index 59ff72cdffec..29a602d29859 100644
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in
index 8b2577209715..2c9c771bf315 100644
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
index 07c1e563328d..9b473f2da2e0 100644
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp
index 95700496ced3..fc0ba823ffa3 100644
--- a/dom/system/OSFileConstants.cpp
+++ b/dom/system/OSFileConstants.cpp
@@ -227,6 +227,7 @@ static dom::ConstantSpec gLibcProperties[] =
   INT_CONSTANT(COPYFILE_XATTR),
   INT_CONSTANT(COPYFILE_STAT),
   INT_CONSTANT(COPYFILE_ACL),
+  INT_CONSTANT(COPYFILE_MOVE),
 #endif // defined(COPYFILE_DATA)
 
   // error values
diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in
index 99b103f61e86..82319bd57fe6 100644
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in
index 0f773669bc51..c95e0be28f1b 100644
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/system/gonk
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/system/tests/Makefile.in b/dom/system/tests/Makefile.in
index 22cd002afc1e..da0fed453426 100644
--- a/dom/system/tests/Makefile.in
+++ b/dom/system/tests/Makefile.in
@@ -1,8 +1,8 @@
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir  = dom/system/tests
+relativesrcdir  = @relativesrcdir@
 
 MODULE          = test_domsystem
 MOCHITEST_CHROME_FILES = \
diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in
index d0d5a221cce1..4c462dfbc008 100644
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in
index 487dfe11f653..980a11e54a30 100644
--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in
index f9ddd721eb30..22229e64a399 100644
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/telephony/nsIDOMCallEvent.idl b/dom/telephony/nsIDOMCallEvent.idl
index b7f2e168d14f..53cd7ed97484 100644
--- a/dom/telephony/nsIDOMCallEvent.idl
+++ b/dom/telephony/nsIDOMCallEvent.idl
@@ -8,7 +8,7 @@
 
 interface nsIDOMTelephonyCall;
 
-[scriptable, builtinclass, uuid(afd4b154-e8ca-46d0-8d1f-eef9b5ffe23f)]
+[scriptable, builtinclass, uuid(d836f0e6-7305-4fdd-966e-ee261fa44001)]
 interface nsIDOMCallEvent : nsIDOMEvent
 {
   readonly attribute nsIDOMTelephonyCall call;
diff --git a/dom/telephony/nsIDOMVoicemailEvent.idl b/dom/telephony/nsIDOMVoicemailEvent.idl
index d5edba3d9404..43c1f48add07 100644
--- a/dom/telephony/nsIDOMVoicemailEvent.idl
+++ b/dom/telephony/nsIDOMVoicemailEvent.idl
@@ -8,7 +8,7 @@
 
 interface nsIDOMMozVoicemailStatus;
 
-[scriptable, builtinclass, uuid(4642f196-1a30-4a9b-986f-7f1574d5cee1)]
+[scriptable, builtinclass, uuid(b2208967-2231-45e4-9a40-57b97908adf8)]
 interface nsIDOMMozVoicemailEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/telephony/test/marionette/test_outgoing_hangup_held.js b/dom/telephony/test/marionette/test_outgoing_hangup_held.js
index c5d1fdecb153..079169b31eb2 100644
--- a/dom/telephony/test/marionette/test_outgoing_hangup_held.js
+++ b/dom/telephony/test/marionette/test_outgoing_hangup_held.js
@@ -39,12 +39,8 @@ function dial() {
   is(telephony.calls.length, 1);
   is(telephony.calls[0], outgoing);
 
-  runEmulatorCmd("gsm list", function(result) {
-    log("Call list is now: " + result);
-    is(result[0], "outbound to  " + number + " : unknown");
-    is(result[1], "OK");
-    answer();
-  });
+  // Get call list. Answer a call if the connection is established.
+  runEmulatorCmd("gsm list", cmdCallback);
 }
 
 function answer() {
@@ -128,6 +124,26 @@ function hangUp() {
   outgoing.hangUp();
 }
 
+function cmdCallback(result) {
+  let unknownState = "outbound to  " + number + " : unknown";
+  let alertingState = "outbound to " + number + " : alerting";
+
+  log("Call list is now: " + result);
+
+  switch (result[0]) {
+    // Gsm list is empty. Wait until the connection is established.
+    case "OK":
+      runEmulatorCmd("gsm list", cmdCallback);
+      break;
+    // Answer the call now since the connection is established.
+    case unknownState: // Fall through ...
+    case alertingState:
+      is(result[1], "OK");
+      answer();
+      break;
+  }
+}
+
 function cleanUp() {
   SpecialPowers.clearUserPref(WHITELIST_PREF);
   finish();
diff --git a/dom/tests/Makefile.in b/dom/tests/Makefile.in
index 4b28720098d5..ba211514899d 100644
--- a/dom/tests/Makefile.in
+++ b/dom/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = dom/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/browser/Makefile.in b/dom/tests/browser/Makefile.in
index b58a41678ebf..475906107332 100644
--- a/dom/tests/browser/Makefile.in
+++ b/dom/tests/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH := ../../..
+DEPTH := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir := @srcdir@
 VPATH := @srcdir@
-relativesrcdir := dom/tests/browser
+relativesrcdir := @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/browser/browser_ConsoleAPITests.js b/dom/tests/browser/browser_ConsoleAPITests.js
index bfd32aa5c3b9..ab0a2ff40985 100644
--- a/dom/tests/browser/browser_ConsoleAPITests.js
+++ b/dom/tests/browser/browser_ConsoleAPITests.js
@@ -207,7 +207,11 @@ function observeConsoleTest() {
 
   expect("error", "arg");
   win.console.error("arg");
+  yield;
 
+  let obj2 = { b: 2 };
+  expect("log", "omg ", obj, " foo ", 4, obj2);
+  win.console.log("omg %o foo %o", obj, 4, obj2);
   yield;
 
   startTraceTest();
diff --git a/dom/tests/mochitest/Makefile.in b/dom/tests/mochitest/Makefile.in
index 6411d139867c..5de932179d44 100644
--- a/dom/tests/mochitest/Makefile.in
+++ b/dom/tests/mochitest/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	= ../../..
+DEPTH	= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	= @srcdir@
 VPATH	= @srcdir@
diff --git a/dom/tests/mochitest/ajax/Makefile.in b/dom/tests/mochitest/ajax/Makefile.in
index df6c90b2726f..02a689f8de2b 100644
--- a/dom/tests/mochitest/ajax/Makefile.in
+++ b/dom/tests/mochitest/ajax/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/dom/tests/mochitest/ajax/jquery/Makefile.in b/dom/tests/mochitest/ajax/jquery/Makefile.in
index 0e22b7e1e92d..2b81689c11a4 100644
--- a/dom/tests/mochitest/ajax/jquery/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/jquery
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
index bd209668d324..7675f2077c90 100644
--- a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/jquery/dist
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/jquery/test/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/Makefile.in
index e22f62df59f0..a458294e3d83 100644
--- a/dom/tests/mochitest/ajax/jquery/test/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/jquery/test
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
index 2df146a1b617..518690594e72 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/jquery/test/data
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
index d13a8ce7f4c1..e4315250bbea 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/jquery/test/data/offset
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
index 2b1475c673e3..012405d85a7a 100644
--- a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/jquery/test/unit
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/lib/Makefile.in b/dom/tests/mochitest/ajax/lib/Makefile.in
index 60abb8d556b2..3e0f75abc8c9 100644
--- a/dom/tests/mochitest/ajax/lib/Makefile.in
+++ b/dom/tests/mochitest/ajax/lib/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/lib
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/mochikit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/Makefile.in
index e09212c63f15..e15e88736a12 100644
--- a/dom/tests/mochitest/ajax/mochikit/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/mochikit
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
index 44187b6cb879..58a3468efb55 100644
--- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/mochikit/MochiKit
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
index 95fbac32f783..c549a9f191c3 100644
--- a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/mochikit/tests
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
index 0c9eb47fd1ea..8002d7e8f7cb 100644
--- a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/mochikit/tests/SimpleTest
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/offline/Makefile.in b/dom/tests/mochitest/ajax/offline/Makefile.in
index 3138bd075552..3241c94427f4 100644
--- a/dom/tests/mochitest/ajax/offline/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/offline
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
index 5e95e835773b..dd526cba97f9 100644
--- a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/offline/namespace1
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
index ba9168cc4301..bdc3f7037491 100644
--- a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/offline/namespace1/sub
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
index 9caf457e545a..bfc2312c60b4 100644
--- a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/offline/namespace1/sub2
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
index 2f8f63302dad..8ef9365dd4cf 100644
--- a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/offline/namespace2
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/Makefile.in b/dom/tests/mochitest/ajax/prototype/Makefile.in
index 049fdf407742..682a1693006f 100644
--- a/dom/tests/mochitest/ajax/prototype/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in
index 1dbfbb401bfb..29e6fbbc63cb 100644
--- a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/dist
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/test/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/Makefile.in
index 3e64febd3d0c..f12d15f2f353 100644
--- a/dom/tests/mochitest/ajax/prototype/test/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/test
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
index d968150fb567..4b58640b7137 100644
--- a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/test/functional
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
index 23f4da489655..6dd897f72d82 100644
--- a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/test/lib
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
index 9a1e3d73a264..3629b127a194 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/test/unit
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
index cea4b1acfca7..01f85a3e5848 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/test/unit/fixtures
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
index 96df818f99e1..c72f0f19a383 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/prototype/test/unit/tmp
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in
index 5afa4e18cd24..0707428feb63 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/scriptaculous
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
index c5521ebc27e3..d32f108a7da5 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/scriptaculous/lib
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
index 295b40b0a47c..b4b7afc23134 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/scriptaculous/src
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
index e42a45d64f3d..963b2cdb048b 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/scriptaculous/test/unit
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index e1c80ecbd2be..5e5b9b95507d 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/bugs
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in
index 211e21541337..2931da2e860e 100644
--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/tests/mochitest/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level0/Makefile.in b/dom/tests/mochitest/dom-level0/Makefile.in
index 89134db1e060..9401c60da3af 100644
--- a/dom/tests/mochitest/dom-level0/Makefile.in
+++ b/dom/tests/mochitest/dom-level0/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level0
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level1-core/Makefile.in b/dom/tests/mochitest/dom-level1-core/Makefile.in
index a676ef3a0590..69c61105ac58 100644
--- a/dom/tests/mochitest/dom-level1-core/Makefile.in
+++ b/dom/tests/mochitest/dom-level1-core/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level1-core
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level1-core/files/Makefile.in b/dom/tests/mochitest/dom-level1-core/files/Makefile.in
index 873fdd213f4c..79fb83147a54 100644
--- a/dom/tests/mochitest/dom-level1-core/files/Makefile.in
+++ b/dom/tests/mochitest/dom-level1-core/files/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level1-core/files
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level2-core/Makefile.in b/dom/tests/mochitest/dom-level2-core/Makefile.in
index 7a0126ff9ba8..5e871c45e9c8 100644
--- a/dom/tests/mochitest/dom-level2-core/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-core/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level2-core
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level2-core/files/Makefile.in b/dom/tests/mochitest/dom-level2-core/files/Makefile.in
index 6f75d2d5b75c..040846515509 100644
--- a/dom/tests/mochitest/dom-level2-core/files/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-core/files/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level2-core/files
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level2-html/Makefile.in b/dom/tests/mochitest/dom-level2-html/Makefile.in
index 7da23f151b35..c0ec782c49bc 100644
--- a/dom/tests/mochitest/dom-level2-html/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-html/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level2-html
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/dom-level2-html/files/Makefile.in b/dom/tests/mochitest/dom-level2-html/files/Makefile.in
index c6f0c7b41e13..760ad12ebd6c 100644
--- a/dom/tests/mochitest/dom-level2-html/files/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-html/files/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/dom-level2-html/files
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index 2c927c82bb1d..e0cf3f2e23bd 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = dom/tests/mochitest/general
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/general/test_offsets.js b/dom/tests/mochitest/general/test_offsets.js
index 5227b39332cf..137b0c9cc093 100644
--- a/dom/tests/mochitest/general/test_offsets.js
+++ b/dom/tests/mochitest/general/test_offsets.js
@@ -119,11 +119,15 @@ function checkScrolledElement(element, child)
   element.scrollTop = 20;
   is(element.scrollLeft, 0, element.id + " scrollLeft after vertical scroll");
   is(element.scrollTop, 20, element.id + " scrollTop after vertical scroll");
-  is(child.getBoundingClientRect().top, childrect.top - 20, "child position after vertical scroll");
+  // If the viewport has been transformed, then we might have scrolled to a subpixel value
+  // that's slightly different from what we requested. After rounding, however, it should
+  // be the same.
+  is(Math.round(childrect.top - child.getBoundingClientRect().top), 20, "child position after vertical scroll");
 
   element.scrollTop = 0;
   is(element.scrollLeft, 0, element.id + " scrollLeft after vertical scroll reset");
   is(element.scrollTop, 0, element.id + " scrollTop after vertical scroll reset");
+  // Scrolling back to the top should work precisely.
   is(child.getBoundingClientRect().top, childrect.top, "child position after vertical scroll reset");
 
   element.scrollTop = 10;
@@ -135,7 +139,7 @@ function checkScrolledElement(element, child)
   element.scrollLeft = 18;
   is(element.scrollLeft, 18, element.id + " scrollLeft after horizontal scroll");
   is(element.scrollTop, 0, element.id + " scrollTop after horizontal scroll");
-  is(child.getBoundingClientRect().left, childrect.left - 18, "child position after horizontal scroll");
+  is(Math.round(childrect.left - child.getBoundingClientRect().left), 18, "child position after horizontal scroll");
 
   element.scrollLeft = -30;
   is(element.scrollLeft, 0, element.id + " scrollLeft after horizontal scroll reset");
diff --git a/dom/tests/mochitest/geolocation/Makefile.in b/dom/tests/mochitest/geolocation/Makefile.in
index 6bf9c91eb2cc..b518c4342b43 100644
--- a/dom/tests/mochitest/geolocation/Makefile.in
+++ b/dom/tests/mochitest/geolocation/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/geolocation
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in
index f227bf1503d6..a8f2be546fb1 100644
--- a/dom/tests/mochitest/localstorage/Makefile.in
+++ b/dom/tests/mochitest/localstorage/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/localstorage
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/notification/Makefile.in b/dom/tests/mochitest/notification/Makefile.in
index 168683cde083..556c18c85534 100644
--- a/dom/tests/mochitest/notification/Makefile.in
+++ b/dom/tests/mochitest/notification/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/notification
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/orientation/Makefile.in b/dom/tests/mochitest/orientation/Makefile.in
index b910e9eebdd8..75c7d02393b8 100644
--- a/dom/tests/mochitest/orientation/Makefile.in
+++ b/dom/tests/mochitest/orientation/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/orientation
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/pointerlock/Makefile.in b/dom/tests/mochitest/pointerlock/Makefile.in
index 46b9010e8940..5d3e209bd5e6 100644
--- a/dom/tests/mochitest/pointerlock/Makefile.in
+++ b/dom/tests/mochitest/pointerlock/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	= ../../../..
+DEPTH	= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	= @srcdir@
 VPATH	= @srcdir@
-relativesrcdir	= dom/tests/mochitest/pointerlock
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in
index c57484f557d0..a6ab5d9096c7 100644
--- a/dom/tests/mochitest/sessionstorage/Makefile.in
+++ b/dom/tests/mochitest/sessionstorage/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/sessionstorage
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/storageevent/Makefile.in b/dom/tests/mochitest/storageevent/Makefile.in
index e05021a12277..2f2508f68823 100644
--- a/dom/tests/mochitest/storageevent/Makefile.in
+++ b/dom/tests/mochitest/storageevent/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/storageevent
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/webapps/Makefile.in b/dom/tests/mochitest/webapps/Makefile.in
index d2e7e887580e..2b86a5e34203 100644
--- a/dom/tests/mochitest/webapps/Makefile.in
+++ b/dom/tests/mochitest/webapps/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	 = ../../../..
+DEPTH	 = @DEPTH@
 topsrcdir	 = @top_srcdir@
 srcdir	= @srcdir@
 VPATH	 = @srcdir@
-relativesrcdir	= dom/tests/mochitest/webapps
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/webapps/apps/Makefile.in b/dom/tests/mochitest/webapps/apps/Makefile.in
index 53f4500dba45..39dc49d05f18 100644
--- a/dom/tests/mochitest/webapps/apps/Makefile.in
+++ b/dom/tests/mochitest/webapps/apps/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	 = ../../../../..
+DEPTH	 = @DEPTH@
 topsrcdir	 = @top_srcdir@
 srcdir	= @srcdir@
 VPATH	 = @srcdir@
-relativesrcdir	= dom/tests/mochitest/webapps/apps
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/tests/mochitest/whatwg/Makefile.in b/dom/tests/mochitest/whatwg/Makefile.in
index 7b93a534166f..7f92fc44d74e 100644
--- a/dom/tests/mochitest/whatwg/Makefile.in
+++ b/dom/tests/mochitest/whatwg/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/whatwg
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/wifi/Makefile.in b/dom/wifi/Makefile.in
index f2683f12d218..0b27ec61b909 100644
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/wifi/nsIWifi.idl b/dom/wifi/nsIWifi.idl
index b31c1b308349..ce2c473e5fde 100644
--- a/dom/wifi/nsIWifi.idl
+++ b/dom/wifi/nsIWifi.idl
@@ -120,7 +120,7 @@ interface nsIDOMWifiManager : nsISupports
     attribute nsIDOMEventListener ondisabled;
 };
 
-[scriptable, builtinclass, uuid(ba1dab70-b70d-11e1-afa6-0800200c9a66)]
+[scriptable, builtinclass, uuid(f3ef70b0-b2d3-4eb5-8ea4-008f8d330cd6)]
 interface nsIDOMMozWifiStatusChangeEvent : nsIDOMEvent
 {
     /**
@@ -142,7 +142,7 @@ interface nsIDOMMozWifiStatusChangeEvent : nsIDOMEvent
                                                  in DOMString status);
 };
 
-[scriptable, builtinclass, uuid(b383e950-b70d-11e1-afa6-0800200c9a66)]
+[scriptable, builtinclass, uuid(34994296-d694-4aed-953d-fc25ee25c050)]
 interface nsIDOMMozWifiConnectionInfoEvent : nsIDOMEvent
 {
     /**
diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in
index 09f93511420b..cc07238df20b 100644
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -2,7 +2,7 @@
 # # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/workers/test/Makefile.in b/dom/workers/test/Makefile.in
index e2138e4b3ea4..157cd5b37c90 100644
--- a/dom/workers/test/Makefile.in
+++ b/dom/workers/test/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/workers/test
+relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/dom/workers/test/extensions/Makefile.in b/dom/workers/test/extensions/Makefile.in
index 9c361d998c52..519f931362c3 100644
--- a/dom/workers/test/extensions/Makefile.in
+++ b/dom/workers/test/extensions/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/workers/test/extensions/bootstrap/Makefile.in b/dom/workers/test/extensions/bootstrap/Makefile.in
index 6e4c97a1bc64..96b08d1be7dc 100644
--- a/dom/workers/test/extensions/bootstrap/Makefile.in
+++ b/dom/workers/test/extensions/bootstrap/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/dom/workers/test/extensions/traditional/Makefile.in b/dom/workers/test/extensions/traditional/Makefile.in
index 3adac2e25a94..3e802a771433 100644
--- a/dom/workers/test/extensions/traditional/Makefile.in
+++ b/dom/workers/test/extensions/traditional/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/editor/Makefile.in b/editor/Makefile.in
index 7dd03dd4791d..11deecd68780 100644
--- a/editor/Makefile.in
+++ b/editor/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            := ..
+DEPTH            := @DEPTH@
 topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
diff --git a/editor/composer/Makefile.in b/editor/composer/Makefile.in
index 7b560d9c6d78..8f6371261a3c 100644
--- a/editor/composer/Makefile.in
+++ b/editor/composer/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           := ../..
+DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
diff --git a/editor/composer/public/Makefile.in b/editor/composer/public/Makefile.in
index 304127ec5692..ee747eb30d7c 100644
--- a/editor/composer/public/Makefile.in
+++ b/editor/composer/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in
index 8062db69f188..cd88e38034d7 100644
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/composer/test/Makefile.in b/editor/composer/test/Makefile.in
index d563578ad547..2467999c7dc6 100644
--- a/editor/composer/test/Makefile.in
+++ b/editor/composer/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = editor/composer/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/editor/idl/Makefile.in b/editor/idl/Makefile.in
index 3469b06c4ed0..6c1f20479e5a 100644
--- a/editor/idl/Makefile.in
+++ b/editor/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           := ../..
+DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
diff --git a/editor/libeditor/Makefile.in b/editor/libeditor/Makefile.in
index 71a4fc2c4338..66bac6cce991 100644
--- a/editor/libeditor/Makefile.in
+++ b/editor/libeditor/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           := ../..
+DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in
index 142c6923f12f..514f04d36873 100644
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
index c4f49cf2de05..1231027912bc 100644
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -62,7 +62,6 @@
 #include "nsIDOMHTMLElement.h"          // for nsIDOMHTMLElement
 #include "nsIDOMKeyEvent.h"             // for nsIDOMKeyEvent, etc
 #include "nsIDOMMouseEvent.h"           // for nsIDOMMouseEvent
-#include "nsIDOMNSEvent.h"              // for nsIDOMNSEvent
 #include "nsIDOMNamedNodeMap.h"         // for nsIDOMNamedNodeMap
 #include "nsIDOMNode.h"                 // for nsIDOMNode, etc
 #include "nsIDOMNodeList.h"             // for nsIDOMNodeList
@@ -5334,8 +5333,7 @@ bool
 nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
 {
   // If the event is trusted, the event should always cause input.
-  nsCOMPtr<nsIDOMNSEvent> NSEvent = do_QueryInterface(aEvent);
-  NS_ENSURE_TRUE(NSEvent, false);
+  NS_ENSURE_TRUE(aEvent, false);
 
   // If this is mouse event but this editor doesn't have focus, we shouldn't
   // handle it.
@@ -5348,7 +5346,7 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
   }
 
   bool isTrusted;
-  nsresult rv = NSEvent->GetIsTrusted(&isTrusted);
+  nsresult rv = aEvent->GetIsTrusted(&isTrusted);
   NS_ENSURE_SUCCESS(rv, false);
   if (isTrusted) {
     return true;
@@ -5390,7 +5388,7 @@ nsEditor::SetSuppressDispatchingInputEvent(bool aSuppress)
 }
 
 nsEditor::HandlingTrustedAction::HandlingTrustedAction(nsEditor* aSelf,
-                                                       nsIDOMNSEvent* aEvent)
+                                                       nsIDOMEvent* aEvent)
 {
   MOZ_ASSERT(aEvent);
 
diff --git a/editor/libeditor/base/nsEditor.h b/editor/libeditor/base/nsEditor.h
index 4f4a37c1f6d9..6b1b0bb4e8db 100644
--- a/editor/libeditor/base/nsEditor.h
+++ b/editor/libeditor/base/nsEditor.h
@@ -49,7 +49,6 @@ class nsIDOMEvent;
 class nsIDOMEventListener;
 class nsIDOMEventTarget;
 class nsIDOMKeyEvent;
-class nsIDOMNSEvent;
 class nsIDOMNode;
 class nsIDOMRange;
 class nsIDocument;
@@ -798,7 +797,7 @@ public:
       Init(aSelf, aIsTrusted);
     }
 
-    HandlingTrustedAction(nsEditor* aSelf, nsIDOMNSEvent* aEvent);
+    HandlingTrustedAction(nsEditor* aSelf, nsIDOMEvent* aEvent);
 
     ~HandlingTrustedAction()
     {
diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp
index 70610a91b14a..fef0d78075d1 100644
--- a/editor/libeditor/base/nsEditorEventListener.cpp
+++ b/editor/libeditor/base/nsEditorEventListener.cpp
@@ -27,7 +27,6 @@
 #include "nsIDOMEventTarget.h"          // for nsIDOMEventTarget
 #include "nsIDOMKeyEvent.h"             // for nsIDOMKeyEvent
 #include "nsIDOMMouseEvent.h"           // for nsIDOMMouseEvent
-#include "nsIDOMNSEvent.h"              // for nsIDOMNSEvent
 #include "nsIDOMNode.h"                 // for nsIDOMNode
 #include "nsIDOMRange.h"                // for nsIDOMRange
 #include "nsIDocument.h"                // for nsIDocument
@@ -453,8 +452,7 @@ nsEditorEventListener::KeyPress(nsIDOMEvent* aKeyEvent)
   }
 
   // Transfer the event's trusted-ness to our editor
-  nsCOMPtr<nsIDOMNSEvent> NSEvent = do_QueryInterface(aKeyEvent);
-  nsEditor::HandlingTrustedAction operation(mEditor, NSEvent);
+  nsEditor::HandlingTrustedAction operation(mEditor, aKeyEvent);
 
   // DOM event handling happens in two passes, the client pass and the system
   // pass.  We do all of our processing in the system pass, to allow client
@@ -608,8 +606,7 @@ nsEditorEventListener::HandleText(nsIDOMEvent* aTextEvent)
   }
 
   // Transfer the event's trusted-ness to our editor
-  nsCOMPtr<nsIDOMNSEvent> NSEvent = do_QueryInterface(aTextEvent);
-  nsEditor::HandlingTrustedAction operation(mEditor, NSEvent);
+  nsEditor::HandlingTrustedAction operation(mEditor, aTextEvent);
 
   return mEditor->UpdateIMEComposition(composedText, textRangeList);
 }
@@ -850,8 +847,7 @@ nsEditorEventListener::HandleEndComposition(nsIDOMEvent* aCompositionEvent)
   }
 
   // Transfer the event's trusted-ness to our editor
-  nsCOMPtr<nsIDOMNSEvent> NSEvent = do_QueryInterface(aCompositionEvent);
-  nsEditor::HandlingTrustedAction operation(mEditor, NSEvent);
+  nsEditor::HandlingTrustedAction operation(mEditor, aCompositionEvent);
 
   mEditor->EndIMEComposition();
 }
diff --git a/editor/libeditor/base/tests/Makefile.in b/editor/libeditor/base/tests/Makefile.in
index cb29d83f42c6..45a8a5ac595a 100644
--- a/editor/libeditor/base/tests/Makefile.in
+++ b/editor/libeditor/base/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = editor/libeditor/base/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in
index fede8c765932..53b9e844a762 100644
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/libeditor/html/nsHTMLEditorEventListener.cpp b/editor/libeditor/html/nsHTMLEditorEventListener.cpp
index 610d9eaee7c2..2771f91e496e 100644
--- a/editor/libeditor/html/nsHTMLEditorEventListener.cpp
+++ b/editor/libeditor/html/nsHTMLEditorEventListener.cpp
@@ -14,7 +14,6 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMRange.h"
 #include "nsIEditor.h"
@@ -104,8 +103,7 @@ nsHTMLEditorEventListener::MouseDown(nsIDOMEvent* aMouseEvent)
   NS_ENSURE_SUCCESS(res, res);
 
   nsCOMPtr<nsIDOMEventTarget> target;
-  nsCOMPtr<nsIDOMNSEvent> internalEvent = do_QueryInterface(aMouseEvent);
-  res = internalEvent->GetExplicitOriginalTarget(getter_AddRefs(target));
+  res = aMouseEvent->GetExplicitOriginalTarget(getter_AddRefs(target));
   NS_ENSURE_SUCCESS(res, res);
   NS_ENSURE_TRUE(target, NS_ERROR_NULL_POINTER);
   nsCOMPtr<nsIDOMElement> element = do_QueryInterface(target);
diff --git a/editor/libeditor/html/tests/Makefile.in b/editor/libeditor/html/tests/Makefile.in
index 8e2964e0d9ad..d11ba05ed0d2 100644
--- a/editor/libeditor/html/tests/Makefile.in
+++ b/editor/libeditor/html/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = editor/libeditor/html/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in
index aff992834cd4..768ba7487afa 100644
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/libeditor/text/tests/Makefile.in b/editor/libeditor/text/tests/Makefile.in
index 85aed9fc5229..a71e2ed24b15 100644
--- a/editor/libeditor/text/tests/Makefile.in
+++ b/editor/libeditor/text/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = editor/libeditor/text/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/editor/public/Makefile.in b/editor/public/Makefile.in
index 9ebcff98b1b4..d28c150b8e28 100644
--- a/editor/public/Makefile.in
+++ b/editor/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           := ../..
+DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
diff --git a/editor/reftests/reftest.list b/editor/reftests/reftest.list
index 62a179837318..15555821efc0 100644
--- a/editor/reftests/reftest.list
+++ b/editor/reftests/reftest.list
@@ -97,4 +97,4 @@ skip-if(Android) == 462758-grabbers-resizers.html 462758-grabbers-resizers-ref.h
 == 694880-3.html 694880-ref.html
 == 388980-1.html 388980-1-ref.html
 needs-focus == spellcheck-superscript-1.html spellcheck-superscript-1-ref.html
-needs-focus != spellcheck-superscript-2.html spellcheck-superscript-2-ref.html
+fails-if(Android) needs-focus != spellcheck-superscript-2.html spellcheck-superscript-2-ref.html
diff --git a/editor/txmgr/Makefile.in b/editor/txmgr/Makefile.in
index b4beae9d93bd..82aa86b0f32e 100644
--- a/editor/txmgr/Makefile.in
+++ b/editor/txmgr/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           := ../..
+DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
diff --git a/editor/txmgr/idl/Makefile.in b/editor/txmgr/idl/Makefile.in
index 73dcf60eeeec..77ab1289f25a 100644
--- a/editor/txmgr/idl/Makefile.in
+++ b/editor/txmgr/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/editor/txmgr/public/Makefile.in b/editor/txmgr/public/Makefile.in
index 48683051edc3..3da7f6370b0e 100644
--- a/editor/txmgr/public/Makefile.in
+++ b/editor/txmgr/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in
index b2eaa0edb49d..445ac549237f 100644
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/txmgr/tests/Makefile.in b/editor/txmgr/tests/Makefile.in
index 3365f56d3d43..58da45154f54 100644
--- a/editor/txmgr/tests/Makefile.in
+++ b/editor/txmgr/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/txtsvc/Makefile.in b/editor/txtsvc/Makefile.in
index 45bc8da4df35..869a09c0e053 100644
--- a/editor/txtsvc/Makefile.in
+++ b/editor/txtsvc/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           := ../..
+DEPTH           := @DEPTH@
 topsrcdir       := @top_srcdir@
 srcdir          := @srcdir@
 VPATH           := @srcdir@
diff --git a/editor/txtsvc/public/Makefile.in b/editor/txtsvc/public/Makefile.in
index 1f19d6b913f5..d401aa7e88ce 100644
--- a/editor/txtsvc/public/Makefile.in
+++ b/editor/txtsvc/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in
index 239c7937bafd..4c41aafa54f6 100644
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/Makefile.in b/embedding/Makefile.in
index 861042557708..e4fdcd1d4dbc 100644
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = embedding
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index 7985cf3cce99..ac12cf417c86 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/android/locales/Makefile.in b/embedding/android/locales/Makefile.in
index d0a7f9b015a6..e9d260b2e762 100644
--- a/embedding/android/locales/Makefile.in
+++ b/embedding/android/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = embedding/android/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in
index 5f527240a020..2ba49530df7a 100644
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@@ -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/.
 
-DEPTH           = ../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/embedding/browser/Makefile.in b/embedding/browser/Makefile.in
index 0462c8166605..c3134c06d23a 100644
--- a/embedding/browser/Makefile.in
+++ b/embedding/browser/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in
index 8955da933323..e5aa8da0b4e1 100644
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
index 6552e7e78d9c..ed101c9f0da1 100644
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
index 5c380e5cc23c..2c9d4b802d75 100644
--- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -36,8 +36,6 @@
 #include "nsIDOMSVGTitleElement.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIDOMNSEvent.h"
-#include "nsIDOMNamedNodeMap.h"
 #include "nsIFormControl.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIDOMHTMLTextAreaElement.h"
@@ -899,12 +897,10 @@ nsDocShellTreeOwner::HandleEvent(nsIDOMEvent* aEvent)
   nsCOMPtr<nsIDOMDragEvent> dragEvent = do_QueryInterface(aEvent);
   NS_ENSURE_TRUE(dragEvent, NS_ERROR_INVALID_ARG);
 
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aEvent);
-  if (domNSEvent) {
-    bool defaultPrevented;
-    domNSEvent->GetPreventDefault(&defaultPrevented);
-    if (defaultPrevented)
-      return NS_OK;
+  bool defaultPrevented;
+  aEvent->GetPreventDefault(&defaultPrevented);
+  if (defaultPrevented) {
+    return NS_OK;
   }
 
   nsCOMPtr<nsIDroppedLinkHandler> handler = do_GetService("@mozilla.org/content/dropped-link-handler;1");
@@ -1647,15 +1643,10 @@ ChromeContextMenuListener::HandleEvent(nsIDOMEvent* aMouseEvent)
   nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aMouseEvent);
   NS_ENSURE_TRUE(mouseEvent, NS_ERROR_UNEXPECTED);
 
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aMouseEvent);
-
-  if (domNSEvent) {
-    bool isDefaultPrevented = false;
-    domNSEvent->GetPreventDefault(&isDefaultPrevented);
-
-    if (isDefaultPrevented) {
-      return NS_OK;
-    }
+  bool isDefaultPrevented = false;
+  aMouseEvent->GetPreventDefault(&isDefaultPrevented);
+  if (isDefaultPrevented) {
+    return NS_OK;
   }
 
   nsCOMPtr<nsIDOMEventTarget> targetNode;
@@ -1679,8 +1670,6 @@ ChromeContextMenuListener::HandleEvent(nsIDOMEvent* aMouseEvent)
   nsCOMPtr<nsIContextMenuInfo> menuInfo;
   if (menuListener2) {
     menuInfoImpl = new nsContextMenuInfo;
-    if (!menuInfoImpl)
-      return NS_ERROR_OUT_OF_MEMORY;
     menuInfo = menuInfoImpl; 
   }
 
diff --git a/embedding/components/Makefile.in b/embedding/components/Makefile.in
index af41237bd0c7..306246244c90 100644
--- a/embedding/components/Makefile.in
+++ b/embedding/components/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in
index e0006362fa36..e54f372a4d5e 100644
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in
index 434baccfb1c4..95a823045069 100644
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/commandhandler/Makefile.in b/embedding/components/commandhandler/Makefile.in
index 141cde31e767..6597bd045361 100644
--- a/embedding/components/commandhandler/Makefile.in
+++ b/embedding/components/commandhandler/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/commandhandler/public/Makefile.in b/embedding/components/commandhandler/public/Makefile.in
index bfefbace1064..417b9d76e3d2 100644
--- a/embedding/components/commandhandler/public/Makefile.in
+++ b/embedding/components/commandhandler/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/commandhandler/src/Makefile.in b/embedding/components/commandhandler/src/Makefile.in
index fe065056c28a..45a51770335c 100644
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/find/Makefile.in b/embedding/components/find/Makefile.in
index 63a65ec9c7a9..50133d97c192 100644
--- a/embedding/components/find/Makefile.in
+++ b/embedding/components/find/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/find/public/Makefile.in b/embedding/components/find/public/Makefile.in
index 8c8e8e2abea5..ff7fc7ea0c25 100644
--- a/embedding/components/find/public/Makefile.in
+++ b/embedding/components/find/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in
index 2641a71c7835..8feffc504221 100644
--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/printingui/src/Makefile.in b/embedding/components/printingui/src/Makefile.in
index 51a713db19d1..069d97ff3be7 100644
--- a/embedding/components/printingui/src/Makefile.in
+++ b/embedding/components/printingui/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in
index c24aaa9e05da..0ff3738857f1 100644
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in
index c922f55c6bfb..4126b6870d38 100644
--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in
index c922f55c6bfb..4126b6870d38 100644
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in
index 8a0d1485318c..464d6bff42b0 100644
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/webbrowserpersist/Makefile.in b/embedding/components/webbrowserpersist/Makefile.in
index 717507188ce7..ee0ef46bbe16 100644
--- a/embedding/components/webbrowserpersist/Makefile.in
+++ b/embedding/components/webbrowserpersist/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/webbrowserpersist/public/Makefile.in b/embedding/components/webbrowserpersist/public/Makefile.in
index b99681a9c02d..58d869f7b9be 100644
--- a/embedding/components/webbrowserpersist/public/Makefile.in
+++ b/embedding/components/webbrowserpersist/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in
index e3b54705ac29..74f466b6152d 100644
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/windowwatcher/Makefile.in b/embedding/components/windowwatcher/Makefile.in
index 2302451c8b8e..42735d2e682f 100644
--- a/embedding/components/windowwatcher/Makefile.in
+++ b/embedding/components/windowwatcher/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/windowwatcher/public/Makefile.in b/embedding/components/windowwatcher/public/Makefile.in
index 3385dc7c3401..304509fcc9c1 100644
--- a/embedding/components/windowwatcher/public/Makefile.in
+++ b/embedding/components/windowwatcher/public/Makefile.in
@@ -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/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in
index c3d3775379fc..c4bcefe5c884 100644
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/embedding/test/Makefile.in b/embedding/test/Makefile.in
index 400722a53f00..325e89a83441 100644
--- a/embedding/test/Makefile.in
+++ b/embedding/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = embedding/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in
index 7e1182c63a90..075cb4604c5d 100644
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -27,7 +27,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index e8478de2c66e..58e7597acf36 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/extensions/auth/Makefile.in b/extensions/auth/Makefile.in
index 17358a2dafbb..c733cf167a72 100644
--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in
index 085d573e834e..c1ce48d8522f 100644
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/cookie/test/Makefile.in b/extensions/cookie/test/Makefile.in
index fcc662681f85..e5e472c060b7 100644
--- a/extensions/cookie/test/Makefile.in
+++ b/extensions/cookie/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = extensions/cookie/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/extensions/gio/Makefile.in b/extensions/gio/Makefile.in
index 0f6205fb39b5..46412c40d959 100644
--- a/extensions/gio/Makefile.in
+++ b/extensions/gio/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in
index a738ee926cbc..54c1601b646a 100644
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in
index e1ac7976f0bd..218f0a3f1c44 100644
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/pref/Makefile.in b/extensions/pref/Makefile.in
index 5589d7a44f8d..3160b0d2932a 100644
--- a/extensions/pref/Makefile.in
+++ b/extensions/pref/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH            = ../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/extensions/pref/autoconfig/Makefile.in b/extensions/pref/autoconfig/Makefile.in
index e56258ece031..d0ce20c967da 100644
--- a/extensions/pref/autoconfig/Makefile.in
+++ b/extensions/pref/autoconfig/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/extensions/pref/autoconfig/public/Makefile.in b/extensions/pref/autoconfig/public/Makefile.in
index eef10aad03f6..524097a437cd 100644
--- a/extensions/pref/autoconfig/public/Makefile.in
+++ b/extensions/pref/autoconfig/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH        = ../../../..
+DEPTH        = @DEPTH@
 topsrcdir    = @top_srcdir@
 srcdir       = @srcdir@
 VPATH        = @srcdir@
diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in
index 9f0f42681fec..e694a0739cb1 100644
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
diff --git a/extensions/spellcheck/Makefile.in b/extensions/spellcheck/Makefile.in
index 9f72cfcd5452..d6529b3719f8 100644
--- a/extensions/spellcheck/Makefile.in
+++ b/extensions/spellcheck/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/spellcheck/hunspell/Makefile.in b/extensions/spellcheck/hunspell/Makefile.in
index f74c7814ea3a..8af680bfdae2 100644
--- a/extensions/spellcheck/hunspell/Makefile.in
+++ b/extensions/spellcheck/hunspell/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = extensions/spellcheck/hunspell
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in
index 030fa48d37d0..825092a695fa 100644
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/extensions/spellcheck/idl/Makefile.in b/extensions/spellcheck/idl/Makefile.in
index 9e5af2d3b46c..324818b7afcf 100644
--- a/extensions/spellcheck/idl/Makefile.in
+++ b/extensions/spellcheck/idl/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/spellcheck/locales/Makefile.in b/extensions/spellcheck/locales/Makefile.in
index 081c45ff64a8..cf6c11abf0c0 100644
--- a/extensions/spellcheck/locales/Makefile.in
+++ b/extensions/spellcheck/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = extensions/spellcheck/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in
index 236e9f1d35fe..b1d62d75a93f 100644
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
index 4a67e6e5bb42..017124d39af3 100644
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -19,9 +19,9 @@
 #include "nsIContent.h"
 #include "nsTextFragment.h"
 #include "mozilla/dom/Element.h"
-#include "nsIFrame.h"
 #include "nsRange.h"
 #include "nsContentUtils.h"
+#include "nsIFrame.h"
 
 using namespace mozilla;
 
diff --git a/extensions/spellcheck/tests/chrome/Makefile.in b/extensions/spellcheck/tests/chrome/Makefile.in
index 4c4c3bfd74c0..8b1d4c9eaedb 100644
--- a/extensions/spellcheck/tests/chrome/Makefile.in
+++ b/extensions/spellcheck/tests/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = extensions/spellcheck/tests/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/extensions/spellcheck/tests/chrome/base/Makefile.in b/extensions/spellcheck/tests/chrome/base/Makefile.in
index 8fd840de9feb..0965eaab3e52 100644
--- a/extensions/spellcheck/tests/chrome/base/Makefile.in
+++ b/extensions/spellcheck/tests/chrome/base/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = extensions/spellcheck/tests/chrome/base
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/extensions/spellcheck/tests/chrome/map/Makefile.in b/extensions/spellcheck/tests/chrome/map/Makefile.in
index 52903b722916..ca847d251cab 100644
--- a/extensions/spellcheck/tests/chrome/map/Makefile.in
+++ b/extensions/spellcheck/tests/chrome/map/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = extensions/spellcheck/tests/chrome/map
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/extensions/universalchardet/Makefile.in b/extensions/universalchardet/Makefile.in
index 39470297d875..97f57f852ea3 100644
--- a/extensions/universalchardet/Makefile.in
+++ b/extensions/universalchardet/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/universalchardet/src/Makefile.in b/extensions/universalchardet/src/Makefile.in
index e7235d97e77b..65c551d253c3 100644
--- a/extensions/universalchardet/src/Makefile.in
+++ b/extensions/universalchardet/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/universalchardet/src/base/Makefile.in b/extensions/universalchardet/src/base/Makefile.in
index 45a74b4835d9..5db5a1284ba7 100644
--- a/extensions/universalchardet/src/base/Makefile.in
+++ b/extensions/universalchardet/src/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in
index bc95fd693b24..924364069398 100644
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/universalchardet/tests/Makefile.in b/extensions/universalchardet/tests/Makefile.in
index fc68e3b0f1fb..512601d17963 100644
--- a/extensions/universalchardet/tests/Makefile.in
+++ b/extensions/universalchardet/tests/Makefile.in
@@ -3,14 +3,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-relativesrcdir = extensions/universalchardet/tests
+relativesrcdir = @relativesrcdir@
 
 MOCHITEST_CHROME_FILES =	\
 		CharsetDetectionTests.js \
diff --git a/extensions/widgetutils/Makefile.in b/extensions/widgetutils/Makefile.in
index 0a2f1434ab39..9ff09d0047a4 100644
--- a/extensions/widgetutils/Makefile.in
+++ b/extensions/widgetutils/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH=../..
+DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
diff --git a/extensions/widgetutils/src/Makefile.in b/extensions/widgetutils/src/Makefile.in
index 25f15a4810d5..654543519c63 100644
--- a/extensions/widgetutils/src/Makefile.in
+++ b/extensions/widgetutils/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/extensions/widgetutils/src/nsWidgetUtils.cpp b/extensions/widgetutils/src/nsWidgetUtils.cpp
index 700dc7f58258..9304bf154655 100644
--- a/extensions/widgetutils/src/nsWidgetUtils.cpp
+++ b/extensions/widgetutils/src/nsWidgetUtils.cpp
@@ -33,7 +33,6 @@
 #include "nsIDOMCompositionListener.h"
 #include "nsIDOMTextListener.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIView.h"
 #include "nsGUIEvent.h"
 #include "nsIViewManager.h"
@@ -114,13 +113,12 @@ nsWidgetUtils::Init()
 nsresult
 nsWidgetUtils::UpdateFromEvent(nsIDOMEvent *aDOMEvent)
 {
-  nsCOMPtr <nsIDOMMouseEvent> mouseEvent;
-  mouseEvent = do_QueryInterface(aDOMEvent);
+  nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aDOMEvent);
   if (!mouseEvent)
     return NS_OK;
 
-  ((nsIDOMMouseEvent*)mouseEvent)->GetScreenX(&g_lastX);
-  ((nsIDOMMouseEvent*)mouseEvent)->GetScreenY(&g_lastY);
+  mouseEvent->GetScreenX(&g_lastX);
+  mouseEvent->GetScreenY(&g_lastY);
 
   nsCOMPtr<nsIDOMWindow> mWindow;
   nsCOMPtr<nsIDOMNode> mNode;
@@ -129,10 +127,8 @@ nsWidgetUtils::UpdateFromEvent(nsIDOMEvent *aDOMEvent)
   PRUint32 type = 0;
   bool isXul = false;
   {
-    nsCOMPtr <nsIDOMNSEvent> aEvent = do_QueryInterface(aDOMEvent);
     nsCOMPtr<nsIDOMEventTarget> eventOrigTarget;
-    if (aEvent)
-      aEvent->GetOriginalTarget(getter_AddRefs(eventOrigTarget));
+    aDOMEvent->GetOriginalTarget(getter_AddRefs(eventOrigTarget));
     if (eventOrigTarget)
       mOrigNode = do_QueryInterface(eventOrigTarget);
     isXul = IsXULNode(mOrigNode, &type);
diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in
index 7662d77ebcc6..14b24bb200bb 100644
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/2d/QuartzSupport.mm b/gfx/2d/QuartzSupport.mm
index e6df9fe61d9d..c0ab0b6137ef 100644
--- a/gfx/2d/QuartzSupport.mm
+++ b/gfx/2d/QuartzSupport.mm
@@ -463,7 +463,6 @@ void cgdata_release_callback(void *aCGData, const void *data, size_t size) {
 }
 
 void nsCARenderer::Destroy() {
-  printf("Destroy\n");
   if (mCARenderer) {
     CARenderer* caRenderer = (CARenderer*)mCARenderer;
     // Bug 556453:
@@ -503,11 +502,9 @@ void nsCARenderer::Destroy() {
   mFBOTexture = 0;
   mOpenGLContext = nullptr;
   mCGImage = nullptr;
-  printf("Destroy: set null\n");
   mIOSurface = nullptr;
   mFBO = 0;
   mIOTexture = 0;
-  printf("Destroy: cleanup\n");
 }
 
 nsresult nsCARenderer::SetupRenderer(void *aCALayer, int aWidth, int aHeight,
@@ -711,7 +708,6 @@ void nsCARenderer::SetViewport(int aWidth, int aHeight) {
 }
 
 void nsCARenderer::AttachIOSurface(RefPtr<MacIOSurface> aSurface) {
-  printf("*****Attach*****\n\n\n\n\n");
   if (mIOSurface &&
       aSurface->GetIOSurfaceID() == mIOSurface->GetIOSurfaceID()) {
     // This object isn't needed since we already have a
diff --git a/gfx/2d/UserData.h b/gfx/2d/UserData.h
index d99fd8580237..20b6c4624ee1 100644
--- a/gfx/2d/UserData.h
+++ b/gfx/2d/UserData.h
@@ -82,6 +82,16 @@ public:
     return NULL;
   }
 
+  bool Has(UserDataKey *key)
+  {
+    for (int i=0; i<count; i++) {
+      if (key == entries[i].key) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   void Destroy()
   {
     for (int i=0; i<count; i++) {
diff --git a/gfx/Makefile.in b/gfx/Makefile.in
index b535a8c5015f..1e4e886b32ca 100644
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
index 05e23ad094b6..b4adfbed4021 100644
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in
index 2571fc31b61c..b643f1a33635 100644
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in
index 285b63c04264..7a8c5e5ef147 100644
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/gfx/cairo/Makefile.in b/gfx/cairo/Makefile.in
index c63a9b44a4a6..cf08a6c769b5 100644
--- a/gfx/cairo/Makefile.in
+++ b/gfx/cairo/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index f057c514ef19..83a309b27fc7 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
@@ -233,4 +233,4 @@ DEFINES += -DMOZ_TREE_PIXMAN
 endif
 
 cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)
-	$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH) ./$@
+	$(PYTHON) $(DEPTH)/config.status -n --file=$@
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index 7af3b8f67043..bdca4490ddf6 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index ae2c2e73d93b..c40712739a79 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -1333,6 +1333,11 @@ GLContext::ChooseGLFormats(ContextFormat& aCF, ColorByteOrder aByteOrder)
         fGetIntegerv(LOCAL_GL_MAX_SAMPLES, (GLint*)&maxSamples);
     samples = NS_MIN(samples, maxSamples);
 
+    // bug 778765
+    if (WorkAroundDriverBugs() && samples == 1) {
+        samples = 0;
+    }
+
     formats.samples = samples;
     aCF.samples = samples;
 
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index 42673ca2f996..74b57e1fd318 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in
index 8c456556e4af..114f464d9688 100644
--- a/gfx/graphite2/src/Makefile.in
+++ b/gfx/graphite2/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla
new file mode 100644
index 000000000000..be55cfd58b4b
--- /dev/null
+++ b/gfx/harfbuzz/README-mozilla
@@ -0,0 +1,23 @@
+gfx/harfbuzz status as of 2012-08-06:
+
+This directory contains the "harfbuzz-ng" source from the 'master' branch of
+git://anongit.freedesktop.org/git/harfbuzz.
+
+UPDATING:
+
+Note that hb-ot-shape-complex-indic-machine.hh and gfx/harfbuzz/src/hb-version.h
+are not present in the upstream Git repository. These are created at build time
+by the harfbuzz build system; but as we don't use that build system in mozilla,
+it is necessary to refresh these files when updating harfbuzz, and check them in
+to the mozilla tree. (This avoids adding the ragel processor to mozilla's build
+prerequisites.)
+
+The normal approach to updating harfbuzz, therefore, is to pull the latest HB
+source into a scratch directory and do a local build; then copy the original
+sources AND the generated headers mentioned above from the build directory into
+the mozilla tree.
+
+In addition, the src/Makefile.in file here is NOT from upstream, nor is it
+generated from src/Makefile.am (the original harfbuzz version); it is a mozilla-
+specific makefile that is maintained by hand. It should only need updating when
+new source files or exported headers are added in harfbuzz.
diff --git a/gfx/harfbuzz/src/Makefile.am b/gfx/harfbuzz/src/Makefile.am
index a50a199094d8..9b583fdbc619 100644
--- a/gfx/harfbuzz/src/Makefile.am
+++ b/gfx/harfbuzz/src/Makefile.am
@@ -1,13 +1,16 @@
 # Process this file with automake to produce Makefile.in
 
 NULL =
+SUBDIRS =
+DIST_SUBDIRS =
 BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
-# The following warning options are useful for debugging: -Wpadded -Wcast-align
+# The following warning options are useful for debugging: -Wpadded
 #AM_CXXFLAGS =
 
 lib_LTLIBRARIES = libharfbuzz.la
@@ -21,7 +24,6 @@ HBSOURCES =  \
 	hb-buffer.cc \
 	hb-cache-private.hh \
 	hb-common.cc \
-	hb-fallback-shape-private.hh \
 	hb-fallback-shape.cc \
 	hb-font-private.hh \
 	hb-font.cc \
@@ -39,6 +41,13 @@ HBSOURCES =  \
 	hb-set-private.hh \
 	hb-set.cc \
 	hb-shape.cc \
+	hb-shape-plan-private.hh \
+	hb-shape-plan.cc \
+	hb-shape-plan.h \
+	hb-shaper-list.hh \
+	hb-shaper-impl-private.hh \
+	hb-shaper-private.hh \
+	hb-shaper.cc \
 	hb-tt-font.cc \
 	hb-unicode-private.hh \
 	hb-unicode.cc \
@@ -126,18 +135,35 @@ endif
 if HAVE_GRAPHITE2
 HBCFLAGS += $(GRAPHITE2_CFLAGS)
 HBLIBS   += $(GRAPHITE2_LIBS)
-HBSOURCES += hb-graphite2.cc hb-graphite2-private.hh
+HBSOURCES += hb-graphite2.cc
 HBHEADERS += hb-graphite2.h
 endif
 
 if HAVE_UNISCRIBE
 HBCFLAGS += $(UNISCRIBE_CFLAGS)
 HBLIBS   += $(UNISCRIBE_LIBS)
-HBSOURCES += hb-uniscribe.cc hb-uniscribe-private.hh
+HBSOURCES += hb-uniscribe.cc
 HBHEADERS += hb-uniscribe.h
 endif
 
-CXXLINK = $(LINK)
+if HAVE_CORETEXT
+HBCFLAGS += $(CORETEXT_CFLAGS)
+HBLIBS   += $(CORETEXT_LIBS)
+HBSOURCES += hb-coretext.cc
+HBHEADERS += hb-coretext.h
+endif
+
+if HAVE_HB_OLD
+SUBDIRS += hb-old
+HBCFLAGS += -I$(srcdir)/hb-old
+HBLIBS   += hb-old/libhb-old.la
+HBSOURCES += hb-old.cc
+endif
+DIST_SUBDIRS += hb-old
+
+
+# Use a C linker, not C++; Don't link to libstdc++
+libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS)
 libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
 nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES)
 libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)
@@ -175,7 +201,7 @@ hb-ot-shape-complex-indic-machine.hh: hb-ot-shape-complex-indic-machine.rl
 	$(AM_V_GEN)$(top_srcdir)/missing --run ragel -e -F1 -o "$@.tmp" "$<" && \
 	mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false )
 
-noinst_PROGRAMS = main indic
+noinst_PROGRAMS = main indic test-would-substitute
 bin_PROGRAMS =
 
 main_SOURCES = main.cc
@@ -186,11 +212,16 @@ indic_SOURCES = indic.cc
 indic_CPPFLAGS = $(HBCFLAGS)
 indic_LDADD = libharfbuzz.la $(HBLIBS)
 
+test_would_substitute_SOURCES = test-would-substitute.cc
+test_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS)
+test_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS)
+
 dist_check_SCRIPTS = \
 	check-c-linkage-decls.sh \
 	check-header-guards.sh \
-	check-internal-symbols.sh \
 	check-includes.sh \
+	check-internal-symbols.sh \
+	check-static-inits.sh \
 	$(NULL)
 
 if HAVE_ICU
@@ -206,8 +237,26 @@ TESTS_ENVIRONMENT = \
 	HBHEADERS="$(HBHEADERS)" \
 	$(NULL)
 
-scan:
-	g-ir-scanner $(HBCFLAGS) $(HBHEADERS) -n hb --strip-prefix=hb --library libharfbuzz.la
-
+#-include $(INTROSPECTION_MAKEFILE)
+#INTROSPECTION_GIRS = hb-1.0.gir
+#INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_
+#INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+#
+#if HAVE_INTROSPECTION
+#
+#hb-1.0.gir: libharfbuzz.la
+#hb_1_0_gir_INCLUDES = GObject-2.0
+#hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN
+#hb_1_0_gir_LIBS = libharfbuzz.la
+#hb_1_0_gir_FILES = $(HBHEADERS)
+#
+#girdir = $(datadir)/gir-1.0
+#gir_DATA = $(INTROSPECTION_GIRS)
+#
+#typelibdir = $(libdir)/girepository-1.0
+#typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+#
+#CLEANFILES += $(gir_DATA) $(typelib_DATA)
+#endif
 
 -include $(top_srcdir)/git.mk
diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in
index 6ca0f86e89c1..b1b81f233c45 100644
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -25,7 +25,7 @@
 #
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -54,6 +54,8 @@ CPPSRCS	=                        \
   hb-ot-tag.cc                   \
   hb-set.cc                      \
   hb-shape.cc                    \
+  hb-shape-plan.cc               \
+  hb-shaper.cc                   \
   hb-unicode.cc                  \
   hb-warning.cc                  \
   $(NULL)
@@ -72,6 +74,7 @@ EXPORTS_harfbuzz = \
   hb-ot-shape.h    \
   hb-set.h         \
   hb-shape.h       \
+  hb-shape-plan.h  \
   hb-unicode.h     \
   hb-version.h     \
   $(NULL)
diff --git a/gfx/harfbuzz/src/check-c-linkage-decls.sh b/gfx/harfbuzz/src/check-c-linkage-decls.sh
index e7c95abc5b40..44cdfa0f23c8 100755
--- a/gfx/harfbuzz/src/check-c-linkage-decls.sh
+++ b/gfx/harfbuzz/src/check-c-linkage-decls.sh
@@ -7,12 +7,20 @@ test -z "$srcdir" && srcdir=.
 stat=0
 
 test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'`
+test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb*.h'`
 
 
 for x in $HBHEADERS; do
 	test -f $srcdir/$x && x=$srcdir/$x
 	if ! grep -q HB_BEGIN_DECLS "$x" || ! grep -q HB_END_DECLS "$x"; then
-		echo "Ouch, file $x does not HB_BEGIN_DECLS / HB_END_DECLS"
+		echo "Ouch, file $x does not have HB_BEGIN_DECLS / HB_END_DECLS, but it should"
+		stat=1
+	fi
+done
+for x in $HBSOURCES; do
+	test -f $srcdir/$x && x=$srcdir/$x
+	if grep -q HB_BEGIN_DECLS "$x" || grep -q HB_END_DECLS "$x"; then
+		echo "Ouch, file $x has HB_BEGIN_DECLS / HB_END_DECLS, but it shouldn't"
 		stat=1
 	fi
 done
diff --git a/gfx/harfbuzz/src/check-internal-symbols.sh b/gfx/harfbuzz/src/check-internal-symbols.sh
index a24a69348105..729b086083f3 100755
--- a/gfx/harfbuzz/src/check-internal-symbols.sh
+++ b/gfx/harfbuzz/src/check-internal-symbols.sh
@@ -14,12 +14,18 @@ else
 	exit 77
 fi
 
+if which c++filt 2>/dev/null >/dev/null; then
+	cplusplusfilt=c++filt
+else
+	cplusplusfilt=cat
+fi
+
 tested=false
 for suffix in so; do
 	so=.libs/libharfbuzz.$suffix
 	if test -f "$so"; then
-		echo "Checking that we are exposing internal symbols"
-		if nm $so | grep ' T ' | grep -v ' T _fini\>\| T _init\>\| T hb_'; then
+		echo "Checking that we are not exposing internal symbols"
+		if nm $so | grep ' [TW] ' | $cplusplusfilt | grep -v ' T _fini\>\| T _init\>\| T hb_'; then
 			echo "Ouch, internal symbols exposed"
 			stat=1
 		fi
diff --git a/gfx/harfbuzz/src/check-static-inits.sh b/gfx/harfbuzz/src/check-static-inits.sh
new file mode 100755
index 000000000000..eb04a55be76c
--- /dev/null
+++ b/gfx/harfbuzz/src/check-static-inits.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+LC_ALL=C
+export LC_ALL
+
+test -z "$srcdir" && srcdir=.
+stat=0
+
+
+if which objdump 2>/dev/null >/dev/null; then
+	:
+else
+	echo "check-static-inits.sh: 'objdump' not found; skipping test"
+	exit 77
+fi
+
+echo "Checking that no object file has static initializers"
+for obj in .libs/*.o; do
+	if objdump -t "$obj" | grep '[.]ctors'; then
+		echo "Ouch, $obj has static initializers"
+		stat=1
+	fi
+done
+
+echo "Checking that no object file has lazy static C++ constructors/destructors"
+for obj in .libs/*.o; do
+	if objdump -t "$obj" | grep '__c'; then
+		echo "Ouch, $obj has lazy static C++ constructors/destructors"
+		stat=1
+	fi
+done
+
+exit $stat
diff --git a/gfx/harfbuzz/src/hb-atomic-private.hh b/gfx/harfbuzz/src/hb-atomic-private.hh
index 458c984969b9..0f70641f490e 100644
--- a/gfx/harfbuzz/src/hb-atomic-private.hh
+++ b/gfx/harfbuzz/src/hb-atomic-private.hh
@@ -45,43 +45,69 @@
 #elif !defined(HB_NO_MT) && defined(_MSC_VER) && _MSC_VER >= 1600
 
 #include <intrin.h>
+/* On x86, _InterlockedCompareExchangePointer is a macro defined in concrt.h */
+#include <concrt.h>
+
 typedef long hb_atomic_int_t;
 #define hb_atomic_int_add(AI, V)	_InterlockedExchangeAdd (&(AI), (V))
-#define hb_atomic_int_set(AI, V)	((AI) = (V), MemoryBarrier ())
-#define hb_atomic_int_get(AI)		(MemoryBarrier (), (AI))
+
+#define hb_atomic_ptr_get(P)		(MemoryBarrier (), (void *) *(P))
+#define hb_atomic_ptr_cmpexch(P,O,N)	(_InterlockedCompareExchangePointer ((void **) (P), (void *) (N), (void *) (O)) == (void *) (O))
 
 
 #elif !defined(HB_NO_MT) && defined(__APPLE__)
 
 #include <libkern/OSAtomic.h>
+
 typedef int32_t hb_atomic_int_t;
 #define hb_atomic_int_add(AI, V)	(OSAtomicAdd32Barrier ((V), &(AI)) - (V))
-#define hb_atomic_int_set(AI, V)	((AI) = (V), OSMemoryBarrier ())
-#define hb_atomic_int_get(AI)		(OSMemoryBarrier (), (AI))
 
+#define hb_atomic_ptr_get(P)		(OSMemoryBarrier (), (void *) *(P))
+#define hb_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
+
+
+#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
+
+typedef int hb_atomic_int_t;
+#define hb_atomic_int_add(AI, V)	__sync_fetch_and_add (&(AI), (V))
+
+#define hb_atomic_ptr_get(P)		(void *) (__sync_synchronize (), *(P))
+#define hb_atomic_ptr_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
 
 #elif !defined(HB_NO_MT) && defined(HAVE_GLIB)
 
 #include <glib.h>
-typedef volatile int hb_atomic_int_t;
+typedef int hb_atomic_int_t;
 #if GLIB_CHECK_VERSION(2,29,5)
 #define hb_atomic_int_add(AI, V)	g_atomic_int_add (&(AI), (V))
 #else
 #define hb_atomic_int_add(AI, V)	g_atomic_int_exchange_and_add (&(AI), (V))
 #endif
-#define hb_atomic_int_set(AI, V)	g_atomic_int_set (&(AI), (V))
-#define hb_atomic_int_get(AI)		g_atomic_int_get (&(AI))
+
+#define hb_atomic_ptr_get(P)		g_atomic_pointer_get (P)
+#define hb_atomic_ptr_cmpexch(P,O,N)	g_atomic_pointer_compare_and_exchange ((void **) (P), (void *) (O), (void *) (N))
 
 
-#else
+#elif !defined(HB_NO_MT)
 
-#define HB_ATOMIC_INT_NIL 1
+#define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */
 typedef volatile int hb_atomic_int_t;
 #define hb_atomic_int_add(AI, V)	(((AI) += (V)) - (V))
-#define hb_atomic_int_set(AI, V)	((void) ((AI) = (V)))
-#define hb_atomic_int_get(AI)		(AI)
+
+#define hb_atomic_ptr_get(P)		((void *) *(P))
+#define hb_atomic_ptr_cmpexch(P,O,N)	(* (void * volatile *) (P) == (void *) (O) ? (* (void * volatile *) (P) = (void *) (N), true) : false)
+
+
+#else /* HB_NO_MT */
+
+typedef int hb_atomic_int_t;
+#define hb_atomic_int_add(AI, V)	(((AI) += (V)) - (V))
+
+#define hb_atomic_ptr_get(P)		((void *) *(P))
+#define hb_atomic_ptr_cmpexch(P,O,N)	(* (void **) (P) == (void *) (O) ? (* (void **) (P) = (void *) (N), true) : false)
 
 #endif
 
+/* TODO Add tracing. */
 
 #endif /* HB_ATOMIC_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-blob.cc b/gfx/harfbuzz/src/hb-blob.cc
index ee997ad306e2..b6e696be322d 100644
--- a/gfx/harfbuzz/src/hb-blob.cc
+++ b/gfx/harfbuzz/src/hb-blob.cc
@@ -46,8 +46,9 @@
 #endif
 
 
-struct _hb_blob_t {
+struct hb_blob_t {
   hb_object_header_t header;
+  ASSERT_POD ();
 
   bool immutable;
 
@@ -59,19 +60,6 @@ struct _hb_blob_t {
   hb_destroy_func_t destroy;
 };
 
-static hb_blob_t _hb_blob_nil = {
-  HB_OBJECT_HEADER_STATIC,
-
-  TRUE, /* immutable */
-
-  NULL, /* data */
-  0, /* length */
-  HB_MEMORY_MODE_READONLY, /* mode */
-
-  NULL, /* user_data */
-  NULL  /* destroy */
-};
-
 
 static bool _try_writable (hb_blob_t *blob);
 
@@ -97,7 +85,7 @@ hb_blob_create (const char        *data,
   if (!length || !(blob = hb_object_create<hb_blob_t> ())) {
     if (destroy)
       destroy (user_data);
-    return &_hb_blob_nil;
+    return hb_blob_get_empty ();
   }
 
   blob->data = data;
@@ -111,7 +99,7 @@ hb_blob_create (const char        *data,
     blob->mode = HB_MEMORY_MODE_READONLY;
     if (!_try_writable (blob)) {
       hb_blob_destroy (blob);
-      return &_hb_blob_nil;
+      return hb_blob_get_empty ();
     }
   }
 
@@ -126,7 +114,7 @@ hb_blob_create_sub_blob (hb_blob_t    *parent,
   hb_blob_t *blob;
 
   if (!length || offset >= parent->length)
-    return &_hb_blob_nil;
+    return hb_blob_get_empty ();
 
   hb_blob_make_immutable (parent);
 
@@ -142,7 +130,20 @@ hb_blob_create_sub_blob (hb_blob_t    *parent,
 hb_blob_t *
 hb_blob_get_empty (void)
 {
-  return &_hb_blob_nil;
+  static const hb_blob_t _hb_blob_nil = {
+    HB_OBJECT_HEADER_STATIC,
+
+    true, /* immutable */
+
+    NULL, /* data */
+    0, /* length */
+    HB_MEMORY_MODE_READONLY, /* mode */
+
+    NULL, /* user_data */
+    NULL  /* destroy */
+  };
+
+  return const_cast<hb_blob_t *> (&_hb_blob_nil);
 }
 
 hb_blob_t *
@@ -185,7 +186,7 @@ hb_blob_make_immutable (hb_blob_t *blob)
   if (hb_object_is_inert (blob))
     return;
 
-  blob->immutable = TRUE;
+  blob->immutable = true;
 }
 
 hb_bool_t
@@ -244,7 +245,7 @@ _try_make_writable_inplace_unix (hb_blob_t *blob)
 
   if ((uintptr_t) -1L == pagesize) {
     DEBUG_MSG_FUNC (BLOB, blob, "failed to get pagesize: %s", strerror (errno));
-    return FALSE;
+    return false;
   }
   DEBUG_MSG_FUNC (BLOB, blob, "pagesize is %lu", (unsigned long) pagesize);
 
@@ -256,7 +257,7 @@ _try_make_writable_inplace_unix (hb_blob_t *blob)
 		  addr, addr+length, (unsigned long) length);
   if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) {
     DEBUG_MSG_FUNC (BLOB, blob, "mprotect failed: %s", strerror (errno));
-    return FALSE;
+    return false;
   }
 
   blob->mode = HB_MEMORY_MODE_WRITABLE;
@@ -264,9 +265,9 @@ _try_make_writable_inplace_unix (hb_blob_t *blob)
   DEBUG_MSG_FUNC (BLOB, blob,
 		  "successfully made [%p..%p] (%lu bytes) writable\n",
 		  addr, addr+length, (unsigned long) length);
-  return TRUE;
+  return true;
 #else
-  return FALSE;
+  return false;
 #endif
 }
 
@@ -276,29 +277,29 @@ _try_writable_inplace (hb_blob_t *blob)
   DEBUG_MSG_FUNC (BLOB, blob, "making writable inplace\n");
 
   if (_try_make_writable_inplace_unix (blob))
-    return TRUE;
+    return true;
 
   DEBUG_MSG_FUNC (BLOB, blob, "making writable -> FAILED\n");
 
   /* Failed to make writable inplace, mark that */
   blob->mode = HB_MEMORY_MODE_READONLY;
-  return FALSE;
+  return false;
 }
 
 static bool
 _try_writable (hb_blob_t *blob)
 {
   if (blob->immutable)
-    return FALSE;
+    return false;
 
   if (blob->mode == HB_MEMORY_MODE_WRITABLE)
-    return TRUE;
+    return true;
 
   if (blob->mode == HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE && _try_writable_inplace (blob))
-    return TRUE;
+    return true;
 
   if (blob->mode == HB_MEMORY_MODE_WRITABLE)
-    return TRUE;
+    return true;
 
 
   DEBUG_MSG_FUNC (BLOB, blob, "current data is -> %p\n", blob->data);
@@ -307,7 +308,7 @@ _try_writable (hb_blob_t *blob)
 
   new_data = (char *) malloc (blob->length);
   if (unlikely (!new_data))
-    return FALSE;
+    return false;
 
   DEBUG_MSG_FUNC (BLOB, blob, "dupped successfully -> %p\n", blob->data);
 
@@ -318,7 +319,7 @@ _try_writable (hb_blob_t *blob)
   blob->user_data = new_data;
   blob->destroy = free;
 
-  return TRUE;
+  return true;
 }
 
 
diff --git a/gfx/harfbuzz/src/hb-blob.h b/gfx/harfbuzz/src/hb-blob.h
index 360310b4a05f..1a93baa46dc4 100644
--- a/gfx/harfbuzz/src/hb-blob.h
+++ b/gfx/harfbuzz/src/hb-blob.h
@@ -43,7 +43,7 @@ typedef enum {
   HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE
 } hb_memory_mode_t;
 
-typedef struct _hb_blob_t hb_blob_t;
+typedef struct hb_blob_t hb_blob_t;
 
 hb_blob_t *
 hb_blob_create (const char        *data,
diff --git a/gfx/harfbuzz/src/hb-buffer-private.hh b/gfx/harfbuzz/src/hb-buffer-private.hh
index e9e0f822b65f..c96723a3bbbe 100644
--- a/gfx/harfbuzz/src/hb-buffer-private.hh
+++ b/gfx/harfbuzz/src/hb-buffer-private.hh
@@ -40,15 +40,48 @@
 ASSERT_STATIC (sizeof (hb_glyph_info_t) == 20);
 ASSERT_STATIC (sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t));
 
-typedef struct _hb_segment_properties_t {
+
+/*
+ * hb_segment_properties_t
+ */
+
+typedef struct hb_segment_properties_t {
     hb_direction_t      direction;
     hb_script_t         script;
     hb_language_t       language;
+    ASSERT_POD ();
 } hb_segment_properties_t;
 
+#define _HB_BUFFER_PROPS_DEFAULT { HB_DIRECTION_INVALID, HB_SCRIPT_INVALID, HB_LANGUAGE_INVALID }
 
-struct _hb_buffer_t {
+static inline hb_bool_t
+hb_segment_properties_equal (const hb_segment_properties_t *a,
+			     const hb_segment_properties_t *b)
+{
+  return a->direction == b->direction &&
+	 a->script    == b->script    &&
+	 a->language  == b->language;
+}
+
+
+static inline long
+hb_segment_properties_hash (const hb_segment_properties_t *p)
+{
+  /* TODO improve */
+  return (long) p->direction +
+	 (long) p->script +
+	 (long) p->language;
+}
+
+
+
+/*
+ * hb_buffer_t
+ */
+
+struct hb_buffer_t {
   hb_object_header_t header;
+  ASSERT_POD ();
 
   /* Information about how the text in the buffer should be treated */
 
@@ -108,12 +141,11 @@ struct _hb_buffer_t {
   HB_INTERNAL void swap_buffers (void);
   HB_INTERNAL void clear_output (void);
   HB_INTERNAL void clear_positions (void);
-  HB_INTERNAL void replace_glyphs_be16 (unsigned int num_in,
-					unsigned int num_out,
-					const uint16_t *glyph_data_be);
+
   HB_INTERNAL void replace_glyphs (unsigned int num_in,
 				   unsigned int num_out,
 				   const hb_codepoint_t *glyph_data);
+
   HB_INTERNAL void replace_glyph (hb_codepoint_t glyph_index);
   /* Makes a copy of the glyph at idx to output and replace glyph_index */
   HB_INTERNAL void output_glyph (hb_codepoint_t glyph_index);
@@ -149,7 +181,7 @@ struct _hb_buffer_t {
   HB_INTERNAL bool enlarge (unsigned int size);
 
   inline bool ensure (unsigned int size)
-  { return likely (size <= allocated) ? TRUE : enlarge (size); }
+  { return likely (size < allocated) ? true : enlarge (size); }
 
   HB_INTERNAL bool make_room_for (unsigned int num_in, unsigned int num_out);
 
@@ -166,5 +198,4 @@ struct _hb_buffer_t {
 	HB_BUFFER_XALLOCATE_VAR (b, deallocate_var, var (), #var)
 
 
-
 #endif /* HB_BUFFER_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
index c566a4a298a2..db4edce13370 100644
--- a/gfx/harfbuzz/src/hb-buffer.cc
+++ b/gfx/harfbuzz/src/hb-buffer.cc
@@ -37,21 +37,7 @@
 #define HB_DEBUG_BUFFER (HB_DEBUG+0)
 #endif
 
-
-static hb_buffer_t _hb_buffer_nil = {
-  HB_OBJECT_HEADER_STATIC,
-
-  &_hb_unicode_funcs_default,
-  {
-    HB_DIRECTION_INVALID,
-    HB_SCRIPT_INVALID,
-    NULL,
-  },
-
-  TRUE, /* in_error */
-  TRUE, /* have_output */
-  TRUE  /* have_positions */
-};
+#define _HB_BUFFER_UNICODE_FUNCS_DEFAULT (const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_default))
 
 /* Here is how the buffer works internally:
  *
@@ -79,7 +65,7 @@ bool
 hb_buffer_t::enlarge (unsigned int size)
 {
   if (unlikely (in_error))
-    return FALSE;
+    return false;
 
   unsigned int new_allocated = allocated;
   hb_glyph_position_t *new_pos = NULL;
@@ -101,7 +87,7 @@ hb_buffer_t::enlarge (unsigned int size)
 
 done:
   if (unlikely (!new_pos || !new_info))
-    in_error = TRUE;
+    in_error = true;
 
   if (likely (new_pos))
     pos = new_pos;
@@ -120,7 +106,7 @@ bool
 hb_buffer_t::make_room_for (unsigned int num_in,
 			    unsigned int num_out)
 {
-  if (unlikely (!ensure (out_len + num_out))) return FALSE;
+  if (unlikely (!ensure (out_len + num_out))) return false;
 
   if (out_info == info &&
       out_len + num_out > idx + num_in)
@@ -131,20 +117,24 @@ hb_buffer_t::make_room_for (unsigned int num_in,
     memcpy (out_info, info, out_len * sizeof (out_info[0]));
   }
 
-  return TRUE;
+  return true;
 }
 
 void *
 hb_buffer_t::get_scratch_buffer (unsigned int *size)
 {
-  have_output = FALSE;
-  have_positions = FALSE;
+  have_output = false;
+  have_positions = false;
+
   out_len = 0;
+  out_info = info;
+
   *size = allocated * sizeof (pos[0]);
   return pos;
 }
 
 
+
 /* HarfBuzz-Internal API */
 
 void
@@ -154,23 +144,23 @@ hb_buffer_t::reset (void)
     return;
 
   hb_unicode_funcs_destroy (unicode);
-  unicode = _hb_buffer_nil.unicode;
+  unicode = _HB_BUFFER_UNICODE_FUNCS_DEFAULT;
 
-  props = _hb_buffer_nil.props;
+  hb_segment_properties_t default_props = _HB_BUFFER_PROPS_DEFAULT;
+  props = default_props;
 
-  in_error = FALSE;
-  have_output = FALSE;
-  have_positions = FALSE;
+  in_error = false;
+  have_output = false;
+  have_positions = false;
 
   idx = 0;
   len = 0;
   out_len = 0;
+  out_info = info;
 
   serial = 0;
   memset (allocated_var_bytes, 0, sizeof allocated_var_bytes);
   memset (allocated_var_owner, 0, sizeof allocated_var_owner);
-
-  out_info = info;
 }
 
 void
@@ -198,8 +188,8 @@ hb_buffer_t::clear_output (void)
   if (unlikely (hb_object_is_inert (this)))
     return;
 
-  have_output = TRUE;
-  have_positions = FALSE;
+  have_output = true;
+  have_positions = false;
 
   out_len = 0;
   out_info = info;
@@ -211,8 +201,11 @@ hb_buffer_t::clear_positions (void)
   if (unlikely (hb_object_is_inert (this)))
     return;
 
-  have_output = FALSE;
-  have_positions = TRUE;
+  have_output = false;
+  have_positions = true;
+
+  out_len = 0;
+  out_info = info;
 
   memset (pos, 0, sizeof (pos[0]) * len);
 }
@@ -223,7 +216,7 @@ hb_buffer_t::swap_buffers (void)
   if (unlikely (in_error)) return;
 
   assert (have_output);
-  have_output = FALSE;
+  have_output = false;
 
   if (out_info != info)
   {
@@ -242,46 +235,17 @@ hb_buffer_t::swap_buffers (void)
   idx = 0;
 }
 
-void
-hb_buffer_t::replace_glyphs_be16 (unsigned int num_in,
-				  unsigned int num_out,
-				  const uint16_t *glyph_data_be)
-{
-  if (!make_room_for (num_in, num_out)) return;
-
-  hb_glyph_info_t orig_info = info[idx];
-  for (unsigned int i = 1; i < num_in; i++)
-  {
-    hb_glyph_info_t *inf = &info[idx + i];
-    orig_info.cluster = MIN (orig_info.cluster, inf->cluster);
-  }
-
-  hb_glyph_info_t *pinfo = &out_info[out_len];
-  for (unsigned int i = 0; i < num_out; i++)
-  {
-    *pinfo = orig_info;
-    pinfo->codepoint = hb_be_uint16 (glyph_data_be[i]);
-    pinfo++;
-  }
-
-  idx  += num_in;
-  out_len += num_out;
-}
 
 void
 hb_buffer_t::replace_glyphs (unsigned int num_in,
 			     unsigned int num_out,
 			     const uint32_t *glyph_data)
 {
-  if (!make_room_for (num_in, num_out)) return;
+  if (unlikely (!make_room_for (num_in, num_out))) return;
+
+  merge_clusters (idx, idx + num_in);
 
   hb_glyph_info_t orig_info = info[idx];
-  for (unsigned int i = 1; i < num_in; i++)
-  {
-    hb_glyph_info_t *inf = &info[idx + i];
-    orig_info.cluster = MIN (orig_info.cluster, inf->cluster);
-  }
-
   hb_glyph_info_t *pinfo = &out_info[out_len];
   for (unsigned int i = 0; i < num_out; i++)
   {
@@ -297,7 +261,7 @@ hb_buffer_t::replace_glyphs (unsigned int num_in,
 void
 hb_buffer_t::output_glyph (hb_codepoint_t glyph_index)
 {
-  if (!make_room_for (0, 1)) return;
+  if (unlikely (!make_room_for (0, 1))) return;
 
   out_info[out_len] = info[idx];
   out_info[out_len].codepoint = glyph_index;
@@ -308,7 +272,7 @@ hb_buffer_t::output_glyph (hb_codepoint_t glyph_index)
 void
 hb_buffer_t::copy_glyph (void)
 {
-  if (!make_room_for (0, 1)) return;
+  if (unlikely (!make_room_for (0, 1))) return;
 
   out_info[out_len] = info[idx];
 
@@ -318,9 +282,10 @@ hb_buffer_t::copy_glyph (void)
 void
 hb_buffer_t::replace_glyph (hb_codepoint_t glyph_index)
 {
-  if (!make_room_for (1, 1)) return;
-
-  out_info[out_len] = info[idx];
+  if (unlikely (out_info != info || out_len != idx)) {
+    if (unlikely (!make_room_for (1, 1))) return;
+    out_info[out_len] = info[idx];
+  }
   out_info[out_len].codepoint = glyph_index;
 
   idx++;
@@ -332,20 +297,17 @@ hb_buffer_t::next_glyph (void)
 {
   if (have_output)
   {
-    if (out_info != info)
-    {
-      if (unlikely (!ensure (out_len + 1))) return;
+    if (unlikely (out_info != info || out_len != idx)) {
+      if (unlikely (!make_room_for (1, 1))) return;
       out_info[out_len] = info[idx];
     }
-    else if (out_len != idx)
-      out_info[out_len] = info[idx];
-
     out_len++;
   }
 
   idx++;
 }
 
+
 void
 hb_buffer_t::set_masks (hb_mask_t    value,
 			hb_mask_t    mask,
@@ -435,23 +397,57 @@ void
 hb_buffer_t::merge_clusters (unsigned int start,
 			     unsigned int end)
 {
-  unsigned int cluster = this->info[start].cluster;
+  if (unlikely (end - start < 2))
+    return;
+
+  unsigned int cluster = info[start].cluster;
 
   for (unsigned int i = start + 1; i < end; i++)
-    cluster = MIN (cluster, this->info[i].cluster);
+    cluster = MIN (cluster, info[i].cluster);
+
+  /* Extend end */
+  while (end < len && info[end - 1].cluster == info[end].cluster)
+    end++;
+
+  /* Extend start */
+  while (idx < start && info[start - 1].cluster == info[start].cluster)
+    start--;
+
+  /* If we hit the start of buffer, continue in out-buffer. */
+  if (idx == start)
+    for (unsigned i = out_len; i && out_info[i - 1].cluster == info[start].cluster; i--)
+      out_info[i - 1].cluster = cluster;
+
   for (unsigned int i = start; i < end; i++)
-    this->info[i].cluster = cluster;
+    info[i].cluster = cluster;
 }
 void
 hb_buffer_t::merge_out_clusters (unsigned int start,
 				 unsigned int end)
 {
-  unsigned int cluster = this->out_info[start].cluster;
+  if (unlikely (end - start < 2))
+    return;
+
+  unsigned int cluster = out_info[start].cluster;
 
   for (unsigned int i = start + 1; i < end; i++)
-    cluster = MIN (cluster, this->out_info[i].cluster);
+    cluster = MIN (cluster, out_info[i].cluster);
+
+  /* Extend start */
+  while (start && out_info[start - 1].cluster == out_info[start].cluster)
+    start--;
+
+  /* Extend end */
+  while (end < out_len && out_info[end - 1].cluster == out_info[end].cluster)
+    end++;
+
+  /* If we hit the end of out-buffer, continue in buffer. */
+  if (end == out_len)
+    for (unsigned i = idx; i < len && info[i].cluster == out_info[end - 1].cluster; i++)
+      info[i].cluster = cluster;
+
   for (unsigned int i = start; i < end; i++)
-    this->out_info[i].cluster = cluster;
+    out_info[i].cluster = cluster;
 }
 
 void
@@ -460,7 +456,7 @@ hb_buffer_t::guess_properties (void)
   /* If script is set to INVALID, guess from buffer contents */
   if (props.script == HB_SCRIPT_INVALID) {
     for (unsigned int i = 0; i < len; i++) {
-      hb_script_t script = hb_unicode_script (unicode, info[i].codepoint);
+      hb_script_t script = unicode->script (info[i].codepoint);
       if (likely (script != HB_SCRIPT_COMMON &&
 		  script != HB_SCRIPT_INHERITED &&
 		  script != HB_SCRIPT_UNKNOWN)) {
@@ -543,7 +539,7 @@ hb_buffer_create ()
   hb_buffer_t *buffer;
 
   if (!(buffer = hb_object_create<hb_buffer_t> ()))
-    return &_hb_buffer_nil;
+    return hb_buffer_get_empty ();
 
   buffer->reset ();
 
@@ -553,7 +549,18 @@ hb_buffer_create ()
 hb_buffer_t *
 hb_buffer_get_empty (void)
 {
-  return &_hb_buffer_nil;
+  static const hb_buffer_t _hb_buffer_nil = {
+    HB_OBJECT_HEADER_STATIC,
+
+    _HB_BUFFER_UNICODE_FUNCS_DEFAULT,
+    _HB_BUFFER_PROPS_DEFAULT,
+
+    true, /* in_error */
+    true, /* have_output */
+    true  /* have_positions */
+  };
+
+  return const_cast<hb_buffer_t *> (&_hb_buffer_nil);
 }
 
 hb_buffer_t *
@@ -601,7 +608,7 @@ hb_buffer_set_unicode_funcs (hb_buffer_t        *buffer,
     return;
 
   if (!unicode)
-    unicode = _hb_buffer_nil.unicode;
+    unicode = _HB_BUFFER_UNICODE_FUNCS_DEFAULT;
 
   hb_unicode_funcs_reference (unicode);
   hb_unicode_funcs_destroy (buffer->unicode);
@@ -695,8 +702,11 @@ hb_bool_t
 hb_buffer_set_length (hb_buffer_t  *buffer,
 		      unsigned int  length)
 {
+  if (unlikely (hb_object_is_inert (buffer)))
+    return length == 0;
+
   if (!buffer->ensure (length))
-    return FALSE;
+    return false;
 
   /* Wipe the new space */
   if (length > buffer->len) {
@@ -706,7 +716,7 @@ hb_buffer_set_length (hb_buffer_t  *buffer,
   }
 
   buffer->len = length;
-  return TRUE;
+  return true;
 }
 
 unsigned int
@@ -881,3 +891,79 @@ hb_buffer_add_utf32 (hb_buffer_t    *buffer,
 }
 
 
+static int
+compare_info_codepoint (const hb_glyph_info_t *pa,
+			const hb_glyph_info_t *pb)
+{
+  return (int) pb->codepoint - (int) pa->codepoint;
+}
+
+static inline void
+normalize_glyphs_cluster (hb_buffer_t *buffer,
+			  unsigned int start,
+			  unsigned int end,
+			  bool backward)
+{
+  hb_glyph_position_t *pos = buffer->pos;
+
+  /* Total cluster advance */
+  hb_position_t total_x_advance = 0, total_y_advance = 0;
+  for (unsigned int i = start; i < end; i++)
+  {
+    total_x_advance += pos[i].x_advance;
+    total_y_advance += pos[i].y_advance;
+  }
+
+  hb_position_t x_advance = 0, y_advance = 0;
+  for (unsigned int i = start; i < end; i++)
+  {
+    pos[i].x_offset += x_advance;
+    pos[i].y_offset += y_advance;
+
+    x_advance += pos[i].x_advance;
+    y_advance += pos[i].y_advance;
+
+    pos[i].x_advance = 0;
+    pos[i].y_advance = 0;
+  }
+
+  if (backward)
+  {
+    /* Transfer all cluster advance to the last glyph. */
+    pos[end - 1].x_advance = total_x_advance;
+    pos[end - 1].y_advance = total_y_advance;
+
+    hb_bubble_sort (buffer->info + start, end - start - 1, compare_info_codepoint, buffer->pos + start);
+  } else {
+    /* Transfer all cluster advance to the first glyph. */
+    pos[start].x_advance += total_x_advance;
+    pos[start].y_advance += total_y_advance;
+    for (unsigned int i = start + 1; i < end; i++) {
+      pos[i].x_offset -= total_x_advance;
+      pos[i].y_offset -= total_y_advance;
+    }
+    hb_bubble_sort (buffer->info + start + 1, end - start - 1, compare_info_codepoint, buffer->pos + start + 1);
+  }
+}
+
+void
+hb_buffer_normalize_glyphs (hb_buffer_t *buffer)
+{
+  assert (buffer->have_positions);
+  /* XXX assert (buffer->have_glyphs); */
+
+  bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
+
+  unsigned int count = buffer->len;
+  if (unlikely (!count)) return;
+  hb_glyph_info_t *info = buffer->info;
+
+  unsigned int start = 0;
+  unsigned int end;
+  for (end = start + 1; end < count; end++)
+    if (info[start].cluster != info[end].cluster) {
+      normalize_glyphs_cluster (buffer, start, end, backward);
+      start = end;
+    }
+  normalize_glyphs_cluster (buffer, start, end, backward);
+}
diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
index ca1bbf476ac8..d67cfd630a99 100644
--- a/gfx/harfbuzz/src/hb-buffer.h
+++ b/gfx/harfbuzz/src/hb-buffer.h
@@ -40,9 +40,9 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_buffer_t hb_buffer_t;
+typedef struct hb_buffer_t hb_buffer_t;
 
-typedef struct _hb_glyph_info_t {
+typedef struct hb_glyph_info_t {
   hb_codepoint_t codepoint;
   hb_mask_t      mask;
   uint32_t       cluster;
@@ -52,7 +52,7 @@ typedef struct _hb_glyph_info_t {
   hb_var_int_t   var2;
 } hb_glyph_info_t;
 
-typedef struct _hb_glyph_position_t {
+typedef struct hb_glyph_position_t {
   hb_position_t  x_advance;
   hb_position_t  y_advance;
   hb_position_t  x_offset;
@@ -121,13 +121,13 @@ hb_buffer_get_language (hb_buffer_t *buffer);
 void
 hb_buffer_reset (hb_buffer_t *buffer);
 
-/* Returns FALSE if allocation failed */
+/* Returns false if allocation failed */
 hb_bool_t
 hb_buffer_pre_allocate (hb_buffer_t  *buffer,
 		        unsigned int  size);
 
 
-/* Returns FALSE if allocation has failed before */
+/* Returns false if allocation has failed before */
 hb_bool_t
 hb_buffer_allocation_successful (hb_buffer_t  *buffer);
 
@@ -193,6 +193,19 @@ hb_buffer_get_glyph_positions (hb_buffer_t  *buffer,
                                unsigned int *length);
 
 
+/* Reorders a glyph buffer to have canonical in-cluster glyph order / position.
+ * The resulting clusters should behave identical to pre-reordering clusters.
+ * NOTE: This has nothing to do with Unicode normalization. */
+void
+hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
+
+/*
+ * NOT IMPLEMENTED
+void
+hb_buffer_normalize_characters (hb_buffer_t *buffer);
+*/
+
+
 HB_END_DECLS
 
 #endif /* HB_BUFFER_H */
diff --git a/gfx/harfbuzz/src/hb-cache-private.hh b/gfx/harfbuzz/src/hb-cache-private.hh
index a0928a0514ed..19b70b7e3958 100644
--- a/gfx/harfbuzz/src/hb-cache-private.hh
+++ b/gfx/harfbuzz/src/hb-cache-private.hh
@@ -49,6 +49,8 @@ struct hb_cache_t
     unsigned int v = values[k];
     if ((v >> value_bits) != (key >> cache_bits))
       return false;
+    *value = v & ((1<<value_bits)-1);
+    return true;
   }
 
   inline bool set (unsigned int key, unsigned int value)
diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
index bfbba6594579..baf597750698 100644
--- a/gfx/harfbuzz/src/hb-common.cc
+++ b/gfx/harfbuzz/src/hb-common.cc
@@ -98,7 +98,7 @@ hb_direction_to_string (hb_direction_t direction)
 
 /* hb_language_t */
 
-struct _hb_language_t {
+struct hb_language_impl_t {
   const char s[1];
 };
 
@@ -114,18 +114,16 @@ static const char canon_map[256] = {
 };
 
 static hb_bool_t
-lang_equal (const void *v1,
-	    const void *v2)
+lang_equal (hb_language_t  v1,
+	    const void    *v2)
 {
   const unsigned char *p1 = (const unsigned char *) v1;
   const unsigned char *p2 = (const unsigned char *) v2;
 
-  while (canon_map[*p1] && canon_map[*p1] == canon_map[*p2])
-    {
-      p1++, p2++;
-    }
+  while (*p1 && *p1 == canon_map[*p2])
+    p1++, p2++;
 
-  return (canon_map[*p1] == canon_map[*p2]);
+  return *p1 == canon_map[*p2];
 }
 
 #if 0
@@ -147,6 +145,7 @@ lang_hash (const void *key)
 
 struct hb_language_item_t {
 
+  struct hb_language_item_t *next;
   hb_language_t lang;
 
   inline bool operator == (const char *s) const {
@@ -164,10 +163,52 @@ struct hb_language_item_t {
   void finish (void) { free (lang); }
 };
 
-static struct hb_static_lang_set_t : hb_lockable_set_t<hb_language_item_t, hb_static_mutex_t> {
-  ~hb_static_lang_set_t (void) { this->finish (lock); }
-  hb_static_mutex_t lock;
-} langs;
+
+/* Thread-safe lock-free language list */
+
+static hb_language_item_t *langs;
+
+static
+void free_langs (void)
+{
+  while (langs) {
+    hb_language_item_t *next = langs->next;
+    langs->finish ();
+    free (langs);
+    langs = next;
+  }
+}
+
+static hb_language_item_t *
+lang_find_or_insert (const char *key)
+{
+retry:
+  hb_language_item_t *first_lang = (hb_language_item_t *) hb_atomic_ptr_get (&langs);
+
+  for (hb_language_item_t *lang = first_lang; lang; lang = lang->next)
+    if (*lang == key)
+      return lang;
+
+  /* Not found; allocate one. */
+  hb_language_item_t *lang = (hb_language_item_t *) calloc (1, sizeof (hb_language_item_t));
+  if (unlikely (!lang))
+    return NULL;
+  lang->next = first_lang;
+  *lang = key;
+
+  if (!hb_atomic_ptr_cmpexch (&langs, first_lang, lang)) {
+    free (lang);
+    goto retry;
+  }
+
+#ifdef HAVE_ATEXIT
+  if (!first_lang)
+    atexit (free_langs); /* First person registers atexit() callback. */
+#endif
+
+  return lang;
+}
+
 
 hb_language_t
 hb_language_from_string (const char *str, int len)
@@ -182,7 +223,7 @@ hb_language_from_string (const char *str, int len)
     strbuf[len] = '\0';
   }
 
-  hb_language_item_t *item = langs.find_or_insert (str, langs.lock);
+  hb_language_item_t *item = lang_find_or_insert (str);
 
   return likely (item) ? item->lang : HB_LANGUAGE_INVALID;
 }
@@ -314,47 +355,41 @@ hb_script_get_horizontal_direction (hb_script_t script)
 
 /* hb_user_data_array_t */
 
-
-/* NOTE: Currently we use a global lock for user_data access
- * threadsafety.  If one day we add a mutex to any object, we
- * should switch to using that insted for these too.
- */
-
-static hb_static_mutex_t user_data_lock;
-
 bool
 hb_user_data_array_t::set (hb_user_data_key_t *key,
 			   void *              data,
 			   hb_destroy_func_t   destroy,
-			   hb_bool_t           replace)
+			   hb_bool_t           replace,
+			   hb_mutex_t         &lock)
 {
   if (!key)
     return false;
 
   if (replace) {
     if (!data && !destroy) {
-      items.remove (key, user_data_lock);
+      items.remove (key, lock);
       return true;
     }
   }
   hb_user_data_item_t item = {key, data, destroy};
-  bool ret = !!items.replace_or_insert (item, user_data_lock, replace);
+  bool ret = !!items.replace_or_insert (item, lock, replace);
 
   return ret;
 }
 
 void *
-hb_user_data_array_t::get (hb_user_data_key_t *key)
+hb_user_data_array_t::get (hb_user_data_key_t *key,
+			   hb_mutex_t         &lock)
 {
   hb_user_data_item_t item = {NULL };
 
-  return items.find (key, &item, user_data_lock) ? item.data : NULL;
+  return items.find (key, &item, lock) ? item.data : NULL;
 }
 
 void
-hb_user_data_array_t::finish (void)
+hb_user_data_array_t::finish (hb_mutex_t &lock)
 {
-  items.finish (user_data_lock);
+  items.finish (lock);
 }
 
 
diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h
index 562b04cec60c..6f2a709b2b88 100644
--- a/gfx/harfbuzz/src/hb-common.h
+++ b/gfx/harfbuzz/src/hb-common.h
@@ -33,6 +33,7 @@
 #ifndef HB_COMMON_H
 #define HB_COMMON_H
 
+#ifndef HB_BEGIN_DECLS
 # ifdef __cplusplus
 #  define HB_BEGIN_DECLS	extern "C" {
 #  define HB_END_DECLS		}
@@ -40,6 +41,7 @@
 #  define HB_BEGIN_DECLS
 #  define HB_END_DECLS
 # endif /* !__cplusplus */
+#endif
 
 HB_BEGIN_DECLS
 
@@ -124,7 +126,7 @@ hb_direction_to_string (hb_direction_t direction);
 
 /* hb_language_t */
 
-typedef struct _hb_language_t *hb_language_t;
+typedef struct hb_language_impl_t *hb_language_t;
 
 /* len=-1 means str is NUL-terminated */
 hb_language_t
@@ -139,47 +141,11 @@ hb_language_t
 hb_language_get_default (void);
 
 
-/* hb_unicode_general_category_t */
-
-typedef enum
-{
-  HB_UNICODE_GENERAL_CATEGORY_CONTROL,			/* Cc */
-  HB_UNICODE_GENERAL_CATEGORY_FORMAT,			/* Cf */
-  HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED,		/* Cn */
-  HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE,		/* Co */
-  HB_UNICODE_GENERAL_CATEGORY_SURROGATE,		/* Cs */
-  HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER,		/* Ll */
-  HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER,		/* Lm */
-  HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER,		/* Lo */
-  HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER,		/* Lt */
-  HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER,		/* Lu */
-  HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK,		/* Mc */
-  HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK,		/* Me */
-  HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK,		/* Mn */
-  HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER,		/* Nd */
-  HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER,		/* Nl */
-  HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER,		/* No */
-  HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION,	/* Pc */
-  HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION,		/* Pd */
-  HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION,	/* Pe */
-  HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION,	/* Pf */
-  HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION,	/* Pi */
-  HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION,	/* Po */
-  HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION,		/* Ps */
-  HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL,		/* Sc */
-  HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL,		/* Sk */
-  HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL,		/* Sm */
-  HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL,		/* So */
-  HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR,		/* Zl */
-  HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR,	/* Zp */
-  HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR		/* Zs */
-} hb_unicode_general_category_t;
-
-
 /* hb_script_t */
 
 /* http://unicode.org/iso15924/ */
 /* http://goo.gl/x9ilM */
+/* Unicode Character Database property: Script (sc) */
 typedef enum
 {
   /* Unicode-1.1 additions */
@@ -333,7 +299,7 @@ hb_script_get_horizontal_direction (hb_script_t script);
 
 /* User data */
 
-typedef struct _hb_user_data_key_t {
+typedef struct hb_user_data_key_t {
   /*< private >*/
   char unused;
 } hb_user_data_key_t;
diff --git a/gfx/harfbuzz/src/hb-coretext.cc b/gfx/harfbuzz/src/hb-coretext.cc
new file mode 100644
index 000000000000..5e1be9cc0bbf
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-coretext.cc
@@ -0,0 +1,357 @@
+/*
+ * Copyright © 2012  Mozilla Foundation.
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Mozilla Author(s): Jonathan Kew
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#define HB_SHAPER coretext
+#include "hb-shaper-impl-private.hh"
+
+#define GlyphID GlyphID_mac
+#include <ApplicationServices/ApplicationServices.h>
+#undef GlyphID
+
+#include "hb-coretext.h"
+
+
+#ifndef HB_DEBUG_CORETEXT
+#define HB_DEBUG_CORETEXT (HB_DEBUG+0)
+#endif
+
+
+HB_SHAPER_DATA_ENSURE_DECLARE(coretext, face)
+HB_SHAPER_DATA_ENSURE_DECLARE(coretext, font)
+
+
+/*
+ * shaper face data
+ */
+
+struct hb_coretext_shaper_face_data_t {
+  CGFontRef cg_font;
+};
+
+static void
+release_data (void *info, const void *data, size_t size)
+{
+  assert (hb_blob_get_length ((hb_blob_t *) info) == size &&
+          hb_blob_get_data ((hb_blob_t *) info, NULL) == data);
+
+  hb_blob_destroy ((hb_blob_t *) info);
+}
+
+hb_coretext_shaper_face_data_t *
+_hb_coretext_shaper_face_data_create (hb_face_t *face)
+{
+  hb_coretext_shaper_face_data_t *data = (hb_coretext_shaper_face_data_t *) calloc (1, sizeof (hb_coretext_shaper_face_data_t));
+  if (unlikely (!data))
+    return NULL;
+
+  hb_blob_t *blob = hb_face_reference_blob (face);
+  unsigned int blob_length;
+  const char *blob_data = hb_blob_get_data (blob, &blob_length);
+  if (unlikely (!blob_length))
+    DEBUG_MSG (CORETEXT, face, "Face has empty blob");
+
+  CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data);
+  data->cg_font = CGFontCreateWithDataProvider (provider);
+  CGDataProviderRelease (provider);
+
+  if (unlikely (!data->cg_font)) {
+    DEBUG_MSG (CORETEXT, face, "Face CGFontCreateWithDataProvider() failed");
+    free (data);
+    return NULL;
+  }
+
+  return data;
+}
+
+void
+_hb_coretext_shaper_face_data_destroy (hb_coretext_shaper_face_data_t *data)
+{
+  CFRelease (data->cg_font);
+  free (data);
+}
+
+
+/*
+ * shaper font data
+ */
+
+struct hb_coretext_shaper_font_data_t {
+  CTFontRef ct_font;
+};
+
+hb_coretext_shaper_font_data_t *
+_hb_coretext_shaper_font_data_create (hb_font_t *font)
+{
+  if (unlikely (!hb_coretext_shaper_face_data_ensure (font->face))) return NULL;
+
+  hb_coretext_shaper_font_data_t *data = (hb_coretext_shaper_font_data_t *) calloc (1, sizeof (hb_coretext_shaper_font_data_t));
+  if (unlikely (!data))
+    return NULL;
+
+  hb_face_t *face = font->face;
+  hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
+
+  data->ct_font = CTFontCreateWithGraphicsFont (face_data->cg_font, font->y_scale, NULL, NULL);
+  if (unlikely (!data->ct_font)) {
+    DEBUG_MSG (CORETEXT, font, "Font CTFontCreateWithGraphicsFont() failed");
+    free (data);
+    return NULL;
+  }
+
+  return data;
+}
+
+void
+_hb_coretext_shaper_font_data_destroy (hb_coretext_shaper_font_data_t *data)
+{
+  CFRelease (data->ct_font);
+  free (data);
+}
+
+
+/*
+ * shaper shape_plan data
+ */
+
+struct hb_coretext_shaper_shape_plan_data_t {};
+
+hb_coretext_shaper_shape_plan_data_t *
+_hb_coretext_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
+					     const hb_feature_t *user_features,
+					     unsigned int        num_user_features)
+{
+  return (hb_coretext_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+}
+
+void
+_hb_coretext_shaper_shape_plan_data_destroy (hb_coretext_shaper_shape_plan_data_t *data)
+{
+}
+
+
+/*
+ * shaper
+ */
+
+CTFontRef
+hb_coretext_font_get_ct_font (hb_font_t *font)
+{
+  if (unlikely (!hb_coretext_shaper_font_data_ensure (font))) return 0;
+  hb_coretext_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
+  return font_data->ct_font;
+}
+
+hb_bool_t
+_hb_coretext_shape (hb_shape_plan_t    *shape_plan,
+		    hb_font_t          *font,
+                    hb_buffer_t        *buffer,
+                    const hb_feature_t *features,
+                    unsigned int        num_features)
+{
+  hb_face_t *face = font->face;
+  hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
+  hb_coretext_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
+
+#define FAIL(...) \
+  HB_STMT_START { \
+    DEBUG_MSG (CORETEXT, NULL, __VA_ARGS__); \
+    return false; \
+  } HB_STMT_END;
+
+  unsigned int scratch_size;
+  char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+
+#define utf16_index() var1.u32
+
+  UniChar *pchars = (UniChar *) scratch;
+  unsigned int chars_len = 0;
+  for (unsigned int i = 0; i < buffer->len; i++) {
+    hb_codepoint_t c = buffer->info[i].codepoint;
+    buffer->info[i].utf16_index() = chars_len;
+    if (likely (c < 0x10000))
+      pchars[chars_len++] = c;
+    else if (unlikely (c >= 0x110000))
+      pchars[chars_len++] = 0xFFFD;
+    else {
+      pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10);
+      pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1));
+    }
+  }
+
+#undef utf16_index
+
+  CFStringRef string_ref = CFStringCreateWithCharactersNoCopy (kCFAllocatorDefault,
+                                                               pchars, chars_len,
+                                                               kCFAllocatorNull);
+
+  CFDictionaryRef attrs = CFDictionaryCreate (kCFAllocatorDefault,
+                                              (const void**) &kCTFontAttributeName,
+                                              (const void**) &font_data->ct_font,
+                                              1, // count of attributes
+                                              &kCFTypeDictionaryKeyCallBacks,
+                                              &kCFTypeDictionaryValueCallBacks);
+
+  // TODO: support features
+
+  // Now we can create an attributed string
+  CFAttributedStringRef attr_string = CFAttributedStringCreate (kCFAllocatorDefault, string_ref, attrs);
+  CFRelease (string_ref);
+  CFRelease (attrs);
+
+  // Create the CoreText line from our string, then we're done with it
+  CTLineRef line = CTLineCreateWithAttributedString (attr_string);
+  CFRelease (attr_string);
+
+  // and finally retrieve the glyph data and store into the gfxTextRun
+  CFArrayRef glyph_runs = CTLineGetGlyphRuns (line);
+  unsigned int num_runs = CFArrayGetCount (glyph_runs);
+
+  // Iterate through the glyph runs.
+  bool success = true;
+  buffer->len = 0;
+
+  const CFRange range_all = CFRangeMake (0, 0);
+
+  for (unsigned int i = 0; i < num_runs; i++) {
+    CTRunRef run = (CTRunRef) CFArrayGetValueAtIndex (glyph_runs, i);
+
+    unsigned int num_glyphs = CTRunGetGlyphCount (run);
+    if (num_glyphs == 0)
+      continue;
+
+    buffer->ensure (buffer->len + num_glyphs);
+
+    // retrieve the laid-out glyph data from the CTRun
+
+    // Testing indicates that CTRunGetGlyphsPtr (almost?) always succeeds,
+    // and so copying data to our own buffer with CTRunGetGlyphs will be
+    // extremely rare.
+
+    unsigned int scratch_size;
+    char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+
+#define ALLOCATE_ARRAY(Type, name, len) \
+  Type *name = (Type *) scratch; \
+  scratch += (len) * sizeof ((name)[0]); \
+  scratch_size -= (len) * sizeof ((name)[0]);
+
+    const CGGlyph* glyphs = CTRunGetGlyphsPtr (run);
+    if (!glyphs) {
+      ALLOCATE_ARRAY (CGGlyph, glyph_buf, num_glyphs);
+      CTRunGetGlyphs (run, range_all, glyph_buf);
+      glyphs = glyph_buf;
+    }
+
+    const CGPoint* positions = CTRunGetPositionsPtr (run);
+    if (!positions) {
+      ALLOCATE_ARRAY (CGPoint, position_buf, num_glyphs);
+      CTRunGetPositions (run, range_all, position_buf);
+      positions = position_buf;
+    }
+
+    const CFIndex* string_indices = CTRunGetStringIndicesPtr (run);
+    if (!string_indices) {
+      ALLOCATE_ARRAY (CFIndex, index_buf, num_glyphs);
+      CTRunGetStringIndices (run, range_all, index_buf);
+      string_indices = index_buf;
+    }
+
+#undef ALLOCATE_ARRAY
+
+    double run_width = CTRunGetTypographicBounds (run, range_all, NULL, NULL, NULL);
+
+    for (unsigned int j = 0; j < num_glyphs; j++) {
+      double advance = (j + 1 < num_glyphs ? positions[j + 1].x : positions[0].x + run_width) - positions[j].x;
+
+      hb_glyph_info_t *info = &buffer->info[buffer->len];
+      hb_glyph_position_t *pos = &buffer->pos[buffer->len];
+
+      info->codepoint = glyphs[j];
+      info->cluster = string_indices[j];
+
+      // currently, we do all x-positioning by setting the advance, we never use x-offset
+      info->mask = advance;
+      info->var1.u32 = 0;
+      info->var2.u32 = positions[j].y;
+
+      buffer->len++;
+    }
+  }
+
+  buffer->clear_positions ();
+
+  unsigned int count = buffer->len;
+  for (unsigned int i = 0; i < count; ++i) {
+    hb_glyph_info_t *info = &buffer->info[i];
+    hb_glyph_position_t *pos = &buffer->pos[i];
+
+    /* TODO vertical */
+    pos->x_advance = info->mask;
+    pos->x_offset = info->var1.u32;
+    pos->y_offset = info->var2.u32;
+  }
+
+  // Fix up clusters so that we never return out-of-order indices;
+  // if core text has reordered glyphs, we'll merge them to the
+  // beginning of the reordered cluster.
+  // This does *not* mean we'll form the same clusters as Uniscribe
+  // or the native OT backend, only that the cluster indices will be
+  // non-decreasing in the output buffer.
+  if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) {
+    unsigned int prev_cluster = 0;
+    for (unsigned int i = 0; i < count; i++) {
+      unsigned int curr_cluster = buffer->info[i].cluster;
+      if (curr_cluster < prev_cluster) {
+        for (unsigned int j = i; j > 0; j--) {
+          if (buffer->info[j - 1].cluster > curr_cluster)
+            buffer->info[j - 1].cluster = curr_cluster;
+          else
+            break;
+        }
+      }
+      prev_cluster = curr_cluster;
+    }
+  } else {
+    // For RTL runs, we make them non-increasing instead.
+    unsigned int prev_cluster = (unsigned int)-1;
+    for (unsigned int i = 0; i < count; i++) {
+      unsigned int curr_cluster = buffer->info[i].cluster;
+      if (curr_cluster > prev_cluster) {
+        for (unsigned int j = i; j > 0; j--) {
+          if (buffer->info[j - 1].cluster < curr_cluster)
+            buffer->info[j - 1].cluster = curr_cluster;
+          else
+            break;
+        }
+      }
+      prev_cluster = curr_cluster;
+    }
+  }
+
+  return true;
+}
diff --git a/gfx/harfbuzz/src/hb-coretext.h b/gfx/harfbuzz/src/hb-coretext.h
new file mode 100644
index 000000000000..0b34203d991f
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-coretext.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012  Mozilla Foundation.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Mozilla Author(s): Jonathan Kew
+ */
+
+#ifndef HB_CORETEXT_H
+#define HB_CORETEXT_H
+
+#include "hb.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+
+HB_BEGIN_DECLS
+
+
+CTFontRef
+hb_coretext_font_get_ct_font (hb_font_t *font);
+
+
+HB_END_DECLS
+
+#endif /* HB_CORETEXT_H */
diff --git a/gfx/harfbuzz/src/hb-fallback-shape.cc b/gfx/harfbuzz/src/hb-fallback-shape.cc
index 20ea43e7fc23..529e5d3ea8e8 100644
--- a/gfx/harfbuzz/src/hb-fallback-shape.cc
+++ b/gfx/harfbuzz/src/hb-fallback-shape.cc
@@ -24,38 +24,106 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#include "hb-fallback-shape-private.hh"
+#define HB_SHAPER fallback
+#include "hb-shaper-impl-private.hh"
 
-#include "hb-buffer-private.hh"
+
+/*
+ * shaper face data
+ */
+
+struct hb_fallback_shaper_face_data_t {};
+
+hb_fallback_shaper_face_data_t *
+_hb_fallback_shaper_face_data_create (hb_face_t *face)
+{
+  return (hb_fallback_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+}
+
+void
+_hb_fallback_shaper_face_data_destroy (hb_fallback_shaper_face_data_t *data)
+{
+}
+
+
+/*
+ * shaper font data
+ */
+
+struct hb_fallback_shaper_font_data_t {};
+
+hb_fallback_shaper_font_data_t *
+_hb_fallback_shaper_font_data_create (hb_font_t *font)
+{
+  return (hb_fallback_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+}
+
+void
+_hb_fallback_shaper_font_data_destroy (hb_fallback_shaper_font_data_t *data)
+{
+}
+
+
+/*
+ * shaper shape_plan data
+ */
+
+struct hb_fallback_shaper_shape_plan_data_t {};
+
+hb_fallback_shaper_shape_plan_data_t *
+_hb_fallback_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
+					    const hb_feature_t *user_features,
+					    unsigned int        num_user_features)
+{
+  return (hb_fallback_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+}
+
+void
+_hb_fallback_shaper_shape_plan_data_destroy (hb_fallback_shaper_shape_plan_data_t *data)
+{
+}
+
+
+/*
+ * shaper
+ */
 
 hb_bool_t
-_hb_fallback_shape (hb_font_t          *font,
+_hb_fallback_shape (hb_shape_plan_t    *shape_plan,
+		    hb_font_t          *font,
 		    hb_buffer_t        *buffer,
 		    const hb_feature_t *features HB_UNUSED,
 		    unsigned int        num_features HB_UNUSED)
 {
+  hb_codepoint_t space;
+  font->get_glyph (' ', 0, &space);
+
   buffer->guess_properties ();
+  buffer->clear_positions ();
 
   unsigned int count = buffer->len;
 
   for (unsigned int i = 0; i < count; i++)
-    hb_font_get_glyph (font, buffer->info[i].codepoint, 0, &buffer->info[i].codepoint);
-
-  buffer->clear_positions ();
-
-  for (unsigned int i = 0; i < count; i++) {
-    hb_font_get_glyph_advance_for_direction (font, buffer->info[i].codepoint,
-					     buffer->props.direction,
-					     &buffer->pos[i].x_advance,
-					     &buffer->pos[i].y_advance);
-    hb_font_subtract_glyph_origin_for_direction (font, buffer->info[i].codepoint,
-						 buffer->props.direction,
-						 &buffer->pos[i].x_offset,
-						 &buffer->pos[i].y_offset);
+  {
+    if (buffer->unicode->is_zero_width (buffer->info[i].codepoint)) {
+      buffer->info[i].codepoint = space;
+      buffer->pos[i].x_advance = 0;
+      buffer->pos[i].y_advance = 0;
+      continue;
+    }
+    font->get_glyph (buffer->info[i].codepoint, 0, &buffer->info[i].codepoint);
+    font->get_glyph_advance_for_direction (buffer->info[i].codepoint,
+					   buffer->props.direction,
+					   &buffer->pos[i].x_advance,
+					   &buffer->pos[i].y_advance);
+    font->subtract_glyph_origin_for_direction (buffer->info[i].codepoint,
+					       buffer->props.direction,
+					       &buffer->pos[i].x_offset,
+					       &buffer->pos[i].y_offset);
   }
 
   if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
     hb_buffer_reverse (buffer);
 
-  return TRUE;
+  return true;
 }
diff --git a/gfx/harfbuzz/src/hb-font-private.hh b/gfx/harfbuzz/src/hb-font-private.hh
index d896e72efe80..56c5913a6dc9 100644
--- a/gfx/harfbuzz/src/hb-font-private.hh
+++ b/gfx/harfbuzz/src/hb-font-private.hh
@@ -33,6 +33,8 @@
 
 #include "hb-font.h"
 #include "hb-object-private.hh"
+#include "hb-shaper-private.hh"
+#include "hb-shape-plan-private.hh"
 
 
 
@@ -50,10 +52,13 @@
   HB_FONT_FUNC_IMPLEMENT (glyph_v_kerning) \
   HB_FONT_FUNC_IMPLEMENT (glyph_extents) \
   HB_FONT_FUNC_IMPLEMENT (glyph_contour_point) \
+  HB_FONT_FUNC_IMPLEMENT (glyph_name) \
+  HB_FONT_FUNC_IMPLEMENT (glyph_from_name) \
   /* ^--- Add new callbacks here */
 
-struct _hb_font_funcs_t {
+struct hb_font_funcs_t {
   hb_object_header_t header;
+  ASSERT_POD ();
 
   hb_bool_t immutable;
 
@@ -83,8 +88,9 @@ struct _hb_font_funcs_t {
  * hb_face_t
  */
 
-struct _hb_face_t {
+struct hb_face_t {
   hb_object_header_t header;
+  ASSERT_POD ();
 
   hb_bool_t immutable;
 
@@ -92,19 +98,31 @@ struct _hb_face_t {
   void                      *user_data;
   hb_destroy_func_t          destroy;
 
-  struct hb_ot_layout_t *ot_layout;
-
   unsigned int index;
   unsigned int upem;
+
+  struct hb_shaper_data_t shaper_data;
+
+  struct plan_node_t {
+    hb_shape_plan_t *shape_plan;
+    plan_node_t *next;
+  } *shape_plans;
 };
 
+#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, face);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
+
 
 /*
  * hb_font_t
  */
 
-struct _hb_font_t {
+struct hb_font_t {
   hb_object_header_t header;
+  ASSERT_POD ();
 
   hb_bool_t immutable;
 
@@ -121,6 +139,8 @@ struct _hb_font_t {
   void              *user_data;
   hb_destroy_func_t  destroy;
 
+  struct hb_shaper_data_t shaper_data;
+
 
   /* Convert from font-space to user-space */
   inline hb_position_t em_scale_x (int16_t v) { return em_scale (v, this->x_scale); }
@@ -154,10 +174,219 @@ struct _hb_font_t {
   }
 
 
+  /* Public getters */
+
+  inline hb_bool_t get_glyph (hb_codepoint_t unicode, hb_codepoint_t variation_selector,
+			      hb_codepoint_t *glyph)
+  {
+    *glyph = 0;
+    return klass->get.glyph (this, user_data,
+			     unicode, variation_selector, glyph,
+			     klass->user_data.glyph);
+  }
+
+  inline hb_position_t get_glyph_h_advance (hb_codepoint_t glyph)
+  {
+    return klass->get.glyph_h_advance (this, user_data,
+				       glyph,
+				       klass->user_data.glyph_h_advance);
+  }
+
+  inline hb_position_t get_glyph_v_advance (hb_codepoint_t glyph)
+  {
+    return klass->get.glyph_v_advance (this, user_data,
+				       glyph,
+				       klass->user_data.glyph_v_advance);
+  }
+
+  inline hb_bool_t get_glyph_h_origin (hb_codepoint_t glyph,
+				       hb_position_t *x, hb_position_t *y)
+  {
+    *x = *y = 0;
+    return klass->get.glyph_h_origin (this, user_data,
+				      glyph, x, y,
+				      klass->user_data.glyph_h_origin);
+  }
+
+  inline hb_bool_t get_glyph_v_origin (hb_codepoint_t glyph,
+				       hb_position_t *x, hb_position_t *y)
+  {
+    *x = *y = 0;
+    return klass->get.glyph_v_origin (this, user_data,
+				      glyph, x, y,
+				      klass->user_data.glyph_v_origin);
+  }
+
+  inline hb_position_t get_glyph_h_kerning (hb_codepoint_t left_glyph, hb_codepoint_t right_glyph)
+  {
+    return klass->get.glyph_h_kerning (this, user_data,
+				       left_glyph, right_glyph,
+				       klass->user_data.glyph_h_kerning);
+  }
+
+  inline hb_position_t get_glyph_v_kerning (hb_codepoint_t left_glyph, hb_codepoint_t right_glyph)
+  {
+    return klass->get.glyph_v_kerning (this, user_data,
+				       left_glyph, right_glyph,
+				       klass->user_data.glyph_v_kerning);
+  }
+
+  inline hb_bool_t get_glyph_extents (hb_codepoint_t glyph,
+				      hb_glyph_extents_t *extents)
+  {
+    memset (extents, 0, sizeof (*extents));
+    return klass->get.glyph_extents (this, user_data,
+				     glyph,
+				     extents,
+				     klass->user_data.glyph_extents);
+  }
+
+  inline hb_bool_t get_glyph_contour_point (hb_codepoint_t glyph, unsigned int point_index,
+					    hb_position_t *x, hb_position_t *y)
+  {
+    *x = *y = 0;
+    return klass->get.glyph_contour_point (this, user_data,
+					   glyph, point_index,
+					   x, y,
+					   klass->user_data.glyph_contour_point);
+  }
+
+  inline hb_bool_t get_glyph_name (hb_codepoint_t glyph,
+				   char *name, unsigned int size)
+  {
+    return klass->get.glyph_name (this, user_data,
+				  glyph,
+				  name, size,
+				  klass->user_data.glyph_name);
+  }
+
+  inline hb_bool_t get_glyph_from_name (const char *name, int len, /* -1 means nul-terminated */
+					hb_codepoint_t *glyph)
+  {
+    return klass->get.glyph_from_name (this, user_data,
+				       name, len,
+				       glyph,
+				       klass->user_data.glyph_from_name);
+  }
+
+
+  /* A bit higher-level, and with fallback */
+
+  inline void get_glyph_advance_for_direction (hb_codepoint_t glyph,
+					       hb_direction_t direction,
+					       hb_position_t *x, hb_position_t *y)
+  {
+    if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
+      *x = get_glyph_h_advance (glyph);
+      *y = 0;
+    } else {
+      *x = 0;
+      *y = get_glyph_v_advance (glyph);
+    }
+  }
+
+  /* Internal only */
+  inline void guess_v_origin_minus_h_origin (hb_codepoint_t glyph,
+					     hb_position_t *x, hb_position_t *y)
+  {
+    *x = get_glyph_h_advance (glyph) / 2;
+
+    /* TODO use font_metics.ascent */
+    *y = y_scale;
+  }
+
+  inline void get_glyph_origin_for_direction (hb_codepoint_t glyph,
+					      hb_direction_t direction,
+					      hb_position_t *x, hb_position_t *y)
+  {
+    if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
+      hb_bool_t ret = get_glyph_h_origin (glyph, x, y);
+      if (!ret && (ret = get_glyph_v_origin (glyph, x, y))) {
+	hb_position_t dx, dy;
+	guess_v_origin_minus_h_origin (glyph, &dx, &dy);
+	*x -= dx; *y -= dy;
+      }
+    } else {
+      hb_bool_t ret = get_glyph_v_origin (glyph, x, y);
+      if (!ret && (ret = get_glyph_h_origin (glyph, x, y))) {
+	hb_position_t dx, dy;
+	guess_v_origin_minus_h_origin (glyph, &dx, &dy);
+	*x += dx; *y += dy;
+      }
+    }
+  }
+
+  inline void add_glyph_origin_for_direction (hb_codepoint_t glyph,
+					      hb_direction_t direction,
+					      hb_position_t *x, hb_position_t *y)
+  {
+    hb_position_t origin_x, origin_y;
+
+    get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y);
+
+    *x += origin_x;
+    *y += origin_y;
+  }
+
+  inline void subtract_glyph_origin_for_direction (hb_codepoint_t glyph,
+						   hb_direction_t direction,
+						   hb_position_t *x, hb_position_t *y)
+  {
+    hb_position_t origin_x, origin_y;
+
+    get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y);
+
+    *x -= origin_x;
+    *y -= origin_y;
+  }
+
+  inline void get_glyph_kerning_for_direction (hb_codepoint_t first_glyph, hb_codepoint_t second_glyph,
+					       hb_direction_t direction,
+					       hb_position_t *x, hb_position_t *y)
+  {
+    if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
+      *x = get_glyph_h_kerning (first_glyph, second_glyph);
+      *y = 0;
+    } else {
+      *x = 0;
+      *y = get_glyph_v_kerning (first_glyph, second_glyph);
+    }
+  }
+
+  inline hb_bool_t get_glyph_extents_for_origin (hb_codepoint_t glyph,
+						 hb_direction_t direction,
+						 hb_glyph_extents_t *extents)
+  {
+    hb_bool_t ret = get_glyph_extents (glyph, extents);
+
+    if (ret)
+      subtract_glyph_origin_for_direction (glyph, direction, &extents->x_bearing, &extents->y_bearing);
+
+    return ret;
+  }
+
+  inline hb_bool_t get_glyph_contour_point_for_origin (hb_codepoint_t glyph, unsigned int point_index,
+						       hb_direction_t direction,
+						       hb_position_t *x, hb_position_t *y)
+  {
+    hb_bool_t ret = get_glyph_contour_point (glyph, point_index, x, y);
+
+    if (ret)
+      subtract_glyph_origin_for_direction (glyph, direction, x, y);
+
+    return ret;
+  }
+
+
   private:
   inline hb_position_t em_scale (int16_t v, int scale) { return v * (int64_t) scale / hb_face_get_upem (this->face); }
 };
 
+#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, font);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
 
 
 #endif /* HB_FONT_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
index e314ad5b96f5..48bfaababb28 100644
--- a/gfx/harfbuzz/src/hb-font.cc
+++ b/gfx/harfbuzz/src/hb-font.cc
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2009  Red Hat, Inc.
+ * Copyright © 2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -22,6 +23,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
  */
 
 #include "hb-private.hh"
@@ -44,7 +46,7 @@
  */
 
 static hb_bool_t
-hb_font_get_glyph_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_nil (hb_font_t *font,
 		       void *font_data HB_UNUSED,
 		       hb_codepoint_t unicode,
 		       hb_codepoint_t variation_selector,
@@ -55,11 +57,11 @@ hb_font_get_glyph_nil (hb_font_t *font HB_UNUSED,
     return hb_font_get_glyph (font->parent, unicode, variation_selector, glyph);
 
   *glyph = 0;
-  return FALSE;
+  return false;
 }
 
 static hb_position_t
-hb_font_get_glyph_h_advance_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_h_advance_nil (hb_font_t *font,
 				 void *font_data HB_UNUSED,
 				 hb_codepoint_t glyph,
 				 void *user_data HB_UNUSED)
@@ -71,7 +73,7 @@ hb_font_get_glyph_h_advance_nil (hb_font_t *font HB_UNUSED,
 }
 
 static hb_position_t
-hb_font_get_glyph_v_advance_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_v_advance_nil (hb_font_t *font,
 				 void *font_data HB_UNUSED,
 				 hb_codepoint_t glyph,
 				 void *user_data HB_UNUSED)
@@ -83,7 +85,7 @@ hb_font_get_glyph_v_advance_nil (hb_font_t *font HB_UNUSED,
 }
 
 static hb_bool_t
-hb_font_get_glyph_h_origin_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_h_origin_nil (hb_font_t *font,
 				void *font_data HB_UNUSED,
 				hb_codepoint_t glyph,
 				hb_position_t *x,
@@ -91,20 +93,18 @@ hb_font_get_glyph_h_origin_nil (hb_font_t *font HB_UNUSED,
 				void *user_data HB_UNUSED)
 {
   if (font->parent) {
-    hb_bool_t ret = hb_font_get_glyph_h_origin (font->parent,
-						glyph,
-						x, y);
+    hb_bool_t ret = hb_font_get_glyph_h_origin (font->parent, glyph, x, y);
     if (ret)
       font->parent_scale_position (x, y);
     return ret;
   }
 
   *x = *y = 0;
-  return FALSE;
+  return false;
 }
 
 static hb_bool_t
-hb_font_get_glyph_v_origin_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_v_origin_nil (hb_font_t *font,
 				void *font_data HB_UNUSED,
 				hb_codepoint_t glyph,
 				hb_position_t *x,
@@ -112,20 +112,18 @@ hb_font_get_glyph_v_origin_nil (hb_font_t *font HB_UNUSED,
 				void *user_data HB_UNUSED)
 {
   if (font->parent) {
-    hb_bool_t ret = hb_font_get_glyph_v_origin (font->parent,
-						glyph,
-						x, y);
+    hb_bool_t ret = hb_font_get_glyph_v_origin (font->parent, glyph, x, y);
     if (ret)
       font->parent_scale_position (x, y);
     return ret;
   }
 
   *x = *y = 0;
-  return FALSE;
+  return false;
 }
 
 static hb_position_t
-hb_font_get_glyph_h_kerning_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_h_kerning_nil (hb_font_t *font,
 				 void *font_data HB_UNUSED,
 				 hb_codepoint_t left_glyph,
 				 hb_codepoint_t right_glyph,
@@ -138,7 +136,7 @@ hb_font_get_glyph_h_kerning_nil (hb_font_t *font HB_UNUSED,
 }
 
 static hb_position_t
-hb_font_get_glyph_v_kerning_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_v_kerning_nil (hb_font_t *font,
 				 void *font_data HB_UNUSED,
 				 hb_codepoint_t top_glyph,
 				 hb_codepoint_t bottom_glyph,
@@ -151,7 +149,7 @@ hb_font_get_glyph_v_kerning_nil (hb_font_t *font HB_UNUSED,
 }
 
 static hb_bool_t
-hb_font_get_glyph_extents_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_extents_nil (hb_font_t *font,
 			       void *font_data HB_UNUSED,
 			       hb_codepoint_t glyph,
 			       hb_glyph_extents_t *extents,
@@ -169,11 +167,11 @@ hb_font_get_glyph_extents_nil (hb_font_t *font HB_UNUSED,
   }
 
   memset (extents, 0, sizeof (*extents));
-  return FALSE;
+  return false;
 }
 
 static hb_bool_t
-hb_font_get_glyph_contour_point_nil (hb_font_t *font HB_UNUSED,
+hb_font_get_glyph_contour_point_nil (hb_font_t *font,
 				     void *font_data HB_UNUSED,
 				     hb_codepoint_t glyph,
 				     unsigned int point_index,
@@ -182,23 +180,49 @@ hb_font_get_glyph_contour_point_nil (hb_font_t *font HB_UNUSED,
 				     void *user_data HB_UNUSED)
 {
   if (font->parent) {
-    hb_bool_t ret = hb_font_get_glyph_contour_point (font->parent,
-						     glyph, point_index,
-						     x, y);
+    hb_bool_t ret = hb_font_get_glyph_contour_point (font->parent, glyph, point_index, x, y);
     if (ret)
       font->parent_scale_position (x, y);
     return ret;
   }
 
   *x = *y = 0;
-  return FALSE;
+  return false;
+}
+
+static hb_bool_t
+hb_font_get_glyph_name_nil (hb_font_t *font,
+			    void *font_data HB_UNUSED,
+			    hb_codepoint_t glyph,
+			    char *name, unsigned int size,
+			    void *user_data HB_UNUSED)
+{
+  if (font->parent)
+    return hb_font_get_glyph_name (font->parent, glyph, name, size);
+
+  snprintf (name, size, "gid%u", glyph);
+  return false;
+}
+
+static hb_bool_t
+hb_font_get_glyph_from_name_nil (hb_font_t *font,
+				 void *font_data HB_UNUSED,
+				 const char *name, int len, /* -1 means nul-terminated */
+				 hb_codepoint_t *glyph,
+				 void *user_data HB_UNUSED)
+{
+  if (font->parent)
+    return hb_font_get_glyph_from_name (font->parent, name, len, glyph);
+
+  *glyph = 0;
+  return false;
 }
 
 
-static hb_font_funcs_t _hb_font_funcs_nil = {
+static const hb_font_funcs_t _hb_font_funcs_nil = {
   HB_OBJECT_HEADER_STATIC,
 
-  TRUE, /* immutable */
+  true, /* immutable */
 
   {
 #define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil,
@@ -214,7 +238,7 @@ hb_font_funcs_create (void)
   hb_font_funcs_t *ffuncs;
 
   if (!(ffuncs = hb_object_create<hb_font_funcs_t> ()))
-    return &_hb_font_funcs_nil;
+    return hb_font_funcs_get_empty ();
 
   ffuncs->get = _hb_font_funcs_nil.get;
 
@@ -224,7 +248,7 @@ hb_font_funcs_create (void)
 hb_font_funcs_t *
 hb_font_funcs_get_empty (void)
 {
-  return &_hb_font_funcs_nil;
+  return const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil);
 }
 
 hb_font_funcs_t *
@@ -270,7 +294,7 @@ hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs)
   if (hb_object_is_inert (ffuncs))
     return;
 
-  ffuncs->immutable = TRUE;
+  ffuncs->immutable = true;
 }
 
 hb_bool_t
@@ -312,33 +336,28 @@ HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
 #undef HB_FONT_FUNC_IMPLEMENT
 
 
+/* Public getters */
+
 hb_bool_t
 hb_font_get_glyph (hb_font_t *font,
 		   hb_codepoint_t unicode, hb_codepoint_t variation_selector,
 		   hb_codepoint_t *glyph)
 {
-  *glyph = 0;
-  return font->klass->get.glyph (font, font->user_data,
-				 unicode, variation_selector, glyph,
-				 font->klass->user_data.glyph);
+  return font->get_glyph (unicode, variation_selector, glyph);
 }
 
 hb_position_t
 hb_font_get_glyph_h_advance (hb_font_t *font,
 			     hb_codepoint_t glyph)
 {
-  return font->klass->get.glyph_h_advance (font, font->user_data,
-					   glyph,
-					   font->klass->user_data.glyph_h_advance);
+  return font->get_glyph_h_advance (glyph);
 }
 
 hb_position_t
 hb_font_get_glyph_v_advance (hb_font_t *font,
 			     hb_codepoint_t glyph)
 {
-  return font->klass->get.glyph_v_advance (font, font->user_data,
-					   glyph,
-					   font->klass->user_data.glyph_v_advance);
+  return font->get_glyph_v_advance (glyph);
 }
 
 hb_bool_t
@@ -346,10 +365,7 @@ hb_font_get_glyph_h_origin (hb_font_t *font,
 			    hb_codepoint_t glyph,
 			    hb_position_t *x, hb_position_t *y)
 {
-  *x = *y = 0;
-  return font->klass->get.glyph_h_origin (font, font->user_data,
-					   glyph, x, y,
-					   font->klass->user_data.glyph_h_origin);
+  return font->get_glyph_h_origin (glyph, x, y);
 }
 
 hb_bool_t
@@ -357,28 +373,21 @@ hb_font_get_glyph_v_origin (hb_font_t *font,
 			    hb_codepoint_t glyph,
 			    hb_position_t *x, hb_position_t *y)
 {
-  *x = *y = 0;
-  return font->klass->get.glyph_v_origin (font, font->user_data,
-					   glyph, x, y,
-					   font->klass->user_data.glyph_v_origin);
+  return font->get_glyph_v_origin (glyph, x, y);
 }
 
 hb_position_t
 hb_font_get_glyph_h_kerning (hb_font_t *font,
 			     hb_codepoint_t left_glyph, hb_codepoint_t right_glyph)
 {
-  return font->klass->get.glyph_h_kerning (font, font->user_data,
-					   left_glyph, right_glyph,
-					   font->klass->user_data.glyph_h_kerning);
+  return font->get_glyph_h_kerning (left_glyph, right_glyph);
 }
 
 hb_position_t
 hb_font_get_glyph_v_kerning (hb_font_t *font,
 			     hb_codepoint_t left_glyph, hb_codepoint_t right_glyph)
 {
-  return font->klass->get.glyph_v_kerning (font, font->user_data,
-				     left_glyph, right_glyph,
-				     font->klass->user_data.glyph_v_kerning);
+  return font->get_glyph_v_kerning (left_glyph, right_glyph);
 }
 
 hb_bool_t
@@ -386,11 +395,7 @@ hb_font_get_glyph_extents (hb_font_t *font,
 			   hb_codepoint_t glyph,
 			   hb_glyph_extents_t *extents)
 {
-  memset (extents, 0, sizeof (*extents));
-  return font->klass->get.glyph_extents (font, font->user_data,
-					 glyph,
-					 extents,
-					 font->klass->user_data.glyph_extents);
+  return font->get_glyph_extents (glyph, extents);
 }
 
 hb_bool_t
@@ -398,11 +403,23 @@ hb_font_get_glyph_contour_point (hb_font_t *font,
 				 hb_codepoint_t glyph, unsigned int point_index,
 				 hb_position_t *x, hb_position_t *y)
 {
-  *x = *y = 0;
-  return font->klass->get.glyph_contour_point (font, font->user_data,
-					       glyph, point_index,
-					       x, y,
-					       font->klass->user_data.glyph_contour_point);
+  return font->get_glyph_contour_point (glyph, point_index, x, y);
+}
+
+hb_bool_t
+hb_font_get_glyph_name (hb_font_t *font,
+			hb_codepoint_t glyph,
+			char *name, unsigned int size)
+{
+  return font->get_glyph_name (glyph, name, size);
+}
+
+hb_bool_t
+hb_font_get_glyph_from_name (hb_font_t *font,
+			     const char *name, int len, /* -1 means nul-terminated */
+			     hb_codepoint_t *glyph)
+{
+  return font->get_glyph_from_name (name, len, glyph);
 }
 
 
@@ -414,48 +431,16 @@ hb_font_get_glyph_advance_for_direction (hb_font_t *font,
 					 hb_direction_t direction,
 					 hb_position_t *x, hb_position_t *y)
 {
-  if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
-    *x = hb_font_get_glyph_h_advance (font, glyph);
-    *y = 0;
-  } else {
-    *x = 0;
-    *y = hb_font_get_glyph_v_advance (font, glyph);
-  }
+  return font->get_glyph_advance_for_direction (glyph, direction, x, y);
 }
 
-static void
-guess_v_origin_minus_h_origin (hb_font_t *font,
-			       hb_codepoint_t glyph,
-			       hb_position_t *x, hb_position_t *y)
-{
-  *x = hb_font_get_glyph_h_advance (font, glyph) / 2;
-
-  /* TODO use font_metics.ascent */
-  *y = font->y_scale;
-}
-
-
 void
 hb_font_get_glyph_origin_for_direction (hb_font_t *font,
 					hb_codepoint_t glyph,
 					hb_direction_t direction,
 					hb_position_t *x, hb_position_t *y)
 {
-  if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
-    hb_bool_t ret = hb_font_get_glyph_h_origin (font, glyph, x, y);
-    if (!ret && (ret = hb_font_get_glyph_v_origin (font, glyph, x, y))) {
-      hb_position_t dx, dy;
-      guess_v_origin_minus_h_origin (font, glyph, &dx, &dy);
-      *x -= dx; *y -= dy;
-    }
-  } else {
-    hb_bool_t ret = hb_font_get_glyph_v_origin (font, glyph, x, y);
-    if (!ret && (ret = hb_font_get_glyph_h_origin (font, glyph, x, y))) {
-      hb_position_t dx, dy;
-      guess_v_origin_minus_h_origin (font, glyph, &dx, &dy);
-      *x += dx; *y += dy;
-    }
-  }
+  return font->get_glyph_origin_for_direction (glyph, direction, x, y);
 }
 
 void
@@ -464,12 +449,7 @@ hb_font_add_glyph_origin_for_direction (hb_font_t *font,
 					hb_direction_t direction,
 					hb_position_t *x, hb_position_t *y)
 {
-  hb_position_t origin_x, origin_y;
-
-  hb_font_get_glyph_origin_for_direction (font, glyph, direction, &origin_x, &origin_y);
-
-  *x += origin_x;
-  *y += origin_y;
+  return font->add_glyph_origin_for_direction (glyph, direction, x, y);
 }
 
 void
@@ -478,12 +458,7 @@ hb_font_subtract_glyph_origin_for_direction (hb_font_t *font,
 					     hb_direction_t direction,
 					     hb_position_t *x, hb_position_t *y)
 {
-  hb_position_t origin_x, origin_y;
-
-  hb_font_get_glyph_origin_for_direction (font, glyph, direction, &origin_x, &origin_y);
-
-  *x -= origin_x;
-  *y -= origin_y;
+  return font->subtract_glyph_origin_for_direction (glyph, direction, x, y);
 }
 
 void
@@ -492,13 +467,7 @@ hb_font_get_glyph_kerning_for_direction (hb_font_t *font,
 					 hb_direction_t direction,
 					 hb_position_t *x, hb_position_t *y)
 {
-  if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
-    *x = hb_font_get_glyph_h_kerning (font, first_glyph, second_glyph);
-    *y = 0;
-  } else {
-    *x = 0;
-    *y = hb_font_get_glyph_v_kerning (font, first_glyph, second_glyph);
-  }
+  return font->get_glyph_kerning_for_direction (first_glyph, second_glyph, direction, x, y);
 }
 
 hb_bool_t
@@ -507,12 +476,7 @@ hb_font_get_glyph_extents_for_origin (hb_font_t *font,
 				      hb_direction_t direction,
 				      hb_glyph_extents_t *extents)
 {
-  hb_bool_t ret = hb_font_get_glyph_extents (font, glyph, extents);
-
-  if (ret)
-    hb_font_subtract_glyph_origin_for_direction (font, glyph, direction, &extents->x_bearing, &extents->y_bearing);
-
-  return ret;
+  return font->get_glyph_extents_for_origin (glyph, direction, extents);
 }
 
 hb_bool_t
@@ -521,12 +485,7 @@ hb_font_get_glyph_contour_point_for_origin (hb_font_t *font,
 					    hb_direction_t direction,
 					    hb_position_t *x, hb_position_t *y)
 {
-  hb_bool_t ret = hb_font_get_glyph_contour_point (font, glyph, point_index, x, y);
-
-  if (ret)
-    hb_font_subtract_glyph_origin_for_direction (font, glyph, direction, x, y);
-
-  return ret;
+  return font->get_glyph_contour_point_for_origin (glyph, point_index, direction, x, y);
 }
 
 
@@ -534,19 +493,25 @@ hb_font_get_glyph_contour_point_for_origin (hb_font_t *font,
  * hb_face_t
  */
 
-static hb_face_t _hb_face_nil = {
+static const hb_face_t _hb_face_nil = {
   HB_OBJECT_HEADER_STATIC,
 
-  TRUE, /* immutable */
+  true, /* immutable */
 
   NULL, /* reference_table */
   NULL, /* user_data */
   NULL, /* destroy */
 
-  NULL, /* ot_layout */
-
   0,    /* index */
-  1000  /* upem */
+  1000, /* upem */
+
+  {
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID,
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+  },
+
+  NULL, /* shape_plans */
 };
 
 
@@ -560,22 +525,20 @@ hb_face_create_for_tables (hb_reference_table_func_t  reference_table,
   if (!reference_table || !(face = hb_object_create<hb_face_t> ())) {
     if (destroy)
       destroy (user_data);
-    return &_hb_face_nil;
+    return hb_face_get_empty ();
   }
 
   face->reference_table = reference_table;
   face->user_data = user_data;
   face->destroy = destroy;
 
-  face->ot_layout = _hb_ot_layout_create (face);
-
   face->upem = 0;
 
   return face;
 }
 
 
-typedef struct _hb_face_for_data_closure_t {
+typedef struct hb_face_for_data_closure_t {
   hb_blob_t *blob;
   unsigned int  index;
 } hb_face_for_data_closure_t;
@@ -627,12 +590,12 @@ hb_face_create (hb_blob_t    *blob,
   hb_face_t *face;
 
   if (unlikely (!blob || !hb_blob_get_length (blob)))
-    return &_hb_face_nil;
+    return hb_face_get_empty ();
 
   hb_face_for_data_closure_t *closure = _hb_face_for_data_closure_create (Sanitizer<OpenTypeFontFile>::sanitize (hb_blob_reference (blob)), index);
 
   if (unlikely (!closure))
-    return &_hb_face_nil;
+    return hb_face_get_empty ();
 
   face = hb_face_create_for_tables (_hb_face_for_data_reference_table,
 				    closure,
@@ -646,7 +609,7 @@ hb_face_create (hb_blob_t    *blob,
 hb_face_t *
 hb_face_get_empty (void)
 {
-  return &_hb_face_nil;
+  return const_cast<hb_face_t *> (&_hb_face_nil);
 }
 
 
@@ -661,7 +624,20 @@ hb_face_destroy (hb_face_t *face)
 {
   if (!hb_object_destroy (face)) return;
 
-  _hb_ot_layout_destroy (face->ot_layout);
+  /* The cached shape_plans think they have a reference on us, and
+   * try to release it.  Make sure that doesn't mess up. */
+  face->header.ref_count.ref_count = HB_REFERENCE_COUNT_INVALID_VALUE;
+  for (hb_face_t::plan_node_t *node = face->shape_plans; node; )
+  {
+    hb_face_t::plan_node_t *next = node->next;
+    hb_shape_plan_destroy (node->shape_plan);
+    free (node);
+    node = next;
+  }
+
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, face);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
 
   if (face->destroy)
     face->destroy (face->user_data);
@@ -767,40 +743,21 @@ hb_face_get_upem (hb_face_t *face)
  * hb_font_t
  */
 
-static hb_font_t _hb_font_nil = {
-  HB_OBJECT_HEADER_STATIC,
-
-  TRUE, /* immutable */
-
-  NULL, /* parent */
-  &_hb_face_nil,
-
-  0, /* x_scale */
-  0, /* y_scale */
-
-  0, /* x_ppem */
-  0, /* y_ppem */
-
-  &_hb_font_funcs_nil, /* klass */
-  NULL, /* user_data */
-  NULL  /* destroy */
-};
-
 hb_font_t *
 hb_font_create (hb_face_t *face)
 {
   hb_font_t *font;
 
   if (unlikely (!face))
-    face = &_hb_face_nil;
+    face = hb_face_get_empty ();
   if (unlikely (hb_object_is_inert (face)))
-    return &_hb_font_nil;
+    return hb_font_get_empty ();
   if (!(font = hb_object_create<hb_font_t> ()))
-    return &_hb_font_nil;
+    return hb_font_get_empty ();
 
   hb_face_make_immutable (face);
   font->face = hb_face_reference (face);
-  font->klass = &_hb_font_funcs_nil;
+  font->klass = hb_font_funcs_get_empty ();
 
   return font;
 }
@@ -809,7 +766,7 @@ hb_font_t *
 hb_font_create_sub_font (hb_font_t *parent)
 {
   if (unlikely (!parent))
-    return &_hb_font_nil;
+    return hb_font_get_empty ();
 
   hb_font_t *font = hb_font_create (parent->face);
 
@@ -824,15 +781,38 @@ hb_font_create_sub_font (hb_font_t *parent)
   font->x_ppem = parent->x_ppem;
   font->y_ppem = parent->y_ppem;
 
-  font->klass = &_hb_font_funcs_nil;
-
   return font;
 }
 
 hb_font_t *
 hb_font_get_empty (void)
 {
-  return &_hb_font_nil;
+  static const hb_font_t _hb_font_nil = {
+    HB_OBJECT_HEADER_STATIC,
+
+    true, /* immutable */
+
+    NULL, /* parent */
+    const_cast<hb_face_t *> (&_hb_face_nil),
+
+    0, /* x_scale */
+    0, /* y_scale */
+
+    0, /* x_ppem */
+    0, /* y_ppem */
+
+    const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil), /* klass */
+    NULL, /* user_data */
+    NULL, /* destroy */
+
+    {
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID,
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+    }
+  };
+
+  return const_cast<hb_font_t *> (&_hb_font_nil);
 }
 
 hb_font_t *
@@ -846,11 +826,16 @@ hb_font_destroy (hb_font_t *font)
 {
   if (!hb_object_destroy (font)) return;
 
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, font);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+  if (font->destroy)
+    font->destroy (font->user_data);
+
   hb_font_destroy (font->parent);
   hb_face_destroy (font->face);
   hb_font_funcs_destroy (font->klass);
-  if (font->destroy)
-    font->destroy (font->user_data);
 
   free (font);
 }
@@ -916,7 +901,7 @@ hb_font_set_funcs (hb_font_t         *font,
     font->destroy (font->user_data);
 
   if (!klass)
-    klass = &_hb_font_funcs_nil;
+    klass = hb_font_funcs_get_empty ();
 
   hb_font_funcs_reference (klass);
   hb_font_funcs_destroy (font->klass);
@@ -986,5 +971,3 @@ hb_font_get_ppem (hb_font_t *font,
   if (x_ppem) *x_ppem = font->x_ppem;
   if (y_ppem) *y_ppem = font->y_ppem;
 }
-
-
diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
index 7e6451580a61..ae4fc9bb6075 100644
--- a/gfx/harfbuzz/src/hb-font.h
+++ b/gfx/harfbuzz/src/hb-font.h
@@ -37,8 +37,8 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_face_t hb_face_t;
-typedef struct _hb_font_t hb_font_t;
+typedef struct hb_face_t hb_face_t;
+typedef struct hb_font_t hb_font_t;
 
 /*
  * hb_face_t
@@ -110,7 +110,7 @@ hb_face_get_upem (hb_face_t *face);
  * hb_font_funcs_t
  */
 
-typedef struct _hb_font_funcs_t hb_font_funcs_t;
+typedef struct hb_font_funcs_t hb_font_funcs_t;
 
 hb_font_funcs_t *
 hb_font_funcs_create (void);
@@ -145,7 +145,7 @@ hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs);
 
 /* funcs */
 
-typedef struct _hb_glyph_extents_t
+typedef struct hb_glyph_extents_t
 {
   hb_position_t x_bearing;
   hb_position_t y_bearing;
@@ -192,6 +192,16 @@ typedef hb_bool_t (*hb_font_get_glyph_contour_point_func_t) (hb_font_t *font, vo
 							     void *user_data);
 
 
+typedef hb_bool_t (*hb_font_get_glyph_name_func_t) (hb_font_t *font, void *font_data,
+						    hb_codepoint_t glyph,
+						    char *name, unsigned int size,
+						    void *user_data);
+typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *font_data,
+							 const char *name, int len, /* -1 means nul-terminated */
+							 hb_codepoint_t *glyph,
+							 void *user_data);
+
+
 /* func setters */
 
 void
@@ -235,6 +245,15 @@ hb_font_funcs_set_glyph_contour_point_func (hb_font_funcs_t *ffuncs,
 					    hb_font_get_glyph_contour_point_func_t func,
 					    void *user_data, hb_destroy_func_t destroy);
 
+void
+hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs,
+				   hb_font_get_glyph_name_func_t glyph_func,
+				   void *user_data, hb_destroy_func_t destroy);
+void
+hb_font_funcs_set_glyph_from_name_func (hb_font_funcs_t *ffuncs,
+					hb_font_get_glyph_from_name_func_t glyph_func,
+					void *user_data, hb_destroy_func_t destroy);
+
 
 /* func dispatch */
 
@@ -276,6 +295,15 @@ hb_font_get_glyph_contour_point (hb_font_t *font,
 				 hb_codepoint_t glyph, unsigned int point_index,
 				 hb_position_t *x, hb_position_t *y);
 
+hb_bool_t
+hb_font_get_glyph_name (hb_font_t *font,
+			hb_codepoint_t glyph,
+			char *name, unsigned int size);
+hb_bool_t
+hb_font_get_glyph_from_name (hb_font_t *font,
+			     const char *name, int len, /* -1 means nul-terminated */
+			     hb_codepoint_t *glyph);
+
 
 /* high-level funcs, with fallback */
 
diff --git a/gfx/harfbuzz/src/hb-ft.cc b/gfx/harfbuzz/src/hb-ft.cc
index da5a4b46013c..37172691938b 100644
--- a/gfx/harfbuzz/src/hb-ft.cc
+++ b/gfx/harfbuzz/src/hb-ft.cc
@@ -81,7 +81,7 @@ hb_ft_get_glyph (hb_font_t *font HB_UNUSED,
   if (unlikely (variation_selector)) {
     *glyph = FT_Face_GetCharVariantIndex (ft_face, unicode, variation_selector);
     if (*glyph)
-      return TRUE;
+      return true;
   }
 #endif
 
@@ -132,7 +132,7 @@ hb_ft_get_glyph_h_origin (hb_font_t *font HB_UNUSED,
 			  void *user_data HB_UNUSED)
 {
   /* We always work in the horizontal coordinates. */
-  return TRUE;
+  return true;
 }
 
 static hb_bool_t
@@ -147,18 +147,18 @@ hb_ft_get_glyph_v_origin (hb_font_t *font HB_UNUSED,
   int load_flags = FT_LOAD_DEFAULT;
 
   if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags)))
-    return FALSE;
+    return false;
 
   /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates
    * have a Y growing upward.  Hence the extra negation. */
   *x = ft_face->glyph->metrics.horiBearingX -   ft_face->glyph->metrics.vertBearingX;
   *y = ft_face->glyph->metrics.horiBearingY - (-ft_face->glyph->metrics.vertBearingY);
 
-  return TRUE;
+  return true;
 }
 
 static hb_position_t
-hb_ft_get_glyph_h_kerning (hb_font_t *font HB_UNUSED,
+hb_ft_get_glyph_h_kerning (hb_font_t *font,
 			   void *font_data,
 			   hb_codepoint_t left_glyph,
 			   hb_codepoint_t right_glyph,
@@ -167,7 +167,8 @@ hb_ft_get_glyph_h_kerning (hb_font_t *font HB_UNUSED,
   FT_Face ft_face = (FT_Face) font_data;
   FT_Vector kerningv;
 
-  if (FT_Get_Kerning (ft_face, left_glyph, right_glyph, FT_KERNING_DEFAULT, &kerningv))
+  FT_Kerning_Mode mode = font->x_ppem ? FT_KERNING_DEFAULT : FT_KERNING_UNFITTED;
+  if (FT_Get_Kerning (ft_face, left_glyph, right_glyph, mode, &kerningv))
     return 0;
 
   return kerningv.x;
@@ -195,13 +196,13 @@ hb_ft_get_glyph_extents (hb_font_t *font HB_UNUSED,
   int load_flags = FT_LOAD_DEFAULT;
 
   if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags)))
-    return FALSE;
+    return false;
 
   extents->x_bearing = ft_face->glyph->metrics.horiBearingX;
   extents->y_bearing = ft_face->glyph->metrics.horiBearingY;
   extents->width = ft_face->glyph->metrics.width;
   extents->height = ft_face->glyph->metrics.height;
-  return TRUE;
+  return true;
 }
 
 static hb_bool_t
@@ -217,42 +218,76 @@ hb_ft_get_glyph_contour_point (hb_font_t *font HB_UNUSED,
   int load_flags = FT_LOAD_DEFAULT;
 
   if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags)))
-      return FALSE;
+      return false;
 
   if (unlikely (ft_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE))
-      return FALSE;
+      return false;
 
   if (unlikely (point_index >= (unsigned int) ft_face->glyph->outline.n_points))
-      return FALSE;
+      return false;
 
   *x = ft_face->glyph->outline.points[point_index].x;
   *y = ft_face->glyph->outline.points[point_index].y;
 
-  return TRUE;
+  return true;
 }
 
-static hb_font_funcs_t ft_ffuncs = {
-  HB_OBJECT_HEADER_STATIC,
+static hb_bool_t
+hb_ft_get_glyph_name (hb_font_t *font HB_UNUSED,
+		      void *font_data,
+		      hb_codepoint_t glyph,
+		      char *name, unsigned int size,
+		      void *user_data HB_UNUSED)
+{
+  FT_Face ft_face = (FT_Face) font_data;
 
-  TRUE, /* immutable */
+  hb_bool_t ret = !FT_Get_Glyph_Name (ft_face, glyph, name, size);
+  if (!ret)
+    snprintf (name, size, "gid%u", glyph);
 
-  {
-    hb_ft_get_glyph,
-    hb_ft_get_glyph_h_advance,
-    hb_ft_get_glyph_v_advance,
-    hb_ft_get_glyph_h_origin,
-    hb_ft_get_glyph_v_origin,
-    hb_ft_get_glyph_h_kerning,
-    hb_ft_get_glyph_v_kerning,
-    hb_ft_get_glyph_extents,
-    hb_ft_get_glyph_contour_point,
+  return ret;
+}
+
+static hb_bool_t
+hb_ft_get_glyph_from_name (hb_font_t *font HB_UNUSED,
+			   void *font_data,
+			   const char *name, int len, /* -1 means nul-terminated */
+			   hb_codepoint_t *glyph,
+			   void *user_data HB_UNUSED)
+{
+  FT_Face ft_face = (FT_Face) font_data;
+
+  if (len < 0)
+    *glyph = FT_Get_Name_Index (ft_face, (FT_String *) name);
+  else {
+    /* Make a nul-terminated version. */
+    char buf[128];
+    len = MIN (len, (int) sizeof (buf) - 1);
+    strncpy (buf, name, len);
+    buf[len] = '\0';
+    *glyph = FT_Get_Name_Index (ft_face, buf);
   }
-};
+
+  return *glyph != 0;
+}
+
 
 static hb_font_funcs_t *
 _hb_ft_get_font_funcs (void)
 {
-  return &ft_ffuncs;
+  static const hb_font_funcs_t ft_ffuncs = {
+    HB_OBJECT_HEADER_STATIC,
+
+    true, /* immutable */
+
+    {
+#define HB_FONT_FUNC_IMPLEMENT(name) hb_ft_get_##name,
+      HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+    }
+  };
+
+  return const_cast<hb_font_funcs_t *> (&ft_ffuncs);
 }
 
 
@@ -364,26 +399,39 @@ hb_ft_font_create (FT_Face           ft_face,
 }
 
 
-
+/* Thread-safe, lock-free, FT_Library */
 
 static FT_Library ft_library;
-static hb_bool_t ft_library_initialized;
-static struct ft_library_destructor {
-  ~ft_library_destructor (void) {
-    if (ft_library)
-      FT_Done_FreeType (ft_library);
-  }
-} static_ft_library_destructor;
+
+static
+void free_ft_library (void)
+{
+  FT_Done_FreeType (ft_library);
+}
 
 static FT_Library
-_get_ft_library (void)
+get_ft_library (void)
 {
-  if (unlikely (!ft_library_initialized)) {
-    FT_Init_FreeType (&ft_library);
-    ft_library_initialized = TRUE;
+retry:
+  FT_Library library = (FT_Library) hb_atomic_ptr_get (&ft_library);
+
+  if (unlikely (!library))
+  {
+    /* Not found; allocate one. */
+    if (FT_Init_FreeType (&library))
+      return NULL;
+
+    if (!hb_atomic_ptr_cmpexch (&ft_library, NULL, library)) {
+      FT_Done_FreeType (library);
+      goto retry;
+    }
+
+#ifdef HAVE_ATEXIT
+    atexit (free_ft_library); /* First person registers atexit() callback. */
+#endif
   }
 
-  return ft_library;
+  return library;
 }
 
 static void
@@ -402,7 +450,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
     DEBUG_MSG (FT, font, "Font face has empty blob");
 
   FT_Face ft_face = NULL;
-  FT_Error err = FT_New_Memory_Face (_get_ft_library (),
+  FT_Error err = FT_New_Memory_Face (get_ft_library (),
 				     (const FT_Byte *) blob_data,
 				     blob_length,
 				     hb_face_get_index (font->face),
@@ -418,8 +466,11 @@ hb_ft_font_set_funcs (hb_font_t *font)
 
   FT_Set_Char_Size (ft_face,
 		    font->x_scale, font->y_scale,
+		    0, 0);
+#if 0
 		    font->x_ppem * 72 * 64 / font->x_scale,
 		    font->y_ppem * 72 * 64 / font->y_scale);
+#endif
 
   ft_face->generic.data = blob;
   ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc
index 26d40a38800c..7af92cc01eb0 100644
--- a/gfx/harfbuzz/src/hb-glib.cc
+++ b/gfx/harfbuzz/src/hb-glib.cc
@@ -192,13 +192,13 @@ hb_glib_script_from_script (hb_script_t script)
 }
 
 
-static unsigned int
+static hb_unicode_combining_class_t
 hb_glib_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 				 hb_codepoint_t      unicode,
 				 void               *user_data HB_UNUSED)
 
 {
-  return g_unichar_combining_class (unicode);
+  return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode);
 }
 
 static unsigned int
@@ -251,11 +251,11 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
    * sees it and makes sure it's compilable. */
 
   if (!a || !b)
-    return FALSE;
+    return false;
 
   gchar utf8[12];
   gchar *normalized;
-  gint len;
+  int len;
   hb_bool_t ret;
 
   len = g_unichar_to_utf8 (a, utf8);
@@ -263,13 +263,13 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
   normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFC);
   len = g_utf8_strlen (normalized, -1);
   if (unlikely (!len))
-    return FALSE;
+    return false;
 
   if (len == 1) {
     *ab = g_utf8_get_char (normalized);
-    ret = TRUE;
+    ret = true;
   } else {
-    ret = FALSE;
+    ret = false;
   }
 
   g_free (normalized);
@@ -292,14 +292,14 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 
   gchar utf8[6];
   gchar *normalized;
-  gint len;
+  int len;
   hb_bool_t ret;
 
   len = g_unichar_to_utf8 (ab, utf8);
   normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFD);
   len = g_utf8_strlen (normalized, -1);
   if (unlikely (!len))
-    return FALSE;
+    return false;
 
   if (len == 1) {
     *a = g_utf8_get_char (normalized);
@@ -318,7 +318,7 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
       *b = 0;
     }
     g_free (recomposed);
-    ret = TRUE;
+    ret = true;
   } else {
     /* If decomposed to more than two characters, take the last one,
      * and recompose the rest to get the first component. */
@@ -329,20 +329,50 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
     /* We expect that recomposed has exactly one character now. */
     *a = g_utf8_get_char (recomposed);
     g_free (recomposed);
-    ret = TRUE;
+    ret = true;
   }
 
   g_free (normalized);
   return ret;
 }
 
+static unsigned int
+hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
+					 hb_codepoint_t      u,
+					 hb_codepoint_t     *decomposed,
+					 void               *user_data HB_UNUSED)
+{
+#if GLIB_CHECK_VERSION(2,29,12)
+  return g_unichar_fully_decompose (u, TRUE, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN);
+#endif
 
-extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_glib;
-hb_unicode_funcs_t _hb_glib_unicode_funcs = {
+  /* If the user doesn't have GLib >= 2.29.12 we have to perform
+   * a round trip to UTF-8 and the associated memory management dance. */
+  gchar utf8[6];
+  gchar *utf8_decomposed, *c;
+  gsize utf8_len, utf8_decomposed_len, i;
+
+  /* Convert @u to UTF-8 and normalise it in NFKD mode. This performs the compatibility decomposition. */
+  utf8_len = g_unichar_to_utf8 (u, utf8);
+  utf8_decomposed = g_utf8_normalize (utf8, utf8_len, G_NORMALIZE_NFKD);
+  utf8_decomposed_len = g_utf8_strlen (utf8_decomposed, -1);
+
+  assert (utf8_decomposed_len <= HB_UNICODE_MAX_DECOMPOSITION_LEN);
+
+  for (i = 0, c = utf8_decomposed; i < utf8_decomposed_len; i++, c = g_utf8_next_char (c))
+    *decomposed++ = g_utf8_get_char (c);
+
+  g_free (utf8_decomposed);
+
+  return utf8_decomposed_len;
+}
+
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_glib_unicode_funcs;
+const hb_unicode_funcs_t _hb_glib_unicode_funcs = {
   HB_OBJECT_HEADER_STATIC,
 
   NULL, /* parent */
-  TRUE, /* immutable */
+  true, /* immutable */
   {
 #define HB_UNICODE_FUNC_IMPLEMENT(name) hb_glib_unicode_##name,
     HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
@@ -353,6 +383,6 @@ hb_unicode_funcs_t _hb_glib_unicode_funcs = {
 hb_unicode_funcs_t *
 hb_glib_get_unicode_funcs (void)
 {
-  return &_hb_glib_unicode_funcs;
+  return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs);
 }
 
diff --git a/gfx/harfbuzz/src/hb-graphite2.cc b/gfx/harfbuzz/src/hb-graphite2.cc
index eab2eae72b60..c14eea5f13be 100644
--- a/gfx/harfbuzz/src/hb-graphite2.cc
+++ b/gfx/harfbuzz/src/hb-graphite2.cc
@@ -108,7 +108,7 @@ static const void *hb_gr_get_table (const void *data, unsigned int tag, size_t *
 
 static float hb_gr_get_advance (const void *hb_font, unsigned short gid)
 {
-  return hb_font_get_glyph_h_advance ((hb_font_t *) hb_font, gid);
+  return ((hb_font_t *) font)->get_glyph_h_advance (gid);
 }
 
 static void _hb_gr_face_data_destroy (void *data)
@@ -159,7 +159,7 @@ _hb_gr_face_get_data (hb_face_t *face)
 
   if (unlikely (!hb_face_set_user_data (face, &hb_gr_data_key, data,
 					(hb_destroy_func_t) _hb_gr_face_data_destroy,
-					FALSE)))
+					false)))
   {
     _hb_gr_face_data_destroy (data);
     data = (hb_gr_face_data_t *) hb_face_get_user_data (face, &hb_gr_data_key);
@@ -191,14 +191,12 @@ _hb_gr_font_get_data (hb_font_t *font)
   }
 
   data->grface = _hb_gr_face_get_data (font->face)->grface;
-  int scale;
-  hb_font_get_scale (font, &scale, NULL);
-  data->grfont = gr_make_font_with_advance_fn (scale, font, &hb_gr_get_advance, data->grface);
+  data->grfont = gr_make_font_with_advance_fn (font->x_scale, font, &hb_gr_get_advance, data->grface);
 
 
   if (unlikely (!hb_font_set_user_data (font, &hb_gr_data_key, data,
 					(hb_destroy_func_t) _hb_gr_font_data_destroy,
-					FALSE)))
+					false)))
   {
     _hb_gr_font_data_destroy (data);
     data = (hb_gr_font_data_t *) hb_font_get_user_data (font, &hb_gr_data_key);
@@ -225,14 +223,14 @@ _hb_graphite_shape (hb_font_t          *font,
    * is not graphite!  Shouldn't do. */
 
   hb_gr_font_data_t *data = _hb_gr_font_get_data (font);
-  if (!data->grface) return FALSE;
+  if (!data->grface) return false;
 
   unsigned int charlen;
   hb_glyph_info_t *bufferi = hb_buffer_get_glyph_infos (buffer, &charlen);
 
   int success = 0;
 
-  if (!charlen) return TRUE;
+  if (!charlen) return true;
 
   const char *lang = hb_language_to_string (hb_buffer_get_language (buffer));
   const char *lang_end = strchr (lang, '-');
diff --git a/gfx/harfbuzz/src/hb-icu.cc b/gfx/harfbuzz/src/hb-icu.cc
index 5cd014356927..d7fd1857c7c3 100644
--- a/gfx/harfbuzz/src/hb-icu.cc
+++ b/gfx/harfbuzz/src/hb-icu.cc
@@ -63,13 +63,13 @@ hb_icu_script_from_script (hb_script_t script)
 }
 
 
-static unsigned int
+static hb_unicode_combining_class_t
 hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 				hb_codepoint_t      unicode,
 				void               *user_data HB_UNUSED)
 
 {
-  return u_getCombiningClass (unicode);
+  return (hb_unicode_combining_class_t) u_getCombiningClass (unicode);
 }
 
 static unsigned int
@@ -172,7 +172,7 @@ hb_icu_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 			void               *user_data HB_UNUSED)
 {
   if (!a || !b)
-    return FALSE;
+    return false;
 
   UChar utf16[4], normalized[5];
   int len;
@@ -180,21 +180,21 @@ hb_icu_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
   UErrorCode icu_err;
 
   len = 0;
-  err = FALSE;
+  err = false;
   U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), a, err);
-  if (err) return FALSE;
+  if (err) return false;
   U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), b, err);
-  if (err) return FALSE;
+  if (err) return false;
 
   icu_err = U_ZERO_ERROR;
   len = unorm_normalize (utf16, len, UNORM_NFC, 0, normalized, ARRAY_LENGTH (normalized), &icu_err);
   if (U_FAILURE (icu_err))
-    return FALSE;
+    return false;
   if (u_countChar32 (normalized, len) == 1) {
     U16_GET_UNSAFE (normalized, 0, *ab);
-    ret = TRUE;
+    ret = true;
   } else {
-    ret = FALSE;
+    ret = false;
   }
 
   return ret;
@@ -207,7 +207,7 @@ hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 			  hb_codepoint_t     *b,
 			  void               *user_data HB_UNUSED)
 {
-  UChar utf16[2], normalized[20];
+  UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1];
   int len;
   hb_bool_t ret, err;
   UErrorCode icu_err;
@@ -217,14 +217,14 @@ hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
   /* Watchout for the dragons.  Err, watchout for macros changing len. */
 
   len = 0;
-  err = FALSE;
+  err = false;
   U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), ab, err);
-  if (err) return FALSE;
+  if (err) return false;
 
   icu_err = U_ZERO_ERROR;
   len = unorm_normalize (utf16, len, UNORM_NFD, 0, normalized, ARRAY_LENGTH (normalized), &icu_err);
   if (U_FAILURE (icu_err))
-    return FALSE;
+    return false;
 
   len = u_countChar32 (normalized, len);
 
@@ -244,37 +244,74 @@ hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
     icu_err = U_ZERO_ERROR;
     unorm_normalize (normalized, len, UNORM_NFC, 0, recomposed, ARRAY_LENGTH (recomposed), &icu_err);
     if (U_FAILURE (icu_err))
-      return FALSE;
+      return false;
     hb_codepoint_t c;
     U16_GET_UNSAFE (recomposed, 0, c);
     if (c != *a && c != ab) {
       *a = c;
       *b = 0;
     }
-    ret = TRUE;
+    ret = true;
   } else {
     /* If decomposed to more than two characters, take the last one,
      * and recompose the rest to get the first component. */
-    U16_PREV_UNSAFE (normalized, len, *b);
-    UChar recomposed[20];
+    U16_PREV_UNSAFE (normalized, len, *b); /* Changes len in-place. */
+    UChar recomposed[18 * 2];
     icu_err = U_ZERO_ERROR;
     len = unorm_normalize (normalized, len, UNORM_NFC, 0, recomposed, ARRAY_LENGTH (recomposed), &icu_err);
     if (U_FAILURE (icu_err))
-      return FALSE;
+      return false;
     /* We expect that recomposed has exactly one character now. */
+    if (unlikely (u_countChar32 (recomposed, len) != 1))
+      return false;
     U16_GET_UNSAFE (recomposed, 0, *a);
-    ret = TRUE;
+    ret = true;
   }
 
   return ret;
 }
 
-extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_icu;
-hb_unicode_funcs_t _hb_icu_unicode_funcs = {
+static unsigned int
+hb_icu_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED,
+					hb_codepoint_t      u,
+					hb_codepoint_t     *decomposed,
+					void               *user_data HB_UNUSED)
+{
+  UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1];
+  int len;
+  int32_t utf32_len;
+  hb_bool_t err;
+  UErrorCode icu_err;
+
+  /* Copy @u into a UTF-16 array to be passed to ICU. */
+  len = 0;
+  err = FALSE;
+  U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), u, err);
+  if (err)
+    return 0;
+
+  /* Normalise the codepoint using NFKD mode. */
+  icu_err = U_ZERO_ERROR;
+  len = unorm_normalize (utf16, len, UNORM_NFKD, 0, normalized, ARRAY_LENGTH (normalized), &icu_err);
+  if (icu_err)
+    return 0;
+
+  /* Convert the decomposed form from UTF-16 to UTF-32. */
+  icu_err = U_ZERO_ERROR;
+  u_strToUTF32 ((UChar32*) decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN, &utf32_len, normalized, len, &icu_err);
+  if (icu_err)
+    return 0;
+
+  return utf32_len;
+}
+
+
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_icu_unicode_funcs;
+const hb_unicode_funcs_t _hb_icu_unicode_funcs = {
   HB_OBJECT_HEADER_STATIC,
 
   NULL, /* parent */
-  TRUE, /* immutable */
+  true, /* immutable */
   {
 #define HB_UNICODE_FUNC_IMPLEMENT(name) hb_icu_unicode_##name,
     HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
@@ -285,7 +322,7 @@ hb_unicode_funcs_t _hb_icu_unicode_funcs = {
 hb_unicode_funcs_t *
 hb_icu_get_unicode_funcs (void)
 {
-  return &_hb_icu_unicode_funcs;
+  return const_cast<hb_unicode_funcs_t *> (&_hb_icu_unicode_funcs);
 }
 
 
diff --git a/gfx/harfbuzz/src/hb-mutex-private.hh b/gfx/harfbuzz/src/hb-mutex-private.hh
index 44b48df223c9..8efd27efe3d7 100644
--- a/gfx/harfbuzz/src/hb-mutex-private.hh
+++ b/gfx/harfbuzz/src/hb-mutex-private.hh
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2007  Chris Wilson
  * Copyright © 2009,2010  Red Hat, Inc.
- * Copyright © 2011  Google, Inc.
+ * Copyright © 2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -50,10 +50,10 @@ typedef CRITICAL_SECTION hb_mutex_impl_t;
 #define hb_mutex_impl_init(M)	InitializeCriticalSection (M)
 #define hb_mutex_impl_lock(M)	EnterCriticalSection (M)
 #define hb_mutex_impl_unlock(M)	LeaveCriticalSection (M)
-#define hb_mutex_impl_free(M)	DeleteCriticalSection (M)
+#define hb_mutex_impl_finish(M)	DeleteCriticalSection (M)
 
 
-#elif !defined(HB_NO_MT) && defined(__APPLE__)
+#elif !defined(HB_NO_MT) && (defined(HAVE_PTHREAD) || defined(__APPLE__))
 
 #include <pthread.h>
 typedef pthread_mutex_t hb_mutex_impl_t;
@@ -61,59 +61,89 @@ typedef pthread_mutex_t hb_mutex_impl_t;
 #define hb_mutex_impl_init(M)	pthread_mutex_init (M, NULL)
 #define hb_mutex_impl_lock(M)	pthread_mutex_lock (M)
 #define hb_mutex_impl_unlock(M)	pthread_mutex_unlock (M)
-#define hb_mutex_impl_free(M)	pthread_mutex_destroy (M)
+#define hb_mutex_impl_finish(M)	pthread_mutex_destroy (M)
 
 
 #elif !defined(HB_NO_MT) && defined(HAVE_GLIB)
 
 #include <glib.h>
+#if !GLIB_CHECK_VERSION(2,32,0)
 typedef GStaticMutex hb_mutex_impl_t;
 #define HB_MUTEX_IMPL_INIT	G_STATIC_MUTEX_INIT
 #define hb_mutex_impl_init(M)	g_static_mutex_init (M)
 #define hb_mutex_impl_lock(M)	g_static_mutex_lock (M)
 #define hb_mutex_impl_unlock(M)	g_static_mutex_unlock (M)
-#define hb_mutex_impl_free(M)	g_static_mutex_free (M)
-
-
+#define hb_mutex_impl_finish(M)	g_static_mutex_free (M)
 #else
+typedef GMutex hb_mutex_impl_t;
+#define HB_MUTEX_IMPL_INIT	{0}
+#define hb_mutex_impl_init(M)	g_mutex_init (M)
+#define hb_mutex_impl_lock(M)	g_mutex_lock (M)
+#define hb_mutex_impl_unlock(M)	g_mutex_unlock (M)
+#define hb_mutex_impl_finish(M)	g_mutex_clear (M)
+#endif
 
-#define HB_MUTEX_IMPL_NIL 1
+
+#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
+
+#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD)
+# include <sched.h>
+# define HB_SCHED_YIELD() sched_yield ()
+#else
+# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END
+#endif
+
+/* This actually is not a totally awful implementation. */
 typedef volatile int hb_mutex_impl_t;
 #define HB_MUTEX_IMPL_INIT	0
-#define hb_mutex_impl_init(M)	((void) (*(M) = 0))
-#define hb_mutex_impl_lock(M)	((void) (*(M) = 1))
-#define hb_mutex_impl_unlock(M)	((void) (*(M) = 0))
-#define hb_mutex_impl_free(M)	((void) (*(M) = 2))
+#define hb_mutex_impl_init(M)	*(M) = 0
+#define hb_mutex_impl_lock(M)	HB_STMT_START { while (__sync_lock_test_and_set((M), 1)) HB_SCHED_YIELD (); } HB_STMT_END
+#define hb_mutex_impl_unlock(M)	__sync_lock_release (M)
+#define hb_mutex_impl_finish(M)	HB_STMT_START {} HB_STMT_END
+
+
+#elif !defined(HB_NO_MT)
+
+#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD)
+# include <sched.h>
+# define HB_SCHED_YIELD() sched_yield ()
+#else
+# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END
+#endif
+
+#define HB_MUTEX_INT_NIL 1 /* Warn that fallback implementation is in use. */
+typedef volatile int hb_mutex_impl_t;
+#define HB_MUTEX_IMPL_INIT	0
+#define hb_mutex_impl_init(M)	*(M) = 0
+#define hb_mutex_impl_lock(M)	HB_STMT_START { while (*(M)) HB_SCHED_YIELD (); (*(M))++; } HB_STMT_END
+#define hb_mutex_impl_unlock(M)	(*(M))--;
+#define hb_mutex_impl_finish(M)	HB_STMT_START {} HB_STMT_END
+
+
+#else /* HB_NO_MT */
+
+typedef int hb_mutex_impl_t;
+#define HB_MUTEX_IMPL_INIT	0
+#define hb_mutex_impl_init(M)	HB_STMT_START {} HB_STMT_END
+#define hb_mutex_impl_lock(M)	HB_STMT_START {} HB_STMT_END
+#define hb_mutex_impl_unlock(M)	HB_STMT_START {} HB_STMT_END
+#define hb_mutex_impl_finish(M)	HB_STMT_START {} HB_STMT_END
 
 #endif
 
 
+#define HB_MUTEX_INIT		{HB_MUTEX_IMPL_INIT}
 struct hb_mutex_t
 {
+  /* TODO Add tracing. */
+
   hb_mutex_impl_t m;
 
   inline void init   (void) { hb_mutex_impl_init   (&m); }
   inline void lock   (void) { hb_mutex_impl_lock   (&m); }
   inline void unlock (void) { hb_mutex_impl_unlock (&m); }
-  inline void free   (void) { hb_mutex_impl_free   (&m); }
+  inline void finish (void) { hb_mutex_impl_finish (&m); }
 };
 
-#define HB_MUTEX_INIT		{HB_MUTEX_IMPL_INIT}
-#define hb_mutex_init(M)	(M)->init ()
-#define hb_mutex_lock(M)	(M)->lock ()
-#define hb_mutex_unlock(M)	(M)->unlock ()
-#define hb_mutex_free(M)	(M)->free ()
-
-
-struct hb_static_mutex_t : hb_mutex_t
-{
-  hb_static_mutex_t (void)  { this->init (); }
-  ~hb_static_mutex_t (void) { this->free (); }
-
-  private:
-  NO_COPY (hb_static_mutex_t);
-};
-
-
 
 #endif /* HB_MUTEX_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-object-private.hh b/gfx/harfbuzz/src/hb-object-private.hh
index edd89217e2ed..c48f24231d9c 100644
--- a/gfx/harfbuzz/src/hb-object-private.hh
+++ b/gfx/harfbuzz/src/hb-object-private.hh
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2007  Chris Wilson
  * Copyright © 2009,2010  Red Hat, Inc.
- * Copyright © 2011  Google, Inc.
+ * Copyright © 2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -47,26 +47,28 @@
 
 /* reference_count */
 
-typedef struct {
-  hb_atomic_int_t ref_count;
-
 #define HB_REFERENCE_COUNT_INVALID_VALUE ((hb_atomic_int_t) -1)
 #define HB_REFERENCE_COUNT_INVALID {HB_REFERENCE_COUNT_INVALID_VALUE}
+struct hb_reference_count_t
+{
+  hb_atomic_int_t ref_count;
 
-  inline void init (int v) { ref_count = v; /* non-atomic is fine */ }
-  inline int inc (void) { return hb_atomic_int_add (ref_count,  1); }
-  inline int dec (void) { return hb_atomic_int_add (ref_count, -1); }
+  inline void init (int v) { ref_count = v; }
+  inline int inc (void) { return hb_atomic_int_add (const_cast<hb_atomic_int_t &> (ref_count),  1); }
+  inline int dec (void) { return hb_atomic_int_add (const_cast<hb_atomic_int_t &> (ref_count), -1); }
+  inline void finish (void) { ref_count = HB_REFERENCE_COUNT_INVALID_VALUE; }
 
-  inline int get (void) { return hb_atomic_int_get (ref_count); }
-  inline int get_unsafe (void) const { return ref_count; }
   inline bool is_invalid (void) const { return ref_count == HB_REFERENCE_COUNT_INVALID_VALUE; }
 
-} hb_reference_count_t;
+};
 
 
 /* user_data */
 
-struct hb_user_data_array_t {
+#define HB_USER_DATA_ARRAY_INIT {HB_LOCKABLE_SET_INIT}
+struct hb_user_data_array_t
+{
+  /* TODO Add tracing. */
 
   struct hb_user_data_item_t {
     hb_user_data_key_t *key;
@@ -79,28 +81,32 @@ struct hb_user_data_array_t {
     void finish (void) { if (destroy) destroy (data); }
   };
 
-  hb_lockable_set_t<hb_user_data_item_t, hb_static_mutex_t> items;
+  hb_lockable_set_t<hb_user_data_item_t, hb_mutex_t> items;
+
+  inline void init (void) { items.init (); }
 
   HB_INTERNAL bool set (hb_user_data_key_t *key,
 			void *              data,
 			hb_destroy_func_t   destroy,
-			hb_bool_t           replace);
+			hb_bool_t           replace,
+			hb_mutex_t         &lock);
 
-  HB_INTERNAL void *get (hb_user_data_key_t *key);
+  HB_INTERNAL void *get (hb_user_data_key_t *key,
+			hb_mutex_t          &lock);
 
-  HB_INTERNAL void finish (void);
+  HB_INTERNAL void finish (hb_mutex_t &lock);
 };
 
 
 /* object_header */
 
-typedef struct _hb_object_header_t hb_object_header_t;
-
-struct _hb_object_header_t {
+struct hb_object_header_t
+{
   hb_reference_count_t ref_count;
+  hb_mutex_t mutex;
   hb_user_data_array_t user_data;
 
-#define HB_OBJECT_HEADER_STATIC {HB_REFERENCE_COUNT_INVALID}
+#define HB_OBJECT_HEADER_STATIC {HB_REFERENCE_COUNT_INVALID, HB_MUTEX_INIT, HB_USER_DATA_ARRAY_INIT}
 
   static inline void *create (unsigned int size) {
     hb_object_header_t *obj = (hb_object_header_t *) calloc (1, size);
@@ -113,6 +119,8 @@ struct _hb_object_header_t {
 
   inline void init (void) {
     ref_count.init (1);
+    mutex.init ();
+    user_data.init ();
   }
 
   inline bool is_inert (void) const {
@@ -131,13 +139,21 @@ struct _hb_object_header_t {
     if (ref_count.dec () != 1)
       return false;
 
-    ref_count.init (HB_REFERENCE_COUNT_INVALID_VALUE);
-
-    user_data.finish ();
+    ref_count.finish (); /* Do this before user_data */
+    user_data.finish (mutex);
+    mutex.finish ();
 
     return true;
   }
 
+  inline void lock (void) {
+    mutex.lock ();
+  }
+
+  inline void unlock (void) {
+    mutex.unlock ();
+  }
+
   inline bool set_user_data (hb_user_data_key_t *key,
 			     void *              data,
 			     hb_destroy_func_t   destroy_func,
@@ -145,23 +161,28 @@ struct _hb_object_header_t {
     if (unlikely (!this || this->is_inert ()))
       return false;
 
-    return user_data.set (key, data, destroy_func, replace);
+    return user_data.set (key, data, destroy_func, replace, mutex);
   }
 
   inline void *get_user_data (hb_user_data_key_t *key) {
-    return user_data.get (key);
+    if (unlikely (!this || this->is_inert ()))
+      return NULL;
+
+    return user_data.get (key, mutex);
   }
 
   inline void trace (const char *function) const {
     if (unlikely (!this)) return;
-    /* XXX We cannot use DEBUG_MSG_FUNC here since that one currecntly only
+    /* TODO We cannot use DEBUG_MSG_FUNC here since that one currently only
      * prints the class name and throws away the template info. */
     DEBUG_MSG (OBJECT, (void *) this,
 	       "%s refcount=%d",
 	       function,
-	       this ? ref_count.get_unsafe () : 0);
+	       this ? ref_count.ref_count : 0);
   }
 
+  private:
+  ASSERT_POD ();
 };
 
 
@@ -198,6 +219,18 @@ static inline bool hb_object_destroy (Type *obj)
   return obj->header.destroy ();
 }
 template <typename Type>
+static inline void hb_object_lock (Type *obj)
+{
+  hb_object_trace (obj, HB_FUNC);
+  return obj->header.lock ();
+}
+template <typename Type>
+static inline void hb_object_unlock (Type *obj)
+{
+  hb_object_trace (obj, HB_FUNC);
+  return obj->header.unlock ();
+}
+template <typename Type>
 static inline bool hb_object_set_user_data (Type               *obj,
 					    hb_user_data_key_t *key,
 					    void *              data,
diff --git a/gfx/harfbuzz/src/hb-old.cc b/gfx/harfbuzz/src/hb-old.cc
new file mode 100644
index 000000000000..1d5544b183dd
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-old.cc
@@ -0,0 +1,407 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#define HB_SHAPER old
+#define hb_old_shaper_face_data_t HB_FaceRec_
+#define hb_old_shaper_font_data_t HB_Font_
+#include "hb-shaper-impl-private.hh"
+
+#include <harfbuzz.h>
+
+
+#ifndef HB_DEBUG_OLD
+#define HB_DEBUG_OLD (HB_DEBUG+0)
+#endif
+
+
+static HB_Script
+hb_old_script_from_script (hb_script_t script)
+{
+  switch ((hb_tag_t) script)
+  {
+    default:
+    case HB_SCRIPT_COMMON:		return HB_Script_Common;
+    case HB_SCRIPT_GREEK:		return HB_Script_Greek;
+    case HB_SCRIPT_CYRILLIC:		return HB_Script_Cyrillic;
+    case HB_SCRIPT_ARMENIAN:		return HB_Script_Armenian;
+    case HB_SCRIPT_HEBREW:		return HB_Script_Hebrew;
+    case HB_SCRIPT_ARABIC:		return HB_Script_Arabic;
+    case HB_SCRIPT_SYRIAC:		return HB_Script_Syriac;
+    case HB_SCRIPT_THAANA:		return HB_Script_Thaana;
+    case HB_SCRIPT_DEVANAGARI:		return HB_Script_Devanagari;
+    case HB_SCRIPT_BENGALI:		return HB_Script_Bengali;
+    case HB_SCRIPT_GURMUKHI:		return HB_Script_Gurmukhi;
+    case HB_SCRIPT_GUJARATI:		return HB_Script_Gujarati;
+    case HB_SCRIPT_ORIYA:		return HB_Script_Oriya;
+    case HB_SCRIPT_TAMIL:		return HB_Script_Tamil;
+    case HB_SCRIPT_TELUGU:		return HB_Script_Telugu;
+    case HB_SCRIPT_KANNADA:		return HB_Script_Kannada;
+    case HB_SCRIPT_MALAYALAM:		return HB_Script_Malayalam;
+    case HB_SCRIPT_SINHALA:		return HB_Script_Sinhala;
+    case HB_SCRIPT_THAI:		return HB_Script_Thai;
+    case HB_SCRIPT_LAO:			return HB_Script_Lao;
+    case HB_SCRIPT_TIBETAN:		return HB_Script_Tibetan;
+    case HB_SCRIPT_MYANMAR:		return HB_Script_Myanmar;
+    case HB_SCRIPT_GEORGIAN:		return HB_Script_Georgian;
+    case HB_SCRIPT_HANGUL:		return HB_Script_Hangul;
+    case HB_SCRIPT_OGHAM:		return HB_Script_Ogham;
+    case HB_SCRIPT_RUNIC:		return HB_Script_Runic;
+    case HB_SCRIPT_KHMER:		return HB_Script_Khmer;
+    case HB_SCRIPT_NKO:			return HB_Script_Nko;
+    case HB_SCRIPT_INHERITED:		return HB_Script_Inherited;
+  }
+}
+
+
+static HB_Bool
+hb_old_convertStringToGlyphIndices (HB_Font old_font,
+				    const HB_UChar16 *string,
+				    hb_uint32 length,
+				    HB_Glyph *glyphs,
+				    hb_uint32 *numGlyphs,
+				    HB_Bool rightToLeft)
+{
+  hb_font_t *font = (hb_font_t *) old_font->userData;
+
+  for (unsigned int i = 0; i < length; i++)
+  {
+    hb_codepoint_t u;
+
+    /* XXX Handle UTF-16.  Ugh */
+    u = string[i];
+
+    if (rightToLeft)
+      u = hb_unicode_funcs_get_default ()->mirroring (u);
+
+    font->get_glyph (u, 0, &u); /* TODO Variation selectors */
+
+    glyphs[i] = u;
+  }
+  *numGlyphs = length; // XXX
+
+  return true;
+}
+
+static void
+hb_old_getGlyphAdvances (HB_Font old_font,
+			 const HB_Glyph *glyphs,
+			 hb_uint32 numGlyphs,
+			 HB_Fixed *advances,
+			 int flags /*HB_ShaperFlag*/)
+{
+  hb_font_t *font = (hb_font_t *) old_font->userData;
+
+  for (unsigned int i = 0; i < numGlyphs; i++)
+    advances[i] = font->get_glyph_h_advance (glyphs[i]);
+}
+
+static HB_Bool
+hb_old_canRender (HB_Font old_font,
+		  const HB_UChar16 *string,
+		  hb_uint32 length)
+{
+  return true; // TODO
+}
+
+static HB_Error
+hb_old_getPointInOutline (HB_Font old_font,
+			  HB_Glyph glyph,
+			  int flags /*HB_ShaperFlag*/,
+			  hb_uint32 point,
+			  HB_Fixed *xpos,
+			  HB_Fixed *ypos,
+			  hb_uint32 *nPoints)
+{
+  return HB_Err_Ok; // TODO
+}
+
+static void
+hb_old_getGlyphMetrics (HB_Font old_font,
+			HB_Glyph glyph,
+			HB_GlyphMetrics *metrics)
+{
+  hb_font_t *font = (hb_font_t *) old_font->userData;
+
+  hb_glyph_extents_t extents;
+
+  font->get_glyph_extents (glyph, &extents);
+
+  metrics->x       = extents.x_bearing;
+  metrics->y       = extents.y_bearing;
+  metrics->width   = extents.width;
+  metrics->height  = -extents.height;
+  metrics->xOffset = font->get_glyph_h_advance (glyph);
+  metrics->yOffset = 0;
+}
+
+static HB_Fixed
+hb_old_getFontMetric (HB_Font old_font,
+		      HB_FontMetric metric)
+{
+  hb_font_t *font = (hb_font_t *) old_font->userData;
+
+  switch (metric)
+  {
+    case HB_FontAscent:
+       return font->y_scale; /* XXX We don't have ascent data yet. */
+
+    default:
+      return 0;
+  }
+}
+
+static const HB_FontClass hb_old_font_class = {
+  hb_old_convertStringToGlyphIndices,
+  hb_old_getGlyphAdvances,
+  hb_old_canRender,
+  hb_old_getPointInOutline,
+  hb_old_getGlyphMetrics,
+  hb_old_getFontMetric
+};
+
+
+
+static HB_Error
+table_func (void *font, HB_Tag tag, HB_Byte *buffer, HB_UInt *length)
+{
+  hb_face_t *face = (hb_face_t *) font;
+  hb_blob_t *blob = hb_face_reference_table (face, (hb_tag_t) tag);
+  unsigned int capacity = *length;
+  *length = hb_blob_get_length (blob);
+  memcpy (buffer, hb_blob_get_data (blob, NULL), MIN (capacity, *length));
+  hb_blob_destroy (blob);
+ return HB_Err_Ok;
+}
+
+
+/*
+ * shaper face data
+ */
+
+hb_old_shaper_face_data_t *
+_hb_old_shaper_face_data_create (hb_face_t *face)
+{
+  return HB_NewFace (face, table_func);
+}
+
+void
+_hb_old_shaper_face_data_destroy (hb_old_shaper_face_data_t *data)
+{
+  HB_FreeFace (data);
+}
+
+
+/*
+ * shaper font data
+ */
+
+hb_old_shaper_font_data_t *
+_hb_old_shaper_font_data_create (hb_font_t *font)
+{
+  HB_FontRec *data = (HB_FontRec *) calloc (1, sizeof (HB_FontRec));
+  if (unlikely (!data)) {
+    DEBUG_MSG (OLD, font, "malloc()ing HB_Font failed");
+    return NULL;
+  }
+
+  data->klass = &hb_old_font_class;
+  data->x_ppem = font->x_ppem;
+  data->y_ppem = font->y_ppem;
+  data->x_scale = font->x_scale; // XXX
+  data->y_scale = font->y_scale; // XXX
+  data->userData = font;
+
+  return data;
+}
+
+void
+_hb_old_shaper_font_data_destroy (hb_old_shaper_font_data_t *data)
+{
+  free (data);
+}
+
+
+/*
+ * shaper shape_plan data
+ */
+
+struct hb_old_shaper_shape_plan_data_t {};
+
+hb_old_shaper_shape_plan_data_t *
+_hb_old_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
+				       const hb_feature_t *user_features,
+				       unsigned int        num_user_features)
+{
+  return (hb_old_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+}
+
+void
+_hb_old_shaper_shape_plan_data_destroy (hb_old_shaper_shape_plan_data_t *data)
+{
+}
+
+
+/*
+ * shaper
+ */
+
+hb_bool_t
+_hb_old_shape (hb_shape_plan_t    *shape_plan,
+	       hb_font_t          *font,
+	       hb_buffer_t        *buffer,
+	       const hb_feature_t *features,
+	       unsigned int        num_features)
+{
+  hb_face_t *face = font->face;
+  HB_Face old_face = HB_SHAPER_DATA_GET (face);
+  HB_Font old_font = HB_SHAPER_DATA_GET (font);
+
+  bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
+
+retry:
+
+  unsigned int scratch_size;
+  char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+
+#define utf16_index() var1.u32
+  HB_UChar16 *pchars = (HB_UChar16 *) scratch;
+  unsigned int chars_len = 0;
+  for (unsigned int i = 0; i < buffer->len; i++) {
+    hb_codepoint_t c = buffer->info[i].codepoint;
+    buffer->info[i].utf16_index() = chars_len;
+    if (likely (c < 0x10000))
+      pchars[chars_len++] = c;
+    else if (unlikely (c >= 0x110000))
+      pchars[chars_len++] = 0xFFFD;
+    else {
+      pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10);
+      pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1));
+    }
+  }
+
+
+#define ALLOCATE_ARRAY(Type, name, len) \
+  name = (Type *) scratch; \
+  scratch += (len) * sizeof ((name)[0]); \
+  scratch_size -= (len) * sizeof ((name)[0]);
+
+
+  HB_ShaperItem item = {0};
+
+  ALLOCATE_ARRAY (const HB_UChar16, item.string, chars_len);
+  ALLOCATE_ARRAY (unsigned short, item.log_clusters, chars_len + 2);
+  item.stringLength = chars_len;
+  item.item.pos = 0;
+  item.item.length = item.stringLength;
+  item.item.script = hb_old_script_from_script (buffer->props.script);
+  item.item.bidiLevel = backward ? 1 : 0;
+
+  item.font = old_font;
+  item.face = old_face;
+  item.shaperFlags = 0;
+
+  item.glyphIndicesPresent = false;
+
+  /* TODO Alignment. */
+  unsigned int num_glyphs = scratch_size / (sizeof (HB_Glyph) +
+					    sizeof (HB_GlyphAttributes) +
+					    sizeof (HB_Fixed) +
+					    sizeof (HB_FixedPoint) +
+					    sizeof (uint32_t));
+
+  item.num_glyphs = num_glyphs;
+  ALLOCATE_ARRAY (HB_Glyph, item.glyphs, num_glyphs);
+  ALLOCATE_ARRAY (HB_GlyphAttributes, item.attributes, num_glyphs);
+  ALLOCATE_ARRAY (HB_Fixed, item.advances, num_glyphs);
+  ALLOCATE_ARRAY (HB_FixedPoint, item.offsets, num_glyphs);
+  uint32_t *vis_clusters;
+  ALLOCATE_ARRAY (uint32_t, vis_clusters, num_glyphs);
+
+#undef ALLOCATE_ARRAY
+
+  if (!HB_ShapeItem (&item))
+  {
+    if (unlikely (item.num_glyphs > num_glyphs))
+    {
+      buffer->ensure (buffer->allocated * 2);
+      if (buffer->in_error)
+        return false;
+      goto retry;
+    }
+    return false;
+  }
+  num_glyphs = item.num_glyphs;
+
+  /* Ok, we've got everything we need, now compose output buffer,
+   * very, *very*, carefully! */
+
+  /* Calculate visual-clusters.  That's what we ship. */
+  for (unsigned int i = 0; i < num_glyphs; i++)
+    vis_clusters[i] = -1;
+  for (unsigned int i = 0; i < buffer->len; i++) {
+    uint32_t *p = &vis_clusters[item.log_clusters[buffer->info[i].utf16_index()]];
+    *p = MIN (*p, buffer->info[i].cluster);
+  }
+  for (unsigned int i = 1; i < num_glyphs; i++)
+    if (vis_clusters[i] == -1)
+      vis_clusters[i] = vis_clusters[i - 1];
+
+#undef utf16_index
+
+  buffer->ensure (num_glyphs);
+  if (buffer->in_error)
+    return false;
+
+
+  buffer->len = num_glyphs;
+  hb_glyph_info_t *info = buffer->info;
+  for (unsigned int i = 0; i < num_glyphs; i++)
+  {
+    info[i].codepoint = item.glyphs[i];
+    info[i].cluster = vis_clusters[i];
+
+    info[i].mask = item.advances[i];
+    info[i].var1.u32 = item.offsets[i].x;
+    info[i].var2.u32 = item.offsets[i].y;
+  }
+
+  buffer->clear_positions ();
+
+  for (unsigned int i = 0; i < num_glyphs; ++i) {
+    hb_glyph_info_t *info = &buffer->info[i];
+    hb_glyph_position_t *pos = &buffer->pos[i];
+
+    /* TODO vertical */
+    pos->x_advance = info->mask;
+    pos->x_offset = info->var1.u32;
+    pos->y_offset = info->var2.u32;
+  }
+
+  if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction))
+    buffer->reverse ();
+
+  return true;
+}
diff --git a/gfx/harfbuzz/src/hb-open-file-private.hh b/gfx/harfbuzz/src/hb-open-file-private.hh
index ce18580f0ec4..e2d4a2c237f9 100644
--- a/gfx/harfbuzz/src/hb-open-file-private.hh
+++ b/gfx/harfbuzz/src/hb-open-file-private.hh
@@ -105,7 +105,7 @@ typedef struct OffsetTable
     return TRACE_RETURN (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables));
   }
 
-  private:
+  protected:
   Tag		sfnt_version;	/* '\0\001\0\00' if TrueType / 'OTTO' if CFF */
   USHORT	numTables;	/* Number of tables. */
   USHORT	searchRange;	/* (Maximum power of 2 <= numTables) x 16 */
@@ -133,7 +133,7 @@ struct TTCHeaderVersion1
     return TRACE_RETURN (table.sanitize (c, this));
   }
 
-  private:
+  protected:
   Tag		ttcTag;		/* TrueType Collection ID string: 'ttcf' */
   FixedVersion	version;	/* Version of the TTC Header (1.0),
 				 * 0x00010000 */
@@ -177,7 +177,7 @@ struct TTCHeader
     }
   }
 
-  private:
+  protected:
   union {
   struct {
   Tag		ttcTag;		/* TrueType Collection ID string: 'ttcf' */
@@ -242,7 +242,7 @@ struct OpenTypeFontFile
     }
   }
 
-  private:
+  protected:
   union {
   Tag			tag;		/* 4-byte identifier. */
   OpenTypeFontFace	fontFace;
diff --git a/gfx/harfbuzz/src/hb-open-type-private.hh b/gfx/harfbuzz/src/hb-open-type-private.hh
index f4a2ba969090..4d8c507fbc94 100644
--- a/gfx/harfbuzz/src/hb-open-type-private.hh
+++ b/gfx/harfbuzz/src/hb-open-type-private.hh
@@ -80,17 +80,25 @@ inline Type& StructAfter(TObject &X)
  */
 
 /* Check _assertion in a method environment */
-#define _DEFINE_SIZE_ASSERTION(_assertion) \
-  inline void _size_assertion (void) const \
-  { ASSERT_STATIC (_assertion); }
+#define _DEFINE_INSTANCE_ASSERTION1(_line, _assertion) \
+  inline void _instance_assertion_on_line_##_line (void) const \
+  { \
+    ASSERT_STATIC (_assertion); \
+    ASSERT_INSTANCE_POD (*this); /* Make sure it's POD. */ \
+  }
+# define _DEFINE_INSTANCE_ASSERTION0(_line, _assertion) _DEFINE_INSTANCE_ASSERTION1 (_line, _assertion)
+# define DEFINE_INSTANCE_ASSERTION(_assertion) _DEFINE_INSTANCE_ASSERTION0 (__LINE__, _assertion)
+
 /* Check that _code compiles in a method environment */
-#define _DEFINE_COMPILES_ASSERTION(_code) \
-  inline void _compiles_assertion (void) const \
+#define _DEFINE_COMPILES_ASSERTION1(_line, _code) \
+  inline void _compiles_assertion_on_line_##_line (void) const \
   { _code; }
+# define _DEFINE_COMPILES_ASSERTION0(_line, _code) _DEFINE_COMPILES_ASSERTION1 (_line, _code)
+# define DEFINE_COMPILES_ASSERTION(_code) _DEFINE_COMPILES_ASSERTION0 (__LINE__, _code)
 
 
 #define DEFINE_SIZE_STATIC(size) \
-  _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size)); \
+  DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)); \
   static const unsigned int static_size = (size); \
   static const unsigned int min_size = (size)
 
@@ -98,21 +106,21 @@ inline Type& StructAfter(TObject &X)
 #define VAR 1
 
 #define DEFINE_SIZE_UNION(size, _member) \
-  _DEFINE_SIZE_ASSERTION (this->u._member.static_size == (size)); \
+  DEFINE_INSTANCE_ASSERTION (this->u._member.static_size == (size)); \
   static const unsigned int min_size = (size)
 
 #define DEFINE_SIZE_MIN(size) \
-  _DEFINE_SIZE_ASSERTION (sizeof (*this) >= (size)); \
+  DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)); \
   static const unsigned int min_size = (size)
 
 #define DEFINE_SIZE_ARRAY(size, array) \
-  _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + sizeof (array[0])); \
-  _DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \
+  DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (array[0])); \
+  DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \
   static const unsigned int min_size = (size)
 
 #define DEFINE_SIZE_ARRAY2(size, array1, array2) \
-  _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \
-  _DEFINE_COMPILES_ASSERTION ((void) array1[0].static_size; (void) array2[0].static_size) \
+  DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \
+  DEFINE_COMPILES_ASSERTION ((void) array1[0].static_size; (void) array2[0].static_size) \
   static const unsigned int min_size = (size)
 
 
@@ -122,6 +130,7 @@ inline Type& StructAfter(TObject &X)
  */
 
 /* Global nul-content Null pool.  Enlarge as necessary. */
+/* TODO This really should be a extern HB_INTERNAL and defined somewhere... */
 static const void *_NullPool[64 / sizeof (void *)];
 
 /* Generic nul-content Null objects. */
@@ -333,8 +342,6 @@ struct Sanitizer
 
 template <typename Type, int Bytes> struct BEInt;
 
-/* LONGTERMTODO: On machines allowing unaligned access, we can make the
- * following tighter by using byteswap instructions on ints directly. */
 template <typename Type>
 struct BEInt<Type, 2>
 {
@@ -689,11 +696,20 @@ struct SortedArrayOf : ArrayOf<Type> {
 
   template <typename SearchType>
   inline int search (const SearchType &x) const {
-    struct Cmp {
-      static int cmp (const SearchType *a, const Type *b) { return b->cmp (*a); }
-    };
-    const Type *p = (const Type *) bsearch (&x, this->array, this->len, sizeof (this->array[0]), (hb_compare_func_t) Cmp::cmp);
-    return p ? p - this->array : -1;
+    unsigned int count = this->len;
+    /* Linear search is *much* faster for small counts. */
+    if (likely (count < 32)) {
+      for (unsigned int i = 0; i < count; i++)
+	if (this->array[i].cmp (x) == 0)
+	  return i;
+      return -1;
+    } else {
+      struct Cmp {
+	static int cmp (const SearchType *a, const Type *b) { return b->cmp (*a); }
+      };
+      const Type *p = (const Type *) bsearch (&x, this->array, this->len, sizeof (this->array[0]), (hb_compare_func_t) Cmp::cmp);
+      return p ? p - this->array : -1;
+    }
   }
 };
 
diff --git a/gfx/harfbuzz/src/hb-ot-head-table.hh b/gfx/harfbuzz/src/hb-ot-head-table.hh
index 32d64ca9640d..bf2d2452b905 100644
--- a/gfx/harfbuzz/src/hb-ot-head-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-head-table.hh
@@ -54,7 +54,7 @@ struct head
     return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
   }
 
-  private:
+  protected:
   FixedVersion	version;		/* Version of the head table--currently
 					 * 0x00010000 for version 1.0. */
   FixedVersion	fontRevision;		/* Set by font manufacturer. */
diff --git a/gfx/harfbuzz/src/hb-ot-hhea-table.hh b/gfx/harfbuzz/src/hb-ot-hhea-table.hh
index 2eea05ac6e92..24f8bdcfd27c 100644
--- a/gfx/harfbuzz/src/hb-ot-hhea-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-hhea-table.hh
@@ -47,7 +47,7 @@ struct hhea
     return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
   }
 
-  private:
+  protected:
   FixedVersion	version;		/* 0x00010000 for version 1.0. */
   FWORD		ascender;		/* Typographic ascent. <a
 					 * href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html">
diff --git a/gfx/harfbuzz/src/hb-ot-hmtx-table.hh b/gfx/harfbuzz/src/hb-ot-hmtx-table.hh
index 35cfb48c7e11..cc7cfbb96cdd 100644
--- a/gfx/harfbuzz/src/hb-ot-hmtx-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-hmtx-table.hh
@@ -57,7 +57,7 @@ struct hmtx
     return TRACE_RETURN (true);
   }
 
-  private:
+  protected:
   LongHorMetric	longHorMetric[VAR];	/* Paired advance width and left side
 					 * bearing values for each glyph. The
 					 * value numOfHMetrics comes from
diff --git a/gfx/harfbuzz/src/hb-ot-layout-common-private.hh b/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
index 2943a7f672c3..fad813f276a4 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
@@ -34,7 +34,7 @@
 #include "hb-set-private.hh"
 
 
-#define NOT_COVERED		((unsigned int) 0x110000)
+#define NOT_COVERED		((unsigned int) -1)
 #define MAX_NESTING_LEVEL	8
 
 
@@ -134,6 +134,11 @@ struct RangeRecord
     return glyphs->intersects (start, end);
   }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs) const {
+    glyphs->add_range (start, end);
+  }
+
   GlyphID	start;		/* First GlyphID in the range */
   GlyphID	end;		/* Last GlyphID in the range */
   USHORT	value;		/* Value */
@@ -227,7 +232,7 @@ struct Script
     return TRACE_RETURN (defaultLangSys.sanitize (c, this) && langSys.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetTo<LangSys>
 		defaultLangSys;	/* Offset to DefaultLangSys table--from
 				 * beginning of Script table--may be Null */
@@ -309,6 +314,7 @@ struct Lookup
     TRACE_SANITIZE ();
     /* Real sanitize of the subtables is done by GSUB/GPOS/... */
     if (!(c->check_struct (this) && subTable.sanitize (c))) return TRACE_RETURN (false);
+    if (!subTable.len) TRACE_RETURN (false);
     if (unlikely (lookupFlag & LookupFlag::UseMarkFilteringSet))
     {
       USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
@@ -343,9 +349,8 @@ struct CoverageFormat1
   inline unsigned int get_coverage (hb_codepoint_t glyph_id) const
   {
     int i = glyphArray.search (glyph_id);
-    if (i != -1)
-        return i;
-    return NOT_COVERED;
+    ASSERT_STATIC (((unsigned int) -1) == NOT_COVERED);
+    return i;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
@@ -357,6 +362,13 @@ struct CoverageFormat1
     return glyphs->has (glyphArray[index]);
   }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs) const {
+    unsigned int count = glyphArray.len;
+    for (unsigned int i = 0; i < count; i++)
+      glyphs->add (glyphArray[i]);
+  }
+
   struct Iter {
     inline void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; };
     inline bool more (void) { return i < c->glyphArray.len; }
@@ -369,7 +381,7 @@ struct CoverageFormat1
     unsigned int i;
   };
 
-  private:
+  protected:
   USHORT	coverageFormat;	/* Format identifier--format = 1 */
   SortedArrayOf<GlyphID>
 		glyphArray;	/* Array of GlyphIDs--in numerical order */
@@ -412,6 +424,13 @@ struct CoverageFormat2
     return false;
   }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs) const {
+    unsigned int count = rangeRecord.len;
+    for (unsigned int i = 0; i < count; i++)
+      rangeRecord[i].add_coverage (glyphs);
+  }
+
   struct Iter {
     inline void init (const CoverageFormat2 &c_) {
       c = &c_;
@@ -438,7 +457,7 @@ struct CoverageFormat2
     unsigned int i, j, coverage;
   };
 
-  private:
+  protected:
   USHORT	coverageFormat;	/* Format identifier--format = 2 */
   SortedArrayOf<RangeRecord>
 		rangeRecord;	/* Array of glyph ranges--ordered by
@@ -489,6 +508,15 @@ struct Coverage
     }
   }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs) const {
+    switch (u.format) {
+    case 1: u.format1.add_coverage (glyphs); break;
+    case 2: u.format2.add_coverage (glyphs); break;
+    default:                                 break;
+    }
+  }
+
   struct Iter {
     Iter (void) : format (0) {};
     inline void init (const Coverage &c_) {
@@ -536,7 +564,7 @@ struct Coverage
     } u;
   };
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   CoverageFormat1	format1;
@@ -558,7 +586,7 @@ struct ClassDefFormat1
   private:
   inline unsigned int get_class (hb_codepoint_t glyph_id) const
   {
-    if ((unsigned int) (glyph_id - startGlyph) < classValue.len)
+    if (unlikely ((unsigned int) (glyph_id - startGlyph) < classValue.len))
       return classValue[glyph_id - startGlyph];
     return 0;
   }
@@ -576,6 +604,7 @@ struct ClassDefFormat1
     return false;
   }
 
+  protected:
   USHORT	classFormat;		/* Format identifier--format = 1 */
   GlyphID	startGlyph;		/* First GlyphID of the classValueArray */
   ArrayOf<USHORT>
@@ -610,6 +639,7 @@ struct ClassDefFormat2
     return false;
   }
 
+  protected:
   USHORT	classFormat;	/* Format identifier--format = 2 */
   SortedArrayOf<RangeRecord>
 		rangeRecord;	/* Array of glyph ranges--ordered by
@@ -649,7 +679,7 @@ struct ClassDef
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   ClassDefFormat1	format1;
@@ -720,7 +750,7 @@ struct Device
     return TRACE_RETURN (c->check_struct (this) && c->check_range (this, this->get_size ()));
   }
 
-  private:
+  protected:
   USHORT	startSize;		/* Smallest size to correct--in ppem */
   USHORT	endSize;		/* Largest size to correct--in ppem */
   USHORT	deltaFormat;		/* Format of DeltaValue array data: 1, 2, or 3
diff --git a/gfx/harfbuzz/src/hb-ot-layout-gdef-table.hh b/gfx/harfbuzz/src/hb-ot-layout-gdef-table.hh
index f29fc14d8f21..cebbe68b0984 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-gdef-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-gdef-table.hh
@@ -74,7 +74,7 @@ struct AttachList
     return TRACE_RETURN (coverage.sanitize (c, this) && attachPoint.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table -- from
 					 * beginning of AttachList table */
@@ -104,7 +104,7 @@ struct CaretValueFormat1
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT	caretValueFormat;	/* Format identifier--format = 1 */
   SHORT		coordinate;		/* X or Y value, in design units */
   public:
@@ -119,7 +119,7 @@ struct CaretValueFormat2
   inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id) const
   {
     hb_position_t x, y;
-    if (hb_font_get_glyph_contour_point_for_origin (font, glyph_id, caretValuePoint, direction, &x, &y))
+    if (font->get_glyph_contour_point_for_origin (glyph_id, caretValuePoint, direction, &x, &y))
       return HB_DIRECTION_IS_HORIZONTAL (direction) ? x : y;
     else
       return 0;
@@ -130,7 +130,7 @@ struct CaretValueFormat2
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT	caretValueFormat;	/* Format identifier--format = 2 */
   USHORT	caretValuePoint;	/* Contour point index on glyph */
   public:
@@ -153,7 +153,7 @@ struct CaretValueFormat3
     return TRACE_RETURN (c->check_struct (this) && deviceTable.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	caretValueFormat;	/* Format identifier--format = 3 */
   SHORT		coordinate;		/* X or Y value, in design units */
   OffsetTo<Device>
@@ -187,7 +187,7 @@ struct CaretValue
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   CaretValueFormat1	format1;
@@ -222,7 +222,7 @@ struct LigGlyph
     return TRACE_RETURN (carets.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetArrayOf<CaretValue>
 		carets;			/* Offset array of CaretValue tables
 					 * --from beginning of LigGlyph table
@@ -256,7 +256,7 @@ struct LigCaretList
     return TRACE_RETURN (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
 					 * beginning of LigCaretList table */
@@ -278,7 +278,7 @@ struct MarkGlyphSetsFormat1
     return TRACE_RETURN (coverage.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   LongOffsetArrayOf<Coverage>
 		coverage;		/* Array of long offsets to mark set
@@ -306,7 +306,7 @@ struct MarkGlyphSets
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   MarkGlyphSetsFormat1	format1;
@@ -392,7 +392,7 @@ struct GDEF
   }
 
 
-  private:
+  protected:
   FixedVersion	version;		/* Version of the GDEF table--currently
 					 * 0x00010002 */
   OffsetTo<ClassDef>
diff --git a/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh b/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
index 71c13a2e06f5..41168b2e0aa6 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
@@ -225,7 +225,7 @@ struct AnchorFormat1
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   SHORT		xCoordinate;		/* Horizontal value--in design units */
   SHORT		yCoordinate;		/* Vertical value--in design units */
@@ -247,7 +247,7 @@ struct AnchorFormat2
       hb_bool_t ret = false;
 
       if (x_ppem || y_ppem)
-	ret = hb_font_get_glyph_contour_point_for_origin (font, glyph_id, anchorPoint, HB_DIRECTION_LTR, &cx, &cy);
+	ret = font->get_glyph_contour_point_for_origin (glyph_id, anchorPoint, HB_DIRECTION_LTR, &cx, &cy);
       *x = x_ppem && ret ? cx : font->em_scale_x (xCoordinate);
       *y = y_ppem && ret ? cy : font->em_scale_y (yCoordinate);
   }
@@ -257,7 +257,7 @@ struct AnchorFormat2
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 2 */
   SHORT		xCoordinate;		/* Horizontal value--in design units */
   SHORT		yCoordinate;		/* Vertical value--in design units */
@@ -288,7 +288,7 @@ struct AnchorFormat3
     return TRACE_RETURN (c->check_struct (this) && xDeviceTable.sanitize (c, this) && yDeviceTable.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 3 */
   SHORT		xCoordinate;		/* Horizontal value--in design units */
   SHORT		yCoordinate;		/* Vertical value--in design units */
@@ -329,7 +329,7 @@ struct Anchor
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   AnchorFormat1		format1;
@@ -360,7 +360,7 @@ struct AnchorMatrix
   }
 
   USHORT	rows;			/* Number of rows */
-  private:
+  protected:
   OffsetTo<Anchor>
 		matrix[VAR];		/* Matrix of offsets to Anchor tables--
 					 * from beginning of AnchorMatrix table */
@@ -378,7 +378,7 @@ struct MarkRecord
     return TRACE_RETURN (c->check_struct (this) && markAnchor.sanitize (c, base));
   }
 
-  private:
+  protected:
   USHORT	klass;			/* Class defined for this mark */
   OffsetTo<Anchor>
 		markAnchor;		/* Offset to Anchor table--from
@@ -429,6 +429,12 @@ struct SinglePosFormat1
   friend struct SinglePos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -447,7 +453,7 @@ struct SinglePosFormat1
     return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && valueFormat.sanitize_value (c, this, values));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -466,6 +472,12 @@ struct SinglePosFormat2
   friend struct SinglePos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -487,7 +499,7 @@ struct SinglePosFormat2
     return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && valueFormat.sanitize_values (c, this, values, valueCount));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 2 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -506,6 +518,16 @@ struct SinglePos
   friend struct PosLookupSubTable;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    case 2: return u.format2.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -526,7 +548,7 @@ struct SinglePos
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   SinglePosFormat1	format1;
@@ -539,7 +561,7 @@ struct PairValueRecord
 {
   friend struct PairSet;
 
-  private:
+  protected:
   GlyphID	secondGlyph;		/* GlyphID of second glyph in the
 					 * pair--first glyph is listed in the
 					 * Coverage table */
@@ -601,7 +623,7 @@ struct PairSet
 		      && closure->valueFormats[1].sanitize_values_stride_unsafe (c, closure->base, &record->values[closure->len1], count, closure->stride));
   }
 
-  private:
+  protected:
   USHORT	len;			/* Number of PairValueRecords */
   USHORT	array[VAR];		/* Array of PairValueRecords--ordered
 					 * by GlyphID of the second glyph */
@@ -614,6 +636,12 @@ struct PairPosFormat1
   friend struct PairPos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -643,7 +671,7 @@ struct PairPosFormat1
     return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && pairSet.sanitize (c, this, &closure));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -666,6 +694,12 @@ struct PairPosFormat2
   friend struct PairPos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -715,7 +749,7 @@ struct PairPosFormat2
 			 valueFormat2.sanitize_values_stride_unsafe (c, this, &values[len1], count, stride));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 2 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -750,6 +784,16 @@ struct PairPos
   friend struct PosLookupSubTable;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    case 2: return u.format2.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -770,7 +814,7 @@ struct PairPos
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   PairPosFormat1	format1;
@@ -788,7 +832,7 @@ struct EntryExitRecord
     return TRACE_RETURN (entryAnchor.sanitize (c, base) && exitAnchor.sanitize (c, base));
   }
 
-  private:
+  protected:
   OffsetTo<Anchor>
 		entryAnchor;		/* Offset to EntryAnchor table--from
 					 * beginning of CursivePos
@@ -806,6 +850,12 @@ struct CursivePosFormat1
   friend struct CursivePos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -893,7 +943,7 @@ struct CursivePosFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && entryExitRecord.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -910,6 +960,15 @@ struct CursivePos
   friend struct PosLookupSubTable;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -928,7 +987,7 @@ struct CursivePos
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   CursivePosFormat1	format1;
@@ -946,6 +1005,12 @@ struct MarkBasePosFormat1
   friend struct MarkBasePos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+markCoverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -955,7 +1020,12 @@ struct MarkBasePosFormat1
     /* now we search backwards for a non-mark glyph */
     unsigned int property;
     hb_apply_context_t::mark_skipping_backward_iterator_t skippy_iter (c, c->buffer->idx, 1);
-    if (!skippy_iter.prev (&property, LookupFlag::IgnoreMarks)) return TRACE_RETURN (false);
+    do {
+      if (!skippy_iter.prev (&property, LookupFlag::IgnoreMarks)) return TRACE_RETURN (false);
+      /* We only want to attach to the first of a MultipleSubst sequence.  Reject others. */
+      if (0 == get_lig_comp (c->buffer->info[skippy_iter.idx])) break;
+      skippy_iter.reject ();
+    } while (1);
 
     /* The following assertion is too strong, so we've disabled it. */
     if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH)) {/*return TRACE_RETURN (false);*/}
@@ -972,7 +1042,7 @@ struct MarkBasePosFormat1
 			 markArray.sanitize (c, this) && baseArray.sanitize (c, this, (unsigned int) classCount));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		markCoverage;		/* Offset to MarkCoverage table--from
@@ -996,6 +1066,15 @@ struct MarkBasePos
   friend struct PosLookupSubTable;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -1014,7 +1093,7 @@ struct MarkBasePos
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   MarkBasePosFormat1	format1;
@@ -1037,6 +1116,12 @@ struct MarkLigPosFormat1
   friend struct MarkLigPos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+markCoverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -1062,19 +1147,16 @@ struct MarkLigPosFormat1
     unsigned int comp_count = lig_attach.rows;
     if (unlikely (!comp_count)) return TRACE_RETURN (false);
 
-    unsigned int comp_index;
     /* We must now check whether the ligature ID of the current mark glyph
      * is identical to the ligature ID of the found ligature.  If yes, we
      * can directly use the component index.  If not, we attach the mark
      * glyph to the last component of the ligature. */
-    if (get_lig_id (c->buffer->info[j]) &&
-	get_lig_id (c->buffer->cur()) &&
-	get_lig_comp (c->buffer->cur()) > 0)
-    {
-      comp_index = get_lig_comp (c->buffer->cur()) - 1;
-      if (comp_index >= comp_count)
-	comp_index = comp_count - 1;
-    }
+    unsigned int comp_index;
+    unsigned int lig_id = get_lig_id (c->buffer->info[j]);
+    unsigned int mark_id = get_lig_id (c->buffer->cur());
+    unsigned int mark_comp = get_lig_comp (c->buffer->cur());
+    if (lig_id && lig_id == mark_id && mark_comp > 0)
+      comp_index = MIN (comp_count, get_lig_comp (c->buffer->cur())) - 1;
     else
       comp_index = comp_count - 1;
 
@@ -1087,7 +1169,7 @@ struct MarkLigPosFormat1
 			 markArray.sanitize (c, this) && ligatureArray.sanitize (c, this, (unsigned int) classCount));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		markCoverage;		/* Offset to Mark Coverage table--from
@@ -1112,6 +1194,15 @@ struct MarkLigPos
   friend struct PosLookupSubTable;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -1130,7 +1221,7 @@ struct MarkLigPos
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   MarkLigPosFormat1	format1;
@@ -1148,6 +1239,12 @@ struct MarkMarkPosFormat1
   friend struct MarkMarkPos;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+mark1Coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -1163,14 +1260,27 @@ struct MarkMarkPosFormat1
 
     unsigned int j = skippy_iter.idx;
 
-    /* Two marks match only if they belong to the same base, or same component
-     * of the same ligature.  That is, the component numbers must match, and
-     * if those are non-zero, the ligid number should also match. */
-    if ((get_lig_comp (c->buffer->cur())) ||
-	(get_lig_comp (c->buffer->info[j]) > 0 &&
-	 get_lig_id (c->buffer->cur())))
-      return TRACE_RETURN (false);
+    unsigned int id1 = get_lig_id (c->buffer->cur());
+    unsigned int id2 = get_lig_id (c->buffer->info[j]);
+    unsigned int comp1 = get_lig_comp (c->buffer->cur());
+    unsigned int comp2 = get_lig_comp (c->buffer->info[j]);
 
+    if (likely (id1 == id2)) {
+      if (id1 == 0) /* Marks belonging to the same base. */
+	goto good;
+      else if (comp1 == comp2) /* Marks belonging to the same ligature component. */
+        goto good;
+    } else {
+      /* If ligature ids don't match, it may be the case that one of the marks
+       * itself is a ligature.  In which case match. */
+      if ((id1 > 0 && !comp1) || (id2 > 0 && !comp2))
+	goto good;
+    }
+
+    /* Didn't match. */
+    return TRACE_RETURN (false);
+
+    good:
     unsigned int mark2_index = (this+mark2Coverage) (c->buffer->info[j].codepoint);
     if (mark2_index == NOT_COVERED) return TRACE_RETURN (false);
 
@@ -1184,7 +1294,7 @@ struct MarkMarkPosFormat1
 			 && mark2Array.sanitize (c, this, (unsigned int) classCount));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		mark1Coverage;		/* Offset to Combining Mark1 Coverage
@@ -1210,6 +1320,15 @@ struct MarkMarkPos
   friend struct PosLookupSubTable;
 
   private:
+
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -1228,7 +1347,7 @@ struct MarkMarkPos
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   MarkMarkPosFormat1	format1;
@@ -1275,6 +1394,8 @@ struct ExtensionPos : Extension
     return StructAtOffset<PosLookupSubTable> (this, offset);
   }
 
+  inline const Coverage &get_coverage (void) const;
+
   inline bool apply (hb_apply_context_t *c) const;
 
   inline bool sanitize (hb_sanitize_context_t *c);
@@ -1303,6 +1424,22 @@ struct PosLookupSubTable
     Extension		= 9
   };
 
+  inline const Coverage &get_coverage (unsigned int lookup_type) const
+  {
+    switch (lookup_type) {
+    case Single:		return u.single.get_coverage ();
+    case Pair:			return u.pair.get_coverage ();
+    case Cursive:		return u.cursive.get_coverage ();
+    case MarkBase:		return u.markBase.get_coverage ();
+    case MarkLig:		return u.markLig.get_coverage ();
+    case MarkMark:		return u.markMark.get_coverage ();
+    case Context:		return u.context.get_coverage ();
+    case ChainContext:		return u.chainContext.get_coverage ();
+    case Extension:		return u.extension.get_coverage ();
+    default:			return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c, unsigned int lookup_type) const
   {
     TRACE_APPLY ();
@@ -1313,7 +1450,7 @@ struct PosLookupSubTable
     case MarkBase:		return TRACE_RETURN (u.markBase.apply (c));
     case MarkLig:		return TRACE_RETURN (u.markLig.apply (c));
     case MarkMark:		return TRACE_RETURN (u.markMark.apply (c));
-    case Context:		return TRACE_RETURN (u.c.apply (c));
+    case Context:		return TRACE_RETURN (u.context.apply (c));
     case ChainContext:		return TRACE_RETURN (u.chainContext.apply (c));
     case Extension:		return TRACE_RETURN (u.extension.apply (c));
     default:			return TRACE_RETURN (false);
@@ -1322,6 +1459,8 @@ struct PosLookupSubTable
 
   inline bool sanitize (hb_sanitize_context_t *c, unsigned int lookup_type) {
     TRACE_SANITIZE ();
+    if (!u.header.sub_format.sanitize (c))
+      return TRACE_RETURN (false);
     switch (lookup_type) {
     case Single:		return TRACE_RETURN (u.single.sanitize (c));
     case Pair:			return TRACE_RETURN (u.pair.sanitize (c));
@@ -1329,28 +1468,30 @@ struct PosLookupSubTable
     case MarkBase:		return TRACE_RETURN (u.markBase.sanitize (c));
     case MarkLig:		return TRACE_RETURN (u.markLig.sanitize (c));
     case MarkMark:		return TRACE_RETURN (u.markMark.sanitize (c));
-    case Context:		return TRACE_RETURN (u.c.sanitize (c));
+    case Context:		return TRACE_RETURN (u.context.sanitize (c));
     case ChainContext:		return TRACE_RETURN (u.chainContext.sanitize (c));
     case Extension:		return TRACE_RETURN (u.extension.sanitize (c));
     default:			return TRACE_RETURN (true);
     }
   }
 
-  private:
+  protected:
   union {
-  USHORT		sub_format;
+  struct {
+    USHORT			sub_format;
+  } header;
   SinglePos		single;
   PairPos		pair;
   CursivePos		cursive;
   MarkBasePos		markBase;
   MarkLigPos		markLig;
   MarkMarkPos		markMark;
-  ContextPos		c;
+  ContextPos		context;
   ChainContextPos	chainContext;
   ExtensionPos		extension;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, sub_format);
+  DEFINE_SIZE_UNION (2, header.sub_format);
 };
 
 
@@ -1359,14 +1500,29 @@ struct PosLookup : Lookup
   inline const PosLookupSubTable& get_subtable (unsigned int i) const
   { return this+CastR<OffsetArrayOf<PosLookupSubTable> > (subTable)[i]; }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs) const
+  {
+    const Coverage *last = NULL;
+    unsigned int count = get_subtable_count ();
+    for (unsigned int i = 0; i < count; i++) {
+      const Coverage *c = &get_subtable (i).get_coverage (get_type ());
+      if (c != last) {
+        c->add_coverage (glyphs);
+        last = c;
+      }
+    }
+  }
+
   inline bool apply_once (hb_apply_context_t *c) const
   {
     unsigned int lookup_type = get_type ();
 
-    if (!_hb_ot_layout_check_glyph_property (c->face, &c->buffer->cur(), c->lookup_props, &c->property))
+    if (!c->check_glyph_property (&c->buffer->cur(), c->lookup_props, &c->property))
       return false;
 
-    for (unsigned int i = 0; i < get_subtable_count (); i++)
+    unsigned int count = get_subtable_count ();
+    for (unsigned int i = 0; i < count; i++)
       if (get_subtable (i).apply (c, lookup_type))
 	return true;
 
@@ -1383,9 +1539,12 @@ struct PosLookup : Lookup
     c->set_lookup (*this);
 
     c->buffer->idx = 0;
+
     while (c->buffer->idx < c->buffer->len)
     {
-      if ((c->buffer->cur().mask & c->lookup_mask) && apply_once (c))
+      if ((c->buffer->cur().mask & c->lookup_mask) &&
+	  c->digest.may_have (c->buffer->cur().codepoint) &&
+	  apply_once (c))
 	ret = true;
       else
 	c->buffer->idx++;
@@ -1415,11 +1574,15 @@ struct GPOS : GSUBGPOS
   inline const PosLookup& get_lookup (unsigned int i) const
   { return CastR<PosLookup> (GSUBGPOS::get_lookup (i)); }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs, unsigned int lookup_index) const
+  { get_lookup (lookup_index).add_coverage (glyphs); }
+
   inline bool position_lookup (hb_apply_context_t *c, unsigned int lookup_index) const
   { return get_lookup (lookup_index).apply_string (c); }
 
-  static inline void position_start (hb_buffer_t *buffer);
-  static inline void position_finish (hb_buffer_t *buffer);
+  static inline void position_start (hb_font_t *font, hb_buffer_t *buffer);
+  static inline void position_finish (hb_font_t *font, hb_buffer_t *buffer, hb_bool_t zero_width_attahced_marks);
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
@@ -1452,15 +1615,17 @@ fix_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction
 }
 
 static void
-fix_mark_attachment (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction)
+fix_mark_attachment (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, hb_bool_t zero_width_attached_marks)
 {
   if (likely (!(pos[i].attach_lookback())))
     return;
 
   unsigned int j = i - pos[i].attach_lookback();
 
-  pos[i].x_advance = 0;
-  pos[i].y_advance = 0;
+  if (zero_width_attached_marks) {
+    pos[i].x_advance = 0;
+    pos[i].y_advance = 0;
+  }
   pos[i].x_offset += pos[j].x_offset;
   pos[i].y_offset += pos[j].y_offset;
 
@@ -1477,7 +1642,7 @@ fix_mark_attachment (hb_glyph_position_t *pos, unsigned int i, hb_direction_t di
 }
 
 void
-GPOS::position_start (hb_buffer_t *buffer)
+GPOS::position_start (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer)
 {
   buffer->clear_positions ();
 
@@ -1487,7 +1652,7 @@ GPOS::position_start (hb_buffer_t *buffer)
 }
 
 void
-GPOS::position_finish (hb_buffer_t *buffer)
+GPOS::position_finish (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer, hb_bool_t zero_width_attached_marks)
 {
   unsigned int len;
   hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, &len);
@@ -1499,16 +1664,21 @@ GPOS::position_finish (hb_buffer_t *buffer)
 
   /* Handle attachments */
   for (unsigned int i = 0; i < len; i++)
-    fix_mark_attachment (pos, i, direction);
+    fix_mark_attachment (pos, i, direction, zero_width_attached_marks);
 
   HB_BUFFER_DEALLOCATE_VAR (buffer, syllable);
   HB_BUFFER_DEALLOCATE_VAR (buffer, lig_props);
-  HB_BUFFER_DEALLOCATE_VAR (buffer, props_cache);
+  HB_BUFFER_DEALLOCATE_VAR (buffer, glyph_props);
 }
 
 
 /* Out-of-class implementation for methods recursing */
 
+inline const Coverage & ExtensionPos::get_coverage (void) const
+{
+  return get_subtable ().get_coverage (get_type ());
+}
+
 inline bool ExtensionPos::apply (hb_apply_context_t *c) const
 {
   TRACE_APPLY ();
@@ -1526,7 +1696,7 @@ inline bool ExtensionPos::sanitize (hb_sanitize_context_t *c)
 
 static inline bool position_lookup (hb_apply_context_t *c, unsigned int lookup_index)
 {
-  const GPOS &gpos = *(c->face->ot_layout->gpos);
+  const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos);
   const PosLookup &l = gpos.get_lookup (lookup_index);
 
   if (unlikely (c->nesting_level_left == 0))
diff --git a/gfx/harfbuzz/src/hb-ot-layout-gsub-table.hh b/gfx/harfbuzz/src/hb-ot-layout-gsub-table.hh
index f6a757530336..b69af4cc31bb 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-gsub-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-gsub-table.hh
@@ -50,9 +50,9 @@ struct SingleSubstFormat1
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
-    return (this+coverage) (glyph_id) != NOT_COVERED;
+    return this+coverage;
   }
 
   inline bool apply (hb_apply_context_t *c) const
@@ -75,7 +75,7 @@ struct SingleSubstFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && deltaGlyphID.sanitize (c));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -102,9 +102,9 @@ struct SingleSubstFormat2
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
-    return (this+coverage) (glyph_id) != NOT_COVERED;
+    return this+coverage;
   }
 
   inline bool apply (hb_apply_context_t *c) const
@@ -127,7 +127,7 @@ struct SingleSubstFormat2
     return TRACE_RETURN (coverage.sanitize (c, this) && substitute.sanitize (c));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 2 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -155,12 +155,12 @@ struct SingleSubst
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
     switch (u.format) {
-    case 1: return u.format1.would_apply (glyph_id);
-    case 2: return u.format2.would_apply (glyph_id);
-    default:return false;
+    case 1: return u.format1.get_coverage ();
+    case 2: return u.format2.get_coverage ();
+    default:return Null(Coverage);
     }
   }
 
@@ -184,7 +184,7 @@ struct SingleSubst
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   SingleSubstFormat1	format1;
@@ -213,7 +213,12 @@ struct Sequence
     if (unlikely (!substitute.len)) return TRACE_RETURN (false);
 
     unsigned int klass = c->property & HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE ? HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH : 0;
-    c->replace_glyphs_be16 (1, substitute.len, (const uint16_t *) substitute.array, klass);
+    unsigned int count = substitute.len;
+    for (unsigned int i = 0; i < count; i++) {
+      set_lig_props_for_component (c->buffer->cur(), i);
+      c->output_glyph (substitute.array[i], klass);
+    }
+    c->buffer->skip_glyph ();
 
     return TRACE_RETURN (true);
   }
@@ -224,7 +229,7 @@ struct Sequence
     return TRACE_RETURN (substitute.sanitize (c));
   }
 
-  private:
+  protected:
   ArrayOf<GlyphID>
 		substitute;		/* String of GlyphIDs to substitute */
   public:
@@ -247,9 +252,9 @@ struct MultipleSubstFormat1
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
-    return (this+coverage) (glyph_id) != NOT_COVERED;
+    return this+coverage;
   }
 
   inline bool apply (hb_apply_context_t *c) const
@@ -267,7 +272,7 @@ struct MultipleSubstFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && sequence.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -294,11 +299,11 @@ struct MultipleSubst
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
     switch (u.format) {
-    case 1: return u.format1.would_apply (glyph_id);
-    default:return false;
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
     }
   }
 
@@ -320,7 +325,7 @@ struct MultipleSubst
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   MultipleSubstFormat1	format1;
@@ -351,9 +356,9 @@ struct AlternateSubstFormat1
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
-    return (this+coverage) (glyph_id) != NOT_COVERED;
+    return this+coverage;
   }
 
   inline bool apply (hb_apply_context_t *c) const
@@ -389,7 +394,7 @@ struct AlternateSubstFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && alternateSet.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -416,11 +421,11 @@ struct AlternateSubst
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  inline const Coverage &get_coverage (void) const
   {
     switch (u.format) {
-    case 1: return u.format1.would_apply (glyph_id);
-    default:return false;
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
     }
   }
 
@@ -442,7 +447,7 @@ struct AlternateSubst
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   AlternateSubstFormat1	format1;
@@ -466,22 +471,71 @@ struct Ligature
     c->glyphs->add (ligGlyph);
   }
 
-  inline bool would_apply (hb_codepoint_t second) const
+  inline bool would_apply (hb_would_apply_context_t *c) const
   {
-    return component.len == 2 && component[1] == second;
+    return c->len == 1 || (c->len == 2 && component.len == 2 && component[1] == c->second);
   }
 
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
     unsigned int count = component.len;
-    if (unlikely (count < 2)) return TRACE_RETURN (false);
+    if (unlikely (count < 1)) return TRACE_RETURN (false);
 
     hb_apply_context_t::mark_skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, count - 1);
     if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false);
 
-    bool first_was_mark = (c->property & HB_OT_LAYOUT_GLYPH_CLASS_MARK);
-    bool found_non_mark = false;
+    /*
+     * This is perhaps the trickiest part of GSUB...  Remarks:
+     *
+     * - If all components of the ligature were marks, we call this a mark ligature.
+     *
+     * - If there is no GDEF, and the ligature is NOT a mark ligature, we categorize
+     *   it as a ligature glyph.  Though, really, this will not really be used...
+     *
+     * - If it *is* a mark ligature, we don't allocate a new ligature id, and leave
+     *   the ligature to keep its old ligature id.  This will allow it to attach to
+     *   a base ligature in GPOS.  Eg. if the sequence is: LAM,LAM,SHADDA,FATHA,HEH,
+     *   and LAM,LAM,HEH for a ligature, they will leave SHADDA and FATHA wit a
+     *   ligature id and component value of 2.  Then if SHADDA,FATHA form a ligature
+     *   later, we don't want them to lose their ligature id/component, otherwise
+     *   GPOS will fail to correctly position the mark ligature on top of the
+     *   LAM,LAM,HEH ligature.  See:
+     *     https://bugzilla.gnome.org/show_bug.cgi?id=676343
+     *
+     * - If a ligature is formed of components that some of which are also ligatures
+     *   themselves, and those ligature components had marks attached to *their*
+     *   components, we have to attach the marks to the new ligature component
+     *   positions!  Now *that*'s tricky!  And these marks may be following the
+     *   last component of the whole sequence, so we should loop forward looking
+     *   for them and update them.
+     *
+     *   Eg. the sequence is LAM,LAM,SHADDA,FATHA,HEH, and the font first forms a
+     *   'calt' ligature of LAM,HEH, leaving the SHADDA and FATHA with a ligature
+     *   id and component == 1.  Now, during 'liga', the LAM and the LAM-HEH ligature
+     *   form a LAM-LAM-HEH ligature.  We need to reassign the SHADDA and FATHA to
+     *   the new ligature with a component value of 2.
+     *
+     *   This in fact happened to a font...  See:
+     *   https://bugzilla.gnome.org/show_bug.cgi?id=437633
+     *
+     * - Ligatures cannot be formed across glyphs attached to different components
+     *   of previous ligatures.  Eg. the sequence is LAM,SHADDA,LAM,FATHA,HEH, and
+     *   LAM,LAM,HEH form a ligature, leaving SHADDA,FATHA next to eachother.
+     *   However, it would be wrong to ligate that SHADDA,FATHA sequence.o
+     *   There is an exception to this: If a ligature tries ligating with marks that
+     *   belong to it itself, go ahead, assuming that the font designer knows what
+     *   they are doing (otherwise it can break Indic stuff when a matra wants to
+     *   ligate with a conjunct...)
+     */
+
+    bool is_mark_ligature = !!(c->property & HB_OT_LAYOUT_GLYPH_CLASS_MARK);
+
+    unsigned int total_component_count = 0;
+    total_component_count += get_lig_num_comps (c->buffer->cur());
+
+    unsigned int first_lig_id = get_lig_id (c->buffer->cur());
+    unsigned int first_lig_comp = get_lig_comp (c->buffer->cur());
 
     for (unsigned int i = 1; i < count; i++)
     {
@@ -489,42 +543,71 @@ struct Ligature
 
       if (!skippy_iter.next (&property)) return TRACE_RETURN (false);
 
-      found_non_mark |= !(property & HB_OT_LAYOUT_GLYPH_CLASS_MARK);
-
       if (likely (c->buffer->info[skippy_iter.idx].codepoint != component[i])) return TRACE_RETURN (false);
+
+      unsigned int this_lig_id = get_lig_id (c->buffer->info[skippy_iter.idx]);
+      unsigned int this_lig_comp = get_lig_comp (c->buffer->info[skippy_iter.idx]);
+
+      if (first_lig_id && first_lig_comp) {
+        /* If first component was attached to a previous ligature component,
+	 * all subsequent components should be attached to the same ligature
+	 * component, otherwise we shouldn't ligate them. */
+        if (first_lig_id != this_lig_id || first_lig_comp != this_lig_comp)
+	  return TRACE_RETURN (false);
+      } else {
+        /* If first component was NOT attached to a previous ligature component,
+	 * all subsequent components should also NOT be attached to any ligature
+	 * component, unless they are attached to the first component itself! */
+        if (this_lig_id && this_lig_comp && (this_lig_id != first_lig_id))
+	  return TRACE_RETURN (false);
+      }
+
+      is_mark_ligature = is_mark_ligature && (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK);
+      total_component_count += get_lig_num_comps (c->buffer->info[skippy_iter.idx]);
     }
 
-    unsigned int klass = first_was_mark && found_non_mark ? HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE : 0;
+    /* Deal, we are forming the ligature. */
+    c->buffer->merge_clusters (c->buffer->idx, skippy_iter.idx + 1);
 
-    /* Allocate new ligature id */
-    unsigned int lig_id = allocate_lig_id (c->buffer);
-    set_lig_props (c->buffer->cur(), lig_id, 0);
+    unsigned int klass = is_mark_ligature ? 0 : HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE;
+    unsigned int lig_id = is_mark_ligature ? 0 : allocate_lig_id (c->buffer);
+    unsigned int last_lig_id = get_lig_id (c->buffer->cur());
+    unsigned int last_num_components = get_lig_num_comps (c->buffer->cur());
+    unsigned int components_so_far = last_num_components;
 
-    if (skippy_iter.idx < c->buffer->idx + count) /* No input glyphs skipped */
+    if (!is_mark_ligature)
+      set_lig_props_for_ligature (c->buffer->cur(), lig_id, total_component_count);
+    c->replace_glyph (ligGlyph, klass);
+
+    for (unsigned int i = 1; i < count; i++)
     {
-      c->replace_glyphs_be16 (count, 1, (const uint16_t *) &ligGlyph, klass);
-    }
-    else
-    {
-      c->replace_glyph (ligGlyph);
-
-      /* Now we must do a second loop to copy the skipped glyphs to
-	 `out' and assign component values to it.  We start with the
-	 glyph after the first component.  Glyphs between component
-	 i and i+1 belong to component i.  Together with the lig_id
-	 value it is later possible to check whether a specific
-	 component value really belongs to a given ligature. */
-
-      for (unsigned int i = 1; i < count; i++)
+      while (c->should_mark_skip_current_glyph ())
       {
-	while (c->should_mark_skip_current_glyph ())
-	{
-	  set_lig_props (c->buffer->cur(),  lig_id, i);
-	  c->replace_glyph (c->buffer->cur().codepoint);
+	if (!is_mark_ligature) {
+	  unsigned int new_lig_comp = components_so_far - last_num_components +
+				      MIN (MAX (get_lig_comp (c->buffer->cur()), 1u), last_num_components);
+	  set_lig_props_for_mark (c->buffer->cur(), lig_id, new_lig_comp);
 	}
+	c->buffer->next_glyph ();
+      }
 
-	/* Skip the base glyph */
-	c->buffer->idx++;
+      last_lig_id = get_lig_id (c->buffer->cur());
+      last_num_components = get_lig_num_comps (c->buffer->cur());
+      components_so_far += last_num_components;
+
+      /* Skip the base glyph */
+      c->buffer->idx++;
+    }
+
+    if (!is_mark_ligature && last_lig_id) {
+      /* Re-adjust components for any marks following. */
+      for (unsigned int i = c->buffer->idx; i < c->buffer->len; i++) {
+	if (last_lig_id == get_lig_id (c->buffer->info[i])) {
+	  unsigned int new_lig_comp = components_so_far - last_num_components +
+				      MIN (MAX (get_lig_comp (c->buffer->info[i]), 1u), last_num_components);
+	  set_lig_props_for_mark (c->buffer->info[i], lig_id, new_lig_comp);
+	} else
+	  break;
       }
     }
 
@@ -537,7 +620,7 @@ struct Ligature
     return TRACE_RETURN (ligGlyph.sanitize (c) && component.sanitize (c));
   }
 
-  private:
+  protected:
   GlyphID	ligGlyph;		/* GlyphID of ligature to substitute */
   HeadlessArrayOf<GlyphID>
 		component;		/* Array of component GlyphIDs--start
@@ -561,13 +644,13 @@ struct LigatureSet
       (this+ligature[i]).closure (c);
   }
 
-  inline bool would_apply (hb_codepoint_t second) const
+  inline bool would_apply (hb_would_apply_context_t *c) const
   {
     unsigned int num_ligs = ligature.len;
     for (unsigned int i = 0; i < num_ligs; i++)
     {
       const Ligature &lig = this+ligature[i];
-      if (lig.would_apply (second))
+      if (lig.would_apply (c))
         return true;
     }
     return false;
@@ -592,7 +675,7 @@ struct LigatureSet
     return TRACE_RETURN (ligature.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetArrayOf<Ligature>
 		ligature;		/* Array LigatureSet tables
 					 * ordered by preference */
@@ -616,11 +699,14 @@ struct LigatureSubstFormat1
     }
   }
 
-  inline bool would_apply (hb_codepoint_t first, hb_codepoint_t second) const
+  inline const Coverage &get_coverage (void) const
   {
-    unsigned int index;
-    return (index = (this+coverage) (first)) != NOT_COVERED &&
-	   (this+ligatureSet[index]).would_apply (second);
+    return this+coverage;
+  }
+
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    return (this+ligatureSet[(this+coverage) (c->first)]).would_apply (c);
   }
 
   inline bool apply (hb_apply_context_t *c) const
@@ -640,7 +726,7 @@ struct LigatureSubstFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && ligatureSet.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -667,10 +753,18 @@ struct LigatureSubst
     }
   }
 
-  inline bool would_apply (hb_codepoint_t first, hb_codepoint_t second) const
+  inline const Coverage &get_coverage (void) const
   {
     switch (u.format) {
-    case 1: return u.format1.would_apply (first, second);
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.would_apply (c);
     default:return false;
     }
   }
@@ -693,7 +787,7 @@ struct LigatureSubst
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   LigatureSubstFormat1	format1;
@@ -757,8 +851,10 @@ struct ExtensionSubst : Extension
   }
 
   inline void closure (hb_closure_context_t *c) const;
-  inline bool would_apply (hb_codepoint_t glyph_id) const;
-  inline bool would_apply (hb_codepoint_t first, hb_codepoint_t second) const;
+
+  inline const Coverage &get_coverage (void) const;
+
+  inline bool would_apply (hb_would_apply_context_t *c) const;
 
   inline bool apply (hb_apply_context_t *c) const;
 
@@ -799,6 +895,11 @@ struct ReverseChainSingleSubstFormat1
     }
   }
 
+  inline const Coverage &get_coverage (void) const
+  {
+    return this+coverage;
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -819,7 +920,7 @@ struct ReverseChainSingleSubstFormat1
 			 match_coverage, this,
 			 1))
     {
-      c->buffer->cur().codepoint = substitute[index];
+      c->replace_glyph_inplace (substitute[index]);
       c->buffer->idx--; /* Reverse! */
       return TRACE_RETURN (true);
     }
@@ -838,7 +939,7 @@ struct ReverseChainSingleSubstFormat1
     return TRACE_RETURN (substitute.sanitize (c));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -873,6 +974,14 @@ struct ReverseChainSingleSubst
     }
   }
 
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
@@ -891,7 +1000,7 @@ struct ReverseChainSingleSubst
     }
   }
 
-  private:
+  protected:
   union {
   USHORT				format;		/* Format identifier */
   ReverseChainSingleSubstFormat1	format1;
@@ -928,7 +1037,7 @@ struct SubstLookupSubTable
     case Multiple:		u.multiple.closure (c); break;
     case Alternate:		u.alternate.closure (c); break;
     case Ligature:		u.ligature.closure (c); break;
-    case Context:		u.c.closure (c); break;
+    case Context:		u.context.closure (c); break;
     case ChainContext:		u.chainContext.closure (c); break;
     case Extension:		u.extension.closure (c); break;
     case ReverseChainSingle:	u.reverseChainContextSingle.closure (c); break;
@@ -936,24 +1045,35 @@ struct SubstLookupSubTable
     }
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id,
-			   unsigned int lookup_type) const
+  inline const Coverage &get_coverage (unsigned int lookup_type) const
   {
     switch (lookup_type) {
-    case Single:		return u.single.would_apply (glyph_id);
-    case Multiple:		return u.multiple.would_apply (glyph_id);
-    case Alternate:		return u.alternate.would_apply (glyph_id);
-    case Extension:		return u.extension.would_apply (glyph_id);
-    default:			return false;
+    case Single:		return u.single.get_coverage ();
+    case Multiple:		return u.multiple.get_coverage ();
+    case Alternate:		return u.alternate.get_coverage ();
+    case Ligature:		return u.ligature.get_coverage ();
+    case Context:		return u.context.get_coverage ();
+    case ChainContext:		return u.chainContext.get_coverage ();
+    case Extension:		return u.extension.get_coverage ();
+    case ReverseChainSingle:	return u.reverseChainContextSingle.get_coverage ();
+    default:			return Null(Coverage);
     }
   }
-  inline bool would_apply (hb_codepoint_t first,
-			   hb_codepoint_t second,
+
+  inline bool would_apply (hb_would_apply_context_t *c,
 			   unsigned int lookup_type) const
   {
+    TRACE_WOULD_APPLY ();
+    if (get_coverage (lookup_type).get_coverage (c->first) == NOT_COVERED) return false;
+    if (c->len == 1) return true; /* Done! */
+
+    /* Only need to look further for lookups that support substitutions
+     * of input longer than 1. */
     switch (lookup_type) {
-    case Ligature:		return u.ligature.would_apply (first, second);
-    case Extension:		return u.extension.would_apply (first, second);
+    case Ligature:		return u.ligature.would_apply (c);
+    case Context:		return u.context.would_apply (c);
+    case ChainContext:		return u.chainContext.would_apply (c);
+    case Extension:		return u.extension.would_apply (c);
     default:			return false;
     }
   }
@@ -966,7 +1086,7 @@ struct SubstLookupSubTable
     case Multiple:		return TRACE_RETURN (u.multiple.apply (c));
     case Alternate:		return TRACE_RETURN (u.alternate.apply (c));
     case Ligature:		return TRACE_RETURN (u.ligature.apply (c));
-    case Context:		return TRACE_RETURN (u.c.apply (c));
+    case Context:		return TRACE_RETURN (u.context.apply (c));
     case ChainContext:		return TRACE_RETURN (u.chainContext.apply (c));
     case Extension:		return TRACE_RETURN (u.extension.apply (c));
     case ReverseChainSingle:	return TRACE_RETURN (u.reverseChainContextSingle.apply (c));
@@ -976,12 +1096,14 @@ struct SubstLookupSubTable
 
   inline bool sanitize (hb_sanitize_context_t *c, unsigned int lookup_type) {
     TRACE_SANITIZE ();
+    if (!u.header.sub_format.sanitize (c))
+      return TRACE_RETURN (false);
     switch (lookup_type) {
     case Single:		return TRACE_RETURN (u.single.sanitize (c));
     case Multiple:		return TRACE_RETURN (u.multiple.sanitize (c));
     case Alternate:		return TRACE_RETURN (u.alternate.sanitize (c));
     case Ligature:		return TRACE_RETURN (u.ligature.sanitize (c));
-    case Context:		return TRACE_RETURN (u.c.sanitize (c));
+    case Context:		return TRACE_RETURN (u.context.sanitize (c));
     case ChainContext:		return TRACE_RETURN (u.chainContext.sanitize (c));
     case Extension:		return TRACE_RETURN (u.extension.sanitize (c));
     case ReverseChainSingle:	return TRACE_RETURN (u.reverseChainContextSingle.sanitize (c));
@@ -989,20 +1111,22 @@ struct SubstLookupSubTable
     }
   }
 
-  private:
+  protected:
   union {
-  USHORT			sub_format;
+  struct {
+    USHORT			sub_format;
+  } header;
   SingleSubst			single;
   MultipleSubst			multiple;
   AlternateSubst		alternate;
   LigatureSubst			ligature;
-  ContextSubst			c;
+  ContextSubst			context;
   ChainContextSubst		chainContext;
   ExtensionSubst		extension;
   ReverseChainSingleSubst	reverseChainContextSingle;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, sub_format);
+  DEFINE_SIZE_UNION (2, header.sub_format);
 };
 
 
@@ -1030,21 +1154,27 @@ struct SubstLookup : Lookup
       get_subtable (i).closure (c, lookup_type);
   }
 
-  inline bool would_apply (hb_codepoint_t glyph_id) const
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs) const
   {
-    unsigned int lookup_type = get_type ();
+    const Coverage *last = NULL;
     unsigned int count = get_subtable_count ();
-    for (unsigned int i = 0; i < count; i++)
-      if (get_subtable (i).would_apply (glyph_id, lookup_type))
-	return true;
-    return false;
+    for (unsigned int i = 0; i < count; i++) {
+      const Coverage *c = &get_subtable (i).get_coverage (get_type ());
+      if (c != last) {
+        c->add_coverage (glyphs);
+        last = c;
+      }
+    }
   }
-  inline bool would_apply (hb_codepoint_t first, hb_codepoint_t second) const
+
+  inline bool would_apply (hb_would_apply_context_t *c) const
   {
+    if (!c->digest.may_have (c->first)) return false;
     unsigned int lookup_type = get_type ();
     unsigned int count = get_subtable_count ();
     for (unsigned int i = 0; i < count; i++)
-      if (get_subtable (i).would_apply (first, second, lookup_type))
+      if (get_subtable (i).would_apply (c, lookup_type))
 	return true;
     return false;
   }
@@ -1053,23 +1183,9 @@ struct SubstLookup : Lookup
   {
     unsigned int lookup_type = get_type ();
 
-    if (!_hb_ot_layout_check_glyph_property (c->face, &c->buffer->cur(), c->lookup_props, &c->property))
+    if (!c->check_glyph_property (&c->buffer->cur(), c->lookup_props, &c->property))
       return false;
 
-    if (unlikely (lookup_type == SubstLookupSubTable::Extension))
-    {
-      /* The spec says all subtables should have the same type.
-       * This is specially important if one has a reverse type!
-       *
-       * This is rather slow to do this here for every glyph,
-       * but it's easiest, and who uses extension lookups anyway?!*/
-      unsigned int type = get_subtable(0).u.extension.get_type ();
-      unsigned int count = get_subtable_count ();
-      for (unsigned int i = 1; i < count; i++)
-        if (get_subtable(i).u.extension.get_type () != type)
-	  return false;
-    }
-
     unsigned int count = get_subtable_count ();
     for (unsigned int i = 0; i < count; i++)
       if (get_subtable (i).apply (c, lookup_type))
@@ -1092,13 +1208,15 @@ struct SubstLookup : Lookup
 	/* in/out forward substitution */
 	c->buffer->clear_output ();
 	c->buffer->idx = 0;
+
 	while (c->buffer->idx < c->buffer->len)
 	{
-	  if ((c->buffer->cur().mask & c->lookup_mask) && apply_once (c))
+	  if ((c->buffer->cur().mask & c->lookup_mask) &&
+	      c->digest.may_have (c->buffer->cur().codepoint) &&
+	      apply_once (c))
 	    ret = true;
 	  else
 	    c->buffer->next_glyph ();
-
 	}
 	if (ret)
 	  c->buffer->swap_buffers ();
@@ -1109,7 +1227,9 @@ struct SubstLookup : Lookup
 	c->buffer->idx = c->buffer->len - 1;
 	do
 	{
-	  if ((c->buffer->cur().mask & c->lookup_mask) && apply_once (c))
+	  if ((c->buffer->cur().mask & c->lookup_mask) &&
+	      c->digest.may_have (c->buffer->cur().codepoint) &&
+	      apply_once (c))
 	    ret = true;
 	  else
 	    c->buffer->idx--;
@@ -1125,7 +1245,22 @@ struct SubstLookup : Lookup
     TRACE_SANITIZE ();
     if (unlikely (!Lookup::sanitize (c))) return TRACE_RETURN (false);
     OffsetArrayOf<SubstLookupSubTable> &list = CastR<OffsetArrayOf<SubstLookupSubTable> > (subTable);
-    return TRACE_RETURN (list.sanitize (c, this, get_type ()));
+    if (unlikely (!list.sanitize (c, this, get_type ()))) return TRACE_RETURN (false);
+
+    if (unlikely (get_type () == SubstLookupSubTable::Extension))
+    {
+      /* The spec says all subtables of an Extension lookup should
+       * have the same type.  This is specially important if one has
+       * a reverse type!
+       *
+       * We just check that they are all either forward, or reverse. */
+      unsigned int type = get_subtable (0).u.extension.get_type ();
+      unsigned int count = get_subtable_count ();
+      for (unsigned int i = 1; i < count; i++)
+        if (get_subtable (i).u.extension.get_type () != type)
+	  return TRACE_RETURN (false);
+    }
+    return TRACE_RETURN (true);
   }
 };
 
@@ -1142,11 +1277,18 @@ struct GSUB : GSUBGPOS
   inline const SubstLookup& get_lookup (unsigned int i) const
   { return CastR<SubstLookup> (GSUBGPOS::get_lookup (i)); }
 
+  template <typename set_t>
+  inline void add_coverage (set_t *glyphs, unsigned int lookup_index) const
+  { get_lookup (lookup_index).add_coverage (glyphs); }
+
+  inline bool would_substitute_lookup (hb_would_apply_context_t *c, unsigned int lookup_index) const
+  { return get_lookup (lookup_index).would_apply (c); }
+
   inline bool substitute_lookup (hb_apply_context_t *c, unsigned int lookup_index) const
   { return get_lookup (lookup_index).apply_string (c); }
 
-  static inline void substitute_start (hb_buffer_t *buffer);
-  static inline void substitute_finish (hb_buffer_t *buffer);
+  static inline void substitute_start (hb_font_t *font, hb_buffer_t *buffer);
+  static inline void substitute_finish (hb_font_t *font, hb_buffer_t *buffer);
 
   inline void closure_lookup (hb_closure_context_t *c,
 			      unsigned int          lookup_index) const
@@ -1164,19 +1306,22 @@ struct GSUB : GSUBGPOS
 
 
 void
-GSUB::substitute_start (hb_buffer_t *buffer)
+GSUB::substitute_start (hb_font_t *font, hb_buffer_t *buffer)
 {
-  HB_BUFFER_ALLOCATE_VAR (buffer, props_cache);
+  HB_BUFFER_ALLOCATE_VAR (buffer, glyph_props);
   HB_BUFFER_ALLOCATE_VAR (buffer, lig_props);
   HB_BUFFER_ALLOCATE_VAR (buffer, syllable);
 
+  const GDEF &gdef = *hb_ot_layout_from_face (font->face)->gdef;
   unsigned int count = buffer->len;
-  for (unsigned int i = 0; i < count; i++)
-    buffer->info[i].props_cache() = buffer->info[i].lig_props() = buffer->info[i].syllable() = 0;
+  for (unsigned int i = 0; i < count; i++) {
+    buffer->info[i].lig_props() = buffer->info[i].syllable() = 0;
+    buffer->info[i].glyph_props() = gdef.get_glyph_props (buffer->info[i].codepoint);
+  }
 }
 
 void
-GSUB::substitute_finish (hb_buffer_t *buffer HB_UNUSED)
+GSUB::substitute_finish (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer HB_UNUSED)
 {
 }
 
@@ -1188,14 +1333,14 @@ inline void ExtensionSubst::closure (hb_closure_context_t *c) const
   get_subtable ().closure (c, get_type ());
 }
 
-inline bool ExtensionSubst::would_apply (hb_codepoint_t glyph_id) const
+inline const Coverage & ExtensionSubst::get_coverage (void) const
 {
-  return get_subtable ().would_apply (glyph_id, get_type ());
+  return get_subtable ().get_coverage (get_type ());
 }
 
-inline bool ExtensionSubst::would_apply (hb_codepoint_t first, hb_codepoint_t second) const
+inline bool ExtensionSubst::would_apply (hb_would_apply_context_t *c) const
 {
-  return get_subtable ().would_apply (first, second, get_type ());
+  return get_subtable ().would_apply (c, get_type ());
 }
 
 inline bool ExtensionSubst::apply (hb_apply_context_t *c) const
@@ -1223,7 +1368,7 @@ inline bool ExtensionSubst::is_reverse (void) const
 
 static inline void closure_lookup (hb_closure_context_t *c, unsigned int lookup_index)
 {
-  const GSUB &gsub = *(c->face->ot_layout->gsub);
+  const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub);
   const SubstLookup &l = gsub.get_lookup (lookup_index);
 
   if (unlikely (c->nesting_level_left == 0))
@@ -1236,7 +1381,7 @@ static inline void closure_lookup (hb_closure_context_t *c, unsigned int lookup_
 
 static inline bool substitute_lookup (hb_apply_context_t *c, unsigned int lookup_index)
 {
-  const GSUB &gsub = *(c->face->ot_layout->gsub);
+  const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub);
   const SubstLookup &l = gsub.get_lookup (lookup_index);
 
   if (unlikely (c->nesting_level_left == 0))
diff --git a/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh b/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
index a2e4b2fdbb55..d91686d178bc 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
@@ -31,33 +31,7 @@
 
 #include "hb-buffer-private.hh"
 #include "hb-ot-layout-gdef-table.hh"
-
-
-
-/* unique ligature id */
-/* component number in the ligature (0 = base) */
-static inline void
-set_lig_props (hb_glyph_info_t &info, unsigned int lig_id, unsigned int lig_comp)
-{
-  info.lig_props() = (lig_id << 4) | (lig_comp & 0x0F);
-}
-static inline unsigned int
-get_lig_id (hb_glyph_info_t &info)
-{
-  return info.lig_props() >> 4;
-}
-static inline unsigned int
-get_lig_comp (hb_glyph_info_t &info)
-{
-  return info.lig_props() & 0x0F;
-}
-
-static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) {
-  uint8_t lig_id = buffer->next_serial () & 0x0F;
-  if (unlikely (!lig_id))
-    lig_id = allocate_lig_id (buffer); /* in case of overflow */
-  return lig_id;
-}
+#include "hb-set-private.hh"
 
 
 
@@ -69,7 +43,13 @@ static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) {
 	hb_auto_trace_t<HB_DEBUG_CLOSURE> trace (&c->debug_depth, "CLOSURE", this, HB_FUNC, "");
 
 
-/* TODO Add TRACE_RETURN annotation for would_apply */
+/* TODO Add TRACE_RETURN annotation to gsub. */
+#ifndef HB_DEBUG_WOULD_APPLY
+#define HB_DEBUG_WOULD_APPLY (HB_DEBUG+0)
+#endif
+
+#define TRACE_WOULD_APPLY() \
+	hb_auto_trace_t<HB_DEBUG_WOULD_APPLY> trace (&c->debug_depth, "WOULD_APPLY", this, HB_FUNC, "first %u second %u", c->first, c->second);
 
 
 struct hb_closure_context_t
@@ -83,20 +63,42 @@ struct hb_closure_context_t
   hb_closure_context_t (hb_face_t *face_,
 			hb_set_t *glyphs_,
 		        unsigned int nesting_level_left_ = MAX_NESTING_LEVEL) :
-			  face (face_), glyphs (glyphs_),
+			  face (face_),
+			  glyphs (glyphs_),
 			  nesting_level_left (nesting_level_left_),
 			  debug_depth (0) {}
 };
 
 
 
+
+struct hb_would_apply_context_t
+{
+  hb_face_t *face;
+  hb_codepoint_t first;
+  hb_codepoint_t second;
+  unsigned int len;
+  const hb_set_digest_t digest;
+  unsigned int debug_depth;
+
+  hb_would_apply_context_t (hb_face_t *face_,
+			    hb_codepoint_t first_,
+			    hb_codepoint_t second_,
+			    const hb_set_digest_t *digest_
+			    ) :
+			      face (face_),
+			      first (first_), second (second_), len (second == (hb_codepoint_t) -1 ? 1 : 2),
+			      digest (*digest_),
+			      debug_depth (0) {};
+};
+
+
 #ifndef HB_DEBUG_APPLY
 #define HB_DEBUG_APPLY (HB_DEBUG+0)
 #endif
 
 #define TRACE_APPLY() \
-	hb_auto_trace_t<HB_DEBUG_APPLY> trace (&c->debug_depth, "APPLY", this, HB_FUNC, "idx %d codepoint %u", c->buffer->cur().codepoint);
-
+	hb_auto_trace_t<HB_DEBUG_APPLY> trace (&c->debug_depth, "APPLY", this, HB_FUNC, "idx %d codepoint %u", c->buffer->idx, c->buffer->cur().codepoint);
 
 
 struct hb_apply_context_t
@@ -110,17 +112,23 @@ struct hb_apply_context_t
   unsigned int lookup_props;
   unsigned int property; /* propety of first glyph */
   unsigned int debug_depth;
+  const GDEF &gdef;
+  bool has_glyph_classes;
+  const hb_set_digest_t digest;
 
 
   hb_apply_context_t (hb_font_t *font_,
-		      hb_face_t *face_,
 		      hb_buffer_t *buffer_,
-		      hb_mask_t lookup_mask_) :
-			font (font_), face (face_), buffer (buffer_),
+		      hb_mask_t lookup_mask_,
+		      const hb_set_digest_t *digest_) :
+			font (font_), face (font->face), buffer (buffer_),
 			direction (buffer_->props.direction),
 			lookup_mask (lookup_mask_),
 			nesting_level_left (MAX_NESTING_LEVEL),
-			lookup_props (0), property (0), debug_depth (0) {}
+			lookup_props (0), property (0), debug_depth (0),
+			gdef (*hb_ot_layout_from_face (face)->gdef),
+			has_glyph_classes (gdef.has_glyph_classes ()),
+			digest (*digest_) {}
 
   void set_lookup (const Lookup &l) {
     lookup_props = l.get_props ();
@@ -144,8 +152,12 @@ struct hb_apply_context_t
     {
       return unlikely (num_items && idx + num_items >= end);
     }
+    inline void reject (void)
+    {
+      num_items++;
+    }
     inline bool next (unsigned int *property_out,
-		      unsigned int lookup_props)
+		      unsigned int  lookup_props)
     {
       assert (num_items > 0);
       do
@@ -153,7 +165,7 @@ struct hb_apply_context_t
 	if (has_no_chance ())
 	  return false;
 	idx++;
-      } while (_hb_ot_layout_skip_mark (c->face, &c->buffer->info[idx], lookup_props, property_out));
+      } while (c->should_skip_mark (&c->buffer->info[idx], lookup_props, property_out));
       num_items--;
       return (c->buffer->info[idx].mask & mask) && (!syllable || syllable == c->buffer->info[idx].syllable ());
     }
@@ -163,7 +175,7 @@ struct hb_apply_context_t
     }
 
     unsigned int idx;
-    private:
+    protected:
     hb_apply_context_t *c;
     unsigned int num_items;
     hb_mask_t mask;
@@ -189,8 +201,12 @@ struct hb_apply_context_t
     {
       return unlikely (idx < num_items);
     }
+    inline void reject (void)
+    {
+      num_items++;
+    }
     inline bool prev (unsigned int *property_out,
-		      unsigned int lookup_props)
+		      unsigned int  lookup_props)
     {
       assert (num_items > 0);
       do
@@ -198,7 +214,7 @@ struct hb_apply_context_t
 	if (has_no_chance ())
 	  return false;
 	idx--;
-      } while (_hb_ot_layout_skip_mark (c->face, &c->buffer->out_info[idx], lookup_props, property_out));
+      } while (c->should_skip_mark (&c->buffer->out_info[idx], lookup_props, property_out));
       num_items--;
       return (c->buffer->out_info[idx].mask & mask) && (!syllable || syllable == c->buffer->out_info[idx].syllable ());
     }
@@ -208,33 +224,114 @@ struct hb_apply_context_t
     }
 
     unsigned int idx;
-    private:
+    protected:
     hb_apply_context_t *c;
     unsigned int num_items;
     hb_mask_t mask;
     uint8_t syllable;
   };
 
+  inline bool
+  match_properties_mark (hb_codepoint_t  glyph,
+			 unsigned int    glyph_props,
+			 unsigned int    lookup_props) const
+  {
+    /* If using mark filtering sets, the high short of
+     * lookup_props has the set index.
+     */
+    if (lookup_props & LookupFlag::UseMarkFilteringSet)
+      return gdef.mark_set_covers (lookup_props >> 16, glyph);
+
+    /* The second byte of lookup_props has the meaning
+     * "ignore marks of attachment type different than
+     * the attachment type specified."
+     */
+    if (lookup_props & LookupFlag::MarkAttachmentType)
+      return (lookup_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType);
+
+    return true;
+  }
+
+  inline bool
+  match_properties (hb_codepoint_t  glyph,
+		    unsigned int    glyph_props,
+		    unsigned int    lookup_props) const
+  {
+    /* Not covered, if, for example, glyph class is ligature and
+     * lookup_props includes LookupFlags::IgnoreLigatures
+     */
+    if (glyph_props & lookup_props & LookupFlag::IgnoreFlags)
+      return false;
+
+    if (unlikely (glyph_props & HB_OT_LAYOUT_GLYPH_CLASS_MARK))
+      return match_properties_mark (glyph, glyph_props, lookup_props);
+
+    return true;
+  }
+
+  inline bool
+  check_glyph_property (hb_glyph_info_t *info,
+			unsigned int  lookup_props,
+			unsigned int *property_out) const
+  {
+    unsigned int property;
+
+    property = info->glyph_props();
+    *property_out = property;
+
+    return match_properties (info->codepoint, property, lookup_props);
+  }
+
+  inline bool
+  should_skip_mark (hb_glyph_info_t *info,
+		   unsigned int  lookup_props,
+		   unsigned int *property_out) const
+  {
+    unsigned int property;
+
+    property = info->glyph_props();
+    if (property_out)
+      *property_out = property;
+
+    /* If it's a mark, skip it if we don't accept it. */
+    if (unlikely (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK))
+      return !match_properties (info->codepoint, property, lookup_props);
+
+    /* If not a mark, don't skip. */
+    return false;
+  }
+
+
   inline bool should_mark_skip_current_glyph (void) const
   {
-    return _hb_ot_layout_skip_mark (face, &buffer->cur(), lookup_props, NULL);
+    return should_skip_mark (&buffer->cur(), lookup_props, NULL);
   }
 
-
-
-  inline void replace_glyph (hb_codepoint_t glyph_index,
-			     unsigned int klass = 0) const
+  inline void set_class (hb_codepoint_t glyph_index, unsigned int class_guess) const
   {
-    buffer->cur().props_cache() = klass; /*XXX if has gdef? */
+    if (likely (has_glyph_classes))
+      buffer->cur().glyph_props() = gdef.get_glyph_props (glyph_index);
+    else if (class_guess)
+      buffer->cur().glyph_props() = class_guess;
+  }
+
+  inline void output_glyph (hb_codepoint_t glyph_index,
+			    unsigned int class_guess = 0) const
+  {
+    set_class (glyph_index, class_guess);
+    buffer->output_glyph (glyph_index);
+  }
+  inline void replace_glyph (hb_codepoint_t glyph_index,
+			     unsigned int class_guess = 0) const
+  {
+    set_class (glyph_index, class_guess);
     buffer->replace_glyph (glyph_index);
   }
-  inline void replace_glyphs_be16 (unsigned int num_in,
-				   unsigned int num_out,
-				   const uint16_t *glyph_data_be,
-				   unsigned int klass = 0) const
+  inline void replace_glyph_inplace (hb_codepoint_t glyph_index,
+				     unsigned int class_guess = 0) const
   {
-    buffer->cur().props_cache() = klass; /* XXX if has gdef? */
-    buffer->replace_glyphs_be16 (num_in, num_out, glyph_data_be);
+    set_class (glyph_index, class_guess);
+    buffer->cur().codepoint = glyph_index;
   }
 };
 
@@ -300,6 +397,21 @@ static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value,
 }
 
 
+static inline bool would_match_input (hb_would_apply_context_t *c,
+				      unsigned int count, /* Including the first glyph (not matched) */
+				      const USHORT input[], /* Array of input values--start with second glyph */
+				      match_func_t match_func,
+				      const void *match_data)
+{
+  if (count != c->len)
+    return false;
+
+  for (unsigned int i = 1; i < count; i++)
+    if (likely (!match_func (c->second, input[i - 1], match_data)))
+      return false;
+
+  return true;
+}
 static inline bool match_input (hb_apply_context_t *c,
 				unsigned int count, /* Including the first glyph (not matched) */
 				const USHORT input[], /* Array of input values--start with second glyph */
@@ -488,6 +600,17 @@ static inline void context_closure_lookup (hb_closure_context_t *c,
 }
 
 
+static inline bool context_would_apply_lookup (hb_would_apply_context_t *c,
+					       unsigned int inputCount, /* Including the first glyph (not matched) */
+					       const USHORT input[], /* Array of input values--start with second glyph */
+					       unsigned int lookupCount,
+					       const LookupRecord lookupRecord[],
+					       ContextApplyLookupContext &lookup_context)
+{
+  return would_match_input (c,
+			    inputCount, input,
+			    lookup_context.funcs.match, lookup_context.match_data);
+}
 static inline bool context_apply_lookup (hb_apply_context_t *c,
 					 unsigned int inputCount, /* Including the first glyph (not matched) */
 					 const USHORT input[], /* Array of input values--start with second glyph */
@@ -520,6 +643,13 @@ struct Rule
 			    lookup_context);
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
+  {
+    TRACE_WOULD_APPLY ();
+    const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (input, input[0].static_size * (inputCount ? inputCount - 1 : 0));
+    return TRACE_RETURN (context_would_apply_lookup (c, inputCount, input, lookupCount, lookupRecord, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY ();
@@ -537,7 +667,7 @@ struct Rule
 			   + lookupRecordX[0].static_size * lookupCount);
   }
 
-  private:
+  protected:
   USHORT	inputCount;		/* Total number of glyphs in input
 					 * glyph sequence--includes the first
 					 * glyph */
@@ -560,6 +690,18 @@ struct RuleSet
       (this+rule[i]).closure (c, lookup_context);
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
+  {
+    TRACE_WOULD_APPLY ();
+    unsigned int num_rules = rule.len;
+    for (unsigned int i = 0; i < num_rules; i++)
+    {
+      if ((this+rule[i]).would_apply (c, lookup_context))
+        return TRACE_RETURN (true);
+    }
+    return TRACE_RETURN (false);
+  }
+
   inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY ();
@@ -577,7 +719,7 @@ struct RuleSet
     return TRACE_RETURN (rule.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetArrayOf<Rule>
 		rule;			/* Array of Rule tables
 					 * ordered by preference */
@@ -611,6 +753,18 @@ struct ContextFormat1
       }
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    TRACE_WOULD_APPLY ();
+
+    const RuleSet &rule_set = this+ruleSet[(this+coverage) (c->first)];
+    struct ContextApplyLookupContext lookup_context = {
+      {match_glyph, NULL},
+      NULL
+    };
+    return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -631,7 +785,7 @@ struct ContextFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && ruleSet.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -671,6 +825,20 @@ struct ContextFormat2
       }
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    TRACE_WOULD_APPLY ();
+
+    const ClassDef &class_def = this+classDef;
+    unsigned int index = class_def (c->first);
+    const RuleSet &rule_set = this+ruleSet[index];
+    struct ContextApplyLookupContext lookup_context = {
+      {match_class, NULL},
+      &class_def
+    };
+    return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -692,7 +860,7 @@ struct ContextFormat2
     return TRACE_RETURN (coverage.sanitize (c, this) && classDef.sanitize (c, this) && ruleSet.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 2 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -731,6 +899,18 @@ struct ContextFormat3
 			    lookup_context);
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    TRACE_WOULD_APPLY ();
+
+    const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount);
+    struct ContextApplyLookupContext lookup_context = {
+      {match_coverage, NULL},
+      this
+    };
+    return TRACE_RETURN (context_would_apply_lookup (c, glyphCount, (const USHORT *) (coverage + 1), lookupCount, lookupRecord, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -749,6 +929,7 @@ struct ContextFormat3
     TRACE_SANITIZE ();
     if (!c->check_struct (this)) return TRACE_RETURN (false);
     unsigned int count = glyphCount;
+    if (unlikely (!glyphCount)) return TRACE_RETURN (false);
     if (!c->check_array (coverage, coverage[0].static_size, count)) return TRACE_RETURN (false);
     for (unsigned int i = 0; i < count; i++)
       if (!coverage[i].sanitize (c, this)) return TRACE_RETURN (false);
@@ -756,7 +937,7 @@ struct ContextFormat3
     return TRACE_RETURN (c->check_array (lookupRecord, lookupRecord[0].static_size, lookupCount));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 3 */
   USHORT	glyphCount;		/* Number of glyphs in the input glyph
 					 * sequence */
@@ -785,6 +966,26 @@ struct Context
     }
   }
 
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return this + u.format1.coverage;
+    case 2: return this + u.format2.coverage;
+    case 3: return this + u.format3.coverage[0];
+    default:return Null(Coverage);
+    }
+  }
+
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.would_apply (c);
+    case 2: return u.format2.would_apply (c);
+    case 3: return u.format3.would_apply (c);
+    default:return false;
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -807,7 +1008,7 @@ struct Context
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   ContextFormat1	format1;
@@ -856,6 +1057,24 @@ static inline void chain_context_closure_lookup (hb_closure_context_t *c,
 		    lookup_context.funcs.closure);
 }
 
+static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c,
+						     unsigned int backtrackCount,
+						     const USHORT backtrack[],
+						     unsigned int inputCount, /* Including the first glyph (not matched) */
+						     const USHORT input[], /* Array of input values--start with second glyph */
+						     unsigned int lookaheadCount,
+						     const USHORT lookahead[],
+						     unsigned int lookupCount,
+						     const LookupRecord lookupRecord[],
+						     ChainContextApplyLookupContext &lookup_context)
+{
+  return !backtrackCount
+      && !lookaheadCount
+      && would_match_input (c,
+			    inputCount, input,
+			    lookup_context.funcs.match, lookup_context.match_data[1]);
+}
+
 static inline bool chain_context_apply_lookup (hb_apply_context_t *c,
 					       unsigned int backtrackCount,
 					       const USHORT backtrack[],
@@ -868,13 +1087,13 @@ static inline bool chain_context_apply_lookup (hb_apply_context_t *c,
 					       ChainContextApplyLookupContext &lookup_context)
 {
   unsigned int lookahead_offset;
-  return match_backtrack (c,
-			  backtrackCount, backtrack,
-			  lookup_context.funcs.match, lookup_context.match_data[0])
-      && match_input (c,
+  return match_input (c,
 		      inputCount, input,
 		      lookup_context.funcs.match, lookup_context.match_data[1],
 		      &lookahead_offset)
+      && match_backtrack (c,
+			  backtrackCount, backtrack,
+			  lookup_context.funcs.match, lookup_context.match_data[0])
       && match_lookahead (c,
 			  lookaheadCount, lookahead,
 			  lookup_context.funcs.match, lookup_context.match_data[2],
@@ -905,6 +1124,19 @@ struct ChainRule
 				  lookup_context);
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
+  {
+    TRACE_WOULD_APPLY ();
+    const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
+    const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
+    const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
+    return TRACE_RETURN (chain_context_would_apply_lookup (c,
+							   backtrack.len, backtrack.array,
+							   input.len, input.array,
+							   lookahead.len, lookahead.array, lookup.len,
+							   lookup.array, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY ();
@@ -930,7 +1162,7 @@ struct ChainRule
     return TRACE_RETURN (lookup.sanitize (c));
   }
 
-  private:
+  protected:
   ArrayOf<USHORT>
 		backtrack;		/* Array of backtracking values
 					 * (to be matched before the input
@@ -958,6 +1190,17 @@ struct ChainRuleSet
       (this+rule[i]).closure (c, lookup_context);
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
+  {
+    TRACE_WOULD_APPLY ();
+    unsigned int num_rules = rule.len;
+    for (unsigned int i = 0; i < num_rules; i++)
+      if ((this+rule[i]).would_apply (c, lookup_context))
+        return TRACE_RETURN (true);
+
+    return TRACE_RETURN (false);
+  }
+
   inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
   {
     TRACE_APPLY ();
@@ -974,7 +1217,7 @@ struct ChainRuleSet
     return TRACE_RETURN (rule.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetArrayOf<ChainRule>
 		rule;			/* Array of ChainRule tables
 					 * ordered by preference */
@@ -1006,6 +1249,18 @@ struct ChainContextFormat1
       }
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    TRACE_WOULD_APPLY ();
+
+    const ChainRuleSet &rule_set = this+ruleSet[(this+coverage) (c->first)];
+    struct ChainContextApplyLookupContext lookup_context = {
+      {match_glyph, NULL},
+      {NULL, NULL, NULL}
+    };
+    return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -1025,7 +1280,7 @@ struct ChainContextFormat1
     return TRACE_RETURN (coverage.sanitize (c, this) && ruleSet.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 1 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -1068,6 +1323,21 @@ struct ChainContextFormat2
       }
   }
 
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    TRACE_WOULD_APPLY ();
+
+    const ClassDef &input_class_def = this+inputClassDef;
+
+    unsigned int index = input_class_def (c->first);
+    const ChainRuleSet &rule_set = this+ruleSet[index];
+    struct ChainContextApplyLookupContext lookup_context = {
+      {match_class, NULL},
+      {NULL, &input_class_def, NULL}
+    };
+    return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -1096,7 +1366,7 @@ struct ChainContextFormat2
 			 ruleSet.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 2 */
   OffsetTo<Coverage>
 		coverage;		/* Offset to Coverage table--from
@@ -1148,6 +1418,30 @@ struct ChainContextFormat3
 				  lookup_context);
   }
 
+  inline const Coverage &get_coverage (void) const
+  {
+    const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
+    return this+input[0];
+  }
+
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    TRACE_WOULD_APPLY ();
+
+    const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
+    const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input);
+    const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
+    struct ChainContextApplyLookupContext lookup_context = {
+      {match_coverage, NULL},
+      {this, this, this}
+    };
+    return TRACE_RETURN (chain_context_would_apply_lookup (c,
+							   backtrack.len, (const USHORT *) backtrack.array,
+							   input.len, (const USHORT *) input.array + 1,
+							   lookahead.len, (const USHORT *) lookahead.array,
+							   lookup.len, lookup.array, lookup_context));
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -1174,13 +1468,14 @@ struct ChainContextFormat3
     if (!backtrack.sanitize (c, this)) return TRACE_RETURN (false);
     OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
     if (!input.sanitize (c, this)) return TRACE_RETURN (false);
+    if (unlikely (!input.len)) return TRACE_RETURN (false);
     OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input);
     if (!lookahead.sanitize (c, this)) return TRACE_RETURN (false);
     ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
     return TRACE_RETURN (lookup.sanitize (c));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier--format = 3 */
   OffsetArrayOf<Coverage>
 		backtrack;		/* Array of coverage tables
@@ -1216,6 +1511,26 @@ struct ChainContext
     }
   }
 
+  inline const Coverage &get_coverage (void) const
+  {
+    switch (u.format) {
+    case 1: return this + u.format1.coverage;
+    case 2: return this + u.format2.coverage;
+    case 3: return u.format3.get_coverage ();
+    default:return Null(Coverage);
+    }
+  }
+
+  inline bool would_apply (hb_would_apply_context_t *c) const
+  {
+    switch (u.format) {
+    case 1: return u.format1.would_apply (c);
+    case 2: return u.format2.would_apply (c);
+    case 3: return u.format3.would_apply (c);
+    default:return false;
+    }
+  }
+
   inline bool apply (hb_apply_context_t *c, apply_lookup_func_t apply_func) const
   {
     TRACE_APPLY ();
@@ -1238,7 +1553,7 @@ struct ChainContext
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;	/* Format identifier */
   ChainContextFormat1	format1;
@@ -1261,7 +1576,7 @@ struct ExtensionFormat1
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT	format;			/* Format identifier. Set to 1. */
   USHORT	extensionLookupType;	/* Lookup type of subtable referenced
 					 * by ExtensionOffset (i.e. the
@@ -1298,7 +1613,7 @@ struct Extension
     }
   }
 
-  private:
+  protected:
   union {
   USHORT		format;		/* Format identifier */
   ExtensionFormat1	format1;
diff --git a/gfx/harfbuzz/src/hb-ot-layout-private.hh b/gfx/harfbuzz/src/hb-ot-layout-private.hh
index f860e7bd1dec..510aec93645c 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-private.hh
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2007,2008,2009  Red Hat, Inc.
+ * Copyright © 2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -22,6 +23,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
  */
 
 #ifndef HB_OT_LAYOUT_PRIVATE_HH
@@ -33,15 +35,20 @@
 
 #include "hb-font-private.hh"
 #include "hb-buffer-private.hh"
-#include "hb-ot-shape-complex-private.hh"
+#include "hb-set-private.hh"
 
 
+/* buffer var allocations, used during the GSUB/GPOS processing */
+#define glyph_props()		var1.u16[1] /* GDEF glyph properties */
+#define syllable()		var2.u8[0] /* GSUB/GPOS shaping boundaries */
+#define lig_props()		var2.u8[1] /* GSUB/GPOS ligature tracking */
+
+#define hb_ot_layout_from_face(face) ((hb_ot_layout_t *) face->shaper_data.ot)
 
 /*
  * GDEF
  */
 
-/* XXX cleanup */
 typedef enum {
   HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED	= 0x0001,
   HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH	= 0x0002,
@@ -51,21 +58,125 @@ typedef enum {
 } hb_ot_layout_glyph_class_t;
 
 
-HB_INTERNAL unsigned int
-_hb_ot_layout_get_glyph_property (hb_face_t       *face,
-				  hb_glyph_info_t *info);
+
+/*
+ * GSUB/GPOS
+ */
+
+/* lig_id / lig_comp
+ *
+ * When a ligature is formed:
+ *
+ *   - The ligature glyph and any marks in between all the same newly allocated
+ *     lig_id,
+ *   - The ligature glyph will get lig_num_comps set to the number of components
+ *   - The marks get lig_comp > 0, reflecting which component of the ligature
+ *     they were applied to.
+ *   - This is used in GPOS to attach marks to the right component of a ligature
+ *     in MarkLigPos.
+ *
+ * When a multiple-substitution is done:
+ *
+ *   - All resulting glyphs will have lig_id = 0,
+ *   - The resulting glyphs will have lig_comp = 0, 1, 2, ... respectively.
+ *   - This is used in GPOS to attach marks to the first component of a
+ *     multiple substitution in MarkBasePos.
+ *
+ * The numbers are also used in GPOS to do mark-to-mark positioning only
+ * to marks that belong to the same component of a ligature in MarkMarPos.
+ */
+#define IS_LIG_BASE 0x10
+static inline void
+set_lig_props_for_ligature (hb_glyph_info_t &info, unsigned int lig_id, unsigned int lig_num_comps)
+{
+  info.lig_props() = (lig_id << 5) | IS_LIG_BASE | (lig_num_comps & 0x0F);
+}
+static inline void
+set_lig_props_for_mark (hb_glyph_info_t &info, unsigned int lig_id, unsigned int lig_comp)
+{
+  info.lig_props() = (lig_id << 5) | (lig_comp & 0x0F);
+}
+static inline void
+set_lig_props_for_component (hb_glyph_info_t &info, unsigned int comp)
+{
+  set_lig_props_for_mark (info, 0, comp);
+}
+
+static inline unsigned int
+get_lig_id (const hb_glyph_info_t &info)
+{
+  return info.lig_props() >> 5;
+}
+static inline bool
+is_a_ligature (const hb_glyph_info_t &info)
+{
+  return !!(info.lig_props() & IS_LIG_BASE);
+}
+static inline unsigned int
+get_lig_comp (const hb_glyph_info_t &info)
+{
+  if (is_a_ligature (info))
+    return 0;
+  else
+    return info.lig_props() & 0x0F;
+}
+static inline unsigned int
+get_lig_num_comps (const hb_glyph_info_t &info)
+{
+  if ((info.glyph_props() & HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE) && is_a_ligature (info))
+    return info.lig_props() & 0x0F;
+  else
+    return 1;
+}
+
+static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) {
+  uint8_t lig_id = buffer->next_serial () & 0x07;
+  if (unlikely (!lig_id))
+    lig_id = allocate_lig_id (buffer); /* in case of overflow */
+  return lig_id;
+}
+
 
 HB_INTERNAL hb_bool_t
-_hb_ot_layout_check_glyph_property (hb_face_t    *face,
-				    hb_glyph_info_t *ginfo,
-				    unsigned int  lookup_props,
-				    unsigned int *property_out);
+hb_ot_layout_would_substitute_lookup_fast (hb_face_t            *face,
+					   const hb_codepoint_t *glyphs,
+					   unsigned int          glyphs_length,
+					   unsigned int          lookup_index);
+
+
+/* Should be called before all the substitute_lookup's are done. */
+HB_INTERNAL void
+hb_ot_layout_substitute_start (hb_font_t    *font,
+			       hb_buffer_t  *buffer);
 
 HB_INTERNAL hb_bool_t
-_hb_ot_layout_skip_mark (hb_face_t    *face,
-			 hb_glyph_info_t *ginfo,
-			 unsigned int  lookup_props,
-			 unsigned int *property_out);
+hb_ot_layout_substitute_lookup (hb_font_t    *font,
+				hb_buffer_t  *buffer,
+				unsigned int  lookup_index,
+				hb_mask_t     mask);
+
+/* Should be called after all the substitute_lookup's are done */
+HB_INTERNAL void
+hb_ot_layout_substitute_finish (hb_font_t    *font,
+				hb_buffer_t  *buffer);
+
+
+/* Should be called before all the position_lookup's are done.  Resets positions to zero. */
+HB_INTERNAL void
+hb_ot_layout_position_start (hb_font_t    *font,
+			     hb_buffer_t  *buffer);
+
+HB_INTERNAL hb_bool_t
+hb_ot_layout_position_lookup (hb_font_t    *font,
+			      hb_buffer_t  *buffer,
+			      unsigned int  lookup_index,
+			      hb_mask_t     mask);
+
+/* Should be called after all the position_lookup's are done */
+HB_INTERNAL void
+hb_ot_layout_position_finish (hb_font_t    *font,
+			      hb_buffer_t  *buffer,
+			      hb_bool_t     zero_width_attached_marks);
 
 
 
@@ -82,6 +193,12 @@ struct hb_ot_layout_t
   const struct GDEF *gdef;
   const struct GSUB *gsub;
   const struct GPOS *gpos;
+
+  unsigned int gsub_lookup_count;
+  unsigned int gpos_lookup_count;
+
+  hb_set_digest_t *gsub_digests;
+  hb_set_digest_t *gpos_digests;
 };
 
 
diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
index 01e062a74b7e..0280f0bed7d0 100644
--- a/gfx/harfbuzz/src/hb-ot-layout.cc
+++ b/gfx/harfbuzz/src/hb-ot-layout.cc
@@ -2,6 +2,7 @@
  * Copyright © 1998-2004  David Turner and Werner Lemberg
  * Copyright © 2006  Behdad Esfahbod
  * Copyright © 2007,2008,2009  Red Hat, Inc.
+ * Copyright © 2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -24,6 +25,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
  */
 
 #include "hb-ot-layout-private.hh"
@@ -32,19 +34,20 @@
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-maxp-table.hh"
-#include "hb-ot-shape-private.hh"
 
 
 #include <stdlib.h>
 #include <string.h>
 
 
+HB_SHAPER_DATA_ENSURE_DECLARE(ot, face)
 
 hb_ot_layout_t *
 _hb_ot_layout_create (hb_face_t *face)
 {
-  /* TODO Remove this object altogether */
   hb_ot_layout_t *layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t));
+  if (unlikely (!layout))
+    return NULL;
 
   layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_reference_table (face, HB_OT_TAG_GDEF));
   layout->gdef = Sanitizer<GDEF>::lock_instance (layout->gdef_blob);
@@ -55,6 +58,24 @@ _hb_ot_layout_create (hb_face_t *face)
   layout->gpos_blob = Sanitizer<GPOS>::sanitize (hb_face_reference_table (face, HB_OT_TAG_GPOS));
   layout->gpos = Sanitizer<GPOS>::lock_instance (layout->gpos_blob);
 
+  layout->gsub_lookup_count = layout->gsub->get_lookup_count ();
+  layout->gpos_lookup_count = layout->gpos->get_lookup_count ();
+
+  layout->gsub_digests = (hb_set_digest_t *) calloc (layout->gsub->get_lookup_count (), sizeof (hb_set_digest_t));
+  layout->gpos_digests = (hb_set_digest_t *) calloc (layout->gpos->get_lookup_count (), sizeof (hb_set_digest_t));
+
+  if (unlikely ((layout->gsub_lookup_count && !layout->gsub_digests) ||
+		(layout->gpos_lookup_count && !layout->gpos_digests)))
+  {
+    _hb_ot_layout_destroy (layout);
+    return NULL;
+  }
+
+  for (unsigned int i = 0; i < layout->gsub_lookup_count; i++)
+    layout->gsub->add_coverage (&layout->gsub_digests[i], i);
+  for (unsigned int i = 0; i < layout->gpos_lookup_count; i++)
+    layout->gpos->add_coverage (&layout->gpos_digests[i], i);
+
   return layout;
 }
 
@@ -65,23 +86,29 @@ _hb_ot_layout_destroy (hb_ot_layout_t *layout)
   hb_blob_destroy (layout->gsub_blob);
   hb_blob_destroy (layout->gpos_blob);
 
+  free (layout->gsub_digests);
+  free (layout->gpos_digests);
+
   free (layout);
 }
 
 static inline const GDEF&
 _get_gdef (hb_face_t *face)
 {
-  return likely (face->ot_layout && face->ot_layout->gdef) ? *face->ot_layout->gdef : Null(GDEF);
+  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(GDEF);
+  return *hb_ot_layout_from_face (face)->gdef;
 }
 static inline const GSUB&
 _get_gsub (hb_face_t *face)
 {
-  return likely (face->ot_layout && face->ot_layout->gsub) ? *face->ot_layout->gsub : Null(GSUB);
+  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(GSUB);
+  return *hb_ot_layout_from_face (face)->gsub;
 }
 static inline const GPOS&
 _get_gpos (hb_face_t *face)
 {
-  return likely (face->ot_layout && face->ot_layout->gpos) ? *face->ot_layout->gpos : Null(GPOS);
+  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(GPOS);
+  return *hb_ot_layout_from_face (face)->gpos;
 }
 
 
@@ -95,84 +122,6 @@ hb_ot_layout_has_glyph_classes (hb_face_t *face)
   return _get_gdef (face).has_glyph_classes ();
 }
 
-unsigned int
-_hb_ot_layout_get_glyph_property (hb_face_t       *face,
-				  hb_glyph_info_t *info)
-{
-  if (!info->props_cache())
-  {
-    const GDEF &gdef = _get_gdef (face);
-    info->props_cache() = gdef.get_glyph_props (info->codepoint);
-  }
-
-  return info->props_cache();
-}
-
-static hb_bool_t
-_hb_ot_layout_match_properties (hb_face_t      *face,
-				hb_codepoint_t  codepoint,
-				unsigned int    glyph_props,
-				unsigned int    lookup_props)
-{
-  /* Not covered, if, for example, glyph class is ligature and
-   * lookup_props includes LookupFlags::IgnoreLigatures
-   */
-  if (glyph_props & lookup_props & LookupFlag::IgnoreFlags)
-    return false;
-
-  if (glyph_props & HB_OT_LAYOUT_GLYPH_CLASS_MARK)
-  {
-    /* If using mark filtering sets, the high short of
-     * lookup_props has the set index.
-     */
-    if (lookup_props & LookupFlag::UseMarkFilteringSet)
-      return _get_gdef (face).mark_set_covers (lookup_props >> 16, codepoint);
-
-    /* The second byte of lookup_props has the meaning
-     * "ignore marks of attachment type different than
-     * the attachment type specified."
-     */
-    if (lookup_props & LookupFlag::MarkAttachmentType && glyph_props & LookupFlag::MarkAttachmentType)
-      return (lookup_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType);
-  }
-
-  return true;
-}
-
-hb_bool_t
-_hb_ot_layout_check_glyph_property (hb_face_t    *face,
-				    hb_glyph_info_t *ginfo,
-				    unsigned int  lookup_props,
-				    unsigned int *property_out)
-{
-  unsigned int property;
-
-  property = _hb_ot_layout_get_glyph_property (face, ginfo);
-  (void) (property_out && (*property_out = property));
-
-  return _hb_ot_layout_match_properties (face, ginfo->codepoint, property, lookup_props);
-}
-
-hb_bool_t
-_hb_ot_layout_skip_mark (hb_face_t    *face,
-			 hb_glyph_info_t *ginfo,
-			 unsigned int  lookup_props,
-			 unsigned int *property_out)
-{
-  unsigned int property;
-
-  property = _hb_ot_layout_get_glyph_property (face, ginfo);
-  (void) (property_out && (*property_out = property));
-
-  /* If it's a mark, skip it we don't accept it. */
-  if (unlikely (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK))
-    return !_hb_ot_layout_match_properties (face, ginfo->codepoint, property, lookup_props);
-
-  /* If not a mark, don't skip. */
-  return false;
-}
-
-
 
 unsigned int
 hb_ot_layout_get_attach_points (hb_face_t      *face,
@@ -195,6 +144,7 @@ hb_ot_layout_get_ligature_carets (hb_font_t      *font,
   return _get_gdef (font->face).get_lig_carets (font, direction, glyph, start_offset, caret_count, caret_array);
 }
 
+
 /*
  * GSUB/GPOS
  */
@@ -233,19 +183,19 @@ hb_ot_layout_table_find_script (hb_face_t    *face,
   const GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
 
   if (g.find_script_index (script_tag, script_index))
-    return TRUE;
+    return true;
 
   /* try finding 'DFLT' */
   if (g.find_script_index (HB_OT_TAG_DEFAULT_SCRIPT, script_index))
-    return FALSE;
+    return false;
 
   /* try with 'dflt'; MS site has had typos and many fonts use it now :(.
    * including many versions of DejaVu Sans Mono! */
   if (g.find_script_index (HB_OT_TAG_DEFAULT_LANGUAGE, script_index))
-    return FALSE;
+    return false;
 
   if (script_index) *script_index = HB_OT_LAYOUT_NO_SCRIPT_INDEX;
-  return FALSE;
+  return false;
 }
 
 hb_bool_t
@@ -263,7 +213,7 @@ hb_ot_layout_table_choose_script (hb_face_t      *face,
     if (g.find_script_index (*script_tags, script_index)) {
       if (chosen_script)
         *chosen_script = *script_tags;
-      return TRUE;
+      return true;
     }
     script_tags++;
   }
@@ -272,14 +222,14 @@ hb_ot_layout_table_choose_script (hb_face_t      *face,
   if (g.find_script_index (HB_OT_TAG_DEFAULT_SCRIPT, script_index)) {
     if (chosen_script)
       *chosen_script = HB_OT_TAG_DEFAULT_SCRIPT;
-    return FALSE;
+    return false;
   }
 
   /* try with 'dflt'; MS site has had typos and many fonts use it now :( */
   if (g.find_script_index (HB_OT_TAG_DEFAULT_LANGUAGE, script_index)) {
     if (chosen_script)
       *chosen_script = HB_OT_TAG_DEFAULT_LANGUAGE;
-    return FALSE;
+    return false;
   }
 
   /* try with 'latn'; some old fonts put their features there even though
@@ -288,13 +238,13 @@ hb_ot_layout_table_choose_script (hb_face_t      *face,
   if (g.find_script_index (HB_OT_TAG_LATIN_SCRIPT, script_index)) {
     if (chosen_script)
       *chosen_script = HB_OT_TAG_LATIN_SCRIPT;
-    return FALSE;
+    return false;
   }
 
   if (script_index) *script_index = HB_OT_LAYOUT_NO_SCRIPT_INDEX;
   if (chosen_script)
     *chosen_script = HB_OT_LAYOUT_NO_SCRIPT_INDEX;
-  return FALSE;
+  return false;
 }
 
 unsigned int
@@ -334,14 +284,14 @@ hb_ot_layout_script_find_language (hb_face_t    *face,
   const Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index);
 
   if (s.find_lang_sys_index (language_tag, language_index))
-    return TRUE;
+    return true;
 
   /* try with 'dflt'; MS site has had typos and many fonts use it now :( */
   if (s.find_lang_sys_index (HB_OT_TAG_DEFAULT_LANGUAGE, language_index))
-    return FALSE;
+    return false;
 
   if (language_index) *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX;
-  return FALSE;
+  return false;
 }
 
 hb_bool_t
@@ -416,12 +366,12 @@ hb_ot_layout_language_find_feature (hb_face_t    *face,
 
     if (feature_tag == g.get_feature_tag (f_index)) {
       if (feature_index) *feature_index = f_index;
-      return TRUE;
+      return true;
     }
   }
 
   if (feature_index) *feature_index = HB_OT_LAYOUT_NO_FEATURE_INDEX;
-  return FALSE;
+  return false;
 }
 
 unsigned int
@@ -449,26 +399,49 @@ hb_ot_layout_has_substitution (hb_face_t *face)
   return &_get_gsub (face) != &Null(GSUB);
 }
 
-void
-hb_ot_layout_substitute_start (hb_buffer_t  *buffer)
+hb_bool_t
+hb_ot_layout_would_substitute_lookup (hb_face_t            *face,
+				      const hb_codepoint_t *glyphs,
+				      unsigned int          glyphs_length,
+				      unsigned int          lookup_index)
 {
-  GSUB::substitute_start (buffer);
+  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return false;
+  return hb_ot_layout_would_substitute_lookup_fast (face, glyphs, glyphs_length, lookup_index);
 }
 
 hb_bool_t
-hb_ot_layout_substitute_lookup (hb_face_t    *face,
+hb_ot_layout_would_substitute_lookup_fast (hb_face_t            *face,
+					   const hb_codepoint_t *glyphs,
+					   unsigned int          glyphs_length,
+					   unsigned int          lookup_index)
+{
+  if (unlikely (glyphs_length < 1 || glyphs_length > 2)) return false;
+  if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false;
+  hb_would_apply_context_t c (face, glyphs[0], glyphs_length == 2 ? glyphs[1] : -1, &hb_ot_layout_from_face (face)->gsub_digests[lookup_index]);
+  return hb_ot_layout_from_face (face)->gsub->would_substitute_lookup (&c, lookup_index);
+}
+
+void
+hb_ot_layout_substitute_start (hb_font_t *font, hb_buffer_t *buffer)
+{
+  GSUB::substitute_start (font, buffer);
+}
+
+hb_bool_t
+hb_ot_layout_substitute_lookup (hb_font_t    *font,
 				hb_buffer_t  *buffer,
 				unsigned int  lookup_index,
 				hb_mask_t     mask)
 {
-  hb_apply_context_t c (NULL, face, buffer, mask);
-  return _get_gsub (face).substitute_lookup (&c, lookup_index);
+  if (unlikely (lookup_index >= hb_ot_layout_from_face (font->face)->gsub_lookup_count)) return false;
+  hb_apply_context_t c (font, buffer, mask, &hb_ot_layout_from_face (font->face)->gsub_digests[lookup_index]);
+  return hb_ot_layout_from_face (font->face)->gsub->substitute_lookup (&c, lookup_index);
 }
 
 void
-hb_ot_layout_substitute_finish (hb_buffer_t  *buffer HB_UNUSED)
+hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer)
 {
-  GSUB::substitute_finish (buffer);
+  GSUB::substitute_finish (font, buffer);
 }
 
 void
@@ -491,50 +464,24 @@ hb_ot_layout_has_positioning (hb_face_t *face)
 }
 
 void
-hb_ot_layout_position_start (hb_buffer_t  *buffer)
+hb_ot_layout_position_start (hb_font_t *font, hb_buffer_t *buffer)
 {
-  GPOS::position_start (buffer);
+  GPOS::position_start (font, buffer);
 }
 
 hb_bool_t
-hb_ot_layout_position_lookup   (hb_font_t    *font,
-				hb_buffer_t  *buffer,
-				unsigned int  lookup_index,
-				hb_mask_t     mask)
+hb_ot_layout_position_lookup (hb_font_t    *font,
+			      hb_buffer_t  *buffer,
+			      unsigned int  lookup_index,
+			      hb_mask_t     mask)
 {
-  hb_apply_context_t c (font, font->face, buffer, mask);
-  return _get_gpos (font->face).position_lookup (&c, lookup_index);
+  if (unlikely (lookup_index >= hb_ot_layout_from_face (font->face)->gpos_lookup_count)) return false;
+  hb_apply_context_t c (font, buffer, mask, &hb_ot_layout_from_face (font->face)->gpos_digests[lookup_index]);
+  return hb_ot_layout_from_face (font->face)->gpos->position_lookup (&c, lookup_index);
 }
 
 void
-hb_ot_layout_position_finish (hb_face_t *face, hb_buffer_t *buffer)
+hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer, hb_bool_t zero_width_attached_marks)
 {
-  /* force diacritics to have zero width */
-  unsigned int count = buffer->len;
-  const hb_glyph_info_t *info = buffer->info;
-  hb_glyph_position_t *positions = buffer->pos;
-  /*
-   * Forcibly zero widths of chars with GC=Mn; we don't use the GDEF 'Mark' class
-   * because some fonts (e.g. C-DAC Yogesh) classify spacing Indic matras as 'Mark'
-   * but we don't want to force their width to zero.
-   */
-  if (buffer->props.direction == HB_DIRECTION_RTL) {
-    for (unsigned int i = 1; i < count; i++) {
-      if (_hb_glyph_info_get_general_category (&info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) {
-        positions[i].x_advance = 0;
-      }
-    }
-  } else {
-    for (unsigned int i = 1; i < count; i++) {
-      if (_hb_glyph_info_get_general_category (&info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) {
-        hb_glyph_position_t& pos = positions[i];
-        pos.x_offset -= pos.x_advance;
-        pos.x_advance = 0;
-      }
-    }
-  }
-
-  GPOS::position_finish (buffer);
+  GPOS::position_finish (font, buffer, zero_width_attached_marks);
 }
-
-
diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
index 478940e53ab0..e14cde81e444 100644
--- a/gfx/harfbuzz/src/hb-ot-layout.h
+++ b/gfx/harfbuzz/src/hb-ot-layout.h
@@ -42,6 +42,7 @@ HB_BEGIN_DECLS
 #define HB_OT_TAG_GSUB HB_TAG('G','S','U','B')
 #define HB_OT_TAG_GPOS HB_TAG('G','P','O','S')
 
+
 /*
  * GDEF
  */
@@ -168,20 +169,12 @@ hb_ot_layout_feature_get_lookup_indexes (hb_face_t    *face,
 hb_bool_t
 hb_ot_layout_has_substitution (hb_face_t *face);
 
-/* Should be called before all the substitute_lookup's are done. */
-void
-hb_ot_layout_substitute_start (hb_buffer_t  *buffer);
-
+/* Supports length 1 or 2 right now. */
 hb_bool_t
-hb_ot_layout_substitute_lookup (hb_face_t    *face,
-				hb_buffer_t  *buffer,
-				unsigned int  lookup_index,
-				hb_mask_t     mask);
-
-/* Should be called after all the substitute_lookup's are done */
-void
-hb_ot_layout_substitute_finish (hb_buffer_t  *buffer);
-
+hb_ot_layout_would_substitute_lookup (hb_face_t            *face,
+				      const hb_codepoint_t *glyphs,
+				      unsigned int          glyphs_length,
+				      unsigned int          lookup_index);
 
 void
 hb_ot_layout_substitute_closure_lookup (hb_face_t    *face,
@@ -195,20 +188,6 @@ hb_ot_layout_substitute_closure_lookup (hb_face_t    *face,
 hb_bool_t
 hb_ot_layout_has_positioning (hb_face_t *face);
 
-/* Should be called before all the position_lookup's are done.  Resets positions to zero. */
-void
-hb_ot_layout_position_start (hb_buffer_t  *buffer);
-
-hb_bool_t
-hb_ot_layout_position_lookup (hb_font_t    *font,
-			      hb_buffer_t  *buffer,
-			      unsigned int  lookup_index,
-			      hb_mask_t     mask);
-
-/* Should be called after all the position_lookup's are done */
-void
-hb_ot_layout_position_finish (hb_face_t *face, hb_buffer_t  *buffer);
-
 
 HB_END_DECLS
 
diff --git a/gfx/harfbuzz/src/hb-ot-map-private.hh b/gfx/harfbuzz/src/hb-ot-map-private.hh
index 3811206d9a51..b9c67362ab0a 100644
--- a/gfx/harfbuzz/src/hb-ot-map-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-map-private.hh
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009,2010  Red Hat, Inc.
- * Copyright © 2010,2011  Google, Inc.
+ * Copyright © 2010,2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -31,8 +31,7 @@
 
 #include "hb-buffer-private.hh"
 
-#include "hb-ot-layout.h"
-
+#include "hb-ot-layout-private.hh"
 
 
 static const hb_tag_t table_tags[2] = {HB_OT_TAG_GSUB, HB_OT_TAG_GPOS};
@@ -43,46 +42,6 @@ struct hb_ot_map_t
 
   public:
 
-  hb_ot_map_t (void) { memset (this, 0, sizeof (*this)); }
-
-  typedef void (*gsub_pause_func_t) (const hb_ot_map_t *map, hb_face_t *face, hb_buffer_t *buffer, void *user_data);
-  typedef void (*gpos_pause_func_t) (const hb_ot_map_t *map, hb_font_t *font, hb_buffer_t *buffer, void *user_data);
-
-  inline hb_mask_t get_global_mask (void) const { return global_mask; }
-
-  inline hb_mask_t get_mask (hb_tag_t tag, unsigned int *shift = NULL) const {
-    const feature_map_t *map = features.bsearch (&tag);
-    if (shift) *shift = map ? map->shift : 0;
-    return map ? map->mask : 0;
-  }
-
-  inline hb_mask_t get_1_mask (hb_tag_t tag) const {
-    const feature_map_t *map = features.bsearch (&tag);
-    return map ? map->_1_mask : 0;
-  }
-
-  inline hb_tag_t get_chosen_script (unsigned int table_index) const
-  { return chosen_script[table_index]; }
-
-  inline void substitute (hb_face_t *face, hb_buffer_t *buffer) const
-  { apply (0, (hb_ot_map_t::apply_lookup_func_t) hb_ot_layout_substitute_lookup, face, buffer); }
-  inline void position (hb_font_t *font, hb_buffer_t *buffer) const
-  { apply (1, (hb_ot_map_t::apply_lookup_func_t) hb_ot_layout_position_lookup, font, buffer); }
-
-  HB_INTERNAL void substitute_closure (hb_face_t *face,
-				       hb_set_t *glyphs) const;
-
-
-  inline void finish (void) {
-    features.finish ();
-    lookups[0].finish ();
-    lookups[1].finish ();
-    pauses[0].finish ();
-    pauses[1].finish ();
-  }
-
-  private:
-
   struct feature_map_t {
     hb_tag_t tag; /* should be first for our bsearch to work */
     unsigned int index[2]; /* GSUB/GPOS */
@@ -103,32 +62,76 @@ struct hb_ot_map_t
     { return a->index < b->index ? -1 : a->index > b->index ? 1 : 0; }
   };
 
-  typedef void (*pause_func_t) (const hb_ot_map_t *map, void *face_or_font, hb_buffer_t *buffer, void *user_data);
-  typedef struct {
-    pause_func_t func;
-    void *user_data;
-  } pause_callback_t;
+  typedef void (*pause_func_t) (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer);
 
   struct pause_map_t {
     unsigned int num_lookups; /* Cumulative */
-    pause_callback_t callback;
+    pause_func_t callback;
   };
 
-  typedef hb_bool_t (*apply_lookup_func_t) (void *face_or_font,
-					    hb_buffer_t  *buffer,
-					    unsigned int  lookup_index,
-					    hb_mask_t     mask);
+
+  hb_ot_map_t (void) { memset (this, 0, sizeof (*this)); }
+
+  inline hb_mask_t get_global_mask (void) const { return global_mask; }
+
+  inline hb_mask_t get_mask (hb_tag_t feature_tag, unsigned int *shift = NULL) const {
+    const feature_map_t *map = features.bsearch (&feature_tag);
+    if (shift) *shift = map ? map->shift : 0;
+    return map ? map->mask : 0;
+  }
+
+  inline hb_mask_t get_1_mask (hb_tag_t feature_tag) const {
+    const feature_map_t *map = features.bsearch (&feature_tag);
+    return map ? map->_1_mask : 0;
+  }
+
+  inline unsigned int get_feature_index (unsigned int table_index, hb_tag_t feature_tag) const {
+    const feature_map_t *map = features.bsearch (&feature_tag);
+    return map ? map->index[table_index] : HB_OT_LAYOUT_NO_FEATURE_INDEX;
+  }
+
+  inline unsigned int get_feature_stage (unsigned int table_index, hb_tag_t feature_tag) const {
+    const feature_map_t *map = features.bsearch (&feature_tag);
+    return map ? map->stage[table_index] : (unsigned int) -1;
+  }
+
+  inline void get_stage_lookups (unsigned int table_index, unsigned int stage,
+				 const struct lookup_map_t **plookups, unsigned int *lookup_count) const {
+    if (unlikely (stage == (unsigned int) -1)) {
+      *plookups = NULL;
+      *lookup_count = 0;
+      return;
+    }
+    assert (stage <= pauses[table_index].len);
+    unsigned int start = stage ? pauses[table_index][stage - 1].num_lookups : 0;
+    unsigned int end   = stage < pauses[table_index].len ? pauses[table_index][stage].num_lookups : lookups[table_index].len;
+    *plookups = &lookups[table_index][start];
+    *lookup_count = end - start;
+  }
+
+  inline hb_tag_t get_chosen_script (unsigned int table_index) const
+  { return chosen_script[table_index]; }
+
+  HB_INTERNAL void substitute_closure (const struct hb_ot_shape_plan_t *plan, hb_face_t *face, hb_set_t *glyphs) const;
+  HB_INTERNAL void substitute (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
+  HB_INTERNAL void position (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
+
+  inline void finish (void) {
+    features.finish ();
+    lookups[0].finish ();
+    lookups[1].finish ();
+    pauses[0].finish ();
+    pauses[1].finish ();
+  }
+
+
+  private:
 
   HB_INTERNAL void add_lookups (hb_face_t    *face,
 				unsigned int  table_index,
 				unsigned int  feature_index,
 				hb_mask_t     mask);
 
-  HB_INTERNAL void apply (unsigned int table_index,
-			  hb_ot_map_t::apply_lookup_func_t apply_lookup_func,
-			  void *face_or_font,
-			  hb_buffer_t *buffer) const;
-
   hb_mask_t global_mask;
 
   hb_tag_t chosen_script[2];
@@ -149,10 +152,10 @@ struct hb_ot_map_builder_t
   inline void add_bool_feature (hb_tag_t tag, bool global = true)
   { add_feature (tag, 1, global); }
 
-  inline void add_gsub_pause (hb_ot_map_t::gsub_pause_func_t pause_func, void *user_data)
-  { add_pause (0, (hb_ot_map_t::pause_func_t) pause_func, user_data); }
-  inline void add_gpos_pause (hb_ot_map_t::gpos_pause_func_t pause_func, void *user_data)
-  { add_pause (1, (hb_ot_map_t::pause_func_t) pause_func, user_data); }
+  inline void add_gsub_pause (hb_ot_map_t::pause_func_t pause_func)
+  { add_pause (0, pause_func); }
+  inline void add_gpos_pause (hb_ot_map_t::pause_func_t pause_func)
+  { add_pause (1, pause_func); }
 
   HB_INTERNAL void compile (hb_face_t *face,
 			    const hb_segment_properties_t *props,
@@ -180,10 +183,10 @@ struct hb_ot_map_builder_t
 
   struct pause_info_t {
     unsigned int stage;
-    hb_ot_map_t::pause_callback_t callback;
+    hb_ot_map_t::pause_func_t callback;
   };
 
-  HB_INTERNAL void add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func, void *user_data);
+  HB_INTERNAL void add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func);
 
   unsigned int current_stage[2]; /* GSUB/GPOS */
   hb_prealloced_array_t<feature_info_t,16> feature_infos;
diff --git a/gfx/harfbuzz/src/hb-ot-map.cc b/gfx/harfbuzz/src/hb-ot-map.cc
index bebf3ed74ed6..7eed624c4464 100644
--- a/gfx/harfbuzz/src/hb-ot-map.cc
+++ b/gfx/harfbuzz/src/hb-ot-map.cc
@@ -28,9 +28,6 @@
 
 #include "hb-ot-map-private.hh"
 
-#include "hb-ot-shape-private.hh"
-
-
 
 void
 hb_ot_map_t::add_lookups (hb_face_t    *face,
@@ -76,27 +73,47 @@ void hb_ot_map_builder_t::add_feature (hb_tag_t tag, unsigned int value, bool gl
   info->stage[1] = current_stage[1];
 }
 
-void hb_ot_map_t::apply (unsigned int table_index,
-			 hb_ot_map_t::apply_lookup_func_t apply_lookup_func,
-			 void *face_or_font,
-			 hb_buffer_t *buffer) const
+/* Keep the next two functions in sync. */
+
+void hb_ot_map_t::substitute (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const
 {
+  const unsigned int table_index = 0;
   unsigned int i = 0;
 
   for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) {
     const pause_map_t *pause = &pauses[table_index][pause_index];
     for (; i < pause->num_lookups; i++)
-      apply_lookup_func (face_or_font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+      hb_ot_layout_substitute_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
 
-    pause->callback.func (this, face_or_font, buffer, pause->callback.user_data);
+    buffer->clear_output ();
+
+    if (pause->callback)
+      pause->callback (plan, font, buffer);
   }
 
   for (; i < lookups[table_index].len; i++)
-    apply_lookup_func (face_or_font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+    hb_ot_layout_substitute_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
 }
 
-void hb_ot_map_t::substitute_closure (hb_face_t *face,
-				      hb_set_t *glyphs) const
+void hb_ot_map_t::position (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const
+{
+  const unsigned int table_index = 1;
+  unsigned int i = 0;
+
+  for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) {
+    const pause_map_t *pause = &pauses[table_index][pause_index];
+    for (; i < pause->num_lookups; i++)
+      hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+
+    if (pause->callback)
+      pause->callback (plan, font, buffer);
+  }
+
+  for (; i < lookups[table_index].len; i++)
+    hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+}
+
+void hb_ot_map_t::substitute_closure (const hb_ot_shape_plan_t *plan, hb_face_t *face, hb_set_t *glyphs) const
 {
   unsigned int table_index = 0;
   unsigned int i = 0;
@@ -111,15 +128,12 @@ void hb_ot_map_t::substitute_closure (hb_face_t *face,
     hb_ot_layout_substitute_closure_lookup (face, glyphs, lookups[table_index][i].index);
 }
 
-void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func, void *user_data)
+void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func)
 {
-  if (pause_func) {
-    pause_info_t *p = pauses[table_index].push ();
-    if (likely (p)) {
-      p->stage = current_stage[table_index];
-      p->callback.func = pause_func;
-      p->callback.user_data = user_data;
-    }
+  pause_info_t *p = pauses[table_index].push ();
+  if (likely (p)) {
+    p->stage = current_stage[table_index];
+    p->callback = pause_func;
   }
 
   current_stage[table_index]++;
@@ -233,8 +247,8 @@ hb_ot_map_builder_t::compile (hb_face_t *face,
   feature_infos.shrink (0); /* Done with these */
 
 
-  add_gsub_pause (NULL, NULL);
-  add_gpos_pause (NULL, NULL);
+  add_gsub_pause (NULL);
+  add_gpos_pause (NULL);
 
   for (unsigned int table_index = 0; table_index < 2; table_index++) {
     hb_tag_t table_tag = table_tags[table_index];
@@ -285,5 +299,3 @@ hb_ot_map_builder_t::compile (hb_face_t *face,
     }
   }
 }
-
-
diff --git a/gfx/harfbuzz/src/hb-ot-maxp-table.hh b/gfx/harfbuzz/src/hb-ot-maxp-table.hh
index e27049001268..c2c90d1ff0d9 100644
--- a/gfx/harfbuzz/src/hb-ot-maxp-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-maxp-table.hh
@@ -52,7 +52,7 @@ struct maxp
   }
 
   /* We only implement version 0.5 as none of the extra fields in version 1.0 are useful. */
-  private:
+  protected:
   FixedVersion	version;		/* Version of the maxp table (0.5 or 1.0),
 					 * 0x00005000 or 0x00010000. */
   USHORT	numGlyphs;		/* The number of glyphs in the font. */
diff --git a/gfx/harfbuzz/src/hb-ot-name-table.hh b/gfx/harfbuzz/src/hb-ot-name-table.hh
index 9077c8c67631..e0d2e89971cb 100644
--- a/gfx/harfbuzz/src/hb-ot-name-table.hh
+++ b/gfx/harfbuzz/src/hb-ot-name-table.hh
@@ -114,7 +114,7 @@ struct name
   }
 
   /* We only implement format 0 for now. */
-  private:
+  protected:
   USHORT	format;			/* Format selector (=0/1). */
   USHORT	count;			/* Number of name records. */
   Offset	stringOffset;		/* Offset to start of string storage (from start of table). */
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
index 54460f011f1d..b014c744f3b8 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
@@ -164,10 +164,11 @@ static const struct arabic_state_table_entry {
 
 
 
-void
-_hb_ot_shape_complex_collect_features_arabic (hb_ot_map_builder_t *map,
-					      const hb_segment_properties_t *props)
+static void
+collect_features_arabic (hb_ot_shape_planner_t *plan)
 {
+  hb_ot_map_builder_t *map = &plan->map;
+
   /* For Language forms (in ArabicOT speak), we do the iso/fina/medi/init together,
    * then rlig and calt each in their own stage.  This makes IranNastaliq's ALLAH
    * ligature work correctly. It's unfortunate though...
@@ -181,30 +182,24 @@ _hb_ot_shape_complex_collect_features_arabic (hb_ot_map_builder_t *map,
   map->add_bool_feature (HB_TAG('c','c','m','p'));
   map->add_bool_feature (HB_TAG('l','o','c','l'));
 
-  map->add_gsub_pause (NULL, NULL);
+  map->add_gsub_pause (NULL);
 
-  unsigned int num_features = props->script == HB_SCRIPT_SYRIAC ? SYRIAC_NUM_FEATURES : COMMON_NUM_FEATURES;
+  unsigned int num_features = plan->props.script == HB_SCRIPT_SYRIAC ? SYRIAC_NUM_FEATURES : COMMON_NUM_FEATURES;
   for (unsigned int i = 0; i < num_features; i++)
     map->add_bool_feature (arabic_syriac_features[i], false);
 
-  map->add_gsub_pause (NULL, NULL);
+  map->add_gsub_pause (NULL);
 
   map->add_bool_feature (HB_TAG('r','l','i','g'));
-  map->add_gsub_pause (NULL, NULL);
+  map->add_gsub_pause (NULL);
 
   map->add_bool_feature (HB_TAG('c','a','l','t'));
-  map->add_gsub_pause (NULL, NULL);
+  map->add_gsub_pause (NULL);
 
   /* ArabicOT spec enables 'cswh' for Arabic where as for basic shaper it's disabled by default. */
   map->add_bool_feature (HB_TAG('c','s','w','h'));
 }
 
-hb_ot_shape_normalization_mode_t
-_hb_ot_shape_complex_normalization_preference_arabic (void)
-{
-  return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
-}
-
 
 static void
 arabic_fallback_shape (hb_font_t *font, hb_buffer_t *buffer)
@@ -216,7 +211,7 @@ arabic_fallback_shape (hb_font_t *font, hb_buffer_t *buffer)
   for (unsigned int i = 0; i < count; i++) {
     hb_codepoint_t u = buffer->info[i].codepoint;
     hb_codepoint_t shaped = get_arabic_shape (u, buffer->info[i].arabic_shaping_action());
-    if (shaped != u && hb_font_get_glyph (font, shaped, 0, &glyph))
+    if (shaped != u && font->get_glyph (shaped, 0, &glyph))
       buffer->info[i].codepoint = shaped;
   }
 
@@ -225,7 +220,7 @@ arabic_fallback_shape (hb_font_t *font, hb_buffer_t *buffer)
   for (buffer->idx = 0; buffer->idx + 1 < count;) {
     hb_codepoint_t ligature = get_ligature (buffer->cur().codepoint,
 					    buffer->cur(+1).codepoint);
-    if (likely (!ligature) || !(hb_font_get_glyph (font, ligature, 0, &glyph))) {
+    if (likely (!ligature) || !(font->get_glyph (ligature, 0, &glyph))) {
       buffer->next_glyph ();
       continue;
     }
@@ -240,10 +235,10 @@ arabic_fallback_shape (hb_font_t *font, hb_buffer_t *buffer)
   buffer->swap_buffers ();
 }
 
-void
-_hb_ot_shape_complex_setup_masks_arabic (hb_ot_map_t *map,
-					 hb_buffer_t *buffer,
-					 hb_font_t *font)
+static void
+setup_masks_arabic (const hb_ot_shape_plan_t *plan,
+		    hb_buffer_t              *buffer,
+		    hb_font_t                *font)
 {
   unsigned int count = buffer->len;
   unsigned int prev = 0, state = 0;
@@ -274,7 +269,7 @@ _hb_ot_shape_complex_setup_masks_arabic (hb_ot_map_t *map,
   hb_mask_t total_masks = 0;
   unsigned int num_masks = buffer->props.script == HB_SCRIPT_SYRIAC ? SYRIAC_NUM_FEATURES : COMMON_NUM_FEATURES;
   for (unsigned int i = 0; i < num_masks; i++) {
-    mask_array[i] = map->get_1_mask (arabic_syriac_features[i]);
+    mask_array[i] = plan->map.get_1_mask (arabic_syriac_features[i]);
     total_masks |= mask_array[i];
   }
 
@@ -296,4 +291,14 @@ _hb_ot_shape_complex_setup_masks_arabic (hb_ot_map_t *map,
   HB_BUFFER_DEALLOCATE_VAR (buffer, arabic_shaping_action);
 }
 
-
+const hb_ot_complex_shaper_t _hb_ot_complex_shaper_arabic =
+{
+  "arabic",
+  collect_features_arabic,
+  NULL, /* override_features */
+  NULL, /* data_create */
+  NULL, /* data_destroy */
+  NULL, /* normalization_preference */
+  setup_masks_arabic,
+  true, /* zero_width_attached_marks */
+};
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.hh
index 137bdfdee2ac..736a2d2800d4 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.hh
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.hh
@@ -31,142 +31,731 @@
 
 #include "hb-private.hh"
 
-HB_BEGIN_DECLS
 
-
-#line 38 "hb-ot-shape-complex-indic-machine.hh.tmp"
+#line 36 "hb-ot-shape-complex-indic-machine.hh.tmp"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
-	5u, 5u, 1u, 2u, 1u, 2u, 5u, 5u, 1u, 5u, 1u, 2u, 5u, 5u, 1u, 13u, 
-	4u, 11u, 4u, 11u, 5u, 11u, 1u, 10u, 1u, 10u, 10u, 10u, 10u, 10u, 4u, 10u, 
-	5u, 10u, 8u, 10u, 5u, 10u, 6u, 10u, 9u, 10u, 4u, 11u, 1u, 13u, 4u, 10u, 
-	4u, 10u, 5u, 10u, 4u, 10u, 5u, 10u, 8u, 10u, 10u, 10u, 10u, 10u, 4u, 10u, 
-	4u, 10u, 5u, 10u, 4u, 10u, 5u, 10u, 8u, 10u, 10u, 10u, 10u, 10u, 0
+	1u, 16u, 13u, 13u, 4u, 14u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 
+	5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 4u, 4u, 6u, 6u, 
+	16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 
+	6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 
+	4u, 14u, 4u, 14u, 4u, 14u, 1u, 16u, 13u, 13u, 4u, 14u, 5u, 7u, 7u, 7u, 
+	5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 
+	7u, 7u, 4u, 4u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 
+	6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 
+	4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 1u, 16u, 13u, 13u, 
+	4u, 14u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 
+	7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 4u, 4u, 6u, 6u, 16u, 16u, 4u, 7u, 
+	6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 
+	4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 
+	4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 
+	4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 
+	4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 8u, 14u, 5u, 14u, 
+	9u, 14u, 9u, 9u, 3u, 13u, 3u, 9u, 9u, 9u, 3u, 9u, 6u, 14u, 3u, 14u, 
+	4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+	3u, 14u, 4u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 
+	3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 
+	3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 3u, 14u, 4u, 14u, 
+	1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 
+	1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 
+	5u, 14u, 8u, 14u, 5u, 14u, 9u, 14u, 9u, 9u, 3u, 13u, 3u, 9u, 9u, 9u, 
+	3u, 9u, 6u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+	3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 1u, 16u, 
+	1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 
+	1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 4u, 14u, 1u, 16u, 3u, 14u, 
+	3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 
+	3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 
+	3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 8u, 14u, 5u, 14u, 9u, 14u, 9u, 9u, 
+	3u, 13u, 3u, 9u, 9u, 9u, 3u, 9u, 6u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 
+	3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 
+	1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 
+	1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 1u, 16u, 
+	1u, 16u, 3u, 14u, 1u, 16u, 3u, 14u, 1u, 16u, 0
 };
 
 static const char _indic_syllable_machine_key_spans[] = {
-	1, 2, 2, 1, 5, 2, 1, 13, 
-	8, 8, 7, 10, 10, 1, 1, 7, 
-	6, 3, 6, 5, 2, 8, 13, 7, 
-	7, 6, 7, 6, 3, 1, 1, 7, 
-	7, 6, 7, 6, 3, 1, 1
+	16, 1, 11, 3, 1, 3, 3, 1, 
+	3, 3, 1, 3, 3, 1, 1, 1, 
+	1, 4, 1, 1, 4, 1, 1, 4, 
+	1, 1, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 16, 1, 11, 3, 1, 
+	3, 3, 1, 3, 3, 1, 3, 3, 
+	1, 1, 1, 1, 4, 1, 1, 4, 
+	1, 1, 4, 1, 1, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 16, 1, 
+	11, 3, 1, 3, 3, 1, 3, 3, 
+	1, 3, 3, 1, 1, 1, 1, 4, 
+	1, 1, 4, 1, 1, 4, 1, 1, 
+	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 16, 12, 12, 11, 16, 12, 12, 
+	11, 16, 12, 12, 11, 16, 12, 12, 
+	11, 16, 12, 12, 11, 10, 7, 10, 
+	6, 1, 11, 7, 1, 7, 9, 12, 
+	11, 10, 12, 11, 10, 12, 11, 10, 
+	12, 11, 11, 16, 12, 16, 16, 16, 
+	12, 16, 16, 16, 12, 16, 16, 16, 
+	12, 16, 16, 16, 12, 12, 12, 11, 
+	16, 12, 12, 11, 16, 12, 12, 11, 
+	16, 12, 12, 11, 16, 12, 12, 11, 
+	10, 7, 10, 6, 1, 11, 7, 1, 
+	7, 9, 12, 11, 10, 12, 11, 10, 
+	12, 11, 10, 12, 11, 16, 12, 16, 
+	16, 16, 12, 16, 16, 16, 12, 16, 
+	16, 16, 12, 16, 16, 11, 16, 12, 
+	12, 12, 11, 16, 12, 12, 11, 16, 
+	12, 12, 11, 16, 12, 12, 11, 16, 
+	12, 12, 11, 10, 7, 10, 6, 1, 
+	11, 7, 1, 7, 9, 12, 11, 10, 
+	12, 11, 10, 12, 11, 10, 12, 11, 
+	16, 12, 16, 16, 16, 12, 16, 16, 
+	16, 12, 16, 16, 16, 12, 16, 16, 
+	16, 12, 16, 12, 16
 };
 
-static const unsigned char _indic_syllable_machine_index_offsets[] = {
-	0, 2, 5, 8, 10, 16, 19, 21, 
-	35, 44, 53, 61, 72, 83, 85, 87, 
-	95, 102, 106, 113, 119, 122, 131, 145, 
-	153, 161, 168, 176, 183, 187, 189, 191, 
-	199, 207, 214, 222, 229, 233, 235
+static const short _indic_syllable_machine_index_offsets[] = {
+	0, 17, 19, 31, 35, 37, 41, 45, 
+	47, 51, 55, 57, 61, 65, 67, 69, 
+	71, 73, 78, 80, 82, 87, 89, 91, 
+	96, 98, 100, 112, 124, 136, 148, 160, 
+	172, 184, 196, 208, 225, 227, 239, 243, 
+	245, 249, 253, 255, 259, 263, 265, 269, 
+	273, 275, 277, 279, 281, 286, 288, 290, 
+	295, 297, 299, 304, 306, 308, 320, 332, 
+	344, 356, 368, 380, 392, 404, 416, 433, 
+	435, 447, 451, 453, 457, 461, 463, 467, 
+	471, 473, 477, 481, 483, 485, 487, 489, 
+	494, 496, 498, 503, 505, 507, 512, 514, 
+	516, 528, 540, 552, 564, 576, 588, 600, 
+	612, 624, 641, 654, 667, 679, 696, 709, 
+	722, 734, 751, 764, 777, 789, 806, 819, 
+	832, 844, 861, 874, 887, 899, 910, 918, 
+	929, 936, 938, 950, 958, 960, 968, 978, 
+	991, 1003, 1014, 1027, 1039, 1050, 1063, 1075, 
+	1086, 1099, 1111, 1123, 1140, 1153, 1170, 1187, 
+	1204, 1217, 1234, 1251, 1268, 1281, 1298, 1315, 
+	1332, 1345, 1362, 1379, 1396, 1409, 1422, 1435, 
+	1447, 1464, 1477, 1490, 1502, 1519, 1532, 1545, 
+	1557, 1574, 1587, 1600, 1612, 1629, 1642, 1655, 
+	1667, 1678, 1686, 1697, 1704, 1706, 1718, 1726, 
+	1728, 1736, 1746, 1759, 1771, 1782, 1795, 1807, 
+	1818, 1831, 1843, 1854, 1867, 1879, 1896, 1909, 
+	1926, 1943, 1960, 1973, 1990, 2007, 2024, 2037, 
+	2054, 2071, 2088, 2101, 2118, 2135, 2147, 2164, 
+	2177, 2190, 2203, 2215, 2232, 2245, 2258, 2270, 
+	2287, 2300, 2313, 2325, 2342, 2355, 2368, 2380, 
+	2397, 2410, 2423, 2435, 2446, 2454, 2465, 2472, 
+	2474, 2486, 2494, 2496, 2504, 2514, 2527, 2539, 
+	2550, 2563, 2575, 2586, 2599, 2611, 2622, 2635, 
+	2647, 2664, 2677, 2694, 2711, 2728, 2741, 2758, 
+	2775, 2792, 2805, 2822, 2839, 2856, 2869, 2886, 
+	2903, 2920, 2933, 2950, 2963
 };
 
-static const char _indic_syllable_machine_indicies[] = {
-	1, 0, 2, 2, 0, 4, 4, 3, 
-	5, 3, 4, 4, 3, 3, 5, 3, 
-	7, 7, 6, 8, 6, 2, 10, 11, 
-	9, 9, 9, 9, 9, 9, 9, 9, 
-	12, 12, 9, 14, 15, 16, 16, 17, 
-	18, 19, 20, 13, 21, 15, 16, 16, 
-	17, 18, 19, 20, 13, 15, 16, 16, 
-	17, 18, 19, 20, 13, 2, 2, 13, 
-	13, 13, 22, 22, 13, 18, 19, 13, 
-	2, 2, 13, 13, 13, 13, 13, 13, 
-	18, 19, 13, 19, 13, 23, 13, 24, 
-	25, 13, 13, 17, 18, 19, 13, 25, 
-	13, 13, 17, 18, 19, 13, 17, 18, 
-	19, 13, 26, 13, 13, 17, 18, 19, 
-	13, 27, 27, 13, 18, 19, 13, 18, 
-	19, 13, 14, 28, 16, 16, 17, 18, 
-	19, 20, 13, 2, 2, 11, 13, 13, 
-	22, 22, 13, 18, 19, 13, 12, 12, 
-	13, 30, 5, 31, 32, 33, 34, 35, 
-	29, 4, 5, 31, 32, 33, 34, 35, 
-	29, 5, 31, 32, 33, 34, 35, 29, 
-	36, 37, 29, 29, 33, 34, 35, 29, 
-	37, 29, 29, 33, 34, 35, 29, 33, 
-	34, 35, 29, 35, 29, 38, 29, 40, 
-	8, 41, 41, 42, 43, 44, 39, 7, 
-	8, 41, 41, 42, 43, 44, 39, 8, 
-	41, 41, 42, 43, 44, 39, 45, 46, 
-	39, 39, 42, 43, 44, 39, 46, 39, 
-	39, 42, 43, 44, 39, 42, 43, 44, 
-	39, 44, 39, 47, 39, 0
+static const short _indic_syllable_machine_indicies[] = {
+	1, 2, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 1, 
+	0, 3, 0, 4, 5, 5, 6, 0, 
+	0, 0, 0, 0, 0, 4, 0, 7, 
+	7, 6, 0, 6, 0, 8, 8, 9, 
+	0, 10, 10, 9, 0, 9, 0, 11, 
+	11, 12, 0, 13, 13, 12, 0, 12, 
+	0, 14, 14, 15, 0, 16, 16, 15, 
+	0, 15, 0, 17, 0, 18, 0, 19, 
+	0, 20, 14, 14, 15, 0, 21, 0, 
+	22, 0, 23, 11, 11, 12, 0, 24, 
+	0, 25, 0, 26, 8, 8, 9, 0, 
+	27, 0, 28, 0, 4, 5, 5, 6, 
+	0, 0, 0, 0, 0, 29, 4, 0, 
+	30, 5, 5, 6, 0, 0, 0, 0, 
+	0, 0, 30, 0, 30, 5, 5, 6, 
+	0, 0, 0, 0, 0, 31, 30, 0, 
+	32, 5, 5, 6, 0, 0, 0, 0, 
+	0, 0, 32, 0, 32, 5, 5, 6, 
+	0, 0, 0, 0, 0, 33, 32, 0, 
+	34, 5, 5, 6, 0, 0, 0, 0, 
+	0, 0, 34, 0, 34, 5, 5, 6, 
+	0, 0, 0, 0, 0, 35, 34, 0, 
+	36, 5, 5, 6, 0, 0, 0, 0, 
+	0, 0, 36, 0, 36, 5, 5, 6, 
+	0, 0, 0, 0, 0, 37, 36, 0, 
+	39, 40, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 39, 
+	38, 41, 38, 42, 43, 43, 44, 38, 
+	38, 38, 38, 38, 38, 42, 38, 45, 
+	45, 44, 38, 44, 38, 46, 46, 47, 
+	38, 48, 48, 47, 38, 47, 38, 49, 
+	49, 50, 38, 51, 51, 50, 38, 50, 
+	38, 52, 52, 53, 38, 54, 54, 53, 
+	38, 53, 38, 55, 38, 56, 38, 57, 
+	38, 58, 52, 52, 53, 38, 59, 38, 
+	60, 38, 61, 49, 49, 50, 38, 62, 
+	38, 63, 38, 64, 46, 46, 47, 38, 
+	65, 38, 66, 38, 42, 43, 43, 44, 
+	38, 38, 38, 38, 38, 67, 42, 38, 
+	68, 43, 43, 44, 38, 38, 38, 38, 
+	38, 38, 68, 38, 68, 43, 43, 44, 
+	38, 38, 38, 38, 38, 69, 68, 38, 
+	70, 43, 43, 44, 38, 38, 38, 38, 
+	38, 38, 70, 38, 70, 43, 43, 44, 
+	38, 38, 38, 38, 38, 71, 70, 38, 
+	72, 43, 43, 44, 38, 38, 38, 38, 
+	38, 38, 72, 38, 72, 43, 43, 44, 
+	38, 38, 38, 38, 38, 73, 72, 38, 
+	74, 43, 43, 44, 38, 38, 38, 38, 
+	38, 38, 74, 38, 74, 43, 43, 44, 
+	38, 38, 38, 38, 38, 75, 74, 38, 
+	77, 78, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 77, 
+	76, 79, 76, 80, 81, 81, 82, 76, 
+	76, 76, 76, 76, 76, 80, 76, 83, 
+	83, 82, 76, 82, 76, 84, 84, 85, 
+	76, 86, 86, 85, 76, 85, 76, 87, 
+	87, 88, 76, 89, 89, 88, 76, 88, 
+	76, 90, 90, 91, 76, 92, 92, 91, 
+	76, 91, 76, 93, 76, 94, 76, 95, 
+	76, 96, 90, 90, 91, 76, 97, 76, 
+	98, 76, 99, 87, 87, 88, 76, 100, 
+	76, 101, 76, 102, 84, 84, 85, 76, 
+	103, 76, 104, 76, 80, 81, 81, 82, 
+	76, 76, 76, 76, 76, 105, 80, 76, 
+	106, 81, 81, 82, 76, 76, 76, 76, 
+	76, 76, 106, 76, 106, 81, 81, 82, 
+	76, 76, 76, 76, 76, 107, 106, 76, 
+	108, 81, 81, 82, 76, 76, 76, 76, 
+	76, 76, 108, 76, 108, 81, 81, 82, 
+	76, 76, 76, 76, 76, 109, 108, 76, 
+	110, 81, 81, 82, 76, 76, 76, 76, 
+	76, 76, 110, 76, 110, 81, 81, 82, 
+	76, 76, 76, 76, 76, 111, 110, 76, 
+	112, 81, 81, 82, 76, 76, 76, 76, 
+	76, 76, 112, 76, 112, 81, 81, 82, 
+	76, 76, 76, 76, 76, 113, 112, 76, 
+	115, 116, 114, 114, 114, 114, 114, 114, 
+	114, 114, 117, 117, 114, 114, 118, 119, 
+	114, 121, 122, 123, 124, 6, 125, 126, 
+	127, 120, 120, 37, 128, 120, 129, 122, 
+	124, 124, 6, 125, 126, 127, 120, 120, 
+	120, 128, 120, 122, 124, 124, 6, 125, 
+	126, 127, 120, 120, 120, 128, 120, 130, 
+	120, 120, 120, 19, 131, 120, 125, 126, 
+	120, 120, 120, 120, 132, 120, 130, 120, 
+	133, 134, 135, 136, 6, 125, 126, 127, 
+	120, 120, 35, 137, 120, 138, 134, 136, 
+	136, 6, 125, 126, 127, 120, 120, 120, 
+	137, 120, 134, 136, 136, 6, 125, 126, 
+	127, 120, 120, 120, 137, 120, 139, 120, 
+	120, 120, 19, 140, 120, 125, 126, 120, 
+	120, 120, 120, 132, 120, 139, 120, 141, 
+	142, 143, 144, 6, 125, 126, 127, 120, 
+	120, 33, 145, 120, 146, 142, 144, 144, 
+	6, 125, 126, 127, 120, 120, 120, 145, 
+	120, 142, 144, 144, 6, 125, 126, 127, 
+	120, 120, 120, 145, 120, 147, 120, 120, 
+	120, 19, 148, 120, 125, 126, 120, 120, 
+	120, 120, 132, 120, 147, 120, 149, 150, 
+	151, 152, 6, 125, 126, 127, 120, 120, 
+	31, 153, 120, 154, 150, 152, 152, 6, 
+	125, 126, 127, 120, 120, 120, 153, 120, 
+	150, 152, 152, 6, 125, 126, 127, 120, 
+	120, 120, 153, 120, 155, 120, 120, 120, 
+	19, 156, 120, 125, 126, 120, 120, 120, 
+	120, 132, 120, 155, 120, 157, 158, 159, 
+	160, 6, 125, 126, 127, 120, 120, 29, 
+	161, 120, 162, 158, 160, 160, 6, 125, 
+	126, 127, 120, 120, 120, 161, 120, 158, 
+	160, 160, 6, 125, 126, 127, 120, 120, 
+	120, 161, 120, 19, 19, 120, 125, 126, 
+	120, 120, 120, 120, 132, 120, 125, 126, 
+	120, 120, 120, 120, 132, 120, 163, 120, 
+	120, 120, 126, 120, 120, 120, 120, 132, 
+	120, 126, 120, 120, 120, 120, 132, 120, 
+	164, 120, 165, 120, 166, 120, 120, 120, 
+	126, 120, 120, 120, 3, 120, 2, 120, 
+	120, 120, 120, 120, 126, 120, 126, 120, 
+	165, 120, 120, 120, 120, 120, 126, 120, 
+	19, 120, 125, 126, 120, 120, 120, 120, 
+	132, 120, 167, 28, 168, 169, 9, 125, 
+	126, 120, 120, 120, 120, 132, 120, 28, 
+	168, 169, 9, 125, 126, 120, 120, 120, 
+	120, 132, 120, 168, 168, 9, 125, 126, 
+	120, 120, 120, 120, 132, 120, 170, 25, 
+	171, 172, 12, 125, 126, 120, 120, 120, 
+	120, 132, 120, 25, 171, 172, 12, 125, 
+	126, 120, 120, 120, 120, 132, 120, 171, 
+	171, 12, 125, 126, 120, 120, 120, 120, 
+	132, 120, 173, 22, 174, 175, 15, 125, 
+	126, 120, 120, 120, 120, 132, 120, 22, 
+	174, 175, 15, 125, 126, 120, 120, 120, 
+	120, 132, 120, 174, 174, 15, 125, 126, 
+	120, 120, 120, 120, 132, 120, 176, 19, 
+	120, 177, 120, 125, 126, 120, 120, 120, 
+	120, 132, 120, 19, 120, 177, 120, 125, 
+	126, 120, 120, 120, 120, 132, 120, 158, 
+	160, 160, 6, 125, 126, 120, 120, 120, 
+	120, 161, 120, 1, 2, 120, 120, 19, 
+	19, 120, 125, 126, 120, 120, 120, 120, 
+	132, 120, 1, 120, 157, 158, 160, 160, 
+	6, 125, 126, 127, 120, 120, 120, 161, 
+	120, 155, 120, 120, 120, 120, 120, 120, 
+	125, 126, 120, 120, 120, 120, 132, 120, 
+	155, 120, 155, 120, 120, 120, 120, 156, 
+	120, 125, 126, 120, 120, 120, 120, 132, 
+	120, 155, 120, 155, 2, 120, 120, 19, 
+	156, 120, 125, 126, 120, 120, 120, 120, 
+	132, 120, 155, 120, 149, 150, 152, 152, 
+	6, 125, 126, 127, 120, 120, 120, 153, 
+	120, 147, 120, 120, 120, 120, 120, 120, 
+	125, 126, 120, 120, 120, 120, 132, 120, 
+	147, 120, 147, 120, 120, 120, 120, 148, 
+	120, 125, 126, 120, 120, 120, 120, 132, 
+	120, 147, 120, 147, 2, 120, 120, 19, 
+	148, 120, 125, 126, 120, 120, 120, 120, 
+	132, 120, 147, 120, 141, 142, 144, 144, 
+	6, 125, 126, 127, 120, 120, 120, 145, 
+	120, 139, 120, 120, 120, 120, 120, 120, 
+	125, 126, 120, 120, 120, 120, 132, 120, 
+	139, 120, 139, 120, 120, 120, 120, 140, 
+	120, 125, 126, 120, 120, 120, 120, 132, 
+	120, 139, 120, 139, 2, 120, 120, 19, 
+	140, 120, 125, 126, 120, 120, 120, 120, 
+	132, 120, 139, 120, 133, 134, 136, 136, 
+	6, 125, 126, 127, 120, 120, 120, 137, 
+	120, 130, 120, 120, 120, 120, 120, 120, 
+	125, 126, 120, 120, 120, 120, 132, 120, 
+	130, 120, 130, 120, 120, 120, 120, 131, 
+	120, 125, 126, 120, 120, 120, 120, 132, 
+	120, 130, 120, 130, 2, 120, 120, 19, 
+	131, 120, 125, 126, 120, 120, 120, 120, 
+	132, 120, 130, 120, 121, 122, 124, 124, 
+	6, 125, 126, 127, 120, 120, 120, 128, 
+	120, 179, 180, 181, 182, 44, 183, 184, 
+	178, 178, 178, 75, 185, 178, 186, 180, 
+	187, 182, 44, 183, 184, 178, 178, 178, 
+	178, 185, 178, 180, 187, 182, 44, 183, 
+	184, 178, 178, 178, 178, 185, 178, 188, 
+	178, 178, 178, 57, 189, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 188, 178, 
+	191, 192, 193, 194, 44, 183, 184, 178, 
+	178, 178, 73, 195, 178, 196, 192, 194, 
+	194, 44, 183, 184, 178, 178, 178, 178, 
+	195, 178, 192, 194, 194, 44, 183, 184, 
+	178, 178, 178, 178, 195, 178, 197, 178, 
+	178, 178, 57, 198, 178, 183, 184, 178, 
+	178, 178, 178, 190, 178, 197, 178, 199, 
+	200, 201, 202, 44, 183, 184, 178, 178, 
+	178, 71, 203, 178, 204, 200, 202, 202, 
+	44, 183, 184, 178, 178, 178, 178, 203, 
+	178, 200, 202, 202, 44, 183, 184, 178, 
+	178, 178, 178, 203, 178, 205, 178, 178, 
+	178, 57, 206, 178, 183, 184, 178, 178, 
+	178, 178, 190, 178, 205, 178, 207, 208, 
+	209, 210, 44, 183, 184, 178, 178, 178, 
+	69, 211, 178, 212, 208, 210, 210, 44, 
+	183, 184, 178, 178, 178, 178, 211, 178, 
+	208, 210, 210, 44, 183, 184, 178, 178, 
+	178, 178, 211, 178, 213, 178, 178, 178, 
+	57, 214, 178, 183, 184, 178, 178, 178, 
+	178, 190, 178, 213, 178, 215, 216, 217, 
+	218, 44, 183, 184, 178, 178, 178, 67, 
+	219, 178, 220, 216, 218, 218, 44, 183, 
+	184, 178, 178, 178, 178, 219, 178, 216, 
+	218, 218, 44, 183, 184, 178, 178, 178, 
+	178, 219, 178, 57, 57, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 221, 178, 
+	178, 178, 184, 178, 178, 178, 178, 190, 
+	178, 184, 178, 178, 178, 178, 190, 178, 
+	222, 178, 223, 178, 224, 178, 178, 178, 
+	184, 178, 178, 178, 41, 178, 40, 178, 
+	178, 178, 178, 178, 184, 178, 184, 178, 
+	223, 178, 178, 178, 178, 178, 184, 178, 
+	57, 178, 183, 184, 178, 178, 178, 178, 
+	190, 178, 225, 66, 226, 227, 47, 183, 
+	184, 178, 178, 178, 178, 190, 178, 66, 
+	226, 227, 47, 183, 184, 178, 178, 178, 
+	178, 190, 178, 226, 226, 47, 183, 184, 
+	178, 178, 178, 178, 190, 178, 228, 63, 
+	229, 230, 50, 183, 184, 178, 178, 178, 
+	178, 190, 178, 63, 229, 230, 50, 183, 
+	184, 178, 178, 178, 178, 190, 178, 229, 
+	229, 50, 183, 184, 178, 178, 178, 178, 
+	190, 178, 231, 60, 232, 233, 53, 183, 
+	184, 178, 178, 178, 178, 190, 178, 60, 
+	232, 233, 53, 183, 184, 178, 178, 178, 
+	178, 190, 178, 232, 232, 53, 183, 184, 
+	178, 178, 178, 178, 190, 178, 234, 57, 
+	178, 235, 178, 183, 184, 178, 178, 178, 
+	178, 190, 178, 57, 178, 235, 178, 183, 
+	184, 178, 178, 178, 178, 190, 178, 39, 
+	40, 178, 178, 57, 57, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 39, 178, 
+	215, 216, 218, 218, 44, 183, 184, 178, 
+	178, 178, 178, 219, 178, 213, 178, 178, 
+	178, 178, 178, 178, 183, 184, 178, 178, 
+	178, 178, 190, 178, 213, 178, 213, 178, 
+	178, 178, 178, 214, 178, 183, 184, 178, 
+	178, 178, 178, 190, 178, 213, 178, 213, 
+	40, 178, 178, 57, 214, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 213, 178, 
+	207, 208, 210, 210, 44, 183, 184, 178, 
+	178, 178, 178, 211, 178, 205, 178, 178, 
+	178, 178, 178, 178, 183, 184, 178, 178, 
+	178, 178, 190, 178, 205, 178, 205, 178, 
+	178, 178, 178, 206, 178, 183, 184, 178, 
+	178, 178, 178, 190, 178, 205, 178, 205, 
+	40, 178, 178, 57, 206, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 205, 178, 
+	199, 200, 202, 202, 44, 183, 184, 178, 
+	178, 178, 178, 203, 178, 197, 178, 178, 
+	178, 178, 178, 178, 183, 184, 178, 178, 
+	178, 178, 190, 178, 197, 178, 197, 178, 
+	178, 178, 178, 198, 178, 183, 184, 178, 
+	178, 178, 178, 190, 178, 197, 178, 197, 
+	40, 178, 178, 57, 198, 178, 183, 184, 
+	178, 178, 178, 178, 190, 178, 197, 178, 
+	191, 192, 194, 194, 44, 183, 184, 178, 
+	178, 178, 178, 195, 178, 188, 178, 178, 
+	178, 178, 178, 178, 183, 184, 178, 178, 
+	178, 178, 190, 178, 188, 178, 188, 178, 
+	178, 178, 178, 189, 178, 183, 184, 178, 
+	178, 178, 178, 190, 178, 188, 178, 74, 
+	43, 43, 44, 178, 178, 178, 178, 178, 
+	178, 74, 178, 188, 40, 178, 178, 57, 
+	189, 178, 183, 184, 178, 178, 178, 178, 
+	190, 178, 188, 178, 179, 180, 187, 182, 
+	44, 183, 184, 178, 178, 178, 178, 185, 
+	178, 237, 238, 239, 240, 82, 241, 242, 
+	236, 236, 236, 113, 243, 236, 244, 238, 
+	240, 240, 82, 241, 242, 236, 236, 236, 
+	236, 243, 236, 238, 240, 240, 82, 241, 
+	242, 236, 236, 236, 236, 243, 236, 245, 
+	236, 236, 236, 95, 246, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 245, 236, 
+	248, 249, 250, 251, 82, 241, 242, 236, 
+	236, 236, 111, 252, 236, 253, 249, 251, 
+	251, 82, 241, 242, 236, 236, 236, 236, 
+	252, 236, 249, 251, 251, 82, 241, 242, 
+	236, 236, 236, 236, 252, 236, 254, 236, 
+	236, 236, 95, 255, 236, 241, 242, 236, 
+	236, 236, 236, 247, 236, 254, 236, 256, 
+	257, 258, 259, 82, 241, 242, 236, 236, 
+	236, 109, 260, 236, 261, 257, 259, 259, 
+	82, 241, 242, 236, 236, 236, 236, 260, 
+	236, 257, 259, 259, 82, 241, 242, 236, 
+	236, 236, 236, 260, 236, 262, 236, 236, 
+	236, 95, 263, 236, 241, 242, 236, 236, 
+	236, 236, 247, 236, 262, 236, 264, 265, 
+	266, 267, 82, 241, 242, 236, 236, 236, 
+	107, 268, 236, 269, 265, 267, 267, 82, 
+	241, 242, 236, 236, 236, 236, 268, 236, 
+	265, 267, 267, 82, 241, 242, 236, 236, 
+	236, 236, 268, 236, 270, 236, 236, 236, 
+	95, 271, 236, 241, 242, 236, 236, 236, 
+	236, 247, 236, 270, 236, 272, 273, 274, 
+	275, 82, 241, 242, 236, 236, 236, 105, 
+	276, 236, 277, 273, 275, 275, 82, 241, 
+	242, 236, 236, 236, 236, 276, 236, 273, 
+	275, 275, 82, 241, 242, 236, 236, 236, 
+	236, 276, 236, 95, 95, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 278, 236, 
+	236, 236, 242, 236, 236, 236, 236, 247, 
+	236, 242, 236, 236, 236, 236, 247, 236, 
+	279, 236, 280, 236, 281, 236, 236, 236, 
+	242, 236, 236, 236, 79, 236, 78, 236, 
+	236, 236, 236, 236, 242, 236, 242, 236, 
+	280, 236, 236, 236, 236, 236, 242, 236, 
+	95, 236, 241, 242, 236, 236, 236, 236, 
+	247, 236, 282, 104, 283, 284, 85, 241, 
+	242, 236, 236, 236, 236, 247, 236, 104, 
+	283, 284, 85, 241, 242, 236, 236, 236, 
+	236, 247, 236, 283, 283, 85, 241, 242, 
+	236, 236, 236, 236, 247, 236, 285, 101, 
+	286, 287, 88, 241, 242, 236, 236, 236, 
+	236, 247, 236, 101, 286, 287, 88, 241, 
+	242, 236, 236, 236, 236, 247, 236, 286, 
+	286, 88, 241, 242, 236, 236, 236, 236, 
+	247, 236, 288, 98, 289, 290, 91, 241, 
+	242, 236, 236, 236, 236, 247, 236, 98, 
+	289, 290, 91, 241, 242, 236, 236, 236, 
+	236, 247, 236, 289, 289, 91, 241, 242, 
+	236, 236, 236, 236, 247, 236, 291, 95, 
+	236, 292, 236, 241, 242, 236, 236, 236, 
+	236, 247, 236, 95, 236, 292, 236, 241, 
+	242, 236, 236, 236, 236, 247, 236, 77, 
+	78, 236, 236, 95, 95, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 77, 236, 
+	272, 273, 275, 275, 82, 241, 242, 236, 
+	236, 236, 236, 276, 236, 270, 236, 236, 
+	236, 236, 236, 236, 241, 242, 236, 236, 
+	236, 236, 247, 236, 270, 236, 270, 236, 
+	236, 236, 236, 271, 236, 241, 242, 236, 
+	236, 236, 236, 247, 236, 270, 236, 270, 
+	78, 236, 236, 95, 271, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 270, 236, 
+	264, 265, 267, 267, 82, 241, 242, 236, 
+	236, 236, 236, 268, 236, 262, 236, 236, 
+	236, 236, 236, 236, 241, 242, 236, 236, 
+	236, 236, 247, 236, 262, 236, 262, 236, 
+	236, 236, 236, 263, 236, 241, 242, 236, 
+	236, 236, 236, 247, 236, 262, 236, 262, 
+	78, 236, 236, 95, 263, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 262, 236, 
+	256, 257, 259, 259, 82, 241, 242, 236, 
+	236, 236, 236, 260, 236, 254, 236, 236, 
+	236, 236, 236, 236, 241, 242, 236, 236, 
+	236, 236, 247, 236, 254, 236, 254, 236, 
+	236, 236, 236, 255, 236, 241, 242, 236, 
+	236, 236, 236, 247, 236, 254, 236, 254, 
+	78, 236, 236, 95, 255, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 254, 236, 
+	248, 249, 251, 251, 82, 241, 242, 236, 
+	236, 236, 236, 252, 236, 245, 236, 236, 
+	236, 236, 236, 236, 241, 242, 236, 236, 
+	236, 236, 247, 236, 245, 236, 245, 236, 
+	236, 236, 236, 246, 236, 241, 242, 236, 
+	236, 236, 236, 247, 236, 245, 236, 245, 
+	78, 236, 236, 95, 246, 236, 241, 242, 
+	236, 236, 236, 236, 247, 236, 245, 236, 
+	237, 238, 240, 240, 82, 241, 242, 236, 
+	236, 236, 236, 243, 236, 115, 116, 293, 
+	293, 293, 293, 293, 293, 293, 293, 117, 
+	117, 293, 293, 293, 115, 293, 121, 294, 
+	123, 124, 6, 125, 126, 127, 120, 120, 
+	37, 128, 120, 130, 116, 120, 120, 19, 
+	131, 120, 125, 126, 120, 117, 117, 120, 
+	132, 120, 130, 120, 0
 };
 
-static const char _indic_syllable_machine_trans_targs[] = {
-	7, 1, 8, 7, 25, 2, 7, 33, 
-	5, 7, 21, 23, 31, 7, 9, 11, 
-	0, 15, 13, 14, 18, 10, 12, 7, 
-	16, 17, 19, 20, 22, 7, 24, 3, 
-	4, 26, 29, 30, 27, 28, 7, 7, 
-	32, 6, 34, 37, 38, 35, 36, 7
+static const short _indic_syllable_machine_trans_targs[] = {
+	105, 130, 132, 133, 134, 3, 135, 4, 
+	6, 138, 7, 9, 141, 10, 12, 144, 
+	13, 15, 16, 126, 18, 19, 143, 21, 
+	22, 140, 24, 25, 137, 148, 150, 152, 
+	154, 156, 158, 160, 162, 164, 105, 189, 
+	191, 192, 193, 38, 194, 39, 41, 197, 
+	42, 44, 200, 45, 47, 203, 48, 50, 
+	51, 185, 53, 54, 202, 56, 57, 199, 
+	59, 60, 196, 206, 208, 210, 212, 214, 
+	216, 218, 220, 223, 105, 248, 250, 251, 
+	252, 73, 253, 74, 76, 256, 77, 79, 
+	259, 80, 82, 262, 83, 85, 86, 244, 
+	88, 89, 261, 91, 92, 258, 94, 95, 
+	255, 265, 267, 269, 271, 273, 275, 277, 
+	279, 281, 105, 106, 165, 224, 282, 283, 
+	105, 107, 109, 34, 33, 127, 129, 146, 
+	163, 108, 110, 161, 0, 111, 113, 32, 
+	31, 159, 112, 114, 157, 115, 117, 30, 
+	29, 155, 116, 118, 153, 119, 121, 28, 
+	27, 151, 120, 122, 149, 123, 125, 26, 
+	2, 147, 124, 128, 105, 131, 1, 136, 
+	5, 23, 139, 8, 20, 142, 11, 17, 
+	145, 14, 105, 166, 168, 69, 221, 186, 
+	188, 222, 167, 68, 169, 219, 35, 170, 
+	172, 67, 66, 217, 171, 173, 215, 174, 
+	176, 65, 64, 213, 175, 177, 211, 178, 
+	180, 63, 62, 209, 179, 181, 207, 182, 
+	184, 61, 37, 205, 183, 187, 105, 190, 
+	36, 195, 40, 58, 198, 43, 55, 201, 
+	46, 52, 204, 49, 105, 225, 227, 104, 
+	103, 245, 247, 280, 226, 228, 278, 70, 
+	229, 231, 102, 101, 276, 230, 232, 274, 
+	233, 235, 100, 99, 272, 234, 236, 270, 
+	237, 239, 98, 97, 268, 238, 240, 266, 
+	241, 243, 96, 72, 264, 242, 246, 105, 
+	249, 71, 254, 75, 93, 257, 78, 90, 
+	260, 81, 87, 263, 84, 105, 284
 };
 
 static const char _indic_syllable_machine_trans_actions[] = {
-	1, 0, 2, 3, 2, 0, 4, 2, 
-	0, 7, 2, 2, 2, 8, 2, 0, 
-	0, 0, 0, 0, 0, 2, 0, 9, 
-	0, 0, 0, 0, 0, 10, 2, 0, 
-	0, 0, 0, 0, 0, 0, 11, 12, 
-	2, 0, 0, 0, 0, 0, 0, 13
+	1, 2, 0, 0, 2, 0, 2, 0, 
+	0, 2, 0, 0, 2, 0, 0, 2, 
+	0, 0, 0, 2, 0, 0, 2, 0, 
+	0, 2, 0, 0, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 3, 2, 
+	0, 0, 2, 0, 2, 0, 0, 2, 
+	0, 0, 2, 0, 0, 2, 0, 0, 
+	0, 2, 0, 0, 2, 0, 0, 2, 
+	0, 0, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 4, 2, 0, 0, 
+	2, 0, 2, 0, 0, 2, 0, 0, 
+	2, 0, 0, 2, 0, 0, 0, 2, 
+	0, 0, 2, 0, 0, 2, 0, 0, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 7, 2, 2, 2, 0, 2, 
+	8, 2, 2, 0, 0, 2, 0, 2, 
+	2, 2, 2, 2, 0, 2, 2, 0, 
+	0, 2, 2, 2, 2, 2, 2, 0, 
+	0, 2, 2, 2, 2, 2, 2, 0, 
+	0, 2, 2, 2, 2, 2, 2, 0, 
+	0, 2, 2, 2, 9, 0, 0, 2, 
+	0, 0, 2, 0, 0, 2, 0, 0, 
+	2, 0, 10, 2, 2, 0, 2, 2, 
+	0, 2, 2, 0, 2, 2, 0, 2, 
+	2, 0, 0, 2, 2, 2, 2, 2, 
+	2, 0, 0, 2, 2, 2, 2, 2, 
+	2, 0, 0, 2, 2, 2, 2, 2, 
+	2, 0, 0, 2, 2, 2, 11, 0, 
+	0, 2, 0, 0, 2, 0, 0, 2, 
+	0, 0, 2, 0, 12, 2, 2, 0, 
+	0, 2, 0, 2, 2, 2, 2, 0, 
+	2, 2, 0, 0, 2, 2, 2, 2, 
+	2, 2, 0, 0, 2, 2, 2, 2, 
+	2, 2, 0, 0, 2, 2, 2, 2, 
+	2, 2, 0, 0, 2, 2, 2, 13, 
+	0, 0, 2, 0, 0, 2, 0, 0, 
+	2, 0, 0, 2, 0, 14, 2
 };
 
 static const char _indic_syllable_machine_to_state_actions[] = {
-	0, 0, 0, 0, 0, 0, 0, 5, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 5, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0
 };
 
 static const char _indic_syllable_machine_from_state_actions[] = {
-	0, 0, 0, 0, 0, 0, 0, 6, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 6, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0
 };
 
-static const unsigned char _indic_syllable_machine_eof_trans[] = {
-	1, 1, 4, 4, 4, 7, 7, 0, 
-	14, 14, 14, 14, 14, 14, 14, 14, 
-	14, 14, 14, 14, 14, 14, 14, 30, 
-	30, 30, 30, 30, 30, 30, 30, 40, 
-	40, 40, 40, 40, 40, 40, 40
+static const short _indic_syllable_machine_eof_trans[] = {
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 77, 
+	77, 0, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 121, 121, 121, 
+	121, 121, 121, 121, 121, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	179, 179, 179, 179, 179, 179, 179, 179, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 237, 237, 237, 237, 237, 237, 
+	237, 237, 294, 121, 121
 };
 
-static const int indic_syllable_machine_start = 7;
-static const int indic_syllable_machine_first_final = 7;
+static const int indic_syllable_machine_start = 105;
+static const int indic_syllable_machine_first_final = 105;
 static const int indic_syllable_machine_error = -1;
 
-static const int indic_syllable_machine_en_main = 7;
+static const int indic_syllable_machine_en_main = 105;
 
 
-#line 38 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 36 "../../src/hb-ot-shape-complex-indic-machine.rl"
 
 
 
-#line 79 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 88 "../../src/hb-ot-shape-complex-indic-machine.rl"
 
 
 #define process_syllable(func) \
   HB_STMT_START { \
-    /* fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #func); */ \
+    if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #func); \
     for (unsigned int i = last; i < p+1; i++) \
       info[i].syllable() = syllable_serial; \
-    PASTE (initial_reordering_, func) (map, buffer, mask_array, last, p+1); \
+    PASTE (initial_reordering_, func) (plan, buffer, last, p+1); \
     last = p+1; \
     syllable_serial++; \
     if (unlikely (!syllable_serial)) syllable_serial++; \
   } HB_STMT_END
 
 static void
-find_syllables (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_array)
+find_syllables (const hb_ot_shape_plan_t *plan, hb_buffer_t *buffer)
 {
   unsigned int p, pe, eof, ts, te, act;
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 170 "hb-ot-shape-complex-indic-machine.hh.tmp"
+#line 759 "hb-ot-shape-complex-indic-machine.hh.tmp"
 	{
 	cs = indic_syllable_machine_start;
 	ts = 0;
@@ -174,7 +763,7 @@ find_syllables (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_arr
 	act = 0;
 	}
 
-#line 101 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 110 "../../src/hb-ot-shape-complex-indic-machine.rl"
 
 
   p = 0;
@@ -183,12 +772,12 @@ find_syllables (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_arr
   unsigned int last = 0;
   uint8_t syllable_serial = 1;
   
-#line 187 "hb-ot-shape-complex-indic-machine.hh.tmp"
+#line 776 "hb-ot-shape-complex-indic-machine.hh.tmp"
 	{
 	int _slen;
 	int _trans;
 	const unsigned char *_keys;
-	const char *_inds;
+	const short *_inds;
 	if ( p == pe )
 		goto _test_eof;
 _resume:
@@ -197,7 +786,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 201 "hb-ot-shape-complex-indic-machine.hh.tmp"
+#line 790 "hb-ot-shape-complex-indic-machine.hh.tmp"
 	}
 
 	_keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -220,46 +809,50 @@ _eof_trans:
 	{te = p+1;}
 	break;
 	case 9:
-#line 72 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 81 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p+1;{ process_syllable (consonant_syllable); }}
 	break;
 	case 11:
-#line 73 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 82 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p+1;{ process_syllable (vowel_syllable); }}
 	break;
 	case 13:
-#line 74 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p+1;{ process_syllable (standalone_cluster); }}
 	break;
 	case 7:
-#line 75 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 84 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p+1;{ process_syllable (non_indic); }}
 	break;
 	case 8:
-#line 72 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 81 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p;p--;{ process_syllable (consonant_syllable); }}
 	break;
 	case 10:
-#line 73 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 82 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p;p--;{ process_syllable (vowel_syllable); }}
 	break;
 	case 12:
-#line 74 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{te = p;p--;{ process_syllable (standalone_cluster); }}
 	break;
+	case 14:
+#line 84 "../../src/hb-ot-shape-complex-indic-machine.rl"
+	{te = p;p--;{ process_syllable (non_indic); }}
+	break;
 	case 1:
-#line 72 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 81 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{{p = ((te))-1;}{ process_syllable (consonant_syllable); }}
 	break;
 	case 3:
-#line 73 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 82 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{{p = ((te))-1;}{ process_syllable (vowel_syllable); }}
 	break;
 	case 4:
-#line 74 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl"
 	{{p = ((te))-1;}{ process_syllable (standalone_cluster); }}
 	break;
-#line 263 "hb-ot-shape-complex-indic-machine.hh.tmp"
+#line 856 "hb-ot-shape-complex-indic-machine.hh.tmp"
 	}
 
 _again:
@@ -268,7 +861,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 272 "hb-ot-shape-complex-indic-machine.hh.tmp"
+#line 865 "hb-ot-shape-complex-indic-machine.hh.tmp"
 	}
 
 	if ( ++p != pe )
@@ -284,10 +877,8 @@ _again:
 
 	}
 
-#line 110 "../../src/hb-ot-shape-complex-indic-machine.rl"
+#line 119 "../../src/hb-ot-shape-complex-indic-machine.rl"
 
 }
 
-HB_END_DECLS
-
 #endif /* HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH */
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.rl b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.rl
index 93ca29a7300f..b6a372e4ab6c 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.rl
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-machine.rl
@@ -29,8 +29,6 @@
 
 #include "hb-private.hh"
 
-HB_BEGIN_DECLS
-
 %%{
   machine indic_syllable_machine;
   alphtype unsigned char;
@@ -42,30 +40,41 @@ HB_BEGIN_DECLS
 # Same order as enum indic_category_t.  Not sure how to avoid duplication.
 X    = 0;
 C    = 1;
-Ra   = 2;
-V    = 3;
-N    = 4;
-H    = 5;
-ZWNJ = 6;
-ZWJ  = 7;
-M    = 8;
-SM   = 9;
-VD   = 10;
-A    = 11;
-NBSP = 12;
-DOTTEDCIRCLE = 13;
+V    = 2;
+N    = 3;
+H    = 4;
+ZWNJ = 5;
+ZWJ  = 6;
+M    = 7;
+SM   = 8;
+VD   = 9;
+A    = 10;
+NBSP = 11;
+DOTTEDCIRCLE = 12;
+RS   = 13;
+Coeng = 14;
+Repha = 15;
+Ra    = 16;
 
-c = C | Ra;
-n = N N?;
-z = ZWJ|ZWNJ;
-matra_group = M N? H?;
-syllable_tail = SM? (VD VD?)?;
+c = (C | Ra);			# is_consonant
+n = ((ZWNJ?.RS)? (N.N?)?);	# is_consonant_modifier
+z = ZWJ|ZWNJ;			# is_joiner
+h = H | Coeng;			# is_halant_or_coeng
+reph = (Ra H | Repha);		# possible reph
+
+cn = c.n?;
+forced_rakar = ZWJ H ZWJ Ra;
+matra_group = z{0,3}.M.N?.(H | forced_rakar)?;
+syllable_tail = (SM.ZWNJ?)? (Coeng (cn|V))? (VD VD?)?;
 place_holder = NBSP | DOTTEDCIRCLE;
+halant_group = (z?.h.ZWJ?);
+final_halant_group = halant_group | h.ZWNJ;
+halant_or_matra_group = (final_halant_group | matra_group{0,4});
 
 
-consonant_syllable =	(c.n? (H.z?|z.H))* c.n? A? (H.z? | matra_group*)? syllable_tail;
-vowel_syllable =	(Ra H)? V n? (z?.H.c | ZWJ.c)* matra_group* syllable_tail;
-standalone_cluster =	(Ra H)? place_holder n? (z? H c)* matra_group* syllable_tail;
+consonant_syllable =	Repha? (cn.halant_group){0,4} cn A? halant_or_matra_group? syllable_tail;
+vowel_syllable =	reph? V.n? (ZWJ | (halant_group.cn){0,4} halant_or_matra_group? syllable_tail);
+standalone_cluster =	reph? place_holder.n? (halant_group.cn){0,4} halant_or_matra_group? syllable_tail;
 other =			any;
 
 main := |*
@@ -80,17 +89,17 @@ main := |*
 
 #define process_syllable(func) \
   HB_STMT_START { \
-    /* fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #func); */ \
+    if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #func); \
     for (unsigned int i = last; i < p+1; i++) \
       info[i].syllable() = syllable_serial; \
-    PASTE (initial_reordering_, func) (map, buffer, mask_array, last, p+1); \
+    PASTE (initial_reordering_, func) (plan, buffer, last, p+1); \
     last = p+1; \
     syllable_serial++; \
     if (unlikely (!syllable_serial)) syllable_serial++; \
   } HB_STMT_END
 
 static void
-find_syllables (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_array)
+find_syllables (const hb_ot_shape_plan_t *plan, hb_buffer_t *buffer)
 {
   unsigned int p, pe, eof, ts, te, act;
   int cs;
@@ -110,6 +119,4 @@ find_syllables (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_arr
   }%%
 }
 
-HB_END_DECLS
-
 #endif /* HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH */
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
index 64af0da46207..719d287376b3 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
@@ -31,12 +31,14 @@
 
 
 #include "hb-ot-shape-complex-private.hh"
+#include "hb-ot-shape-private.hh" /* XXX Remove */
 
 
 /* buffer var allocations */
 #define indic_category() complex_var_persistent_u8_0() /* indic_category_t */
 #define indic_position() complex_var_persistent_u8_1() /* indic_matra_category_t */
 
+
 #define INDIC_TABLE_ELEMENT_TYPE uint8_t
 
 /* Cateories used in the OpenType spec:
@@ -47,7 +49,6 @@
 enum indic_category_t {
   OT_X = 0,
   OT_C,
-  OT_Ra, /* Not explicitly listed in the OT spec, but used in the grammar. */
   OT_V,
   OT_N,
   OT_H,
@@ -58,22 +59,38 @@ enum indic_category_t {
   OT_VD,
   OT_A,
   OT_NBSP,
-  OT_DOTTEDCIRCLE /* Not in the spec, but special in Uniscribe. /Very very/ special! */
+  OT_DOTTEDCIRCLE, /* Not in the spec, but special in Uniscribe. /Very very/ special! */
+  OT_RS, /* Register Shifter, used in Khmer OT spec */
+  OT_Coeng,
+  OT_Repha,
+  OT_Ra /* Not explicitly listed in the OT spec, but used in the grammar. */
 };
 
 /* Visual positions in a syllable from left to right. */
 enum indic_position_t {
+  POS_START,
+
   POS_RA_TO_BECOME_REPH,
   POS_PRE_M,
   POS_PRE_C,
+
   POS_BASE_C,
+  POS_AFTER_MAIN,
+
   POS_ABOVE_C,
+
+  POS_BEFORE_SUB,
   POS_BELOW_C,
-  POS_ABOVE_M,
-  POS_BELOW_M,
+  POS_AFTER_SUB,
+
+  POS_BEFORE_POST,
   POS_POST_C,
-  POS_POST_M,
-  POS_SMVD
+  POS_AFTER_POST,
+
+  POS_FINAL_C,
+  POS_SMVD,
+
+  POS_END
 };
 
 /* Categories used in IndicSyllabicCategory.txt from UCD. */
@@ -89,10 +106,10 @@ enum indic_syllabic_category_t {
   INDIC_SYLLABIC_CATEGORY_CONSONANT_MEDIAL	= OT_C,
   INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER	= OT_NBSP,
   INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED	= OT_C,
-  INDIC_SYLLABIC_CATEGORY_CONSONANT_REPHA	= OT_C,
+  INDIC_SYLLABIC_CATEGORY_CONSONANT_REPHA	= OT_Repha,
   INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER	= OT_X,
   INDIC_SYLLABIC_CATEGORY_NUKTA			= OT_N,
-  INDIC_SYLLABIC_CATEGORY_REGISTER_SHIFTER	= OT_X,
+  INDIC_SYLLABIC_CATEGORY_REGISTER_SHIFTER	= OT_RS,
   INDIC_SYLLABIC_CATEGORY_TONE_LETTER		= OT_X,
   INDIC_SYLLABIC_CATEGORY_TONE_MARK		= OT_X,
   INDIC_SYLLABIC_CATEGORY_VIRAMA		= OT_H,
@@ -104,29 +121,21 @@ enum indic_syllabic_category_t {
 
 /* Categories used in IndicSMatraCategory.txt from UCD */
 enum indic_matra_category_t {
-  INDIC_MATRA_CATEGORY_NOT_APPLICABLE		= POS_BASE_C,
+  INDIC_MATRA_CATEGORY_NOT_APPLICABLE		= POS_END,
 
-  INDIC_MATRA_CATEGORY_LEFT			= POS_PRE_M,
-  INDIC_MATRA_CATEGORY_TOP			= POS_ABOVE_M,
-  INDIC_MATRA_CATEGORY_BOTTOM			= POS_BELOW_M,
-  INDIC_MATRA_CATEGORY_RIGHT			= POS_POST_M,
+  INDIC_MATRA_CATEGORY_LEFT			= POS_PRE_C,
+  INDIC_MATRA_CATEGORY_TOP			= POS_ABOVE_C,
+  INDIC_MATRA_CATEGORY_BOTTOM			= POS_BELOW_C,
+  INDIC_MATRA_CATEGORY_RIGHT			= POS_POST_C,
 
-  /* We don't really care much about these since we decompose them
-   * in the generic pre-shaping layer.  They will only be used if
-   * the font does not cover the decomposition.  In which case, we
-   * define these as aliases to the place we want the split-matra
-   * glyph to show up.  Quite arbitrary.
-   *
-   * TODO: There are some split matras without Unicode decompositions.
-   * We have to figure out what to do with them.
-   */
-  INDIC_MATRA_CATEGORY_BOTTOM_AND_RIGHT		= POS_POST_M,
-  INDIC_MATRA_CATEGORY_LEFT_AND_RIGHT		= POS_PRE_M,
-  INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM		= POS_BELOW_M,
-  INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM_AND_RIGHT	= POS_POST_M,
-  INDIC_MATRA_CATEGORY_TOP_AND_LEFT		= POS_PRE_M,
-  INDIC_MATRA_CATEGORY_TOP_AND_LEFT_AND_RIGHT	= POS_PRE_M,
-  INDIC_MATRA_CATEGORY_TOP_AND_RIGHT		= POS_POST_M,
+  /* These should resolve to the position of the last part of the split sequence. */
+  INDIC_MATRA_CATEGORY_BOTTOM_AND_RIGHT		= INDIC_MATRA_CATEGORY_RIGHT,
+  INDIC_MATRA_CATEGORY_LEFT_AND_RIGHT		= INDIC_MATRA_CATEGORY_RIGHT,
+  INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM		= INDIC_MATRA_CATEGORY_BOTTOM,
+  INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM_AND_RIGHT	= INDIC_MATRA_CATEGORY_RIGHT,
+  INDIC_MATRA_CATEGORY_TOP_AND_LEFT		= INDIC_MATRA_CATEGORY_TOP,
+  INDIC_MATRA_CATEGORY_TOP_AND_LEFT_AND_RIGHT	= INDIC_MATRA_CATEGORY_RIGHT,
+  INDIC_MATRA_CATEGORY_TOP_AND_RIGHT		= INDIC_MATRA_CATEGORY_RIGHT,
 
   INDIC_MATRA_CATEGORY_INVISIBLE		= INDIC_MATRA_CATEGORY_NOT_APPLICABLE,
   INDIC_MATRA_CATEGORY_OVERSTRUCK		= INDIC_MATRA_CATEGORY_NOT_APPLICABLE,
@@ -143,111 +152,79 @@ enum indic_matra_category_t {
 
 #include "hb-ot-shape-complex-indic-table.hh"
 
-/* XXX
- * This is a hack for now.  We should:
- * 1. Move this data into the main Indic table,
- * and/or
- * 2. Probe font lookups to determine consonant positions.
- */
-static const struct consonant_position_t {
-  hb_codepoint_t u;
-  indic_position_t position;
-} consonant_positions[] = {
-  {0x0930, POS_BELOW_C},
-  {0x09AC, POS_BELOW_C},
-  {0x09AF, POS_POST_C},
-  {0x09B0, POS_BELOW_C},
-  {0x09F0, POS_BELOW_C},
-  {0x0A2F, POS_POST_C},
-  {0x0A30, POS_BELOW_C},
-  {0x0A35, POS_BELOW_C},
-  {0x0A39, POS_BELOW_C},
-  {0x0AB0, POS_BELOW_C},
-  {0x0B24, POS_BELOW_C},
-  {0x0B28, POS_BELOW_C},
-  {0x0B2C, POS_BELOW_C},
-  {0x0B2D, POS_BELOW_C},
-  {0x0B2E, POS_BELOW_C},
-  {0x0B2F, POS_POST_C},
-  {0x0B30, POS_BELOW_C},
-  {0x0B32, POS_BELOW_C},
-  {0x0B33, POS_BELOW_C},
-  {0x0B5F, POS_POST_C},
-  {0x0B71, POS_BELOW_C},
-  {0x0C15, POS_BELOW_C},
-  {0x0C16, POS_BELOW_C},
-  {0x0C17, POS_BELOW_C},
-  {0x0C18, POS_BELOW_C},
-  {0x0C19, POS_BELOW_C},
-  {0x0C1A, POS_BELOW_C},
-  {0x0C1B, POS_BELOW_C},
-  {0x0C1C, POS_BELOW_C},
-  {0x0C1D, POS_BELOW_C},
-  {0x0C1E, POS_BELOW_C},
-  {0x0C1F, POS_BELOW_C},
-  {0x0C20, POS_BELOW_C},
-  {0x0C21, POS_BELOW_C},
-  {0x0C22, POS_BELOW_C},
-  {0x0C23, POS_BELOW_C},
-  {0x0C24, POS_BELOW_C},
-  {0x0C25, POS_BELOW_C},
-  {0x0C26, POS_BELOW_C},
-  {0x0C27, POS_BELOW_C},
-  {0x0C28, POS_BELOW_C},
-  {0x0C2A, POS_BELOW_C},
-  {0x0C2B, POS_BELOW_C},
-  {0x0C2C, POS_BELOW_C},
-  {0x0C2D, POS_BELOW_C},
-  {0x0C2E, POS_BELOW_C},
-  {0x0C2F, POS_BELOW_C},
-  {0x0C30, POS_BELOW_C},
-  {0x0C32, POS_BELOW_C},
-  {0x0C33, POS_BELOW_C},
-  {0x0C35, POS_BELOW_C},
-  {0x0C36, POS_BELOW_C},
-  {0x0C37, POS_BELOW_C},
-  {0x0C38, POS_BELOW_C},
-  {0x0C39, POS_BELOW_C},
-  {0x0C95, POS_BELOW_C},
-  {0x0C96, POS_BELOW_C},
-  {0x0C97, POS_BELOW_C},
-  {0x0C98, POS_BELOW_C},
-  {0x0C99, POS_BELOW_C},
-  {0x0C9A, POS_BELOW_C},
-  {0x0C9B, POS_BELOW_C},
-  {0x0C9C, POS_BELOW_C},
-  {0x0C9D, POS_BELOW_C},
-  {0x0C9E, POS_BELOW_C},
-  {0x0C9F, POS_BELOW_C},
-  {0x0CA0, POS_BELOW_C},
-  {0x0CA1, POS_BELOW_C},
-  {0x0CA2, POS_BELOW_C},
-  {0x0CA3, POS_BELOW_C},
-  {0x0CA4, POS_BELOW_C},
-  {0x0CA5, POS_BELOW_C},
-  {0x0CA6, POS_BELOW_C},
-  {0x0CA7, POS_BELOW_C},
-  {0x0CA8, POS_BELOW_C},
-  {0x0CAA, POS_BELOW_C},
-  {0x0CAB, POS_BELOW_C},
-  {0x0CAC, POS_BELOW_C},
-  {0x0CAD, POS_BELOW_C},
-  {0x0CAE, POS_BELOW_C},
-  {0x0CAF, POS_BELOW_C},
-  {0x0CB0, POS_BELOW_C},
-  {0x0CB2, POS_BELOW_C},
-  {0x0CB3, POS_BELOW_C},
-  {0x0CB5, POS_BELOW_C},
-  {0x0CB6, POS_BELOW_C},
-  {0x0CB7, POS_BELOW_C},
-  {0x0CB8, POS_BELOW_C},
-  {0x0CB9, POS_BELOW_C},
-  {0x0CDE, POS_BELOW_C},
-  {0x0D2F, POS_POST_C},
-  {0x0D30, POS_POST_C},
-  {0x0D32, POS_BELOW_C},
-  {0x0D35, POS_POST_C},
-};
+
+#define IN_HALF_BLOCK(u, Base) (((u) & ~0x7F) == (Base))
+
+#define IS_DEVA(u) (IN_HALF_BLOCK (u, 0x0900))
+#define IS_BENG(u) (IN_HALF_BLOCK (u, 0x0980))
+#define IS_GURU(u) (IN_HALF_BLOCK (u, 0x0A00))
+#define IS_GUJR(u) (IN_HALF_BLOCK (u, 0x0A80))
+#define IS_ORYA(u) (IN_HALF_BLOCK (u, 0x0B00))
+#define IS_TAML(u) (IN_HALF_BLOCK (u, 0x0B80))
+#define IS_TELU(u) (IN_HALF_BLOCK (u, 0x0C00))
+#define IS_KNDA(u) (IN_HALF_BLOCK (u, 0x0C80))
+#define IS_MLYM(u) (IN_HALF_BLOCK (u, 0x0D00))
+#define IS_SINH(u) (IN_HALF_BLOCK (u, 0x0D80))
+#define IS_KHMR(u) (IN_HALF_BLOCK (u, 0x1780))
+
+
+#define MATRA_POS_LEFT(u)	POS_PRE_M
+#define MATRA_POS_RIGHT(u)	( \
+				  IS_DEVA(u) ? POS_AFTER_SUB  : \
+				  IS_BENG(u) ? POS_AFTER_POST : \
+				  IS_GURU(u) ? POS_AFTER_POST : \
+				  IS_GUJR(u) ? POS_AFTER_POST : \
+				  IS_ORYA(u) ? POS_AFTER_POST : \
+				  IS_TAML(u) ? POS_AFTER_POST : \
+				  IS_TELU(u) ? (u <= 0x0C42 ? POS_BEFORE_SUB : POS_AFTER_SUB) : \
+				  IS_KNDA(u) ? (u < 0x0CC3 || u > 0xCD6 ? POS_BEFORE_SUB : POS_AFTER_SUB) : \
+				  IS_MLYM(u) ? POS_AFTER_POST : \
+				  IS_SINH(u) ? POS_AFTER_SUB  : \
+				  IS_KHMR(u) ? POS_AFTER_POST : \
+				  /*default*/  POS_AFTER_SUB    \
+				)
+#define MATRA_POS_TOP(u)	( /* BENG and MLYM don't have top matras. */ \
+				  IS_DEVA(u) ? POS_AFTER_SUB  : \
+				  IS_GURU(u) ? POS_AFTER_POST : /* Deviate from spec */ \
+				  IS_GUJR(u) ? POS_AFTER_SUB  : \
+				  IS_ORYA(u) ? POS_AFTER_MAIN : \
+				  IS_TAML(u) ? POS_AFTER_SUB  : \
+				  IS_TELU(u) ? POS_BEFORE_SUB : \
+				  IS_KNDA(u) ? POS_BEFORE_SUB : \
+				  IS_SINH(u) ? POS_AFTER_SUB  : \
+				  IS_KHMR(u) ? POS_AFTER_POST : \
+				  /*default*/  POS_AFTER_SUB    \
+				)
+#define MATRA_POS_BOTTOM(u)	( \
+				  IS_DEVA(u) ? POS_AFTER_SUB  : \
+				  IS_BENG(u) ? POS_AFTER_SUB  : \
+				  IS_GURU(u) ? POS_AFTER_POST : \
+				  IS_GUJR(u) ? POS_AFTER_POST : \
+				  IS_ORYA(u) ? POS_AFTER_SUB  : \
+				  IS_TAML(u) ? POS_AFTER_POST : \
+				  IS_TELU(u) ? POS_BEFORE_SUB : \
+				  IS_KNDA(u) ? POS_BEFORE_SUB : \
+				  IS_MLYM(u) ? POS_AFTER_POST : \
+				  IS_SINH(u) ? POS_AFTER_SUB  : \
+				  IS_KHMR(u) ? POS_AFTER_POST : \
+				  /*default*/  POS_AFTER_SUB    \
+				)
+
+
+static inline indic_position_t
+matra_position (hb_codepoint_t u, indic_position_t side)
+{
+  switch ((int) side)
+  {
+    case POS_PRE_C:	return MATRA_POS_LEFT (u);
+    case POS_POST_C:	return MATRA_POS_RIGHT (u);
+    case POS_ABOVE_C:	return MATRA_POS_TOP (u);
+    case POS_BELOW_C:	return MATRA_POS_BOTTOM (u);
+  };
+  abort ();
+}
+
+
 
 /* XXX
  * This is a hack for now.  We should move this data into the main Indic table.
@@ -261,10 +238,150 @@ static const hb_codepoint_t ra_chars[] = {
   0x0AB0, /* Gujarati */
   0x0B30, /* Oriya */
   0x0BB0, /* Tamil */		/* No Reph */
-  0x0C30, /* Telugu */		/* No Reph */
+  0x0C30, /* Telugu */		/* Reph formed only with ZWJ */
   0x0CB0, /* Kannada */
-  0x0D30, /* Malayalam */	/* No Reph */
+  0x0D30, /* Malayalam */	/* No Reph, Logical Repha */
+
+  0x0DBB, /* Sinhala */		/* Reph formed only with ZWJ */
+
+  0x179A, /* Khmer */		/* No Reph, Visual Repha */
 };
 
+static inline indic_position_t
+consonant_position (hb_codepoint_t  u)
+{
+  if ((u & ~0x007F) == 0x1780)
+    return POS_BELOW_C; /* In Khmer coeng model, post and below forms should not be reordered. */
+  return POS_BASE_C; /* Will recategorize later based on font lookups. */
+}
+
+static inline bool
+is_ra (hb_codepoint_t u)
+{
+  for (unsigned int i = 0; i < ARRAY_LENGTH (ra_chars); i++)
+    if (u == ra_chars[i])
+      return true;
+  return false;
+}
+
+
+static inline bool
+is_one_of (const hb_glyph_info_t &info, unsigned int flags)
+{
+  /* If it ligated, all bets are off. */
+  if (is_a_ligature (info)) return false;
+  return !!(FLAG (info.indic_category()) & flags);
+}
+
+#define JOINER_FLAGS (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ))
+static inline bool
+is_joiner (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, JOINER_FLAGS);
+}
+
+/* Note:
+ *
+ * We treat Vowels and placeholders as if they were consonants.  This is safe because Vowels
+ * cannot happen in a consonant syllable.  The plus side however is, we can call the
+ * consonant syllable logic from the vowel syllable function and get it all right! */
+#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_Ra) | FLAG (OT_V) | FLAG (OT_NBSP) | FLAG (OT_DOTTEDCIRCLE))
+static inline bool
+is_consonant (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, CONSONANT_FLAGS);
+}
+
+#define HALANT_OR_COENG_FLAGS (FLAG (OT_H) | FLAG (OT_Coeng))
+static inline bool
+is_halant_or_coeng (const hb_glyph_info_t &info)
+{
+  return is_one_of (info, HALANT_OR_COENG_FLAGS);
+}
+
+static inline void
+set_indic_properties (hb_glyph_info_t   &info)
+{
+  hb_codepoint_t u = info.codepoint;
+  unsigned int type = get_indic_categories (u);
+  indic_category_t cat = (indic_category_t) (type & 0x0F);
+  indic_position_t pos = (indic_position_t) (type >> 4);
+
+
+  /*
+   * Re-assign category
+   */
+
+
+  /* The spec says U+0952 is OT_A.  However, testing shows that Uniscribe
+   * treats U+0951..U+0952 all as OT_VD.
+   * TESTS:
+   * U+092E,U+0947,U+0952
+   * U+092E,U+0952,U+0947
+   * U+092E,U+0947,U+0951
+   * U+092E,U+0951,U+0947
+   * */
+  if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x0951, 0x0954)))
+    cat = OT_VD;
+
+  if (unlikely (u == 0x17D1))
+    cat = OT_X;
+  if (cat == OT_X &&
+      unlikely (hb_in_range<hb_codepoint_t> (u, 0x17CB, 0x17D3))) /* Khmer Various signs */
+  {
+    /* These are like Top Matras. */
+    cat = OT_M;
+    pos = POS_ABOVE_C;
+  }
+  if (u == 0x17C6) /* Khmer Bindu doesn't like to be repositioned. */
+    cat = OT_N;
+
+  if (unlikely (u == 0x17D2)) cat = OT_Coeng; /* Khmer coeng */
+  else if (unlikely (u == 0x200C)) cat = OT_ZWNJ;
+  else if (unlikely (u == 0x200D)) cat = OT_ZWJ;
+  else if (unlikely (u == 0x25CC)) cat = OT_DOTTEDCIRCLE;
+  else if (unlikely (u == 0x0A71)) cat = OT_SM; /* GURMUKHI ADDAK.  More like consonant medial. like 0A75. */
+
+  if (cat == OT_Repha) {
+    /* There are two kinds of characters marked as Repha:
+     * - The ones that are GenCat=Mn are already positioned visually, ie. after base. (eg. Khmer)
+     * - The ones that are GenCat=Lo is encoded logically, ie. beginning of syllable. (eg. Malayalam)
+     *
+     * We recategorize the first kind to look like a Nukta and attached to the base directly.
+     */
+    if (_hb_glyph_info_get_general_category (&info) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)
+      cat = OT_N;
+  }
+
+
+
+  /*
+   * Re-assign position.
+   */
+
+  if ((FLAG (cat) & CONSONANT_FLAGS))
+  {
+    pos = consonant_position (u);
+    if (is_ra (u))
+      cat = OT_Ra;
+  }
+  else if (cat == OT_M)
+  {
+    pos = matra_position (u, pos);
+  }
+  else if (cat == OT_SM || cat == OT_VD)
+  {
+    pos = POS_SMVD;
+  }
+
+  if (unlikely (u == 0x0B01)) pos = POS_BEFORE_SUB; /* Oriya Bindu is BeforeSub in the spec. */
+
+
+
+  info.indic_category() = cat;
+  info.indic_position() = pos;
+}
+
+
 
 #endif /* HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
index 53ce2633f7e0..ccc4a9de2d36 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
@@ -25,66 +25,111 @@
  */
 
 #include "hb-ot-shape-complex-indic-private.hh"
-#include "hb-ot-shape-private.hh"
+#include "hb-ot-layout-private.hh"
 
-static const struct indic_options_t
+
+/*
+ * Global Indic shaper options.
+ */
+
+struct indic_options_t
 {
-  indic_options_t (void)
-  {
-    char *c = getenv ("HB_OT_INDIC_OPTIONS");
-    uniscribe_bug_compatible = c && strstr (c, "uniscribe-bug-compatible");
+  int initialized : 1;
+  int uniscribe_bug_compatible : 1;
+};
+
+union indic_options_union_t {
+  int i;
+  indic_options_t opts;
+};
+ASSERT_STATIC (sizeof (int) == sizeof (indic_options_union_t));
+
+static indic_options_union_t
+indic_options_init (void)
+{
+  indic_options_union_t u;
+  u.i = 0;
+  u.opts.initialized = 1;
+
+  char *c = getenv ("HB_OT_INDIC_OPTIONS");
+  u.opts.uniscribe_bug_compatible = c && strstr (c, "uniscribe-bug-compatible");
+
+  return u;
+}
+
+inline indic_options_t
+indic_options (void)
+{
+  static indic_options_union_t options;
+
+  if (unlikely (!options.i)) {
+    /* This is idempotent and threadsafe. */
+    options = indic_options_init ();
   }
 
-  bool uniscribe_bug_compatible;
-} options;
-
-static int
-compare_codepoint (const void *pa, const void *pb)
-{
-  hb_codepoint_t a = * (hb_codepoint_t *) pa;
-  hb_codepoint_t b = * (hb_codepoint_t *) pb;
-
-  return a < b ? -1 : a == b ? 0 : +1;
+  return options.opts;
 }
 
-static indic_position_t
-consonant_position (hb_codepoint_t u)
+
+/*
+ * Indic configurations.  Note that we do not want to keep every single script-specific
+ * behavior in these tables necessarily.  This should mainly be used for per-script
+ * properties that are cheaper keeping here, than in the code.  Ie. if, say, one and
+ * only one script has an exception, that one script can be if'ed directly in the code,
+ * instead of adding a new flag in these structs.
+ */
+
+enum base_position_t {
+  BASE_POS_FIRST,
+  BASE_POS_LAST
+};
+enum reph_position_t {
+  REPH_POS_DEFAULT     = POS_BEFORE_POST,
+
+  REPH_POS_AFTER_MAIN  = POS_AFTER_MAIN,
+  REPH_POS_BEFORE_SUB  = POS_BEFORE_SUB,
+  REPH_POS_AFTER_SUB   = POS_AFTER_SUB,
+  REPH_POS_BEFORE_POST = POS_BEFORE_POST,
+  REPH_POS_AFTER_POST  = POS_AFTER_POST
+};
+enum reph_mode_t {
+  REPH_MODE_IMPLICIT,  /* Reph formed out of initial Ra,H sequence. */
+  REPH_MODE_EXPLICIT,  /* Reph formed out of initial Ra,H,ZWJ sequence. */
+  REPH_MODE_VIS_REPHA, /* Encoded Repha character, no reordering needed. */
+  REPH_MODE_LOG_REPHA  /* Encoded Repha character, needs reordering. */
+};
+struct indic_config_t
 {
-  consonant_position_t *record;
+  hb_script_t     script;
+  bool            has_old_spec;
+  hb_codepoint_t  virama;
+  base_position_t base_pos;
+  reph_position_t reph_pos;
+  reph_mode_t     reph_mode;
+};
 
-  record = (consonant_position_t *) bsearch (&u, consonant_positions,
-					     ARRAY_LENGTH (consonant_positions),
-					     sizeof (consonant_positions[0]),
-					     compare_codepoint);
-
-  return record ? record->position : POS_BASE_C;
-}
-
-static bool
-is_ra (hb_codepoint_t u)
+static const indic_config_t indic_configs[] =
 {
-  return !!bsearch (&u, ra_chars,
-		    ARRAY_LENGTH (ra_chars),
-		    sizeof (ra_chars[0]),
-		    compare_codepoint);
-}
+  /* Default.  Should be first. */
+  {HB_SCRIPT_INVALID,	false,     0,BASE_POS_LAST, REPH_POS_DEFAULT,    REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_DEVANAGARI,true, 0x094D,BASE_POS_LAST, REPH_POS_BEFORE_POST,REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_BENGALI,	true, 0x09CD,BASE_POS_LAST, REPH_POS_AFTER_SUB,  REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_GURMUKHI,	true, 0x0A4D,BASE_POS_LAST, REPH_POS_BEFORE_SUB, REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_GUJARATI,	true, 0x0ACD,BASE_POS_LAST, REPH_POS_BEFORE_POST,REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_ORIYA,	true, 0x0B4D,BASE_POS_LAST, REPH_POS_AFTER_MAIN, REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_TAMIL,	true, 0x0BCD,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_TELUGU,	true, 0x0C4D,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_EXPLICIT},
+  {HB_SCRIPT_KANNADA,	true, 0x0CCD,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_IMPLICIT},
+  {HB_SCRIPT_MALAYALAM,	true, 0x0D4D,BASE_POS_LAST, REPH_POS_AFTER_MAIN, REPH_MODE_LOG_REPHA},
+  {HB_SCRIPT_SINHALA,	false,0x0DCA,BASE_POS_FIRST,REPH_POS_AFTER_MAIN, REPH_MODE_EXPLICIT},
+  {HB_SCRIPT_KHMER,	false,0x17D2,BASE_POS_FIRST,REPH_POS_DEFAULT,    REPH_MODE_VIS_REPHA},
+};
 
-static bool
-is_joiner (const hb_glyph_info_t &info)
-{
-  return !!(FLAG (info.indic_category()) & (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ)));
-}
 
-static bool
-is_consonant (const hb_glyph_info_t &info)
-{
-  /* Note:
-   *
-   * We treat Vowels and placeholders as if they were consonants.  This is safe because Vowels
-   * cannot happen in a consonant syllable.  The plus side however is, we can call the
-   * consonant syllable logic from the vowel syllable function and get it all right! */
-  return !!(FLAG (info.indic_category()) & (FLAG (OT_C) | FLAG (OT_Ra) | FLAG (OT_V) | FLAG (OT_NBSP) | FLAG (OT_DOTTEDCIRCLE)));
-}
+
+/*
+ * Indic shaper.
+ */
 
 struct feature_list_t {
   hb_tag_t tag;
@@ -92,103 +137,220 @@ struct feature_list_t {
 };
 
 static const feature_list_t
-indic_basic_features[] =
+indic_features[] =
 {
+  /*
+   * Basic features.
+   * These features are applied in order, one at a time, after initial_reordering.
+   */
   {HB_TAG('n','u','k','t'), true},
-  {HB_TAG('a','k','h','n'), false},
+  {HB_TAG('a','k','h','n'), true},
   {HB_TAG('r','p','h','f'), false},
   {HB_TAG('r','k','r','f'), true},
   {HB_TAG('p','r','e','f'), false},
   {HB_TAG('b','l','w','f'), false},
   {HB_TAG('h','a','l','f'), false},
+  {HB_TAG('a','b','v','f'), false},
   {HB_TAG('p','s','t','f'), false},
-  {HB_TAG('c','j','c','t'), false},
+  {HB_TAG('c','f','a','r'), false},
+  {HB_TAG('c','j','c','t'), true},
   {HB_TAG('v','a','t','u'), true},
-};
-
-/* Same order as the indic_basic_features array */
-enum {
-  _NUKT,
-  AKHN,
-  RPHF,
-  _RKRF,
-  PREF,
-  BLWF,
-  HALF,
-  PSTF,
-  CJCT,
-  VATU
-};
-
-static const feature_list_t
-indic_other_features[] =
-{
+  /*
+   * Other features.
+   * These features are applied all at once, after final_reordering.
+   */
   {HB_TAG('i','n','i','t'), false},
   {HB_TAG('p','r','e','s'), true},
   {HB_TAG('a','b','v','s'), true},
   {HB_TAG('b','l','w','s'), true},
   {HB_TAG('p','s','t','s'), true},
   {HB_TAG('h','a','l','n'), true},
-
+  /* Positioning features, though we don't care about the types. */
   {HB_TAG('d','i','s','t'), true},
   {HB_TAG('a','b','v','m'), true},
   {HB_TAG('b','l','w','m'), true},
 };
 
-/* Same order as the indic_other_features array */
+/*
+ * Must be in the same order as the indic_features array.
+ */
 enum {
-  INIT
+  _NUKT,
+  _AKHN,
+  RPHF,
+  _RKRF,
+  PREF,
+  BLWF,
+  HALF,
+  ABVF,
+  PSTF,
+  CFAR,
+  _CJCT,
+  _VATU,
+
+  INIT,
+  _PRES,
+  _ABVS,
+  _BLWS,
+  _PSTS,
+  _HALN,
+  _DIST,
+  _ABVM,
+  _BLWM,
+
+  INDIC_NUM_FEATURES,
+  INDIC_BASIC_FEATURES = INIT /* Don't forget to update this! */
 };
 
+static void
+initial_reordering (const hb_ot_shape_plan_t *plan,
+		    hb_font_t *font,
+		    hb_buffer_t *buffer);
+static void
+final_reordering (const hb_ot_shape_plan_t *plan,
+		  hb_font_t *font,
+		  hb_buffer_t *buffer);
 
 static void
-initial_reordering (const hb_ot_map_t *map,
-		    hb_face_t *face,
-		    hb_buffer_t *buffer,
-		    void *user_data HB_UNUSED);
-static void
-final_reordering (const hb_ot_map_t *map,
-		  hb_face_t *face,
-		  hb_buffer_t *buffer,
-		  void *user_data HB_UNUSED);
-
-void
-_hb_ot_shape_complex_collect_features_indic (hb_ot_map_builder_t *map,
-					     const hb_segment_properties_t *props HB_UNUSED)
+collect_features_indic (hb_ot_shape_planner_t *plan)
 {
+  hb_ot_map_builder_t *map = &plan->map;
+
   map->add_bool_feature (HB_TAG('l','o','c','l'));
   /* The Indic specs do not require ccmp, but we apply it here since if
    * there is a use of it, it's typically at the beginning. */
   map->add_bool_feature (HB_TAG('c','c','m','p'));
 
-  map->add_gsub_pause (initial_reordering, NULL);
 
-  for (unsigned int i = 0; i < ARRAY_LENGTH (indic_basic_features); i++) {
-    map->add_bool_feature (indic_basic_features[i].tag, indic_basic_features[i].is_global);
-    map->add_gsub_pause (NULL, NULL);
+  unsigned int i = 0;
+  map->add_gsub_pause (initial_reordering);
+  for (; i < INDIC_BASIC_FEATURES; i++) {
+    map->add_bool_feature (indic_features[i].tag, indic_features[i].is_global);
+    map->add_gsub_pause (NULL);
   }
-
-  map->add_gsub_pause (final_reordering, NULL);
-
-  for (unsigned int i = 0; i < ARRAY_LENGTH (indic_other_features); i++) {
-    map->add_bool_feature (indic_other_features[i].tag, indic_other_features[i].is_global);
-    map->add_gsub_pause (NULL, NULL);
+  map->add_gsub_pause (final_reordering);
+  for (; i < INDIC_NUM_FEATURES; i++) {
+    map->add_bool_feature (indic_features[i].tag, indic_features[i].is_global);
   }
 }
 
-
-hb_ot_shape_normalization_mode_t
-_hb_ot_shape_complex_normalization_preference_indic (void)
+static void
+override_features_indic (hb_ot_shape_planner_t *plan)
 {
-  /* We want split matras decomposed by the common shaping logic. */
-  return HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED;
+  /* Uniscribe does not apply 'kern'. */
+  if (indic_options ().uniscribe_bug_compatible)
+    plan->map.add_feature (HB_TAG('k','e','r','n'), 0, true);
 }
 
 
-void
-_hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map HB_UNUSED,
-					hb_buffer_t *buffer,
-					hb_font_t *font HB_UNUSED)
+struct would_substitute_feature_t
+{
+  inline void init (const hb_ot_map_t *map, hb_tag_t feature_tag)
+  {
+    map->get_stage_lookups (0/*GSUB*/,
+			    map->get_feature_stage (0/*GSUB*/, feature_tag),
+			    &lookups, &count);
+  }
+
+  inline bool would_substitute (hb_codepoint_t    *glyphs,
+				unsigned int       glyphs_count,
+				hb_face_t         *face) const
+  {
+    for (unsigned int i = 0; i < count; i++)
+      if (hb_ot_layout_would_substitute_lookup_fast (face, glyphs, glyphs_count, lookups[i].index))
+	return true;
+    return false;
+  }
+
+  private:
+  const hb_ot_map_t::lookup_map_t *lookups;
+  unsigned int count;
+};
+
+struct indic_shape_plan_t
+{
+  ASSERT_POD ();
+
+  inline bool get_virama_glyph (hb_font_t *font, hb_codepoint_t *pglyph) const
+  {
+    hb_codepoint_t glyph = virama_glyph;
+    if (unlikely (virama_glyph == (hb_codepoint_t) -1))
+    {
+      if (!config->virama || !font->get_glyph (config->virama, 0, &glyph))
+	glyph = 0;
+      /* Technically speaking, the spec says we should apply 'locl' to virama too.
+       * Maybe one day... */
+
+      /* Our get_glyph() function needs a font, so we can't get the virama glyph
+       * during shape planning...  Instead, overwrite it here.  It's safe.  Don't worry! */
+      (const_cast<indic_shape_plan_t *> (this))->virama_glyph = glyph;
+    }
+
+    *pglyph = glyph;
+    return glyph != 0;
+  }
+
+  const indic_config_t *config;
+
+  bool is_old_spec;
+  hb_codepoint_t virama_glyph;
+
+  would_substitute_feature_t pref;
+  would_substitute_feature_t blwf;
+  would_substitute_feature_t pstf;
+
+  hb_mask_t mask_array[INDIC_NUM_FEATURES];
+};
+
+static void *
+data_create_indic (const hb_ot_shape_plan_t *plan)
+{
+  indic_shape_plan_t *indic_plan = (indic_shape_plan_t *) calloc (1, sizeof (indic_shape_plan_t));
+  if (unlikely (!indic_plan))
+    return NULL;
+
+  indic_plan->config = &indic_configs[0];
+  for (unsigned int i = 1; i < ARRAY_LENGTH (indic_configs); i++)
+    if (plan->props.script == indic_configs[i].script) {
+      indic_plan->config = &indic_configs[i];
+      break;
+    }
+
+  indic_plan->is_old_spec = indic_plan->config->has_old_spec && ((plan->map.get_chosen_script (0) & 0x000000FF) != '2');
+  indic_plan->virama_glyph = (hb_codepoint_t) -1;
+
+  indic_plan->pref.init (&plan->map, HB_TAG('p','r','e','f'));
+  indic_plan->blwf.init (&plan->map, HB_TAG('b','l','w','f'));
+  indic_plan->pstf.init (&plan->map, HB_TAG('p','s','t','f'));
+
+  for (unsigned int i = 0; i < ARRAY_LENGTH (indic_plan->mask_array); i++)
+    indic_plan->mask_array[i] = indic_features[i].is_global ? 0 : plan->map.get_1_mask (indic_features[i].tag);
+
+  return indic_plan;
+}
+
+static void
+data_destroy_indic (void *data)
+{
+  free (data);
+}
+
+static indic_position_t
+consonant_position_from_face (const indic_shape_plan_t *indic_plan,
+			      hb_codepoint_t *glyphs, unsigned int glyphs_len,
+			      hb_face_t      *face)
+{
+  if (indic_plan->pref.would_substitute (glyphs, glyphs_len, face)) return POS_BELOW_C;
+  if (indic_plan->blwf.would_substitute (glyphs, glyphs_len, face)) return POS_BELOW_C;
+  if (indic_plan->pstf.would_substitute (glyphs, glyphs_len, face)) return POS_POST_C;
+  return POS_BASE_C;
+}
+
+
+static void
+setup_masks_indic (const hb_ot_shape_plan_t *plan HB_UNUSED,
+		   hb_buffer_t              *buffer,
+		   hb_font_t                *font HB_UNUSED)
 {
   HB_BUFFER_ALLOCATE_VAR (buffer, indic_category);
   HB_BUFFER_ALLOCATE_VAR (buffer, indic_position);
@@ -198,38 +360,7 @@ _hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map HB_UNUSED,
 
   unsigned int count = buffer->len;
   for (unsigned int i = 0; i < count; i++)
-  {
-    hb_glyph_info_t &info = buffer->info[i];
-    unsigned int type = get_indic_categories (info.codepoint);
-
-    info.indic_category() = type & 0x0F;
-    info.indic_position() = type >> 4;
-
-    /* The spec says U+0952 is OT_A.  However, testing shows that Uniscribe
-     * treats U+0951..U+0952 all as OT_VD.
-     * TESTS:
-     * U+092E,U+0947,U+0952
-     * U+092E,U+0952,U+0947
-     * U+092E,U+0947,U+0951
-     * U+092E,U+0951,U+0947
-     * */
-    if (unlikely (hb_in_range<hb_codepoint_t> (info.codepoint, 0x0951, 0x0954)))
-      info.indic_category() = OT_VD;
-
-    if (info.indic_category() == OT_C) {
-      info.indic_position() = consonant_position (info.codepoint);
-      if (is_ra (info.codepoint))
-	info.indic_category() = OT_Ra;
-    } else if (info.indic_category() == OT_SM ||
-	       info.indic_category() == OT_VD) {
-      info.indic_position() = POS_SMVD;
-    } else if (unlikely (info.codepoint == 0x200C))
-      info.indic_category() = OT_ZWNJ;
-    else if (unlikely (info.codepoint == 0x200D))
-      info.indic_category() = OT_ZWJ;
-    else if (unlikely (info.codepoint == 0x25CC))
-      info.indic_category() = OT_DOTTEDCIRCLE;
-  }
+    set_indic_properties (buffer->info[i]);
 }
 
 static int
@@ -241,13 +372,38 @@ compare_indic_order (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb)
   return a < b ? -1 : a == b ? 0 : +1;
 }
 
+
+
+static void
+update_consonant_positions (const hb_ot_shape_plan_t *plan,
+			    hb_font_t         *font,
+			    hb_buffer_t       *buffer)
+{
+  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
+
+  unsigned int consonant_pos = indic_plan->is_old_spec ? 0 : 1;
+  hb_codepoint_t glyphs[2];
+  if (indic_plan->get_virama_glyph (font, &glyphs[1 - consonant_pos]))
+  {
+    hb_face_t *face = font->face;
+    unsigned int count = buffer->len;
+    for (unsigned int i = 0; i < count; i++)
+      if (buffer->info[i].indic_position() == POS_BASE_C) {
+	glyphs[consonant_pos] = buffer->info[i].codepoint;
+	buffer->info[i].indic_position() = consonant_position_from_face (indic_plan, glyphs, 2, face);
+      }
+  }
+}
+
+
 /* Rules from:
  * https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx */
 
 static void
-initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buffer, hb_mask_t *mask_array,
+initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan, hb_buffer_t *buffer,
 				       unsigned int start, unsigned int end)
 {
+  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
   hb_glyph_info_t *info = buffer->info;
 
 
@@ -273,59 +429,116 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
      *    and has more than one consonant, Ra is excluded from candidates for
      *    base consonants. */
     unsigned int limit = start;
-    if (mask_array[RPHF] &&
+    if (indic_plan->mask_array[RPHF] &&
 	start + 3 <= end &&
 	info[start].indic_category() == OT_Ra &&
 	info[start + 1].indic_category() == OT_H &&
-	!is_joiner (info[start + 2]))
+	(/* TODO Handle other Reph modes. */
+	 (indic_plan->config->reph_mode == REPH_MODE_IMPLICIT && !is_joiner (info[start + 2])) ||
+	 (indic_plan->config->reph_mode == REPH_MODE_EXPLICIT && info[start + 2].indic_category() == OT_ZWJ)
+	))
     {
       limit += 2;
+      while (limit < end && is_joiner (info[limit]))
+        limit++;
       base = start;
       has_reph = true;
     };
 
-    /* -> starting from the end of the syllable, move backwards */
-    unsigned int i = end;
-    do {
-      i--;
-      /* -> until a consonant is found */
-      if (is_consonant (info[i]))
+    switch (indic_plan->config->base_pos == BASE_POS_LAST)
+    {
+      case BASE_POS_LAST:
       {
-	/* -> that does not have a below-base or post-base form
-	 * (post-base forms have to follow below-base forms), */
-	if (info[i].indic_position() != POS_BELOW_C &&
-	    info[i].indic_position() != POS_POST_C)
-	{
-	  base = i;
-	  break;
-	}
+	/* -> starting from the end of the syllable, move backwards */
+	unsigned int i = end;
+	bool seen_below = false;
+	do {
+	  i--;
+	  /* -> until a consonant is found */
+	  if (is_consonant (info[i]))
+	  {
+	    /* -> that does not have a below-base or post-base form
+	     * (post-base forms have to follow below-base forms), */
+	    if (info[i].indic_position() != POS_BELOW_C &&
+		(info[i].indic_position() != POS_POST_C || seen_below))
+	    {
+	      base = i;
+	      break;
+	    }
+	    if (info[i].indic_position() == POS_BELOW_C)
+	      seen_below = true;
 
-	/* -> or that is not a pre-base reordering Ra,
-	 *
-	 * TODO
-	 */
+	    /* -> or that is not a pre-base reordering Ra,
+	     *
+	     * IMPLEMENTATION NOTES:
+	     *
+	     * Our pre-base reordering Ra's are marked POS_BELOW, so will be skipped
+	     * by the logic above already.
+	     */
 
-	/* -> or arrive at the first consonant. The consonant stopped at will
-	 * be the base. */
-	base = i;
+	    /* -> or arrive at the first consonant. The consonant stopped at will
+	     * be the base. */
+	    base = i;
+	  }
+	  else
+	  {
+	    /* A ZWJ after a Halant stops the base search, and requests an explicit
+	     * half form.
+	     * A ZWJ before a Halant, requests a subjoined form instead, and hence
+	     * search continues.  This is particularly important for Bengali
+	     * sequence Ra,H,Ya that shouls form Ya-Phalaa by subjoining Ya. */
+	    if (start < i &&
+		info[i].indic_category() == OT_ZWJ &&
+		info[i - 1].indic_category() == OT_H)
+	      break;
+	  }
+	} while (i > limit);
       }
-      else
-	if (is_joiner (info[i]))
-	  break;
-    } while (i > limit);
-    if (base < start)
-      base = start; /* Just in case... */
+      break;
 
+      case BASE_POS_FIRST:
+      {
+	/* In scripts without half forms (eg. Khmer), the first consonant is always the base. */
+
+	if (!has_reph)
+	  base = limit;
+
+	/* Find the last base consonant that is not blocked by ZWJ.  If there is
+	 * a ZWJ right before a base consonant, that would request a subjoined form. */
+	for (unsigned int i = limit; i < end; i++)
+	  if (is_consonant (info[i]) && info[i].indic_position() == POS_BASE_C)
+	  {
+	    if (limit < i && info[i - 1].indic_category() == OT_ZWJ)
+	      break;
+	    else
+	      base = i;
+	  }
+
+	/* Mark all subsequent consonants as below. */
+	for (unsigned int i = base + 1; i < end; i++)
+	  if (is_consonant (info[i]) && info[i].indic_position() == POS_BASE_C)
+	    info[i].indic_position() = POS_BELOW_C;
+      }
+      break;
+
+      default:
+      abort ();
+    }
 
     /* -> If the syllable starts with Ra + Halant (in a script that has Reph)
      *    and has more than one consonant, Ra is excluded from candidates for
-     *    base consonants. */
-    if (has_reph && base == start) {
+     *    base consonants.
+     *
+     *  Only do this for unforced Reph. (ie. not for Ra,H,ZWJ. */
+    if (has_reph && base == start && start + 2 == limit) {
       /* Have no other consonant, so Reph is not formed and Ra becomes base. */
       has_reph = false;
     }
   }
 
+  if (base < end)
+    info[base].indic_position() = POS_BASE_C;
+
 
   /* 2. Decompose and reorder Matras:
    *
@@ -362,8 +575,22 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
   /* Reorder characters */
 
   for (unsigned int i = start; i < base; i++)
-    info[i].indic_position() = POS_PRE_C;
-  info[base].indic_position() = POS_BASE_C;
+    info[i].indic_position() = MIN (POS_PRE_C, (indic_position_t) info[i].indic_position());
+
+  if (base < end)
+    info[base].indic_position() = POS_BASE_C;
+
+  /* Mark final consonants.  A final consonant is one appearing after a matra,
+   * like in Khmer. */
+  for (unsigned int i = base + 1; i < end; i++)
+    if (info[i].indic_category() == OT_M) {
+      for (unsigned int j = i + 1; j < end; j++)
+        if (is_consonant (info[j])) {
+	  info[j].indic_position() = POS_FINAL_C;
+	  break;
+	}
+      break;
+    }
 
   /* Handle beginning Ra */
   if (has_reph)
@@ -371,8 +598,7 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
 
   /* For old-style Indic script tags, move the first post-base Halant after
    * last consonant. */
-  if ((map->get_chosen_script (0) & 0x000000FF) != '2') {
-    /* We should only do this for Indic scripts which have a version two I guess. */
+  if (indic_plan->is_old_spec) {
     for (unsigned int i = base + 1; i < end; i++)
       if (info[i].indic_category() == OT_H) {
         unsigned int j;
@@ -389,34 +615,51 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
       }
   }
 
-  /* Attach ZWJ, ZWNJ, nukta, and halant to previous char to move with them. */
-  if (!options.uniscribe_bug_compatible)
+  /* Attach misc marks to previous char to move with them. */
   {
-    /* Please update the Uniscribe branch when touching this! */
-    for (unsigned int i = start + 1; i < end; i++)
-      if ((FLAG (info[i].indic_category()) & (FLAG (OT_ZWNJ) | FLAG (OT_ZWJ) | FLAG (OT_N) | FLAG (OT_H))))
-	info[i].indic_position() = info[i - 1].indic_position();
-  } else {
-    /*
-     * Uniscribe doesn't move the Halant with Left Matra.
-     * TEST: U+092B,U+093F,U+094DE
-     */
-    /* Please update the non-Uniscribe branch when touching this! */
-    for (unsigned int i = start + 1; i < end; i++)
-      if ((FLAG (info[i].indic_category()) & (FLAG (OT_ZWNJ) | FLAG (OT_ZWJ) | FLAG (OT_N) | FLAG (OT_H)))) {
-	info[i].indic_position() = info[i - 1].indic_position();
-	if (info[i].indic_category() == OT_H && info[i].indic_position() == POS_PRE_M)
+    indic_position_t last_pos = POS_START;
+    for (unsigned int i = start; i < end; i++)
+    {
+      if ((FLAG (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | HALANT_OR_COENG_FLAGS)))
+      {
+	info[i].indic_position() = last_pos;
+	if (unlikely (indic_options ().uniscribe_bug_compatible &&
+		      info[i].indic_category() == OT_H &&
+		      info[i].indic_position() == POS_PRE_M))
+	{
+	  /*
+	   * Uniscribe doesn't move the Halant with Left Matra.
+	   * TEST: U+092B,U+093F,U+094DE
+	   */
 	  for (unsigned int j = i; j > start; j--)
 	    if (info[j - 1].indic_position() != POS_PRE_M) {
 	      info[i].indic_position() = info[j - 1].indic_position();
 	      break;
 	    }
+	}
+      } else if (info[i].indic_position() != POS_SMVD) {
+        last_pos = (indic_position_t) info[i].indic_position();
+      }
+    }
+  }
+  /* Re-attach ZWJ, ZWNJ, and halant to next char, for after-base consonants. */
+  {
+    unsigned int last_halant = end;
+    for (unsigned int i = base + 1; i < end; i++)
+      if (is_halant_or_coeng (info[i]))
+        last_halant = i;
+      else if (is_consonant (info[i])) {
+	for (unsigned int j = last_halant; j < i; j++)
+	  if (info[j].indic_position() != POS_SMVD)
+	    info[j].indic_position() = info[i].indic_position();
       }
   }
 
-  /* We do bubble-sort, skip malicious clusters attempts */
-  if (end - start < 64)
   {
+    /* Things are out-of-control for post base positions, they may shuffle
+     * around like crazy, so merge clusters.  For pre-base stuff, we handle
+     * cluster issues in final reordering. */
+    buffer->merge_clusters (base, end);
     /* Sit tight, rock 'n roll! */
     hb_bubble_sort (info + start, end - start, compare_indic_order);
     /* Find base again */
@@ -435,21 +678,46 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
 
     /* Reph */
     for (unsigned int i = start; i < end && info[i].indic_position() == POS_RA_TO_BECOME_REPH; i++)
-      info[i].mask |= mask_array[RPHF];
+      info[i].mask |= indic_plan->mask_array[RPHF];
 
     /* Pre-base */
-    mask = mask_array[HALF] | mask_array[AKHN] | mask_array[CJCT];
+    mask = indic_plan->mask_array[HALF];
     for (unsigned int i = start; i < base; i++)
       info[i].mask  |= mask;
     /* Base */
-    mask = mask_array[AKHN] | mask_array[CJCT];
-    info[base].mask |= mask;
+    mask = 0;
+    if (base < end)
+      info[base].mask |= mask;
     /* Post-base */
-    mask = mask_array[BLWF] | mask_array[PSTF] | mask_array[CJCT];
+    mask = indic_plan->mask_array[BLWF] | indic_plan->mask_array[ABVF] | indic_plan->mask_array[PSTF];
     for (unsigned int i = base + 1; i < end; i++)
       info[i].mask  |= mask;
   }
 
+  /* XXX This will not match for old-Indic spec since the Halant-Ra order is reversed already. */
+  if (indic_plan->mask_array[PREF] && base + 2 < end)
+  {
+    /* Find a Halant,Ra sequence and mark it for pre-base reordering processing. */
+    for (unsigned int i = base + 1; i + 1 < end; i++)
+      if (is_halant_or_coeng (info[i]) &&
+	  info[i + 1].indic_category() == OT_Ra)
+      {
+	info[i++].mask |= indic_plan->mask_array[PREF];
+	info[i++].mask |= indic_plan->mask_array[PREF];
+
+	/* Mark the subsequent stuff with 'cfar'.  Used in Khmer.
+	 * Read the feature spec.
+	 * This allows distinguishing the following cases with MS Khmer fonts:
+	 * U+1784,U+17D2,U+179A,U+17D2,U+1782
+	 * U+1784,U+17D2,U+1782,U+17D2,U+179A
+	 */
+	for (; i < end; i++)
+	  info[i].mask |= indic_plan->mask_array[CFAR];
+
+	break;
+      }
+  }
+
   /* Apply ZWJ/ZWNJ effects */
   for (unsigned int i = start + 1; i < end; i++)
     if (is_joiner (info[i])) {
@@ -459,9 +727,12 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
       do {
 	j--;
 
-	info[j].mask &= ~mask_array[CJCT];
+	/* A ZWJ disables CJCT, however, it's mere presence is enough
+	 * to disable ligation.  No explicit action needed. */
+
+	/* A ZWNJ disables HALF. */
 	if (non_joiner)
-	  info[j].mask &= ~mask_array[HALF];
+	  info[j].mask &= ~indic_plan->mask_array[HALF];
 
       } while (j > start && !is_consonant (info[j]));
     }
@@ -469,25 +740,23 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
 
 
 static void
-initial_reordering_vowel_syllable (const hb_ot_map_t *map,
+initial_reordering_vowel_syllable (const hb_ot_shape_plan_t *plan,
 				   hb_buffer_t *buffer,
-				   hb_mask_t *mask_array,
 				   unsigned int start, unsigned int end)
 {
   /* We made the vowels look like consonants.  So let's call the consonant logic! */
-  initial_reordering_consonant_syllable (map, buffer, mask_array, start, end);
+  initial_reordering_consonant_syllable (plan, buffer, start, end);
 }
 
 static void
-initial_reordering_standalone_cluster (const hb_ot_map_t *map,
+initial_reordering_standalone_cluster (const hb_ot_shape_plan_t *plan,
 				       hb_buffer_t *buffer,
-				       hb_mask_t *mask_array,
 				       unsigned int start, unsigned int end)
 {
   /* We treat NBSP/dotted-circle as if they are consonants, so we should just chain.
    * Only if not in compatibility mode that is... */
 
-  if (options.uniscribe_bug_compatible)
+  if (indic_options ().uniscribe_bug_compatible)
   {
     /* For dotted-circle, this is what Uniscribe does:
      * If dotted-circle is the last glyph, it just does nothing.
@@ -496,13 +765,12 @@ initial_reordering_standalone_cluster (const hb_ot_map_t *map,
       return;
   }
 
-  initial_reordering_consonant_syllable (map, buffer, mask_array, start, end);
+  initial_reordering_consonant_syllable (plan, buffer, start, end);
 }
 
 static void
-initial_reordering_non_indic (const hb_ot_map_t *map HB_UNUSED,
+initial_reordering_non_indic (const hb_ot_shape_plan_t *plan HB_UNUSED,
 			      hb_buffer_t *buffer HB_UNUSED,
-			      hb_mask_t *mask_array HB_UNUSED,
 			      unsigned int start HB_UNUSED, unsigned int end HB_UNUSED)
 {
   /* Nothing to do right now.  If we ever switch to using the output
@@ -512,23 +780,20 @@ initial_reordering_non_indic (const hb_ot_map_t *map HB_UNUSED,
 #include "hb-ot-shape-complex-indic-machine.hh"
 
 static void
-initial_reordering (const hb_ot_map_t *map,
-		    hb_face_t *face HB_UNUSED,
-		    hb_buffer_t *buffer,
-		    void *user_data HB_UNUSED)
+initial_reordering (const hb_ot_shape_plan_t *plan,
+		    hb_font_t *font,
+		    hb_buffer_t *buffer)
 {
-  hb_mask_t mask_array[ARRAY_LENGTH (indic_basic_features)] = {0};
-  unsigned int num_masks = ARRAY_LENGTH (indic_basic_features);
-  for (unsigned int i = 0; i < num_masks; i++)
-    mask_array[i] = map->get_1_mask (indic_basic_features[i].tag);
-
-  find_syllables (map, buffer, mask_array);
+  update_consonant_positions (plan, font, buffer);
+  find_syllables (plan, buffer);
 }
 
 static void
-final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
+final_reordering_syllable (const hb_ot_shape_plan_t *plan,
+			   hb_buffer_t *buffer,
 			   unsigned int start, unsigned int end)
 {
+  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
   hb_glyph_info_t *info = buffer->info;
 
   /* 4. Final reordering:
@@ -540,21 +805,14 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
    */
 
   /* Find base again */
-  unsigned int base = end;
-  for (unsigned int i = start; i < end; i++)
-    if (info[i].indic_position() == POS_BASE_C) {
-      base = i;
+  unsigned int base;
+  for (base = start; base < end; base++)
+    if (info[base].indic_position() >= POS_BASE_C) {
+      if (start < base && info[base].indic_position() > POS_BASE_C)
+        base--;
       break;
     }
 
-  if (base == start) {
-    /* There's no Reph, and no left Matra to reposition.  Just merge the cluster
-     * and go home. */
-    buffer->merge_clusters (start, end);
-    return;
-  }
-
-  unsigned int start_of_last_cluster = base;
 
   /*   o Reorder matras:
    *
@@ -566,29 +824,53 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
    *     halant, position is moved after it.
    */
 
+  if (start + 1 < end && start < base) /* Otherwise there can't be any pre-base matra characters. */
   {
-    unsigned int new_matra_pos = base - 1;
-    while (new_matra_pos > start &&
-	   !(FLAG (info[new_matra_pos].indic_category()) & (FLAG (OT_M) | FLAG (OT_H))))
-      new_matra_pos--;
-    /* If we found no Halant we are done.  Otherwise only proceed if the Halant does
-     * not belong to the Matra itself! */
-    if (info[new_matra_pos].indic_category() == OT_H &&
-	info[new_matra_pos].indic_position() != POS_PRE_M) {
-      /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
-      if (new_matra_pos + 1 < end && is_joiner (info[new_matra_pos + 1]))
-	new_matra_pos++;
+    /* If we lost track of base, alas, position before last thingy. */
+    unsigned int new_pos = base == end ? base - 2 : base - 1;
 
+    /* Malayalam does not have "half" forms or explicit virama forms.
+     * The glyphs formed by 'half' are Chillus.  We want to position
+     * matra after them all.
+     */
+    if (buffer->props.script != HB_SCRIPT_MALAYALAM)
+    {
+      while (new_pos > start &&
+	     !(is_one_of (info[new_pos], (FLAG (OT_M) | FLAG (OT_H) | FLAG (OT_Coeng)))))
+	new_pos--;
+
+      /* If we found no Halant we are done.
+       * Otherwise only proceed if the Halant does
+       * not belong to the Matra itself! */
+      if (is_halant_or_coeng (info[new_pos]) &&
+	  info[new_pos].indic_position() != POS_PRE_M)
+      {
+	/* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
+	if (new_pos + 1 < end && is_joiner (info[new_pos + 1]))
+	  new_pos++;
+      }
+      else
+        new_pos = start; /* No move. */
+    }
+
+    if (start < new_pos)
+    {
       /* Now go see if there's actually any matras... */
-      for (unsigned int i = new_matra_pos; i > start; i--)
+      for (unsigned int i = new_pos; i > start; i--)
 	if (info[i - 1].indic_position () == POS_PRE_M)
 	{
-	  unsigned int old_matra_pos = i - 1;
-	  hb_glyph_info_t matra = info[old_matra_pos];
-	  memmove (&info[old_matra_pos], &info[old_matra_pos + 1], (new_matra_pos - old_matra_pos) * sizeof (info[0]));
-	  info[new_matra_pos] = matra;
-	  start_of_last_cluster = MIN (new_matra_pos, start_of_last_cluster);
-	  new_matra_pos--;
+	  unsigned int old_pos = i - 1;
+	  hb_glyph_info_t tmp = info[old_pos];
+	  memmove (&info[old_pos], &info[old_pos + 1], (new_pos - old_pos) * sizeof (info[0]));
+	  info[new_pos] = tmp;
+	  new_pos--;
+	}
+      buffer->merge_clusters (new_pos, MIN (end, base + 1));
+    } else {
+      for (unsigned int i = start; i < base; i++)
+	if (info[i].indic_position () == POS_PRE_M) {
+	  buffer->merge_clusters (i, MIN (end, base + 1));
+	  break;
 	}
     }
   }
@@ -610,49 +892,15 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
       info[start].indic_position() == POS_RA_TO_BECOME_REPH &&
       info[start + 1].indic_position() != POS_RA_TO_BECOME_REPH)
   {
-      unsigned int new_reph_pos;
+    unsigned int new_reph_pos;
+    reph_position_t reph_pos = indic_plan->config->reph_pos;
 
-     enum reph_position_t {
-       REPH_AFTER_MAIN,
-       REPH_BEFORE_SUBSCRIPT,
-       REPH_AFTER_SUBSCRIPT,
-       REPH_BEFORE_POSTSCRIPT,
-       REPH_AFTER_POSTSCRIPT
-     } reph_pos;
-
-     /* XXX Figure out old behavior too */
-     switch ((hb_tag_t) buffer->props.script)
-     {
-       case HB_SCRIPT_MALAYALAM:
-       case HB_SCRIPT_ORIYA:
-	 reph_pos = REPH_AFTER_MAIN;
-	 break;
-
-       case HB_SCRIPT_GURMUKHI:
-	 reph_pos = REPH_BEFORE_SUBSCRIPT;
-	 break;
-
-       case HB_SCRIPT_BENGALI:
-	 reph_pos = REPH_AFTER_SUBSCRIPT;
-	 break;
-
-       default:
-       case HB_SCRIPT_DEVANAGARI:
-       case HB_SCRIPT_GUJARATI:
-	 reph_pos = REPH_BEFORE_POSTSCRIPT;
-	 break;
-
-       case HB_SCRIPT_KANNADA:
-       case HB_SCRIPT_TAMIL:
-       case HB_SCRIPT_TELUGU:
-	 reph_pos = REPH_AFTER_POSTSCRIPT;
-	 break;
-     }
+    /* XXX Figure out old behavior too */
 
     /*       1. If reph should be positioned after post-base consonant forms,
      *          proceed to step 5.
      */
-    if (reph_pos == REPH_AFTER_POSTSCRIPT)
+    if (reph_pos == REPH_POS_AFTER_POST)
     {
       goto reph_step_5;
     }
@@ -670,10 +918,10 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
      */
     {
       new_reph_pos = start + 1;
-      while (new_reph_pos < base && info[new_reph_pos].indic_category() != OT_H)
+      while (new_reph_pos < base && !is_halant_or_coeng (info[new_reph_pos]))
 	new_reph_pos++;
 
-      if (new_reph_pos < base && info[new_reph_pos].indic_category() == OT_H) {
+      if (new_reph_pos < base && is_halant_or_coeng (info[new_reph_pos])) {
 	/* ->If ZWJ or ZWNJ are following this halant, position is moved after it. */
 	if (new_reph_pos + 1 < base && is_joiner (info[new_reph_pos + 1]))
 	  new_reph_pos++;
@@ -685,9 +933,14 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
      *          first consonant not ligated with main, or find the first
      *          consonant that is not a potential pre-base reordering Ra.
      */
-    if (reph_pos == REPH_AFTER_MAIN)
+    if (reph_pos == REPH_POS_AFTER_MAIN)
     {
-      /* XXX */
+      new_reph_pos = base;
+      /* XXX Skip potential pre-base reordering Ra. */
+      while (new_reph_pos + 1 < end && info[new_reph_pos + 1].indic_position() <= POS_AFTER_MAIN)
+	new_reph_pos++;
+      if (new_reph_pos < end)
+        goto reph_move;
     }
 
     /*       4. If reph should be positioned before post-base consonant, find
@@ -696,11 +949,11 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
      *          first matra, syllable modifier sign or vedic sign.
      */
     /* This is our take on what step 4 is trying to say (and failing, BADLY). */
-    if (reph_pos == REPH_AFTER_SUBSCRIPT)
+    if (reph_pos == REPH_POS_AFTER_SUB)
     {
       new_reph_pos = base;
       while (new_reph_pos < end &&
-	     !( FLAG (info[new_reph_pos + 1].indic_position()) & (FLAG (POS_POST_C) | FLAG (POS_POST_M) | FLAG (POS_SMVD))))
+	     !( FLAG (info[new_reph_pos + 1].indic_position()) & (FLAG (POS_POST_C) | FLAG (POS_AFTER_POST) | FLAG (POS_SMVD))))
 	new_reph_pos++;
       if (new_reph_pos < end)
         goto reph_move;
@@ -715,7 +968,17 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
      */
     reph_step_5:
     {
-      /* XXX */
+      /* Copied from step 2. */
+      new_reph_pos = start + 1;
+      while (new_reph_pos < base && !is_halant_or_coeng (info[new_reph_pos]))
+	new_reph_pos++;
+
+      if (new_reph_pos < base && is_halant_or_coeng (info[new_reph_pos])) {
+	/* ->If ZWJ or ZWNJ are following this halant, position is moved after it. */
+	if (new_reph_pos + 1 < base && is_joiner (info[new_reph_pos + 1]))
+	  new_reph_pos++;
+	goto reph_move;
+      }
     }
 
     /*       6. Otherwise, reorder reph to the end of the syllable.
@@ -732,8 +995,8 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
        * Uniscribe doesn't do this.
        * TEST: U+0930,U+094D,U+0915,U+094B,U+094D
        */
-      if (!options.uniscribe_bug_compatible &&
-	  unlikely (info[new_reph_pos].indic_category() == OT_H)) {
+      if (!indic_options ().uniscribe_bug_compatible &&
+	  unlikely (is_halant_or_coeng (info[new_reph_pos]))) {
 	for (unsigned int i = base + 1; i < new_reph_pos; i++)
 	  if (info[i].indic_category() == OT_M) {
 	    /* Ok, got it. */
@@ -745,11 +1008,13 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
 
     reph_move:
     {
+      /* Yay, one big cluster! Merge before moving. */
+      buffer->merge_clusters (start, end);
+
       /* Move */
       hb_glyph_info_t reph = info[start];
       memmove (&info[start], &info[start + 1], (new_reph_pos - start) * sizeof (info[0]));
       info[new_reph_pos] = reph;
-      start_of_last_cluster = start; /* Yay, one big cluster! */
     }
   }
 
@@ -758,88 +1023,118 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array,
    *
    *     If a pre-base reordering consonant is found, reorder it according to
    *     the following rules:
-   *
-   *       1. Only reorder a glyph produced by substitution during application
-   *          of the feature. (Note that a font may shape a Ra consonant with
-   *          the feature generally but block it in certain contexts.)
-   *
-   *       2. Try to find a target position the same way as for pre-base matra.
-   *          If it is found, reorder pre-base consonant glyph.
-   *
-   *       3. If position is not found, reorder immediately before main
-   *          consonant.
    */
 
-  /* TODO */
+  if (indic_plan->mask_array[PREF] && base + 1 < end) /* Otherwise there can't be any pre-base reordering Ra. */
+  {
+    for (unsigned int i = base + 1; i < end; i++)
+      if ((info[i].mask & indic_plan->mask_array[PREF]) != 0)
+      {
+	/*       1. Only reorder a glyph produced by substitution during application
+	 *          of the <pref> feature. (Note that a font may shape a Ra consonant with
+	 *          the feature generally but block it in certain contexts.)
+	 */
+	if (i + 1 == end || (info[i + 1].mask & indic_plan->mask_array[PREF]) == 0)
+	{
+	  /*
+	   *       2. Try to find a target position the same way as for pre-base matra.
+	   *          If it is found, reorder pre-base consonant glyph.
+	   *
+	   *       3. If position is not found, reorder immediately before main
+	   *          consonant.
+	   */
 
+	  unsigned int new_pos = base;
+	  while (new_pos > start &&
+		 !(is_one_of (info[new_pos - 1], FLAG(OT_M) | HALANT_OR_COENG_FLAGS)))
+	    new_pos--;
+
+	  /* In Khmer coeng model, a V,Ra can go *after* matras.  If it goes after a
+	   * split matra, it should be reordered to *before* the left part of such matra. */
+	  if (new_pos > start && info[new_pos - 1].indic_category() == OT_M)
+	  {
+	    unsigned int old_pos = i;
+	    for (unsigned int i = base + 1; i < old_pos; i++)
+	      if (info[i].indic_category() == OT_M)
+	      {
+		new_pos--;
+		break;
+	      }
+	  }
+
+	  if (new_pos > start && is_halant_or_coeng (info[new_pos - 1]))
+	    /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */
+	    if (new_pos < end && is_joiner (info[new_pos]))
+	      new_pos++;
+
+	  {
+	    unsigned int old_pos = i;
+	    buffer->merge_clusters (new_pos, old_pos + 1);
+	    hb_glyph_info_t tmp = info[old_pos];
+	    memmove (&info[new_pos + 1], &info[new_pos], (old_pos - new_pos) * sizeof (info[0]));
+	    info[new_pos] = tmp;
+	  }
+	}
+
+        break;
+      }
+  }
 
 
   /* Apply 'init' to the Left Matra if it's a word start. */
   if (info[start].indic_position () == POS_PRE_M &&
       (!start ||
        !(FLAG (_hb_glyph_info_get_general_category (&info[start - 1])) &
-	 (FLAG (HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
-	  FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))))
-    info[start].mask |= mask_array[INIT];
+	 FLAG_RANGE (HB_UNICODE_GENERAL_CATEGORY_FORMAT, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))))
+    info[start].mask |= indic_plan->mask_array[INIT];
 
 
-
-  /* Finish off the clusters and go home! */
-
-  if (!options.uniscribe_bug_compatible)
+  /*
+   * Finish off the clusters and go home!
+   */
+  if (indic_options ().uniscribe_bug_compatible)
   {
-    /* This is what Uniscribe does.  Ie. add cluster boundaries after Halant,ZWNJ.
+    /* Uniscribe merges the entire cluster.
      * This means, half forms are submerged into the main consonants cluster.
      * This is unnecessary, and makes cursor positioning harder, but that's what
      * Uniscribe does. */
-    unsigned int cluster_start = start;
-    for (unsigned int i = start + 1; i < start_of_last_cluster; i++)
-      if (info[i - 1].indic_category() == OT_H && info[i].indic_category() == OT_ZWNJ) {
-        i++;
-	buffer->merge_clusters (cluster_start, i);
-	cluster_start = i;
-      }
-    start_of_last_cluster = cluster_start;
+    buffer->merge_clusters (start, end);
   }
-
-  buffer->merge_clusters (start_of_last_cluster, end);
 }
 
 
 static void
-final_reordering (const hb_ot_map_t *map,
-		  hb_face_t *face HB_UNUSED,
-		  hb_buffer_t *buffer,
-		  void *user_data HB_UNUSED)
+final_reordering (const hb_ot_shape_plan_t *plan,
+		  hb_font_t *font,
+		  hb_buffer_t *buffer)
 {
   unsigned int count = buffer->len;
   if (!count) return;
 
-  hb_mask_t mask_array[ARRAY_LENGTH (indic_other_features)] = {0};
-  unsigned int num_masks = ARRAY_LENGTH (indic_other_features);
-  for (unsigned int i = 0; i < num_masks; i++)
-    mask_array[i] = map->get_1_mask (indic_other_features[i].tag);
-
   hb_glyph_info_t *info = buffer->info;
   unsigned int last = 0;
   unsigned int last_syllable = info[0].syllable();
   for (unsigned int i = 1; i < count; i++)
     if (last_syllable != info[i].syllable()) {
-      final_reordering_syllable (buffer, mask_array, last, i);
+      final_reordering_syllable (plan, buffer, last, i);
       last = i;
       last_syllable = info[last].syllable();
     }
-  final_reordering_syllable (buffer, mask_array, last, count);
+  final_reordering_syllable (plan, buffer, last, count);
 
   HB_BUFFER_DEALLOCATE_VAR (buffer, indic_category);
   HB_BUFFER_DEALLOCATE_VAR (buffer, indic_position);
 }
 
 
-
+const hb_ot_complex_shaper_t _hb_ot_complex_shaper_indic =
+{
+  "indic",
+  collect_features_indic,
+  override_features_indic,
+  data_create_indic,
+  data_destroy_indic,
+  NULL, /* normalization_preference */
+  setup_masks_indic,
+  false, /* zero_width_attached_marks */
+};
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-misc.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-misc.cc
index d93d4c672d7e..4f1dd5b2d307 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-misc.cc
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-misc.cc
@@ -29,101 +29,104 @@
 
 /* TODO Add kana, and other small shapers here */
 
-/* When adding trivial shapers, eg. kana, hangul, etc, we can either
- * add a full shaper enum value for them, or switch on the script in
- * the default complex shaper.  The former is faster, so I think that's
- * what we would do, and hence the default complex shaper shall remain
- * empty.
- */
 
-void
-_hb_ot_shape_complex_collect_features_default (hb_ot_map_builder_t *map HB_UNUSED,
-					       const hb_segment_properties_t *props HB_UNUSED)
-{
-}
-
-hb_ot_shape_normalization_mode_t
-_hb_ot_shape_complex_normalization_preference_default (void)
-{
-  return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
-}
-
-void
-_hb_ot_shape_complex_setup_masks_default (hb_ot_map_t *map HB_UNUSED,
-					  hb_buffer_t *buffer HB_UNUSED,
-					  hb_font_t *font HB_UNUSED)
-{
-}
-
-
-
-/* Hangul shaper */
+/* The default shaper *only* adds additional per-script features.*/
 
 static const hb_tag_t hangul_features[] =
 {
   HB_TAG('l','j','m','o'),
   HB_TAG('v','j','m','o'),
   HB_TAG('t','j','m','o'),
+  HB_TAG_NONE
 };
 
-void
-_hb_ot_shape_complex_collect_features_hangul (hb_ot_map_builder_t *map,
-					      const hb_segment_properties_t *props HB_UNUSED)
+static const hb_tag_t tibetan_features[] =
 {
-  for (unsigned int i = 0; i < ARRAY_LENGTH (hangul_features); i++)
-    map->add_bool_feature (hangul_features[i]);
+  HB_TAG('a','b','v','s'),
+  HB_TAG('b','l','w','s'),
+  HB_TAG('a','b','v','m'),
+  HB_TAG('b','l','w','m'),
+  HB_TAG_NONE
+};
+
+static void
+collect_features_default (hb_ot_shape_planner_t *plan)
+{
+  const hb_tag_t *script_features = NULL;
+
+  switch ((hb_tag_t) plan->props.script)
+  {
+    /* Unicode-1.1 additions */
+    case HB_SCRIPT_HANGUL:
+      script_features = hangul_features;
+      break;
+
+    /* Unicode-2.0 additions */
+    case HB_SCRIPT_TIBETAN:
+      script_features = tibetan_features;
+      break;
+  }
+
+  for (; script_features && *script_features; script_features++)
+    plan->map.add_bool_feature (*script_features);
 }
 
-hb_ot_shape_normalization_mode_t
-_hb_ot_shape_complex_normalization_preference_hangul (void)
+static hb_ot_shape_normalization_mode_t
+normalization_preference_default (const hb_ot_shape_plan_t *plan)
 {
-  return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL;
+  switch ((hb_tag_t) plan->props.script)
+  {
+    /* Unicode-1.1 additions */
+    case HB_SCRIPT_HANGUL:
+      return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL;
+  }
+  return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
 }
 
-void
-_hb_ot_shape_complex_setup_masks_hangul (hb_ot_map_t *map HB_UNUSED,
-					 hb_buffer_t *buffer HB_UNUSED,
-					 hb_font_t *font HB_UNUSED)
+const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default =
 {
-}
-
+  "default",
+  collect_features_default,
+  NULL, /* override_features */
+  NULL, /* data_create */
+  NULL, /* data_destroy */
+  normalization_preference_default,
+  NULL, /* setup_masks */
+  true, /* zero_width_attached_marks */
+};
 
 
 /* Thai / Lao shaper */
 
-void
-_hb_ot_shape_complex_collect_features_thai (hb_ot_map_builder_t *map HB_UNUSED,
-					    const hb_segment_properties_t *props HB_UNUSED)
-{
-}
-
-hb_ot_shape_normalization_mode_t
-_hb_ot_shape_complex_normalization_preference_thai (void)
-{
-  return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL;
-}
-
-void
-_hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map HB_UNUSED,
-				       hb_buffer_t *buffer,
-				       hb_font_t *font HB_UNUSED)
+static void
+setup_masks_thai (const hb_ot_shape_plan_t *plan HB_UNUSED,
+		  hb_buffer_t              *buffer,
+		  hb_font_t                *font HB_UNUSED)
 {
   /* The following is NOT specified in the MS OT Thai spec, however, it seems
    * to be what Uniscribe and other engines implement.  According to Eric Muller:
    *
-   * When you have a sara am, decompose it in nikhahit + sara a, *and* mode the
-   * nihka hit backwards over any *tone* mark (0E48-0E4B).
+   * When you have a SARA AM, decompose it in NIKHAHIT + SARA AA, *and* move the
+   * NIKHAHIT backwards over any tone mark (0E48-0E4B).
    *
    * <0E14, 0E4B, 0E33> -> <0E14, 0E4D, 0E4B, 0E32>
    *
-   * This reordering is legit only when the nikhahit comes from a sara am, not
+   * This reordering is legit only when the NIKHAHIT comes from a SARA AM, not
    * when it's there to start with. The string <0E14, 0E4B, 0E4D> is probably
-   * not what a u↪ser wanted, but the rendering is nevertheless nikhahit above
+   * not what a user wanted, but the rendering is nevertheless nikhahit above
    * chattawa.
    *
    * Same for Lao.
+   *
+   * Note:
+   *
+   * Uniscribe also does so below-marks reordering.  Namely, it positions U+0E3A
+   * after U+0E38 and U+0E39.  We do that by modifying the ccc for U+0E3A.
+   * See unicode->modified_combining_class ().  Lao does NOT have a U+0E3A
+   * equivalent.
    */
 
+
   /*
    * Here are the characters of significance:
    *
@@ -132,9 +135,9 @@ _hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map HB_UNUSED,
    * SARA AA:		U+0E32	U+0EB2
    * Nikhahit:		U+0E4D	U+0ECD
    *
-   * Tone marks:
-   * Thai:	<0E48..0E4B> CCC=107
-   * Lao:	<0EC8..0ECB> CCC=122
+   * Testing shows that Uniscribe reorder the following marks:
+   * Thai:	<0E31,0E34..0E37,0E47..0E4E>
+   * Lao:	<0EB1,0EB4..0EB7,0EC7..0ECE>
    *
    * Note how the Lao versions are the same as Thai + 0x80.
    */
@@ -144,7 +147,7 @@ _hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map HB_UNUSED,
 #define IS_SARA_AM(x) (((x) & ~0x0080) == 0x0E33)
 #define NIKHAHIT_FROM_SARA_AM(x) ((x) - 0xE33 + 0xE4D)
 #define SARA_AA_FROM_SARA_AM(x) ((x) - 1)
-#define IS_TONE_MARK(x) (((x) & ~0x0083) == 0x0E48)
+#define IS_TONE_MARK(x) (hb_in_ranges<hb_codepoint_t> ((x) & ~0x0080, 0x0E34, 0x0E37, 0x0E47, 0x0E4E, 0x0E31, 0x0E31))
 
   buffer->clear_output ();
   unsigned int count = buffer->len;
@@ -169,25 +172,35 @@ _hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map HB_UNUSED,
     while (start > 0 && IS_TONE_MARK (buffer->out_info[start - 1].codepoint))
       start--;
 
-    /* Move Nikhahit (end-2) to the beginning */
-    hb_glyph_info_t t = buffer->out_info[end - 2];
-    memmove (buffer->out_info + start + 1,
-	     buffer->out_info + start,
-	     sizeof (buffer->out_info[0]) * (end - start - 2));
-    buffer->out_info[start] = t;
-
-    /* XXX Make this easier! */
-    /* Make cluster */
-    for (; start > 0 && buffer->out_info[start - 1].cluster == buffer->out_info[start].cluster; start--)
-      ;
-    for (; buffer->idx < count;)
-      if (buffer->cur().cluster == buffer->prev().cluster)
-        buffer->next_glyph ();
-      else
-        break;
-    end = buffer->out_len;
-
-    buffer->merge_out_clusters (start, end);
+    if (start + 2 < end)
+    {
+      /* Move Nikhahit (end-2) to the beginning */
+      buffer->merge_out_clusters (start, end);
+      hb_glyph_info_t t = buffer->out_info[end - 2];
+      memmove (buffer->out_info + start + 1,
+	       buffer->out_info + start,
+	       sizeof (buffer->out_info[0]) * (end - start - 2));
+      buffer->out_info[start] = t;
+    }
+    else
+    {
+      /* Since we decomposed, and NIKHAHIT is combining, merge clusters with the
+       * previous cluster. */
+      if (start)
+	buffer->merge_out_clusters (start - 1, end);
+    }
   }
   buffer->swap_buffers ();
 }
+
+const hb_ot_complex_shaper_t _hb_ot_complex_shaper_thai =
+{
+  "thai",
+  NULL, /* collect_features */
+  NULL, /* override_features */
+  NULL, /* data_create */
+  NULL, /* data_destroy */
+  NULL, /* normalization_preference */
+  setup_masks_thai,
+  true, /* zero_width_attached_marks */
+};
diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
index ba962b591971..baece320d859 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
@@ -29,49 +29,90 @@
 
 #include "hb-private.hh"
 
-#include "hb-ot-map-private.hh"
+#include "hb-ot-shape-private.hh"
 #include "hb-ot-shape-normalize-private.hh"
 
 
 
-/* buffer var allocations, used during the entire shaping process */
-#define unicode_props0()	var1.u8[0]
-#define unicode_props1()	var1.u8[1]
-
-/* buffer var allocations, used during the GSUB/GPOS processing */
-#define props_cache()		var1.u16[1] /* GSUB/GPOS glyph_props cache */
-#define syllable()		var2.u8[0] /* GSUB/GPOS shaping boundaries */
-#define lig_props()		var2.u8[1] /* GSUB/GPOS ligature tracking */
-
 /* buffer var allocations, used by complex shapers */
 #define complex_var_persistent_u8_0()	var2.u8[2]
 #define complex_var_persistent_u8_1()	var2.u8[3]
 #define complex_var_temporary_u8()	var2.u8[0]
 
 
+
+/* Master OT shaper list */
 #define HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS \
   HB_COMPLEX_SHAPER_IMPLEMENT (default) /* should be first */ \
   HB_COMPLEX_SHAPER_IMPLEMENT (arabic) \
-  HB_COMPLEX_SHAPER_IMPLEMENT (hangul) \
   HB_COMPLEX_SHAPER_IMPLEMENT (indic) \
   HB_COMPLEX_SHAPER_IMPLEMENT (thai) \
   /* ^--- Add new shapers here */
 
-enum hb_ot_complex_shaper_t {
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) hb_ot_complex_shaper_##name,
-  HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-  /* Just here to avoid enum trailing comma: */
-  hb_ot_complex_shaper_generic = hb_ot_complex_shaper_default
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
+
+struct hb_ot_complex_shaper_t
+{
+  char name[8];
+
+  /* collect_features()
+   * Called during shape_plan().
+   * Shapers should use plan->map to add their features and callbacks.
+   * May be NULL.
+   */
+  void (*collect_features) (hb_ot_shape_planner_t *plan);
+
+  /* override_features()
+   * Called during shape_plan().
+   * Shapers should use plan->map to override features and add callbacks after
+   * common features are added.
+   * May be NULL.
+   */
+  void (*override_features) (hb_ot_shape_planner_t *plan);
+
+
+  /* data_create()
+   * Called at the end of shape_plan().
+   * Whatever shapers return will be accessible through plan->data later.
+   * If NULL is returned, means a plan failure.
+   * May be NULL. */
+  void *(*data_create) (const hb_ot_shape_plan_t *plan);
+
+  /* data_destroy()
+   * Called when the shape_plan is being destroyed.
+   * plan->data is passed here for destruction.
+   * If NULL is returned, means a plan failure.
+   * May be NULL. */
+  void (*data_destroy) (void *data);
+
+  /* normalization_preference()
+   * Called during shape().
+   */
+  hb_ot_shape_normalization_mode_t
+  (*normalization_preference) (const hb_ot_shape_plan_t *plan);
+
+  /* setup_masks()
+   * Called during shape().
+   * Shapers should use map to get feature masks and set on buffer.
+   */
+  void (*setup_masks) (const hb_ot_shape_plan_t *plan,
+		       hb_buffer_t              *buffer,
+		       hb_font_t                *font);
+
+  bool zero_width_attached_marks;
 };
 
-static inline hb_ot_complex_shaper_t
+#define HB_COMPLEX_SHAPER_IMPLEMENT(name) extern HB_INTERNAL const hb_ot_complex_shaper_t _hb_ot_complex_shaper_##name;
+HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
+#undef HB_COMPLEX_SHAPER_IMPLEMENT
+
+
+static inline const hb_ot_complex_shaper_t *
 hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
 {
   switch ((hb_tag_t) props->script)
   {
     default:
-      return hb_ot_complex_shaper_default;
+      return &_hb_ot_complex_shaper_default;
 
 
     /* Unicode-1.1 additions */
@@ -85,20 +126,14 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     /* Unicode-6.0 additions */
     case HB_SCRIPT_MANDAIC:
 
-      return hb_ot_complex_shaper_arabic;
-
-
-    /* Unicode-1.1 additions */
-    case HB_SCRIPT_HANGUL:
-
-      return hb_ot_complex_shaper_hangul;
+      return &_hb_ot_complex_shaper_arabic;
 
 
     /* Unicode-1.1 additions */
     case HB_SCRIPT_THAI:
     case HB_SCRIPT_LAO:
 
-      return hb_ot_complex_shaper_thai;
+      return &_hb_ot_complex_shaper_thai;
 
 
 
@@ -213,96 +248,9 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     case HB_SCRIPT_SHARADA:
     case HB_SCRIPT_TAKRI:
 
-      return hb_ot_complex_shaper_indic;
+      return &_hb_ot_complex_shaper_indic;
   }
 }
 
 
-
-/*
- * collect_features()
- *
- * Called during shape_plan().
- *
- * Shapers should use map to add their features and callbacks.
- */
-
-typedef void hb_ot_shape_complex_collect_features_func_t (hb_ot_map_builder_t *map, const hb_segment_properties_t  *props);
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) \
-  HB_INTERNAL hb_ot_shape_complex_collect_features_func_t _hb_ot_shape_complex_collect_features_##name;
-  HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
-
-static inline void
-hb_ot_shape_complex_collect_features (hb_ot_complex_shaper_t shaper,
-				      hb_ot_map_builder_t *map,
-				      const hb_segment_properties_t  *props)
-{
-  switch (shaper) {
-    default:
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) \
-    case hb_ot_complex_shaper_##name:	_hb_ot_shape_complex_collect_features_##name (map, props); return;
-    HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
-  }
-}
-
-
-/*
- * normalization_preference()
- *
- * Called during shape_execute().
- *
- * Shapers should return TRUE if it prefers decomposed (NFD) input rather than precomposed (NFC).
- */
-
-typedef hb_ot_shape_normalization_mode_t hb_ot_shape_complex_normalization_preference_func_t (void);
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) \
-  HB_INTERNAL hb_ot_shape_complex_normalization_preference_func_t _hb_ot_shape_complex_normalization_preference_##name;
-  HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
-
-static inline hb_ot_shape_normalization_mode_t
-hb_ot_shape_complex_normalization_preference (hb_ot_complex_shaper_t shaper)
-{
-  switch (shaper) {
-    default:
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) \
-    case hb_ot_complex_shaper_##name:	return _hb_ot_shape_complex_normalization_preference_##name ();
-    HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
-  }
-}
-
-
-/* setup_masks()
- *
- * Called during shape_execute().
- *
- * Shapers should use map to get feature masks and set on buffer.
- */
-
-typedef void hb_ot_shape_complex_setup_masks_func_t (hb_ot_map_t *map, hb_buffer_t *buffer, hb_font_t *font);
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) \
-  HB_INTERNAL hb_ot_shape_complex_setup_masks_func_t _hb_ot_shape_complex_setup_masks_##name;
-  HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
-
-static inline void
-hb_ot_shape_complex_setup_masks (hb_ot_complex_shaper_t shaper,
-				 hb_ot_map_t *map,
-				 hb_buffer_t *buffer,
-				 hb_font_t *font)
-{
-  switch (shaper) {
-    default:
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) \
-    case hb_ot_complex_shaper_##name:	_hb_ot_shape_complex_setup_masks_##name (map, buffer, font); return;
-    HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
-  }
-}
-
-
-
 #endif /* HB_OT_SHAPE_COMPLEX_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-ot-shape-normalize-private.hh b/gfx/harfbuzz/src/hb-ot-shape-normalize-private.hh
index bb81f00ef81e..4c89a8fcc16d 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-normalize-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-shape-normalize-private.hh
@@ -36,7 +36,9 @@
 enum hb_ot_shape_normalization_mode_t {
   HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED,
   HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS, /* never composes base-to-base */
-  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL /* including base-to-base composition */
+  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL, /* including base-to-base composition */
+
+  HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS,
 };
 
 HB_INTERNAL void _hb_ot_shape_normalize (hb_font_t *font,
diff --git a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc b/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
index a9019fb72704..bc1df54d1d90 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
+++ b/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
@@ -62,10 +62,23 @@
  *     knowledge too.  We need to provide assistance to the itemizer.
  *
  *   - When a font does not support a character but supports its decomposition,
- *     well, use the decomposition.
+ *     well, use the decomposition (preferring the canonical decomposition, but
+ *     falling back to the compatibility decomposition if necessary).  The
+ *     compatibility decomposition is really nice to have, for characters like
+ *     ellipsis, or various-sized space characters.
  *
- *   - The Indic shaper requests decomposed output.  This will handle splitting
- *     matra for the Indic shaper.
+ *   - The complex shapers can customize the compose and decompose functions to
+ *     offload some of their requirements to the normalizer.  For example, the
+ *     Indic shaper may want to disallow recomposing of two matras.
+ *
+ *   - We try compatibility decomposition if decomposing through canonical
+ *     decomposition alone failed to find a sequence that the font supports.
+ *     We don't try compatibility decomposition recursively during the canonical
+ *     decomposition phase.  This has minimal impact.  There are only a handful
+ *     of Greek letter that have canonical decompositions that include characters
+ *     with compatibility decomposition.  Those can be found using this command:
+ *
+ *     egrep  "`echo -n ';('; grep ';<' UnicodeData.txt | cut -d';' -f1 | tr '\n' '|'; echo ') '`" UnicodeData.txt
  */
 
 static void
@@ -82,58 +95,74 @@ decompose (hb_font_t *font, hb_buffer_t *buffer,
 {
   hb_codepoint_t a, b, glyph;
 
-  if (!hb_unicode_decompose (buffer->unicode, ab, &a, &b) ||
-      (b && !hb_font_get_glyph (font, b, 0, &glyph)))
-    return FALSE;
+  if (!buffer->unicode->decompose (ab, &a, &b) ||
+      (b && !font->get_glyph (b, 0, &glyph)))
+    return false;
 
-  bool has_a = hb_font_get_glyph (font, a, 0, &glyph);
+  bool has_a = font->get_glyph (a, 0, &glyph);
   if (shortest && has_a) {
     /* Output a and b */
     output_glyph (buffer, a);
     if (b)
       output_glyph (buffer, b);
-    return TRUE;
+    return true;
   }
 
   if (decompose (font, buffer, shortest, a)) {
     if (b)
       output_glyph (buffer, b);
-    return TRUE;
+    return true;
   }
 
   if (has_a) {
     output_glyph (buffer, a);
     if (b)
       output_glyph (buffer, b);
-    return TRUE;
+    return true;
   }
 
-  return FALSE;
+  return false;
 }
 
-static void
-decompose_current_glyph (hb_font_t *font, hb_buffer_t *buffer,
-			 bool shortest)
+static bool
+decompose_compatibility (hb_font_t *font, hb_buffer_t *buffer,
+			 hb_codepoint_t u)
 {
-  if (decompose (font, buffer, shortest, buffer->cur().codepoint))
-    buffer->skip_glyph ();
-  else
-    buffer->next_glyph ();
+  unsigned int len, i;
+  hb_codepoint_t decomposed[HB_UNICODE_MAX_DECOMPOSITION_LEN];
+
+  len = buffer->unicode->decompose_compatibility (u, decomposed);
+  if (!len)
+    return false;
+
+  hb_codepoint_t glyph;
+  for (i = 0; i < len; i++)
+    if (!font->get_glyph (decomposed[i], 0, &glyph))
+      return false;
+
+  for (i = 0; i < len; i++)
+    output_glyph (buffer, decomposed[i]);
+
+  return true;
 }
 
 static void
-decompose_single_char_cluster (hb_font_t *font, hb_buffer_t *buffer,
-			       bool will_recompose)
+decompose_current_character (hb_font_t *font, hb_buffer_t *buffer,
+			     bool shortest)
 {
   hb_codepoint_t glyph;
 
-  /* If recomposing and font supports this, we're good to go */
-  if (will_recompose && hb_font_get_glyph (font, buffer->cur().codepoint, 0, &glyph)) {
+  /* Kind of a cute waterfall here... */
+  if (shortest && font->get_glyph (buffer->cur().codepoint, 0, &glyph))
+    buffer->next_glyph ();
+  else if (decompose (font, buffer, shortest, buffer->cur().codepoint))
+    buffer->skip_glyph ();
+  else if (!shortest && font->get_glyph (buffer->cur().codepoint, 0, &glyph))
+    buffer->next_glyph ();
+  else if (decompose_compatibility (font, buffer, buffer->cur().codepoint))
+    buffer->skip_glyph ();
+  else
     buffer->next_glyph ();
-    return;
-  }
-
-  decompose_current_glyph (font, buffer, will_recompose);
 }
 
 static void
@@ -142,14 +171,14 @@ decompose_multi_char_cluster (hb_font_t *font, hb_buffer_t *buffer,
 {
   /* TODO Currently if there's a variation-selector we give-up, it's just too hard. */
   for (unsigned int i = buffer->idx; i < end; i++)
-    if (unlikely (_hb_unicode_is_variation_selector (buffer->info[i].codepoint))) {
+    if (unlikely (buffer->unicode->is_variation_selector (buffer->info[i].codepoint))) {
       while (buffer->idx < end)
 	buffer->next_glyph ();
       return;
     }
 
   while (buffer->idx < end)
-    decompose_current_glyph (font, buffer, FALSE);
+    decompose_current_character (font, buffer, false);
 }
 
 static int
@@ -166,7 +195,7 @@ _hb_ot_shape_normalize (hb_font_t *font, hb_buffer_t *buffer,
 			hb_ot_shape_normalization_mode_t mode)
 {
   bool recompose = mode != HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED;
-  bool has_multichar_clusters = FALSE;
+  bool has_multichar_clusters = false;
   unsigned int count;
 
   /* We do a fairly straightforward yet custom normalization process in three
@@ -188,10 +217,10 @@ _hb_ot_shape_normalize (hb_font_t *font, hb_buffer_t *buffer,
         break;
 
     if (buffer->idx + 1 == end)
-      decompose_single_char_cluster (font, buffer, recompose);
+      decompose_current_character (font, buffer, recompose);
     else {
       decompose_multi_char_cluster (font, buffer, end);
-      has_multichar_clusters = TRUE;
+      has_multichar_clusters = true;
     }
   }
   buffer->swap_buffers ();
@@ -252,19 +281,21 @@ _hb_ot_shape_normalize (hb_font_t *font, hb_buffer_t *buffer,
 	(starter == buffer->out_len - 1 ||
 	 _hb_glyph_info_get_modified_combining_class (&buffer->prev()) < _hb_glyph_info_get_modified_combining_class (&buffer->cur())) &&
 	/* And compose. */
-	hb_unicode_compose (buffer->unicode,
-			    buffer->out_info[starter].codepoint,
-			    buffer->cur().codepoint,
-			    &composed) &&
+	buffer->unicode->compose (buffer->out_info[starter].codepoint,
+				  buffer->cur().codepoint,
+				  &composed) &&
 	/* And the font has glyph for the composite. */
-	hb_font_get_glyph (font, composed, 0, &glyph))
+	font->get_glyph (composed, 0, &glyph))
     {
-      /* Composes. Modify starter and carry on. */
-      buffer->out_info[starter].codepoint = composed;
-      /* XXX update cluster */
+      /* Composes. */
+      buffer->next_glyph (); /* Copy to out-buffer. */
+      if (unlikely (buffer->in_error))
+        return;
+      buffer->merge_out_clusters (starter, buffer->out_len);
+      buffer->out_len--; /* Remove the second composble. */
+      buffer->out_info[starter].codepoint = composed; /* Modify starter and carry on. */
       _hb_glyph_info_set_unicode_props (&buffer->out_info[starter], buffer->unicode);
 
-      buffer->skip_glyph ();
       continue;
     }
 
diff --git a/gfx/harfbuzz/src/hb-ot-shape-private.hh b/gfx/harfbuzz/src/hb-ot-shape-private.hh
index df0c7052e9b0..975665e960e1 100644
--- a/gfx/harfbuzz/src/hb-ot-shape-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-shape-private.hh
@@ -30,36 +30,63 @@
 #include "hb-private.hh"
 
 #include "hb-ot-map-private.hh"
-#include "hb-ot-shape-complex-private.hh"
+
+
+
+/* buffer var allocations, used during the entire shaping process */
+#define unicode_props0()	var1.u8[0]
+#define unicode_props1()	var1.u8[1]
+
 
 
 struct hb_ot_shape_plan_t
 {
+  hb_segment_properties_t props;
+  const struct hb_ot_complex_shaper_t *shaper;
   hb_ot_map_t map;
-  hb_ot_complex_shaper_t shaper;
+  const void *data;
 
-  hb_ot_shape_plan_t (void) : map () {}
-  ~hb_ot_shape_plan_t (void) { map.finish (); }
+  inline void substitute_closure (hb_face_t *face, hb_set_t *glyphs) const { map.substitute_closure (this, face, glyphs); }
+  inline void substitute (hb_font_t *font, hb_buffer_t *buffer) const { map.substitute (this, font, buffer); }
+  inline void position (hb_font_t *font, hb_buffer_t *buffer) const { map.position (this, font, buffer); }
 
-  private:
-  NO_COPY (hb_ot_shape_plan_t);
+  void finish (void) { map.finish (); }
 };
 
+struct hb_ot_shape_planner_t
+{
+  /* In the order that they are filled in. */
+  hb_face_t *face;
+  hb_segment_properties_t props;
+  const struct hb_ot_complex_shaper_t *shaper;
+  hb_ot_map_builder_t map;
 
+  hb_ot_shape_planner_t (const hb_shape_plan_t *master_plan) :
+			 face (master_plan->face),
+			 props (master_plan->props),
+			 shaper (NULL),
+			 map () {}
+  ~hb_ot_shape_planner_t (void) { map.finish (); }
+
+  inline void compile (hb_ot_shape_plan_t &plan)
+  {
+    plan.props = props;
+    plan.shaper = shaper;
+    map.compile (face, &props, plan.map);
+  }
+
+  private:
+  NO_COPY (hb_ot_shape_planner_t);
+};
 
-HB_INTERNAL hb_bool_t
-_hb_ot_shape (hb_font_t          *font,
-	      hb_buffer_t        *buffer,
-	      const hb_feature_t *features,
-	      unsigned int        num_features);
 
 
 inline void
 _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode)
 {
-  info->unicode_props0() = ((unsigned int) hb_unicode_general_category (unicode, info->codepoint)) |
-			   (_hb_unicode_is_zero_width (info->codepoint) ? 0x80 : 0);
-  info->unicode_props1() = _hb_unicode_modified_combining_class (unicode, info->codepoint);
+  info->unicode_props0() = ((unsigned int) unicode->general_category (info->codepoint)) |
+			   (unicode->is_zero_width (info->codepoint) ? 0x80 : 0);
+  info->unicode_props1() = unicode->modified_combining_class (info->codepoint);
 }
 
 inline hb_unicode_general_category_t
diff --git a/gfx/harfbuzz/src/hb-ot-shape.cc b/gfx/harfbuzz/src/hb-ot-shape.cc
index a1268a09a60e..08457bece2f3 100644
--- a/gfx/harfbuzz/src/hb-ot-shape.cc
+++ b/gfx/harfbuzz/src/hb-ot-shape.cc
@@ -26,14 +26,19 @@
  * Google Author(s): Behdad Esfahbod
  */
 
+#define HB_SHAPER ot
+#define hb_ot_shaper_face_data_t hb_ot_layout_t
+#define hb_ot_shaper_shape_plan_data_t hb_ot_shape_plan_t
+#include "hb-shaper-impl-private.hh"
+
 #include "hb-ot-shape-private.hh"
 #include "hb-ot-shape-normalize-private.hh"
+#include "hb-ot-shape-complex-private.hh"
 
-#include "hb-font-private.hh"
+#include "hb-ot-layout-private.hh"
 #include "hb-set-private.hh"
 
 
-
 hb_tag_t common_features[] = {
   HB_TAG('c','c','m','p'),
   HB_TAG('l','i','g','a'),
@@ -66,40 +71,22 @@ hb_tag_t vertical_features[] = {
 
 
 
-struct hb_ot_shape_planner_t
-{
-  hb_ot_map_builder_t map;
-  hb_ot_complex_shaper_t shaper;
-
-  hb_ot_shape_planner_t (void) : map () {}
-  ~hb_ot_shape_planner_t (void) { map.finish (); }
-
-  inline void compile (hb_face_t *face,
-		       const hb_segment_properties_t *props,
-		       struct hb_ot_shape_plan_t &plan)
-  {
-    plan.shaper = shaper;
-    map.compile (face, props, plan.map);
-  }
-
-  private:
-  NO_COPY (hb_ot_shape_planner_t);
-};
-
 static void
 hb_ot_shape_collect_features (hb_ot_shape_planner_t          *planner,
 			      const hb_segment_properties_t  *props,
 			      const hb_feature_t             *user_features,
 			      unsigned int                    num_user_features)
 {
+  hb_ot_map_builder_t *map = &planner->map;
+
   switch (props->direction) {
     case HB_DIRECTION_LTR:
-      planner->map.add_bool_feature (HB_TAG ('l','t','r','a'));
-      planner->map.add_bool_feature (HB_TAG ('l','t','r','m'));
+      map->add_bool_feature (HB_TAG ('l','t','r','a'));
+      map->add_bool_feature (HB_TAG ('l','t','r','m'));
       break;
     case HB_DIRECTION_RTL:
-      planner->map.add_bool_feature (HB_TAG ('r','t','l','a'));
-      planner->map.add_bool_feature (HB_TAG ('r','t','l','m'), false);
+      map->add_bool_feature (HB_TAG ('r','t','l','a'));
+      map->add_bool_feature (HB_TAG ('r','t','l','m'), false);
       break;
     case HB_DIRECTION_TTB:
     case HB_DIRECTION_BTT:
@@ -111,10 +98,11 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t          *planner,
 #define ADD_FEATURES(array) \
   HB_STMT_START { \
     for (unsigned int i = 0; i < ARRAY_LENGTH (array); i++) \
-      planner->map.add_bool_feature (array[i]); \
+      map->add_bool_feature (array[i]); \
   } HB_STMT_END
 
-  hb_ot_shape_complex_collect_features (planner->shaper, &planner->map, props);
+  if (planner->shaper->collect_features)
+    planner->shaper->collect_features (planner);
 
   ADD_FEATURES (common_features);
 
@@ -123,18 +111,102 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t          *planner,
   else
     ADD_FEATURES (vertical_features);
 
+  if (planner->shaper->override_features)
+    planner->shaper->override_features (planner);
+
 #undef ADD_FEATURES
 
   for (unsigned int i = 0; i < num_user_features; i++) {
     const hb_feature_t *feature = &user_features[i];
-    planner->map.add_feature (feature->tag, feature->value, (feature->start == 0 && feature->end == (unsigned int) -1));
+    map->add_feature (feature->tag, feature->value, (feature->start == 0 && feature->end == (unsigned int) -1));
   }
 }
 
 
+/*
+ * shaper face data
+ */
+
+hb_ot_shaper_face_data_t *
+_hb_ot_shaper_face_data_create (hb_face_t *face)
+{
+  return _hb_ot_layout_create (face);
+}
+
+void
+_hb_ot_shaper_face_data_destroy (hb_ot_shaper_face_data_t *data)
+{
+  _hb_ot_layout_destroy (data);
+}
+
+
+/*
+ * shaper font data
+ */
+
+struct hb_ot_shaper_font_data_t {};
+
+hb_ot_shaper_font_data_t *
+_hb_ot_shaper_font_data_create (hb_font_t *font)
+{
+  return (hb_ot_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+}
+
+void
+_hb_ot_shaper_font_data_destroy (hb_ot_shaper_font_data_t *data)
+{
+}
+
+
+/*
+ * shaper shape_plan data
+ */
+
+hb_ot_shaper_shape_plan_data_t *
+_hb_ot_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
+				      const hb_feature_t *user_features,
+				      unsigned int        num_user_features)
+{
+  hb_ot_shape_plan_t *plan = (hb_ot_shape_plan_t *) calloc (1, sizeof (hb_ot_shape_plan_t));
+  if (unlikely (!plan))
+    return NULL;
+
+  hb_ot_shape_planner_t planner (shape_plan);
+
+  planner.shaper = hb_ot_shape_complex_categorize (&shape_plan->props);
+
+  hb_ot_shape_collect_features (&planner, &shape_plan->props, user_features, num_user_features);
+
+  planner.compile (*plan);
+
+  if (plan->shaper->data_create) {
+    plan->data = plan->shaper->data_create (plan);
+    if (unlikely (!plan->data))
+      return NULL;
+  }
+
+  return plan;
+}
+
+void
+_hb_ot_shaper_shape_plan_data_destroy (hb_ot_shaper_shape_plan_data_t *plan)
+{
+  if (plan->shaper->data_destroy)
+    plan->shaper->data_destroy (const_cast<void *> (plan->data));
+
+  plan->finish ();
+
+  free (plan);
+}
+
+
+/*
+ * shaper
+ */
+
 struct hb_ot_shape_context_t
 {
-  /* Input to hb_ot_shape_execute() */
+  /* Input to hb_ot_shape_internal() */
   hb_ot_shape_plan_t *plan;
   hb_font_t *font;
   hb_face_t *face;
@@ -150,17 +222,20 @@ struct hb_ot_shape_context_t
 static void
 hb_ot_shape_setup_masks (hb_ot_shape_context_t *c)
 {
-  hb_mask_t global_mask = c->plan->map.get_global_mask ();
+  hb_ot_map_t *map = &c->plan->map;
+
+  hb_mask_t global_mask = map->get_global_mask ();
   c->buffer->reset_masks (global_mask);
 
-  hb_ot_shape_complex_setup_masks (c->plan->shaper, &c->plan->map, c->buffer, c->font);
+  if (c->plan->shaper->setup_masks)
+    c->plan->shaper->setup_masks (c->plan, c->buffer, c->font);
 
   for (unsigned int i = 0; i < c->num_user_features; i++)
   {
     const hb_feature_t *feature = &c->user_features[i];
     if (!(feature->start == 0 && feature->end == (unsigned int)-1)) {
       unsigned int shift;
-      hb_mask_t mask = c->plan->map.get_mask (feature->tag, &shift);
+      hb_mask_t mask = map->get_mask (feature->tag, &shift);
       c->buffer->set_masks (feature->value << shift, mask, feature->start, feature->end);
     }
   }
@@ -188,7 +263,7 @@ hb_form_clusters (hb_buffer_t *buffer)
 	(FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) |
 	 FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
 	 FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))
-      buffer->info[i].cluster = buffer->info[i - 1].cluster; /* XXX do the min() here */
+      buffer->merge_clusters (i - 1, i + 1);
 }
 
 static void
@@ -223,7 +298,7 @@ hb_mirror_chars (hb_ot_shape_context_t *c)
 
   unsigned int count = c->buffer->len;
   for (unsigned int i = 0; i < count; i++) {
-    hb_codepoint_t codepoint = hb_unicode_mirroring (unicode, c->buffer->info[i].codepoint);
+    hb_codepoint_t codepoint = unicode->mirroring (c->buffer->info[i].codepoint);
     if (likely (codepoint == c->buffer->info[i].codepoint))
       c->buffer->info[i].mask |= rtlm_mask; /* XXX this should be moved to before setting user-feature masks */
     else
@@ -244,16 +319,16 @@ hb_map_glyphs (hb_font_t    *font,
 
   unsigned int count = buffer->len - 1;
   for (buffer->idx = 0; buffer->idx < count;) {
-    if (unlikely (_hb_unicode_is_variation_selector (buffer->cur(+1).codepoint))) {
-      hb_font_get_glyph (font, buffer->cur().codepoint, buffer->cur(+1).codepoint, &glyph);
+    if (unlikely (buffer->unicode->is_variation_selector (buffer->cur(+1).codepoint))) {
+      font->get_glyph (buffer->cur().codepoint, buffer->cur(+1).codepoint, &glyph);
       buffer->replace_glyphs (2, 1, &glyph);
     } else {
-      hb_font_get_glyph (font, buffer->cur().codepoint, 0, &glyph);
+      font->get_glyph (buffer->cur().codepoint, 0, &glyph);
       buffer->replace_glyph (glyph);
     }
   }
   if (likely (buffer->idx < buffer->len)) {
-    hb_font_get_glyph (font, buffer->cur().codepoint, 0, &glyph);
+    font->get_glyph (buffer->cur().codepoint, 0, &glyph);
     buffer->replace_glyph (glyph);
   }
   buffer->swap_buffers ();
@@ -262,21 +337,34 @@ hb_map_glyphs (hb_font_t    *font,
 static void
 hb_substitute_default (hb_ot_shape_context_t *c)
 {
-  hb_ot_layout_substitute_start (c->buffer);
-
   hb_mirror_chars (c);
 
   hb_map_glyphs (c->font, c->buffer);
 }
 
+static void
+hb_synthesize_glyph_classes (hb_ot_shape_context_t *c)
+{
+  unsigned int count = c->buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    c->buffer->info[i].glyph_props() = _hb_glyph_info_get_general_category (&c->buffer->info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK ?
+				       HB_OT_LAYOUT_GLYPH_CLASS_MARK :
+				       HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH;
+}
+
+
 static void
 hb_ot_substitute_complex (hb_ot_shape_context_t *c)
 {
-  if (hb_ot_layout_has_substitution (c->face)) {
-    c->plan->map.substitute (c->face, c->buffer);
-  }
+  hb_ot_layout_substitute_start (c->font, c->buffer);
 
-  hb_ot_layout_substitute_finish (c->buffer);
+  if (!hb_ot_layout_has_glyph_classes (c->face))
+    hb_synthesize_glyph_classes (c);
+
+  if (hb_ot_layout_has_substitution (c->face))
+    c->plan->substitute (c->font, c->buffer);
+
+  hb_ot_layout_substitute_finish (c->font, c->buffer);
 
   return;
 }
@@ -287,21 +375,33 @@ hb_ot_substitute_complex (hb_ot_shape_context_t *c)
 static void
 hb_position_default (hb_ot_shape_context_t *c)
 {
-  hb_ot_layout_position_start (c->buffer);
+  hb_ot_layout_position_start (c->font, c->buffer);
 
   unsigned int count = c->buffer->len;
   for (unsigned int i = 0; i < count; i++) {
-    hb_font_get_glyph_advance_for_direction (c->font, c->buffer->info[i].codepoint,
-					     c->buffer->props.direction,
-					     &c->buffer->pos[i].x_advance,
-					     &c->buffer->pos[i].y_advance);
-    hb_font_subtract_glyph_origin_for_direction (c->font, c->buffer->info[i].codepoint,
-						 c->buffer->props.direction,
-						 &c->buffer->pos[i].x_offset,
-						 &c->buffer->pos[i].y_offset);
+    c->font->get_glyph_advance_for_direction (c->buffer->info[i].codepoint,
+					      c->buffer->props.direction,
+					      &c->buffer->pos[i].x_advance,
+					      &c->buffer->pos[i].y_advance);
+    c->font->subtract_glyph_origin_for_direction (c->buffer->info[i].codepoint,
+						  c->buffer->props.direction,
+						  &c->buffer->pos[i].x_offset,
+						  &c->buffer->pos[i].y_offset);
   }
 }
 
+static void
+hb_zero_mark_advances (hb_ot_shape_context_t *c)
+{
+  unsigned int count = c->buffer->len;
+  for (unsigned int i = 0; i < count; i++)
+    if (_hb_glyph_info_get_general_category (&c->buffer->info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)
+    {
+      c->buffer->pos[i].x_advance = 0;
+      c->buffer->pos[i].y_advance = 0;
+    }
+}
+
 static void
 hb_ot_position_complex (hb_ot_shape_context_t *c)
 {
@@ -312,56 +412,34 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
 
     unsigned int count = c->buffer->len;
     for (unsigned int i = 0; i < count; i++) {
-      hb_font_add_glyph_origin_for_direction (c->font, c->buffer->info[i].codepoint,
-					      HB_DIRECTION_LTR,
-					      &c->buffer->pos[i].x_offset,
-					      &c->buffer->pos[i].y_offset);
+      c->font->add_glyph_origin_for_direction (c->buffer->info[i].codepoint,
+					       HB_DIRECTION_LTR,
+					       &c->buffer->pos[i].x_offset,
+					       &c->buffer->pos[i].y_offset);
     }
 
-    c->plan->map.position (c->font, c->buffer);
+    c->plan->position (c->font, c->buffer);
 
     for (unsigned int i = 0; i < count; i++) {
-      hb_font_subtract_glyph_origin_for_direction (c->font, c->buffer->info[i].codepoint,
-						   HB_DIRECTION_LTR,
-						   &c->buffer->pos[i].x_offset,
-						   &c->buffer->pos[i].y_offset);
+      c->font->subtract_glyph_origin_for_direction (c->buffer->info[i].codepoint,
+						    HB_DIRECTION_LTR,
+						    &c->buffer->pos[i].x_offset,
+						    &c->buffer->pos[i].y_offset);
     }
 
-    c->applied_position_complex = TRUE;
-  }
+    c->applied_position_complex = true;
+  } else
+    hb_zero_mark_advances (c);
 
-  hb_ot_layout_position_finish (c->face, c->buffer);
+  hb_ot_layout_position_finish (c->font, c->buffer, c->plan->shaper->zero_width_attached_marks);
 
   return;
 }
 
 static void
-hb_position_complex_fallback (hb_ot_shape_context_t *c)
+hb_position_complex_fallback (hb_ot_shape_context_t *c HB_UNUSED)
 {
   /* TODO Mark pos */
-  unsigned int count = c->buffer->len;
-  const hb_glyph_info_t *info = c->buffer->info;
-  hb_glyph_position_t *positions = c->buffer->pos;
-  if (c->buffer->props.direction == HB_DIRECTION_RTL) {
-    for (unsigned int i = 1; i < count; i++) {
-      if (FLAG (_hb_glyph_info_get_general_category (&info[i])) &
-	  (FLAG (HB_UNICODE_GENERAL_CATEGORY_FORMAT) |
-	   FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
-	   FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))
-        positions[i].x_advance = 0;
-    }
-  } else {
-    for (unsigned int i = 1; i < count; i++) {
-      if (FLAG (_hb_glyph_info_get_general_category (&info[i])) &
-	  (FLAG (HB_UNICODE_GENERAL_CATEGORY_FORMAT) |
-	   FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
-	   FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))) {
-        hb_glyph_position_t& pos = positions[i];
-        pos.x_offset = -pos.x_advance;
-        pos.x_advance = 0;
-      }
-    }
-  }
 }
 
 static void
@@ -371,10 +449,9 @@ hb_truetype_kern (hb_ot_shape_context_t *c)
   unsigned int count = c->buffer->len;
   for (unsigned int i = 1; i < count; i++) {
     hb_position_t x_kern, y_kern, kern1, kern2;
-    hb_font_get_glyph_kerning_for_direction (c->font,
-					     c->buffer->info[i - 1].codepoint, c->buffer->info[i].codepoint,
-					     c->buffer->props.direction,
-					     &x_kern, &y_kern);
+    c->font->get_glyph_kerning_for_direction (c->buffer->info[i - 1].codepoint, c->buffer->info[i].codepoint,
+					      c->buffer->props.direction,
+					      &x_kern, &y_kern);
 
     kern1 = x_kern >> 1;
     kern2 = x_kern - kern1;
@@ -399,14 +476,14 @@ hb_position_complex_fallback_visual (hb_ot_shape_context_t *c)
 static void
 hb_hide_zerowidth (hb_ot_shape_context_t *c)
 {
-  /* TODO Save the space character in the font? */
   hb_codepoint_t space;
-  if (!hb_font_get_glyph (c->font, ' ', 0, &space))
+  if (!c->font->get_glyph (' ', 0, &space))
     return; /* No point! */
 
   unsigned int count = c->buffer->len;
   for (unsigned int i = 0; i < count; i++)
-    if (unlikely (_hb_glyph_info_is_zero_width (&c->buffer->info[i]))) {
+    if (unlikely (!is_a_ligature (c->buffer->info[i]) &&
+		  _hb_glyph_info_is_zero_width (&c->buffer->info[i]))) {
       c->buffer->info[i].codepoint = space;
       c->buffer->pos[i].x_advance = 0;
       c->buffer->pos[i].y_advance = 0;
@@ -417,7 +494,7 @@ hb_hide_zerowidth (hb_ot_shape_context_t *c)
 /* Do it! */
 
 static void
-hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
+hb_ot_shape_internal (hb_ot_shape_context_t *c)
 {
   c->buffer->deallocate_var_all ();
 
@@ -427,13 +504,18 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
   HB_BUFFER_ALLOCATE_VAR (c->buffer, unicode_props0);
   HB_BUFFER_ALLOCATE_VAR (c->buffer, unicode_props1);
 
+  c->buffer->clear_output ();
+
   hb_set_unicode_props (c->buffer);
 
   hb_form_clusters (c->buffer);
 
   hb_ensure_native_direction (c->buffer);
 
-  _hb_ot_shape_normalize (c->font, c->buffer, hb_ot_shape_complex_normalization_preference (c->plan->shaper));
+  _hb_ot_shape_normalize (c->font, c->buffer,
+			  c->plan->shaper->normalization_preference ?
+			  c->plan->shaper->normalization_preference (c->plan) :
+			  HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT);
 
   hb_ot_shape_setup_masks (c);
 
@@ -471,49 +553,18 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
   c->buffer->deallocate_var_all ();
 }
 
-static void
-hb_ot_shape_plan_internal (hb_ot_shape_plan_t       *plan,
-			   hb_face_t                *face,
-			   const hb_segment_properties_t  *props,
-			   const hb_feature_t       *user_features,
-			   unsigned int              num_user_features)
-{
-  hb_ot_shape_planner_t planner;
-
-  assert (HB_DIRECTION_IS_VALID (props->direction));
-
-  planner.shaper = hb_ot_shape_complex_categorize (props);
-
-  hb_ot_shape_collect_features (&planner, props, user_features, num_user_features);
-
-  planner.compile (face, props, *plan);
-}
-
-static void
-hb_ot_shape_execute (hb_ot_shape_plan_t *plan,
-		     hb_font_t          *font,
-		     hb_buffer_t        *buffer,
-		     const hb_feature_t *user_features,
-		     unsigned int        num_user_features)
-{
-  hb_ot_shape_context_t c = {plan, font, font->face, buffer, user_features, num_user_features};
-  hb_ot_shape_execute_internal (&c);
-}
 
 hb_bool_t
-_hb_ot_shape (hb_font_t          *font,
+_hb_ot_shape (hb_shape_plan_t    *shape_plan,
+	      hb_font_t          *font,
 	      hb_buffer_t        *buffer,
 	      const hb_feature_t *features,
 	      unsigned int        num_features)
 {
-  hb_ot_shape_plan_t plan;
+  hb_ot_shape_context_t c = {HB_SHAPER_DATA_GET (shape_plan), font, font->face, buffer, features, num_features};
+  hb_ot_shape_internal (&c);
 
-  buffer->guess_properties ();
-
-  hb_ot_shape_plan_internal (&plan, font->face, &buffer->props, features, num_features);
-  hb_ot_shape_execute (&plan, font, buffer, features, num_features);
-
-  return TRUE;
+  return true;
 }
 
 
@@ -528,7 +579,8 @@ hb_ot_shape_glyphs_closure (hb_font_t          *font,
 
   buffer->guess_properties ();
 
-  hb_ot_shape_plan_internal (&plan, font->face, &buffer->props, features, num_features);
+  /* TODO cache / ensure correct backend, etc. */
+  hb_shape_plan_t *shape_plan = hb_shape_plan_create (font->face, &buffer->props, features, num_features, NULL);
 
   /* TODO: normalization? have shapers do closure()? */
   /* TODO: Deal with mirrored chars? */
@@ -546,6 +598,8 @@ hb_ot_shape_glyphs_closure (hb_font_t          *font,
 
   do {
     copy.set (glyphs);
-    plan.map.substitute_closure (font->face, glyphs);
+    HB_SHAPER_DATA_GET (shape_plan)->substitute_closure (font->face, glyphs);
   } while (!copy.equal (glyphs));
+
+  hb_shape_plan_destroy (shape_plan);
 }
diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh
index aa86072b0f72..2f8502545b17 100644
--- a/gfx/harfbuzz/src/hb-private.hh
+++ b/gfx/harfbuzz/src/hb-private.hh
@@ -61,12 +61,6 @@
 # define NULL ((void *) 0)
 #endif
 
-#undef FALSE
-#define FALSE 0
-
-#undef TRUE
-#define TRUE 1
-
 
 /* Basics */
 
@@ -84,11 +78,11 @@ template <typename Type> static inline Type MAX (const Type &a, const Type &b) {
 #define HB_STMT_START do
 #define HB_STMT_END   while (0)
 
-#define _ASSERT_STATIC1(_line, _cond) typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1]
-#define _ASSERT_STATIC0(_line, _cond) _ASSERT_STATIC1 (_line, (_cond))
-#define ASSERT_STATIC(_cond) _ASSERT_STATIC0 (__LINE__, (_cond))
+#define _ASSERT_STATIC1(_line, _cond)	typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1]
+#define _ASSERT_STATIC0(_line, _cond)	_ASSERT_STATIC1 (_line, (_cond))
+#define ASSERT_STATIC(_cond)		_ASSERT_STATIC0 (__LINE__, (_cond))
 
-#define ASSERT_STATIC_EXPR(_cond) ((void) sizeof (char[(_cond) ? 1 : -1]))
+#define ASSERT_STATIC_EXPR(_cond)((void) sizeof (char[(_cond) ? 1 : -1]))
 #define ASSERT_STATIC_EXPR_ZERO(_cond) (0 * sizeof (char[(_cond) ? 1 : -1]))
 
 #define _PASTE1(a,b) a##b
@@ -110,6 +104,34 @@ ASSERT_STATIC (sizeof (hb_position_t) == 4);
 ASSERT_STATIC (sizeof (hb_mask_t) == 4);
 ASSERT_STATIC (sizeof (hb_var_int_t) == 4);
 
+
+/* We like our types POD */
+
+#define _ASSERT_TYPE_POD1(_line, _type)	union _type_##_type##_on_line_##_line##_is_not_POD { _type instance; }
+#define _ASSERT_TYPE_POD0(_line, _type)	_ASSERT_TYPE_POD1 (_line, _type)
+#define ASSERT_TYPE_POD(_type)		_ASSERT_TYPE_POD0 (__LINE__, _type)
+
+#ifdef __GNUC__
+# define _ASSERT_INSTANCE_POD1(_line, _instance) \
+	HB_STMT_START { \
+		typedef __typeof__(_instance) _type_##_line; \
+		_ASSERT_TYPE_POD1 (_line, _type_##_line); \
+	} HB_STMT_END
+#else
+# define _ASSERT_INSTANCE_POD1(_line, _instance)	typedef int _assertion_on_line_##_line##_not_tested
+#endif
+# define _ASSERT_INSTANCE_POD0(_line, _instance)	_ASSERT_INSTANCE_POD1 (_line, _instance)
+# define ASSERT_INSTANCE_POD(_instance)			_ASSERT_INSTANCE_POD0 (__LINE__, _instance)
+
+/* Check _assertion in a method environment */
+#define _ASSERT_POD1(_line) \
+	inline void _static_assertion_on_line_##_line (void) const \
+	{ _ASSERT_INSTANCE_POD1 (_line, *this); /* Make sure it's POD. */ }
+# define _ASSERT_POD0(_line)	_ASSERT_POD1 (_line)
+# define ASSERT_POD()		_ASSERT_POD0 (__LINE__)
+
+
+
 /* Misc */
 
 
@@ -239,15 +261,16 @@ typedef int (*hb_compare_func_t) (const void *, const void *);
 /* arrays and maps */
 
 
+#define HB_PREALLOCED_ARRAY_INIT {0}
 template <typename Type, unsigned int StaticSize>
-struct hb_prealloced_array_t {
-
+struct hb_prealloced_array_t
+{
   unsigned int len;
   unsigned int allocated;
   Type *array;
   Type static_array[StaticSize];
 
-  hb_prealloced_array_t (void) { memset (this, 0, sizeof (*this)); }
+  void init (void) { memset (this, 0, sizeof (*this)); }
 
   inline Type& operator [] (unsigned int i) { return array[i]; }
   inline const Type& operator [] (unsigned int i) const { return array[i]; }
@@ -342,14 +365,14 @@ struct hb_prealloced_array_t {
   }
 };
 
-template <typename Type>
-struct hb_array_t : hb_prealloced_array_t<Type, 2> {};
-
 
+#define HB_LOCKABLE_SET_INIT {HB_PREALLOCED_ARRAY_INIT}
 template <typename item_t, typename lock_t>
 struct hb_lockable_set_t
 {
-  hb_array_t <item_t> items;
+  hb_prealloced_array_t <item_t, 2> items;
+
+  inline void init (void) { items.init (); }
 
   template <typename T>
   inline item_t *replace_or_insert (T v, lock_t &l, bool replace)
@@ -419,6 +442,11 @@ struct hb_lockable_set_t
 
   inline void finish (lock_t &l)
   {
+    if (!items.len) {
+      /* No need for locking. */
+      items.finish ();
+      return;
+    }
     l.lock ();
     while (items.len) {
       item_t old = items[items.len - 1];
@@ -441,7 +469,17 @@ struct hb_lockable_set_t
 static inline uint16_t hb_be_uint16 (const uint16_t v)
 {
   const uint8_t *V = (const uint8_t *) &v;
-  return (uint16_t) (V[0] << 8) + V[1];
+  return (V[0] << 8) | V[1];
+}
+
+static inline uint16_t hb_uint16_swap (const uint16_t v)
+{
+  return (v >> 8) | (v << 8);
+}
+
+static inline uint32_t hb_uint32_swap (const uint32_t v)
+{
+  return (hb_uint16_swap (v) << 16) | hb_uint16_swap (v >> 16);
 }
 
 /* Note, of the following macros, uint16_get is the one called many many times.
@@ -524,13 +562,20 @@ _hb_debug_msg_va (const char *what,
     fprintf (stderr, " %*s  ", (unsigned int) (2 * sizeof (void *)), "");
 
   if (indented) {
-    static const char bars[] = "││││││││││││││││││││││││││││││││││││││││";
-    fprintf (stderr, "%2d %s├%s",
+/* One may want to add ASCII version of these.  See:
+ * https://bugs.freedesktop.org/show_bug.cgi?id=50970 */
+#define VBAR	"\342\224\202"	/* U+2502 BOX DRAWINGS LIGHT VERTICAL */
+#define VRBAR	"\342\224\234"	/* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+#define DLBAR	"\342\225\256"	/* U+256E BOX DRAWINGS LIGHT ARC DOWN AND LEFT */
+#define ULBAR	"\342\225\257"	/* U+256F BOX DRAWINGS LIGHT ARC UP AND LEFT */
+#define LBAR	"\342\225\264"	/* U+2574 BOX DRAWINGS LIGHT LEFT */
+    static const char bars[] = VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR;
+    fprintf (stderr, "%2d %s" VRBAR "%s",
 	     level,
-	     bars + sizeof (bars) - 1 - MIN ((unsigned int) sizeof (bars), 3 * level),
-	     level_dir ? (level_dir > 0 ? "╮" : "╯") : "╴");
+	     bars + sizeof (bars) - 1 - MIN ((unsigned int) sizeof (bars), (unsigned int) (sizeof (VBAR) - 1) * level),
+	     level_dir ? (level_dir > 0 ? DLBAR : ULBAR) : LBAR);
   } else
-    fprintf (stderr, "   ├╴");
+    fprintf (stderr, "   " VRBAR LBAR);
 
   if (func) {
     /* If there's a class name, just write that. */
@@ -600,9 +645,9 @@ _hb_debug_msg<0> (const char *what HB_UNUSED,
 		  const char *message HB_UNUSED,
 		  ...) {}
 
-#define DEBUG_MSG_LEVEL(WHAT, OBJ, LEVEL, LEVEL_DIR, ...)	_hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL,    TRUE, (LEVEL), (LEVEL_DIR), __VA_ARGS__)
-#define DEBUG_MSG(WHAT, OBJ, ...) 				_hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL,    FALSE, 0, 0, __VA_ARGS__)
-#define DEBUG_MSG_FUNC(WHAT, OBJ, ...)				_hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), HB_FUNC, FALSE, 0, 0, __VA_ARGS__)
+#define DEBUG_MSG_LEVEL(WHAT, OBJ, LEVEL, LEVEL_DIR, ...)	_hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL,    true, (LEVEL), (LEVEL_DIR), __VA_ARGS__)
+#define DEBUG_MSG(WHAT, OBJ, ...) 				_hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL,    false, 0, 0, __VA_ARGS__)
+#define DEBUG_MSG_FUNC(WHAT, OBJ, ...)				_hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), HB_FUNC, false, 0, 0, __VA_ARGS__)
 
 
 /*
@@ -622,28 +667,28 @@ struct hb_auto_trace_t {
 
     va_list ap;
     va_start (ap, message);
-    _hb_debug_msg_va<max_level> (what, obj, func, TRUE, plevel ? *plevel : 0, +1, message, ap);
+    _hb_debug_msg_va<max_level> (what, obj, func, true, plevel ? *plevel : 0, +1, message, ap);
     va_end (ap);
   }
   inline ~hb_auto_trace_t (void)
   {
     if (unlikely (!returned)) {
       fprintf (stderr, "OUCH, returned with no call to TRACE_RETURN.  This is a bug, please report.  Level was %d.\n", plevel ? *plevel : -1);
-      _hb_debug_msg<max_level> (what, obj, NULL, TRUE, plevel ? *plevel : 1, -1, " ");
+      _hb_debug_msg<max_level> (what, obj, NULL, true, plevel ? *plevel : 1, -1, " ");
       return;
     }
 
     if (plevel) --*plevel;
   }
 
-  inline bool ret (bool v)
+  inline bool ret (bool v, unsigned int line = 0)
   {
     if (unlikely (returned)) {
       fprintf (stderr, "OUCH, double calls to TRACE_RETURN.  This is a bug, please report.\n");
       return v;
     }
 
-    _hb_debug_msg<max_level> (what, obj, NULL, TRUE, plevel ? *plevel : 1, -1, "return %s", v ? "true" : "false");
+    _hb_debug_msg<max_level> (what, obj, NULL, true, plevel ? *plevel : 1, -1, "return %s (line %d)", v ? "true" : "false", line);
     if (plevel) --*plevel;
     plevel = NULL;
     returned = true;
@@ -666,10 +711,10 @@ struct hb_auto_trace_t<0> {
 				   ...) {}
 
   template <typename T>
-  inline T ret (T v) { return v; }
+  inline T ret (T v, unsigned int line = 0) { return v; }
 };
 
-#define TRACE_RETURN(RET) trace.ret (RET)
+#define TRACE_RETURN(RET) trace.ret (RET, __LINE__)
 
 /* Misc */
 
@@ -678,7 +723,7 @@ struct hb_auto_trace_t<0> {
  * Checks for lo <= u <= hi but with an optimization if lo and hi
  * are only different in a contiguous set of lower-most bits.
  */
-template <typename T> inline bool
+template <typename T> static inline bool
 hb_in_range (T u, T lo, T hi)
 {
   if ( ((lo^hi) & lo) == 0 &&
@@ -689,16 +734,23 @@ hb_in_range (T u, T lo, T hi)
     return lo <= u && u <= hi;
 }
 
+template <typename T> static inline bool
+hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3)
+{
+  return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2) || hb_in_range (u, lo3, hi3);
+}
+
 
 /* Useful for set-operations on small enums.
  * For example, for testing "x ∈ {x1, x2, x3}" use:
  * (FLAG(x) & (FLAG(x1) | FLAG(x2) | FLAG(x3)))
  */
 #define FLAG(x) (1<<(x))
+#define FLAG_RANGE(x,y) (ASSERT_STATIC_EXPR_ZERO ((x) < (y)) + FLAG(y+1) - FLAG(x))
 
 
-template <typename T> inline void
-hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *))
+template <typename T, typename T2> inline void
+hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *), T2 *array2)
 {
   if (unlikely (!len))
     return;
@@ -708,11 +760,21 @@ hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *))
     unsigned int new_k = 0;
 
     for (unsigned int j = 0; j < k; j++)
-      if (compar (&array[j], &array[j+1]) > 0) {
-        T t;
-	t = array[j];
-	array[j] = array[j + 1];
-	array[j + 1] = t;
+      if (compar (&array[j], &array[j+1]) > 0)
+      {
+        {
+	  T t;
+	  t = array[j];
+	  array[j] = array[j + 1];
+	  array[j + 1] = t;
+	}
+        if (array2)
+        {
+	  T2 t;
+	  t = array2[j];
+	  array2[j] = array2[j + 1];
+	  array2[j + 1] = t;
+	}
 
 	new_k = j;
       }
@@ -720,6 +782,11 @@ hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *))
   } while (k);
 }
 
+template <typename T> inline void
+hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *))
+{
+  hb_bubble_sort (array, len, compar, (int *) NULL);
+}
 
 
 
diff --git a/gfx/harfbuzz/src/hb-set-private.hh b/gfx/harfbuzz/src/hb-set-private.hh
index 9d8ba4a5a4bc..550b7f214972 100644
--- a/gfx/harfbuzz/src/hb-set-private.hh
+++ b/gfx/harfbuzz/src/hb-set-private.hh
@@ -32,11 +32,110 @@
 #include "hb-object-private.hh"
 
 
+struct hb_set_digest_common_bits_t
+{
+  ASSERT_POD ();
+
+  typedef unsigned int mask_t;
+
+  inline void init (void) {
+    mask = ~0;
+    value = (mask_t) -1;
+  }
+
+  inline void add (hb_codepoint_t g) {
+    if (unlikely (value == (mask_t) -1)) {
+      value = g;
+      return;
+    }
+
+    mask ^= (g & mask) ^ value;
+    value &= mask;
+  }
+
+  inline void add_range (hb_codepoint_t a, hb_codepoint_t b) {
+    /* TODO Speedup. */
+    for (unsigned int i = a; i < b + 1; i++)
+      add (i);
+  }
+
+  inline bool may_have (hb_codepoint_t g) const {
+    return (g & mask) == value;
+  }
+
+  private:
+  mask_t mask;
+  mask_t value;
+};
+
+struct hb_set_digest_lowest_bits_t
+{
+  ASSERT_POD ();
+
+  typedef unsigned long mask_t;
+
+  inline void init (void) {
+    mask = 0;
+  }
+
+  inline void add (hb_codepoint_t g) {
+    mask |= mask_for (g);
+  }
+
+  inline void add_range (hb_codepoint_t a, hb_codepoint_t b) {
+    /* TODO Speedup. */
+    for (unsigned int i = a; i < b + 1; i++)
+      add (i);
+  }
+
+  inline bool may_have (hb_codepoint_t g) const {
+    return !!(mask & mask_for (g));
+  }
+
+  private:
+
+  mask_t mask_for (hb_codepoint_t g) const { return ((mask_t) 1) << (g & (sizeof (mask_t) * 8 - 1)); }
+  mask_t mask;
+};
+
+struct hb_set_digest_t
+{
+  ASSERT_POD ();
+
+  inline void init (void) {
+    digest1.init ();
+    digest2.init ();
+  }
+
+  inline void add (hb_codepoint_t g) {
+    digest1.add (g);
+    digest2.add (g);
+  }
+
+  inline void add_range (hb_codepoint_t a, hb_codepoint_t b) {
+    digest1.add_range (a, b);
+    digest2.add_range (a, b);
+  }
+
+  inline bool may_have (hb_codepoint_t g) const {
+    return digest1.may_have (g) && digest2.may_have (g);
+  }
+
+  private:
+  hb_set_digest_common_bits_t digest1;
+  hb_set_digest_lowest_bits_t digest2;
+};
+
+
 /* TODO Make this faster and memmory efficient. */
 
-struct _hb_set_t
+struct hb_set_t
 {
+  hb_object_header_t header;
+  ASSERT_POD ();
+
   inline void init (void) {
+    header.init ();
     clear ();
   }
   inline void fini (void) {
@@ -56,6 +155,11 @@ struct _hb_set_t
     if (unlikely (g > MAX_G)) return;
     elt (g) |= mask (g);
   }
+  inline void add_range (hb_codepoint_t a, hb_codepoint_t b)
+  {
+    for (unsigned int i = a; i < b + 1; i++)
+      add (i);
+  }
   inline void del (hb_codepoint_t g)
   {
     if (unlikely (g > MAX_G)) return;
@@ -157,7 +261,6 @@ struct _hb_set_t
   elt_t elt (hb_codepoint_t g) const { return elts[g >> SHIFT]; }
   elt_t mask (hb_codepoint_t g) const { return elt_t (1) << (g & MASK); }
 
-  hb_object_header_t header;
   elt_t elts[ELTS]; /* XXX 8kb */
 
   ASSERT_STATIC (sizeof (elt_t) * 8 == BITS);
diff --git a/gfx/harfbuzz/src/hb-set.cc b/gfx/harfbuzz/src/hb-set.cc
index 504538602acd..4225e3c98c92 100644
--- a/gfx/harfbuzz/src/hb-set.cc
+++ b/gfx/harfbuzz/src/hb-set.cc
@@ -30,12 +30,6 @@
 
 /* Public API */
 
-static hb_set_t _hb_set_nil = {
-  HB_OBJECT_HEADER_STATIC,
-
-  {0} /* elts */
-};
-
 
 hb_set_t *
 hb_set_create ()
@@ -43,7 +37,7 @@ hb_set_create ()
   hb_set_t *set;
 
   if (!(set = hb_object_create<hb_set_t> ()))
-    return &_hb_set_nil;
+    return hb_set_get_empty ();
 
   set->clear ();
 
@@ -53,7 +47,13 @@ hb_set_create ()
 hb_set_t *
 hb_set_get_empty (void)
 {
-  return &_hb_set_nil;
+  static const hb_set_t _hb_set_nil = {
+    HB_OBJECT_HEADER_STATIC,
+
+    {0} /* elts */
+  };
+
+  return const_cast<hb_set_t *> (&_hb_set_nil);
 }
 
 hb_set_t *
@@ -93,7 +93,7 @@ hb_set_get_user_data (hb_set_t        *set,
 hb_bool_t
 hb_set_allocation_successful (hb_set_t  *set HB_UNUSED)
 {
-  return TRUE;
+  return true;
 }
 
 void
diff --git a/gfx/harfbuzz/src/hb-set.h b/gfx/harfbuzz/src/hb-set.h
index 97e68e48e0d4..1838889f21be 100644
--- a/gfx/harfbuzz/src/hb-set.h
+++ b/gfx/harfbuzz/src/hb-set.h
@@ -36,7 +36,7 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_set_t hb_set_t;
+typedef struct hb_set_t hb_set_t;
 
 
 hb_set_t *
@@ -63,7 +63,7 @@ hb_set_get_user_data (hb_set_t           *set,
 		      hb_user_data_key_t *key);
 
 
-/* Returns FALSE if allocation has failed before */
+/* Returns false if allocation has failed before */
 hb_bool_t
 hb_set_allocation_successful (hb_set_t  *set);
 
diff --git a/gfx/harfbuzz/src/hb-shape-plan-private.hh b/gfx/harfbuzz/src/hb-shape-plan-private.hh
new file mode 100644
index 000000000000..d6a57d6ca5ac
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shape-plan-private.hh
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_SHAPE_PLAN_PRIVATE_HH
+#define HB_SHAPE_PLAN_PRIVATE_HH
+
+#include "hb-private.hh"
+
+#include "hb-shape-plan.h"
+
+#include "hb-shaper-private.hh"
+
+
+struct hb_shape_plan_t
+{
+  hb_object_header_t header;
+  ASSERT_POD ();
+
+  hb_bool_t default_shaper_list;
+  hb_face_t *face;
+  hb_segment_properties_t props;
+
+  hb_shape_func_t *shaper_func;
+
+  struct hb_shaper_data_t shaper_data;
+};
+
+#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS \
+	, const hb_feature_t            *user_features \
+	, unsigned int                   num_user_features
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, shape_plan);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
+
+
+#endif /* HB_SHAPE_PLAN_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-shape-plan.cc b/gfx/harfbuzz/src/hb-shape-plan.cc
new file mode 100644
index 000000000000..ddfb5016863b
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shape-plan.cc
@@ -0,0 +1,285 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "hb-private.hh"
+
+#include "hb-shape-plan-private.hh"
+#include "hb-shaper-private.hh"
+#include "hb-font-private.hh"
+
+#define HB_SHAPER_IMPLEMENT(shaper) \
+	HB_SHAPER_DATA_ENSURE_DECLARE(shaper, face) \
+	HB_SHAPER_DATA_ENSURE_DECLARE(shaper, font)
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+
+void
+hb_shape_plan_plan (hb_shape_plan_t    *shape_plan,
+		    const hb_feature_t *user_features,
+		    unsigned int        num_user_features,
+		    const char * const *shaper_list)
+{
+  const hb_shaper_pair_t *shapers = _hb_shapers_get ();
+
+#define HB_SHAPER_PLAN(shaper) \
+	HB_STMT_START { \
+	  if (hb_##shaper##_shaper_face_data_ensure (shape_plan->face)) { \
+	    HB_SHAPER_DATA (shaper, shape_plan) = \
+	      HB_SHAPER_DATA_CREATE_FUNC (shaper, shape_plan) (shape_plan, user_features, num_user_features); \
+	    shape_plan->shaper_func = _hb_##shaper##_shape; \
+	    return; \
+	  } \
+	} HB_STMT_END
+
+  if (likely (!shaper_list)) {
+    for (unsigned int i = 0; i < HB_SHAPERS_COUNT; i++)
+      if (0)
+	;
+#define HB_SHAPER_IMPLEMENT(shaper) \
+      else if (shapers[i].func == _hb_##shaper##_shape) \
+	HB_SHAPER_PLAN (shaper);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+  } else {
+    for (; *shaper_list; shaper_list++)
+      if (0)
+	;
+#define HB_SHAPER_IMPLEMENT(shaper) \
+      else if (0 == strcmp (*shaper_list, #shaper)) \
+	HB_SHAPER_PLAN (shaper);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+  }
+
+#undef HB_SHAPER_PLAN
+}
+
+
+/*
+ * hb_shape_plan_t
+ */
+
+hb_shape_plan_t *
+hb_shape_plan_create (hb_face_t                     *face,
+		      const hb_segment_properties_t *props,
+		      const hb_feature_t            *user_features,
+		      unsigned int                   num_user_features,
+		      const char * const            *shaper_list)
+{
+  assert (props->direction != HB_DIRECTION_INVALID);
+
+  hb_shape_plan_t *shape_plan;
+
+  if (unlikely (!face))
+    face = hb_face_get_empty ();
+  if (unlikely (!props || hb_object_is_inert (face)))
+    return hb_shape_plan_get_empty ();
+  if (!(shape_plan = hb_object_create<hb_shape_plan_t> ()))
+    return hb_shape_plan_get_empty ();
+
+  hb_face_make_immutable (face);
+  shape_plan->default_shaper_list = shaper_list == NULL;
+  shape_plan->face = hb_face_reference (face);
+  shape_plan->props = *props;
+
+  hb_shape_plan_plan (shape_plan, user_features, num_user_features, shaper_list);
+
+  return shape_plan;
+}
+
+hb_shape_plan_t *
+hb_shape_plan_get_empty (void)
+{
+  static const hb_shape_plan_t _hb_shape_plan_nil = {
+    HB_OBJECT_HEADER_STATIC,
+
+    true, /* default_shaper_list */
+    NULL, /* face */
+    _HB_BUFFER_PROPS_DEFAULT, /* props */
+
+    NULL, /* shaper_func */
+
+    {
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID,
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+    }
+  };
+
+  return const_cast<hb_shape_plan_t *> (&_hb_shape_plan_nil);
+}
+
+hb_shape_plan_t *
+hb_shape_plan_reference (hb_shape_plan_t *shape_plan)
+{
+  return hb_object_reference (shape_plan);
+}
+
+void
+hb_shape_plan_destroy (hb_shape_plan_t *shape_plan)
+{
+  if (!hb_object_destroy (shape_plan)) return;
+
+#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, shape_plan);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+  hb_face_destroy (shape_plan->face);
+
+  free (shape_plan);
+}
+
+
+hb_bool_t
+hb_shape_plan_execute (hb_shape_plan      *shape_plan,
+		       hb_font_t          *font,
+		       hb_buffer_t        *buffer,
+		       const hb_feature_t *features,
+		       unsigned int        num_features)
+{
+  if (unlikely (shape_plan->face != font->face))
+    return false;
+
+#define HB_SHAPER_EXECUTE(shaper) \
+	HB_STMT_START { \
+	  return HB_SHAPER_DATA (shaper, shape_plan) && \
+		 hb_##shaper##_shaper_font_data_ensure (font) && \
+		 _hb_##shaper##_shape (shape_plan, font, buffer, features, num_features); \
+	} HB_STMT_END
+
+  if (0)
+    ;
+#define HB_SHAPER_IMPLEMENT(shaper) \
+  else if (shape_plan->shaper_func == _hb_##shaper##_shape) \
+    HB_SHAPER_EXECUTE (shaper);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+#undef HB_SHAPER_EXECUTE
+
+  return false;
+}
+
+
+/*
+ * caching
+ */
+
+#if 0
+static long
+hb_shape_plan_hash (const hb_shape_plan_t *shape_plan)
+{
+  return hb_segment_properties_hash (&shape_plan->props) +
+	 shape_plan->default_shaper_list ? 0 : (long) shape_plan->shaper_func;
+}
+#endif
+
+/* TODO no user-feature caching for now. */
+struct hb_shape_plan_proposal_t
+{
+  const hb_segment_properties_t  props;
+  const char * const            *shaper_list;
+  hb_shape_func_t               *shaper_func;
+};
+
+static hb_bool_t
+hb_shape_plan_matches (const hb_shape_plan_t          *shape_plan,
+		       const hb_shape_plan_proposal_t *proposal)
+{
+  return hb_segment_properties_equal (&shape_plan->props, &proposal->props) &&
+	 ((shape_plan->default_shaper_list && proposal->shaper_list == NULL) ||
+	  (shape_plan->shaper_func == proposal->shaper_func));
+}
+
+hb_shape_plan_t *
+hb_shape_plan_create_cached (hb_face_t                     *face,
+			     const hb_segment_properties_t *props,
+			     const hb_feature_t            *user_features,
+			     unsigned int                   num_user_features,
+			     const char * const            *shaper_list)
+{
+  if (num_user_features)
+    return hb_shape_plan_create (face, props, user_features, num_user_features, shaper_list);
+
+  hb_shape_plan_proposal_t proposal = {
+    *props,
+    shaper_list,
+    NULL
+  };
+
+  if (shaper_list) {
+    /* Choose shaper.  Adapted from hb_shape_plan_plan(). */
+#define HB_SHAPER_PLAN(shaper) \
+	  HB_STMT_START { \
+	    if (hb_##shaper##_shaper_face_data_ensure (face)) \
+	      proposal.shaper_func = _hb_##shaper##_shape; \
+	  } HB_STMT_END
+
+    for (const char * const *shaper_item = shaper_list; *shaper_item; shaper_item++)
+      if (0)
+	;
+#define HB_SHAPER_IMPLEMENT(shaper) \
+      else if (0 == strcmp (*shaper_item, #shaper)) \
+	HB_SHAPER_PLAN (shaper);
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+#undef HB_SHAPER_PLAN
+
+    if (unlikely (!proposal.shaper_list))
+      return hb_shape_plan_get_empty ();
+  }
+
+
+retry:
+  hb_face_t::plan_node_t *cached_plan_nodes = (hb_face_t::plan_node_t *) hb_atomic_ptr_get (&face->shape_plans);
+  for (hb_face_t::plan_node_t *node = cached_plan_nodes; node; node = node->next)
+    if (hb_shape_plan_matches (node->shape_plan, &proposal))
+      return hb_shape_plan_reference (node->shape_plan);
+
+  /* Not found. */
+
+  hb_shape_plan_t *shape_plan = hb_shape_plan_create (face, props, user_features, num_user_features, shaper_list);
+
+  hb_face_t::plan_node_t *node = (hb_face_t::plan_node_t *) calloc (1, sizeof (hb_face_t::plan_node_t));
+  if (unlikely (!node))
+    return shape_plan;
+
+  node->shape_plan = shape_plan;
+  node->next = cached_plan_nodes;
+
+  if (!hb_atomic_ptr_cmpexch (&face->shape_plans, cached_plan_nodes, node)) {
+    hb_shape_plan_destroy (shape_plan);
+    free (node);
+    goto retry;
+  }
+
+  /* Release our reference on face. */
+  hb_face_destroy (face);
+
+  return hb_shape_plan_reference (shape_plan);
+}
diff --git a/gfx/harfbuzz/src/hb-shape-plan.h b/gfx/harfbuzz/src/hb-shape-plan.h
new file mode 100644
index 000000000000..fbce5ddfa71a
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shape-plan.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_SHAPE_PLAN_H
+#define HB_SHAPE_PLAN_H
+
+/* TODO To become public one day */
+
+#include "hb-private.hh"
+
+#include "hb-buffer-private.hh"
+
+
+typedef struct hb_shape_plan_t hb_shape_plan;
+
+/*
+ * hb_shape_plan_t
+ */
+
+HB_INTERNAL hb_shape_plan_t *
+hb_shape_plan_create (hb_face_t                     *face,
+		      const hb_segment_properties_t *props,
+		      const hb_feature_t            *user_features,
+		      unsigned int                   num_user_features,
+		      const char * const            *shaper_list);
+
+hb_shape_plan_t *
+hb_shape_plan_create_cached (hb_face_t                     *face,
+			     const hb_segment_properties_t *props,
+			     const hb_feature_t            *user_features,
+			     unsigned int                   num_user_features,
+			     const char * const            *shaper_list);
+
+HB_INTERNAL hb_shape_plan_t *
+hb_shape_plan_get_empty (void);
+
+HB_INTERNAL hb_shape_plan_t *
+hb_shape_plan_reference (hb_shape_plan_t *shape_plan);
+
+HB_INTERNAL void
+hb_shape_plan_destroy (hb_shape_plan_t *shape_plan);
+
+
+HB_INTERNAL hb_bool_t
+hb_shape_plan_execute (hb_shape_plan      *shape_plan,
+		       hb_font_t          *font,
+		       hb_buffer_t        *buffer,
+		       const hb_feature_t *features,
+		       unsigned int        num_features);
+
+
+#endif /* HB_SHAPE_PLAN_H */
diff --git a/gfx/harfbuzz/src/hb-shape.cc b/gfx/harfbuzz/src/hb-shape.cc
index d97028e71dee..5aa587bc35f3 100644
--- a/gfx/harfbuzz/src/hb-shape.cc
+++ b/gfx/harfbuzz/src/hb-shape.cc
@@ -26,94 +26,55 @@
 
 #include "hb-private.hh"
 
-#include "hb-shape.h"
-
+#include "hb-shaper-private.hh"
+#include "hb-shape-plan-private.hh"
 #include "hb-buffer-private.hh"
+#include "hb-font-private.hh"
 
-#ifdef HAVE_GRAPHITE
-#include "hb-graphite2-private.hh"
-#endif
-#ifdef HAVE_UNISCRIBE
-# include "hb-uniscribe-private.hh"
-#endif
-#ifdef HAVE_OT
-# include "hb-ot-shape-private.hh"
-#endif
-#include "hb-fallback-shape-private.hh"
 
-typedef hb_bool_t (*hb_shape_func_t) (hb_font_t          *font,
-				      hb_buffer_t        *buffer,
-				      const hb_feature_t *features,
-				      unsigned int        num_features);
+static const char **static_shaper_list;
 
-#define HB_SHAPER_IMPLEMENT(name) {#name, _hb_##name##_shape}
-static struct hb_shaper_pair_t {
-  char name[16];
-  hb_shape_func_t func;
-} shapers[] = {
-  /* v--- Add new shapers in the right place here */
-#ifdef HAVE_GRAPHITE
-  HB_SHAPER_IMPLEMENT (graphite2),
-#endif
-#ifdef HAVE_UNISCRIBE
-  HB_SHAPER_IMPLEMENT (uniscribe),
-#endif
-#ifdef HAVE_OT
-  HB_SHAPER_IMPLEMENT (ot),
-#endif
-  HB_SHAPER_IMPLEMENT (fallback) /* should be last */
-};
-#undef HB_SHAPER_IMPLEMENT
-
-static struct static_shaper_list_t
+static
+void free_static_shaper_list (void)
 {
-  static_shaper_list_t (void)
-  {
-    char *env = getenv ("HB_SHAPER_LIST");
-    if (env && *env)
-    {
-       /* Reorder shaper list to prefer requested shaper list. */
-      unsigned int i = 0;
-      char *end, *p = env;
-      for (;;) {
-        end = strchr (p, ',');
-        if (!end)
-          end = p + strlen (p);
-
-	for (unsigned int j = i; j < ARRAY_LENGTH (shapers); j++)
-	  if (end - p == (int) strlen (shapers[j].name) &&
-	      0 == strncmp (shapers[j].name, p, end - p))
-	  {
-	    /* Reorder this shaper to position i */
-	   struct hb_shaper_pair_t t = shapers[j];
-	   memmove (&shapers[i + 1], &shapers[i], sizeof (shapers[i]) * (j - i));
-	   shapers[i] = t;
-	   i++;
-	  }
-
-        if (!*end)
-          break;
-        else
-          p = end + 1;
-      }
-    }
-
-    ASSERT_STATIC ((ARRAY_LENGTH (shapers) + 1) * sizeof (*shaper_list) <= sizeof (shaper_list));
-    unsigned int i;
-    for (i = 0; i < ARRAY_LENGTH (shapers); i++)
-      shaper_list[i] = shapers[i].name;
-    shaper_list[i] = NULL;
-  }
-
-  const char *shaper_list[ARRAY_LENGTH (shapers) + 1];
-} static_shaper_list;
+  free (static_shaper_list);
+}
 
 const char **
 hb_shape_list_shapers (void)
 {
-  return static_shaper_list.shaper_list;
+retry:
+  const char **shaper_list = (const char **) hb_atomic_ptr_get (&static_shaper_list);
+
+  if (unlikely (!shaper_list))
+  {
+    /* Not found; allocate one. */
+    shaper_list = (const char **) calloc (1 + HB_SHAPERS_COUNT, sizeof (const char *));
+    if (unlikely (!shaper_list)) {
+      static const char *nil_shaper_list[] = {NULL};
+      return nil_shaper_list;
+    }
+
+    const hb_shaper_pair_t *shapers = _hb_shapers_get ();
+    unsigned int i;
+    for (i = 0; i < HB_SHAPERS_COUNT; i++)
+      shaper_list[i] = shapers[i].name;
+    shaper_list[i] = NULL;
+
+    if (!hb_atomic_ptr_cmpexch (&static_shaper_list, NULL, shaper_list)) {
+      free (shaper_list);
+      goto retry;
+    }
+
+#ifdef HAVE_ATEXIT
+    atexit (free_static_shaper_list); /* First person registers atexit() callback. */
+#endif
+  }
+
+  return shaper_list;
 }
 
+
 hb_bool_t
 hb_shape_full (hb_font_t          *font,
 	       hb_buffer_t        *buffer,
@@ -121,24 +82,15 @@ hb_shape_full (hb_font_t          *font,
 	       unsigned int        num_features,
 	       const char * const *shaper_list)
 {
-  hb_font_make_immutable (font); /* So we can safely cache stuff on it */
+  if (unlikely (!buffer->len))
+    return true;
 
-  if (likely (!shaper_list)) {
-    for (unsigned int i = 0; i < ARRAY_LENGTH (shapers); i++)
-      if (likely (shapers[i].func (font, buffer, features, num_features)))
-        return TRUE;
-  } else {
-    while (*shaper_list) {
-      for (unsigned int i = 0; i < ARRAY_LENGTH (shapers); i++)
-	if (0 == strcmp (*shaper_list, shapers[i].name)) {
-	  if (likely (shapers[i].func (font, buffer, features, num_features)))
-	    return TRUE;
-	  break;
-	}
-      shaper_list++;
-    }
-  }
-  return FALSE;
+  buffer->guess_properties ();
+
+  hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, features, num_features, shaper_list);
+  hb_bool_t res = hb_shape_plan_execute (shape_plan, font, buffer, features, num_features);
+  hb_shape_plan_destroy (shape_plan);
+  return res;
 }
 
 void
diff --git a/gfx/harfbuzz/src/hb-shape.h b/gfx/harfbuzz/src/hb-shape.h
index 1a0d6cf6184b..84bf3e76e4de 100644
--- a/gfx/harfbuzz/src/hb-shape.h
+++ b/gfx/harfbuzz/src/hb-shape.h
@@ -38,7 +38,7 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_feature_t {
+typedef struct hb_feature_t {
   hb_tag_t      tag;
   uint32_t      value;
   unsigned int  start;
diff --git a/gfx/harfbuzz/src/hb-shaper-impl-private.hh b/gfx/harfbuzz/src/hb-shaper-impl-private.hh
new file mode 100644
index 000000000000..7844081e95be
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shaper-impl-private.hh
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_SHAPER_IMPL_PRIVATE_HH
+#define HB_SHAPER_IMPL_PRIVATE_HH
+
+#include "hb-private.hh"
+
+#include "hb-shaper-private.hh"
+#include "hb-shape-plan-private.hh"
+#include "hb-font-private.hh"
+#include "hb-buffer-private.hh"
+
+
+#ifdef HB_SHAPER
+#define HB_SHAPER_DATA_GET(object) HB_SHAPER_DATA (HB_SHAPER, object)
+#endif
+
+
+#endif /* HB_SHAPER_IMPL_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-shaper-list.hh b/gfx/harfbuzz/src/hb-shaper-list.hh
new file mode 100644
index 000000000000..ff1fdfd1aa53
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shaper-list.hh
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_SHAPER_LIST_HH
+#define HB_SHAPER_LIST_HH
+#endif /* HB_SHAPER_LIST_HH */ /* Dummy header guards */
+
+/* v--- Add new shapers in the right place here. */
+#ifdef HAVE_GRAPHITE
+HB_SHAPER_IMPLEMENT (graphite2)
+#endif
+#ifdef HAVE_UNISCRIBE
+HB_SHAPER_IMPLEMENT (uniscribe)
+#endif
+#ifdef HAVE_CORETEXT
+HB_SHAPER_IMPLEMENT (coretext)
+#endif
+
+#ifdef HAVE_OT
+HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */
+#endif
+
+#ifdef HAVE_HB_OLD
+HB_SHAPER_IMPLEMENT (old)
+#endif
+
+HB_SHAPER_IMPLEMENT (fallback) /* <--- This should be last. */
diff --git a/gfx/harfbuzz/src/hb-shaper-private.hh b/gfx/harfbuzz/src/hb-shaper-private.hh
new file mode 100644
index 000000000000..186318da08ac
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shaper-private.hh
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_SHAPER_PRIVATE_HH
+#define HB_SHAPER_PRIVATE_HH
+
+#include "hb-private.hh"
+
+#include "hb-shape-plan.h" /* TODO remove */
+
+typedef hb_bool_t hb_shape_func_t (hb_shape_plan_t    *shape_plan,
+				   hb_font_t          *font,
+				   hb_buffer_t        *buffer,
+				   const hb_feature_t *features,
+				   unsigned int        num_features);
+
+#define HB_SHAPER_IMPLEMENT(name) \
+	extern "C" HB_INTERNAL hb_shape_func_t _hb_##name##_shape;
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+struct hb_shaper_pair_t {
+  char name[16];
+  hb_shape_func_t *func;
+};
+
+HB_INTERNAL const hb_shaper_pair_t *
+_hb_shapers_get (void);
+
+
+/* For embedding in face / font / ... */
+struct hb_shaper_data_t {
+#define HB_SHAPER_IMPLEMENT(shaper) void *shaper;
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+};
+
+#define HB_SHAPERS_COUNT (sizeof (hb_shaper_data_t) / sizeof (void *))
+
+/* Means: succeeded, but don't need to keep any data. */
+#define HB_SHAPER_DATA_SUCCEEDED ((void *) +1)
+
+/* Means: tried but failed to create. */
+#define HB_SHAPER_DATA_INVALID ((void *) -1)
+#define HB_SHAPER_DATA_IS_INVALID(data) ((void *) (data) == HB_SHAPER_DATA_INVALID)
+
+#define HB_SHAPER_DATA_TYPE(shaper, object)		struct hb_##shaper##_shaper_##object##_data_t
+#define HB_SHAPER_DATA_INSTANCE(shaper, object, instance)	(* (HB_SHAPER_DATA_TYPE(shaper, object) **) &(instance)->shaper_data.shaper)
+#define HB_SHAPER_DATA(shaper, object)			HB_SHAPER_DATA_INSTANCE (shaper, object, object)
+#define HB_SHAPER_DATA_CREATE_FUNC(shaper, object)	_hb_##shaper##_shaper_##object##_data_create
+#define HB_SHAPER_DATA_DESTROY_FUNC(shaper, object)	_hb_##shaper##_shaper_##object##_data_destroy
+
+#define HB_SHAPER_DATA_PROTOTYPE(shaper, object) \
+	HB_SHAPER_DATA_TYPE (shaper, object); /* Type forward declaration. */ \
+	extern "C" HB_INTERNAL HB_SHAPER_DATA_TYPE (shaper, object) * \
+	HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (hb_##object##_t *object HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS); \
+	extern "C" HB_INTERNAL void \
+	HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA_TYPE (shaper, object) *data)
+
+#define HB_SHAPER_DATA_DESTROY(shaper, object) \
+	if (object->shaper_data.shaper && \
+	    object->shaper_data.shaper != HB_SHAPER_DATA_INVALID && \
+	    object->shaper_data.shaper != HB_SHAPER_DATA_SUCCEEDED) \
+	  HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA (shaper, object));
+
+#define HB_SHAPER_DATA_ENSURE_DECLARE(shaper, object) \
+static inline bool \
+hb_##shaper##_shaper_##object##_data_ensure (hb_##object##_t *object) \
+{\
+  retry: \
+  HB_SHAPER_DATA_TYPE (shaper, object) *data = (HB_SHAPER_DATA_TYPE (shaper, object) *) hb_atomic_ptr_get (&HB_SHAPER_DATA (shaper, object)); \
+  if (unlikely (!data)) { \
+    data = HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (object); \
+    if (unlikely (!data)) \
+      data = (HB_SHAPER_DATA_TYPE (shaper, object) *) HB_SHAPER_DATA_INVALID; \
+    if (!hb_atomic_ptr_cmpexch (&HB_SHAPER_DATA (shaper, object), NULL, data)) { \
+      HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (data); \
+      goto retry; \
+    } \
+  } \
+  return data != NULL && !HB_SHAPER_DATA_IS_INVALID (data); \
+}
+
+
+#endif /* HB_SHAPER_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-shaper.cc b/gfx/harfbuzz/src/hb-shaper.cc
new file mode 100644
index 000000000000..a16ffc849af6
--- /dev/null
+++ b/gfx/harfbuzz/src/hb-shaper.cc
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2012  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "hb-private.hh"
+
+#include "hb-shaper-private.hh"
+
+
+static const hb_shaper_pair_t all_shapers[] = {
+#define HB_SHAPER_IMPLEMENT(name) {#name, _hb_##name##_shape},
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+};
+
+
+/* Thread-safe, lock-free, shapers */
+
+static const hb_shaper_pair_t *static_shapers;
+
+static
+void free_static_shapers (void)
+{
+  if (unlikely (static_shapers != all_shapers))
+    free ((void *) static_shapers);
+}
+
+const hb_shaper_pair_t *
+_hb_shapers_get (void)
+{
+retry:
+  hb_shaper_pair_t *shapers = (hb_shaper_pair_t *) hb_atomic_ptr_get (&static_shapers);
+
+  if (unlikely (!shapers))
+  {
+    char *env = getenv ("HB_SHAPER_LIST");
+    if (!env || !*env) {
+      (void) hb_atomic_ptr_cmpexch (&static_shapers, NULL, &all_shapers[0]);
+      return (const hb_shaper_pair_t *) all_shapers;
+    }
+
+    /* Not found; allocate one. */
+    shapers = (hb_shaper_pair_t *) malloc (sizeof (all_shapers));
+    if (unlikely (!shapers)) {
+      (void) hb_atomic_ptr_cmpexch (&static_shapers, NULL, &all_shapers[0]);
+      return (const hb_shaper_pair_t *) all_shapers;
+    }
+
+    memcpy (shapers, all_shapers, sizeof (all_shapers));
+
+     /* Reorder shaper list to prefer requested shapers. */
+    unsigned int i = 0;
+    char *end, *p = env;
+    for (;;) {
+      end = strchr (p, ',');
+      if (!end)
+	end = p + strlen (p);
+
+      for (unsigned int j = i; j < ARRAY_LENGTH (all_shapers); j++)
+	if (end - p == (int) strlen (shapers[j].name) &&
+	    0 == strncmp (shapers[j].name, p, end - p))
+	{
+	  /* Reorder this shaper to position i */
+	 struct hb_shaper_pair_t t = shapers[j];
+	 memmove (&shapers[i + 1], &shapers[i], sizeof (shapers[i]) * (j - i));
+	 shapers[i] = t;
+	 i++;
+	}
+
+      if (!*end)
+	break;
+      else
+	p = end + 1;
+    }
+
+    if (!hb_atomic_ptr_cmpexch (&static_shapers, NULL, shapers)) {
+      free (shapers);
+      goto retry;
+    }
+
+#ifdef HAVE_ATEXIT
+    atexit (free_static_shapers); /* First person registers atexit() callback. */
+#endif
+  }
+
+  return shapers;
+}
diff --git a/gfx/harfbuzz/src/hb-tt-font.cc b/gfx/harfbuzz/src/hb-tt-font.cc
index b2f24f6e892a..0055ae9cd53e 100644
--- a/gfx/harfbuzz/src/hb-tt-font.cc
+++ b/gfx/harfbuzz/src/hb-tt-font.cc
@@ -88,7 +88,7 @@ hb_font_get_glyph_nil (hb_font_t *font HB_UNUSED,
     return hb_font_get_glyph (font->parent, unicode, variation_selector, glyph);
 
   *glyph = 0;
-  return FALSE;
+  return false;
 }
 
 static hb_position_t
@@ -133,7 +133,7 @@ hb_font_get_glyph_h_origin_nil (hb_font_t *font HB_UNUSED,
   }
 
   *x = *y = 0;
-  return FALSE;
+  return false;
 }
 
 static hb_bool_t
@@ -154,7 +154,7 @@ hb_font_get_glyph_v_origin_nil (hb_font_t *font HB_UNUSED,
   }
 
   *x = *y = 0;
-  return FALSE;
+  return false;
 }
 
 static hb_position_t
@@ -202,7 +202,7 @@ hb_font_get_glyph_extents_nil (hb_font_t *font HB_UNUSED,
   }
 
   memset (extents, 0, sizeof (*extents));
-  return FALSE;
+  return false;
 }
 
 static hb_bool_t
@@ -224,14 +224,14 @@ hb_font_get_glyph_contour_point_nil (hb_font_t *font HB_UNUSED,
   }
 
   *x = *y = 0;
-  return FALSE;
+  return false;
 }
 
 
 static hb_font_funcs_t _hb_font_funcs_nil = {
   HB_OBJECT_HEADER_STATIC,
 
-  TRUE, /* immutable */
+  true, /* immutable */
 
   {
 #define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil,
diff --git a/gfx/harfbuzz/src/hb-unicode-private.hh b/gfx/harfbuzz/src/hb-unicode-private.hh
index c06dfe5fde98..5c5fff9745a8 100644
--- a/gfx/harfbuzz/src/hb-unicode-private.hh
+++ b/gfx/harfbuzz/src/hb-unicode-private.hh
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2009  Red Hat, Inc.
  * Copyright © 2011  Codethink Limited
- * Copyright © 2010,2011  Google, Inc.
+ * Copyright © 2010,2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -37,6 +37,7 @@
 #include "hb-object-private.hh"
 
 
+extern HB_INTERNAL const uint8_t _hb_modified_combining_class[256];
 
 /*
  * hb_unicode_funcs_t
@@ -50,25 +51,157 @@
   HB_UNICODE_FUNC_IMPLEMENT (script) \
   HB_UNICODE_FUNC_IMPLEMENT (compose) \
   HB_UNICODE_FUNC_IMPLEMENT (decompose) \
+  HB_UNICODE_FUNC_IMPLEMENT (decompose_compatibility) \
   /* ^--- Add new callbacks here */
 
 /* Simple callbacks are those taking a hb_codepoint_t and returning a hb_codepoint_t */
 #define HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE \
-  HB_UNICODE_FUNC_IMPLEMENT (unsigned int, combining_class) \
+  HB_UNICODE_FUNC_IMPLEMENT (hb_unicode_combining_class_t, combining_class) \
   HB_UNICODE_FUNC_IMPLEMENT (unsigned int, eastasian_width) \
   HB_UNICODE_FUNC_IMPLEMENT (hb_unicode_general_category_t, general_category) \
   HB_UNICODE_FUNC_IMPLEMENT (hb_codepoint_t, mirroring) \
   HB_UNICODE_FUNC_IMPLEMENT (hb_script_t, script) \
   /* ^--- Add new simple callbacks here */
 
-struct _hb_unicode_funcs_t {
+struct hb_unicode_funcs_t {
   hb_object_header_t header;
+  ASSERT_POD ();
 
   hb_unicode_funcs_t *parent;
 
   bool immutable;
 
-  /* Don't access these directly.  Call hb_unicode_*() instead. */
+#define HB_UNICODE_FUNC_IMPLEMENT(return_type, name) \
+  inline return_type name (hb_codepoint_t unicode) { return func.name (this, unicode, user_data.name); }
+HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
+#undef HB_UNICODE_FUNC_IMPLEMENT
+
+  inline hb_bool_t compose (hb_codepoint_t a, hb_codepoint_t b,
+			    hb_codepoint_t *ab)
+  {
+    *ab = 0;
+    /* XXX, this belongs to indic normalizer. */
+    if ((FLAG (general_category (a)) &
+	 (FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) |
+	  FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
+	  FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))))
+      return false;
+    /* XXX, add composition-exclusion exceptions to Indic shaper. */
+    if (a == 0x09AF && b == 0x09BC) { *ab = 0x09DF; return true; }
+    return func.compose (this, a, b, ab, user_data.compose);
+  }
+
+  inline hb_bool_t decompose (hb_codepoint_t ab,
+			      hb_codepoint_t *a, hb_codepoint_t *b)
+  {
+    /* XXX FIXME, move these to complex shapers and propagage to normalizer.*/
+    switch (ab) {
+      case 0x0AC9  : return false;
+
+      case 0x0931  : return false;
+      case 0x0B94  : return false;
+
+      /* These ones have Unicode decompositions, but we do it
+       * this way to be close to what Uniscribe does. */
+      case 0x0DDA  : *a = 0x0DD9; *b= 0x0DDA; return true;
+      case 0x0DDC  : *a = 0x0DD9; *b= 0x0DDC; return true;
+      case 0x0DDD  : *a = 0x0DD9; *b= 0x0DDD; return true;
+      case 0x0DDE  : *a = 0x0DD9; *b= 0x0DDE; return true;
+
+      case 0x0F77  : *a = 0x0FB2; *b= 0x0F81; return true;
+      case 0x0F79  : *a = 0x0FB3; *b= 0x0F81; return true;
+      case 0x17BE  : *a = 0x17C1; *b= 0x17BE; return true;
+      case 0x17BF  : *a = 0x17C1; *b= 0x17BF; return true;
+      case 0x17C0  : *a = 0x17C1; *b= 0x17C0; return true;
+      case 0x17C4  : *a = 0x17C1; *b= 0x17C4; return true;
+      case 0x17C5  : *a = 0x17C1; *b= 0x17C5; return true;
+      case 0x1925  : *a = 0x1920; *b= 0x1923; return true;
+      case 0x1926  : *a = 0x1920; *b= 0x1924; return true;
+      case 0x1B3C  : *a = 0x1B42; *b= 0x1B3C; return true;
+      case 0x1112E  : *a = 0x11127; *b= 0x11131; return true;
+      case 0x1112F  : *a = 0x11127; *b= 0x11132; return true;
+#if 0
+      case 0x0B57  : *a = 0xno decomp, -> RIGHT; return true;
+      case 0x1C29  : *a = 0xno decomp, -> LEFT; return true;
+      case 0xA9C0  : *a = 0xno decomp, -> RIGHT; return true;
+      case 0x111BF  : *a = 0xno decomp, -> ABOVE; return true;
+#endif
+    }
+    *a = ab; *b = 0;
+    return func.decompose (this, ab, a, b, user_data.decompose);
+  }
+
+  inline unsigned int decompose_compatibility (hb_codepoint_t  u,
+					       hb_codepoint_t *decomposed)
+  {
+    unsigned int ret = func.decompose_compatibility (this, u, decomposed, user_data.decompose_compatibility);
+    if (ret == 1 && u == decomposed[0]) {
+      decomposed[0] = 0;
+      return 0;
+    }
+    decomposed[ret] = 0;
+    return ret;
+  }
+
+
+  unsigned int
+  modified_combining_class (hb_codepoint_t unicode)
+  {
+    return _hb_modified_combining_class[combining_class (unicode)];
+  }
+
+  inline hb_bool_t
+  is_variation_selector (hb_codepoint_t unicode)
+  {
+    return unlikely (hb_in_ranges<hb_codepoint_t> (unicode,
+						   0x180B, 0x180D, /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */
+						   0xFE00, 0xFE0F, /* VARIATION SELECTOR-1..16 */
+						   0xE0100, 0xE01EF));  /* VARIATION SELECTOR-17..256 */
+  }
+
+  /* Zero-Width invisible characters:
+   *
+   *  00AD  SOFT HYPHEN
+   *  034F  COMBINING GRAPHEME JOINER
+   *
+   *  180E  MONGOLIAN VOWEL SEPARATOR
+   *
+   *  200B  ZERO WIDTH SPACE
+   *  200C  ZERO WIDTH NON-JOINER
+   *  200D  ZERO WIDTH JOINER
+   *  200E  LEFT-TO-RIGHT MARK
+   *  200F  RIGHT-TO-LEFT MARK
+   *
+   *  2028  LINE SEPARATOR
+   *
+   *  202A  LEFT-TO-RIGHT EMBEDDING
+   *  202B  RIGHT-TO-LEFT EMBEDDING
+   *  202C  POP DIRECTIONAL FORMATTING
+   *  202D  LEFT-TO-RIGHT OVERRIDE
+   *  202E  RIGHT-TO-LEFT OVERRIDE
+   *
+   *  2060  WORD JOINER
+   *  2061  FUNCTION APPLICATION
+   *  2062  INVISIBLE TIMES
+   *  2063  INVISIBLE SEPARATOR
+   *
+   *  FEFF  ZERO WIDTH NO-BREAK SPACE
+   */
+  inline hb_bool_t
+  is_zero_width (hb_codepoint_t ch)
+  {
+    return ((ch & ~0x007F) == 0x2000 && (hb_in_ranges<hb_codepoint_t> (ch,
+								       0x200B, 0x200F,
+								       0x202A, 0x202E,
+								       0x2060, 0x2064) ||
+					 (ch == 0x2028))) ||
+	    unlikely (ch == 0x0009 ||
+		      ch == 0x00AD ||
+		      ch == 0x034F ||
+		      ch == 0x180E ||
+		      ch == 0xFEFF);
+  }
+
 
   struct {
 #define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_func_t name;
@@ -91,66 +224,16 @@ struct _hb_unicode_funcs_t {
 
 
 #ifdef HAVE_GLIB
-extern HB_INTERNAL hb_unicode_funcs_t _hb_glib_unicode_funcs;
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_glib_unicode_funcs;
 #define _hb_unicode_funcs_default _hb_glib_unicode_funcs
 #elif defined(HAVE_ICU)
-extern HB_INTERNAL hb_unicode_funcs_t _hb_icu_unicode_funcs;
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_icu_unicode_funcs;
 #define _hb_unicode_funcs_default _hb_icu_unicode_funcs
 #else
-extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_nil;
+#define HB_UNICODE_FUNCS_NIL 1
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_unicode_funcs_nil;
 #define _hb_unicode_funcs_default _hb_unicode_funcs_nil
 #endif
 
 
-HB_INTERNAL unsigned int
-_hb_unicode_modified_combining_class (hb_unicode_funcs_t *ufuncs,
-				      hb_codepoint_t      unicode);
-
-static inline hb_bool_t
-_hb_unicode_is_variation_selector (hb_codepoint_t unicode)
-{
-  return unlikely ((unicode >=  0x180B && unicode <=  0x180D) || /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */
-		   (unicode >=  0xFE00 && unicode <=  0xFE0F) || /* VARIATION SELECTOR-1..16 */
-		   (unicode >= 0xE0100 && unicode <= 0xE01EF));  /* VARIATION SELECTOR-17..256 */
-}
-
-/* Zero-Width invisible characters:
- *
- *  00AD  SOFT HYPHEN
- *  034F  COMBINING GRAPHEME JOINER
- *
- *  200B  ZERO WIDTH SPACE
- *  200C  ZERO WIDTH NON-JOINER
- *  200D  ZERO WIDTH JOINER
- *  200E  LEFT-TO-RIGHT MARK
- *  200F  RIGHT-TO-LEFT MARK
- *
- *  2028  LINE SEPARATOR
- *
- *  202A  LEFT-TO-RIGHT EMBEDDING
- *  202B  RIGHT-TO-LEFT EMBEDDING
- *  202C  POP DIRECTIONAL FORMATTING
- *  202D  LEFT-TO-RIGHT OVERRIDE
- *  202E  RIGHT-TO-LEFT OVERRIDE
- *
- *  2060  WORD JOINER
- *  2061  FUNCTION APPLICATION
- *  2062  INVISIBLE TIMES
- *  2063  INVISIBLE SEPARATOR
- *
- *  FEFF  ZERO WIDTH NO-BREAK SPACE
- */
-static inline hb_bool_t
-_hb_unicode_is_zero_width (hb_codepoint_t ch)
-{
-  return ((ch & ~0x007F) == 0x2000 && (
-	  (ch >= 0x200B && ch <= 0x200F) ||
-	  (ch >= 0x202A && ch <= 0x202E) ||
-	  (ch >= 0x2060 && ch <= 0x2063) ||
-	  (ch == 0x2028)
-	 )) || unlikely (ch == 0x00AD
-		      || ch == 0x034F
-		      || ch == 0xFEFF);
-}
-
 #endif /* HB_UNICODE_PRIVATE_HH */
diff --git a/gfx/harfbuzz/src/hb-unicode.cc b/gfx/harfbuzz/src/hb-unicode.cc
index f2fbebbac2f8..f4eae0d5f6ec 100644
--- a/gfx/harfbuzz/src/hb-unicode.cc
+++ b/gfx/harfbuzz/src/hb-unicode.cc
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2009  Red Hat, Inc.
- * Copyright © 2011 Codethink Limited
- * Copyright © 2010,2011  Google, Inc.
+ * Copyright © 2011  Codethink Limited
+ * Copyright © 2010,2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -38,12 +38,12 @@
  * hb_unicode_funcs_t
  */
 
-static unsigned int
+static hb_unicode_combining_class_t
 hb_unicode_combining_class_nil (hb_unicode_funcs_t *ufuncs    HB_UNUSED,
 				hb_codepoint_t      unicode   HB_UNUSED,
 				void               *user_data HB_UNUSED)
 {
-  return 0;
+  return HB_UNICODE_COMBINING_CLASS_NOT_REORDERED;
 }
 
 static unsigned int
@@ -85,7 +85,7 @@ hb_unicode_compose_nil (hb_unicode_funcs_t *ufuncs    HB_UNUSED,
 			hb_codepoint_t     *ab        HB_UNUSED,
 			void               *user_data HB_UNUSED)
 {
-  return FALSE;
+  return false;
 }
 
 static hb_bool_t
@@ -95,27 +95,24 @@ hb_unicode_decompose_nil (hb_unicode_funcs_t *ufuncs    HB_UNUSED,
 			  hb_codepoint_t     *b         HB_UNUSED,
 			  void               *user_data HB_UNUSED)
 {
-  return FALSE;
+  return false;
 }
 
 
-hb_unicode_funcs_t _hb_unicode_funcs_nil = {
-  HB_OBJECT_HEADER_STATIC,
-
-  NULL, /* parent */
-  TRUE, /* immutable */
-  {
-#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_nil,
-    HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
-#undef HB_UNICODE_FUNC_IMPLEMENT
-  }
-};
+static unsigned int
+hb_unicode_decompose_compatibility_nil (hb_unicode_funcs_t *ufuncs     HB_UNUSED,
+					hb_codepoint_t      u          HB_UNUSED,
+					hb_codepoint_t     *decomposed HB_UNUSED,
+					void               *user_data  HB_UNUSED)
+{
+  return 0;
+}
 
 
 hb_unicode_funcs_t *
 hb_unicode_funcs_get_default (void)
 {
-  return &_hb_unicode_funcs_default;
+  return const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_default);
 }
 
 hb_unicode_funcs_t *
@@ -124,10 +121,10 @@ hb_unicode_funcs_create (hb_unicode_funcs_t *parent)
   hb_unicode_funcs_t *ufuncs;
 
   if (!(ufuncs = hb_object_create<hb_unicode_funcs_t> ()))
-    return &_hb_unicode_funcs_nil;
+    return hb_unicode_funcs_get_empty ();
 
   if (!parent)
-    parent = &_hb_unicode_funcs_nil;
+    parent = hb_unicode_funcs_get_empty ();
 
   hb_unicode_funcs_make_immutable (parent);
   ufuncs->parent = hb_unicode_funcs_reference (parent);
@@ -142,10 +139,24 @@ hb_unicode_funcs_create (hb_unicode_funcs_t *parent)
   return ufuncs;
 }
 
+
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_unicode_funcs_nil;
+const hb_unicode_funcs_t _hb_unicode_funcs_nil = {
+  HB_OBJECT_HEADER_STATIC,
+
+  NULL, /* parent */
+  true, /* immutable */
+  {
+#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_nil,
+    HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_UNICODE_FUNC_IMPLEMENT
+  }
+};
+
 hb_unicode_funcs_t *
 hb_unicode_funcs_get_empty (void)
 {
-  return &_hb_unicode_funcs_nil;
+  return const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_nil);
 }
 
 hb_unicode_funcs_t *
@@ -193,7 +204,7 @@ hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs)
   if (hb_object_is_inert (ufuncs))
     return;
 
-  ufuncs->immutable = TRUE;
+  ufuncs->immutable = true;
 }
 
 hb_bool_t
@@ -205,7 +216,7 @@ hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs)
 hb_unicode_funcs_t *
 hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs)
 {
-  return ufuncs->parent ? ufuncs->parent : &_hb_unicode_funcs_nil;
+  return ufuncs->parent ? ufuncs->parent : hb_unicode_funcs_get_empty ();
 }
 
 
@@ -234,7 +245,7 @@ hb_unicode_funcs_set_##name##_func (hb_unicode_funcs_t		   *ufuncs,	\
   }										\
 }
 
-    HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
+HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
 #undef HB_UNICODE_FUNC_IMPLEMENT
 
 
@@ -244,9 +255,9 @@ return_type									\
 hb_unicode_##name (hb_unicode_funcs_t *ufuncs,					\
 		   hb_codepoint_t      unicode)					\
 {										\
-  return ufuncs->func.name (ufuncs, unicode, ufuncs->user_data.name);		\
+  return ufuncs->name (unicode);						\
 }
-    HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
+HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
 #undef HB_UNICODE_FUNC_IMPLEMENT
 
 hb_bool_t
@@ -255,8 +266,7 @@ hb_unicode_compose (hb_unicode_funcs_t *ufuncs,
 		    hb_codepoint_t      b,
 		    hb_codepoint_t     *ab)
 {
-  *ab = 0;
-  return ufuncs->func.compose (ufuncs, a, b, ab, ufuncs->user_data.compose);
+  return ufuncs->compose (a, b, ab);
 }
 
 hb_bool_t
@@ -265,62 +275,160 @@ hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
 		      hb_codepoint_t     *a,
 		      hb_codepoint_t     *b)
 {
-  *a = ab; *b = 0;
-  return ufuncs->func.decompose (ufuncs, ab, a, b, ufuncs->user_data.decompose);
+  return ufuncs->decompose (ab, a, b);
 }
 
-
-
 unsigned int
-_hb_unicode_modified_combining_class (hb_unicode_funcs_t *ufuncs,
-				      hb_codepoint_t      unicode)
+hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
+				    hb_codepoint_t      u,
+				    hb_codepoint_t     *decomposed)
 {
-  int c = hb_unicode_combining_class (ufuncs, unicode);
-
-  if (unlikely (hb_in_range<int> (c, 27, 33)))
-  {
-    /* Modify the combining-class to suit Arabic better.  See:
-     * http://unicode.org/faq/normalization.html#8
-     * http://unicode.org/faq/normalization.html#9
-     */
-    c = c == 33 ? 27 : c + 1;
-  }
-  else if (unlikely (hb_in_range<int> (c, 10, 25)))
-  {
-    /* The equivalent fix for Hebrew is more complex.
-     *
-     * We permute the "fixed-position" classes 10-25 into the order
-     * described in the SBL Hebrew manual:
-     *
-     * http://www.sbl-site.org/Fonts/SBLHebrewUserManual1.5x.pdf
-     *
-     * (as recommended by:
-     *  http://forum.fontlab.com/archive-old-microsoft-volt-group/vista-and-diacritic-ordering-t6751.0.html)
-     *
-     * More details here:
-     * https://bugzilla.mozilla.org/show_bug.cgi?id=662055
-     */
-    static const int permuted_hebrew_classes[25 - 10 + 1] = {
-      /* 10 sheva */        22,
-      /* 11 hataf segol */  15,
-      /* 12 hataf patah */  16,
-      /* 13 hataf qamats */ 17,
-      /* 14 hiriq */        23,
-      /* 15 tsere */        18,
-      /* 16 segol */        19,
-      /* 17 patah */        20,
-      /* 18 qamats */       21,
-      /* 19 holam */        14,
-      /* 20 qubuts */       24,
-      /* 21 dagesh */       12,
-      /* 22 meteg */        25,
-      /* 23 rafe */         13,
-      /* 24 shin dot */     10,
-      /* 25 sin dot */      11,
-    };
-    c = permuted_hebrew_classes[c - 10];
-  }
-
-  return c;
+  return ufuncs->decompose_compatibility (u, decomposed);
 }
 
+
+const uint8_t
+_hb_modified_combining_class[256] =
+{
+  0, /* HB_UNICODE_COMBINING_CLASS_NOT_REORDERED */
+  1, /* HB_UNICODE_COMBINING_CLASS_OVERLAY */
+  2, 3, 4, 5, 6,
+  7, /* HB_UNICODE_COMBINING_CLASS_NUKTA */
+  8, /* HB_UNICODE_COMBINING_CLASS_KANA_VOICING */
+  9, /* HB_UNICODE_COMBINING_CLASS_VIRAMA */
+
+  /* Hebrew */
+
+  /*
+   * We permute the "fixed-position" classes 10-26 into the order
+   * described in the SBL Hebrew manual:
+   *
+   * http://www.sbl-site.org/Fonts/SBLHebrewUserManual1.5x.pdf
+   *
+   * (as recommended by:
+   *  http://forum.fontlab.com/archive-old-microsoft-volt-group/vista-and-diacritic-ordering-t6751.0.html)
+   *
+   * More details here:
+   * https://bugzilla.mozilla.org/show_bug.cgi?id=662055
+   */
+  22, /* HB_UNICODE_COMBINING_CLASS_CCC10 sheva */
+  15, /* HB_UNICODE_COMBINING_CLASS_CCC11 hataf segol */
+  16, /* HB_UNICODE_COMBINING_CLASS_CCC12 hataf patah*/
+  17, /* HB_UNICODE_COMBINING_CLASS_CCC13 hataf qamats */
+  23, /* HB_UNICODE_COMBINING_CLASS_CCC14 hiriq */
+  18, /* HB_UNICODE_COMBINING_CLASS_CCC15 tsere */
+  19, /* HB_UNICODE_COMBINING_CLASS_CCC16 segol */
+  20, /* HB_UNICODE_COMBINING_CLASS_CCC17 patah */
+  21, /* HB_UNICODE_COMBINING_CLASS_CCC18 qamats */
+  14, /* HB_UNICODE_COMBINING_CLASS_CCC19 holam */
+  24, /* HB_UNICODE_COMBINING_CLASS_CCC20 qubuts */
+  12, /* HB_UNICODE_COMBINING_CLASS_CCC21 dagesh */
+  25, /* HB_UNICODE_COMBINING_CLASS_CCC22 meteg */
+  13, /* HB_UNICODE_COMBINING_CLASS_CCC23 rafe */
+  10, /* HB_UNICODE_COMBINING_CLASS_CCC24 shin dot */
+  11, /* HB_UNICODE_COMBINING_CLASS_CCC25 sin dot */
+
+  26, /* HB_UNICODE_COMBINING_CLASS_CCC26 */
+
+  /* Arabic */
+
+  /*
+   * Modify to move Shadda (ccc=33) before other marks.  See:
+   * http://unicode.org/faq/normalization.html#8
+   * http://unicode.org/faq/normalization.html#9
+   */
+  28, /* HB_UNICODE_COMBINING_CLASS_CCC27 */
+  29, /* HB_UNICODE_COMBINING_CLASS_CCC28 */
+  30, /* HB_UNICODE_COMBINING_CLASS_CCC29 */
+  31, /* HB_UNICODE_COMBINING_CLASS_CCC30 */
+  32, /* HB_UNICODE_COMBINING_CLASS_CCC31 */
+  33, /* HB_UNICODE_COMBINING_CLASS_CCC32 */
+  27, /* HB_UNICODE_COMBINING_CLASS_CCC33 shadda */
+
+  34, /* HB_UNICODE_COMBINING_CLASS_CCC34 */
+  35, /* HB_UNICODE_COMBINING_CLASS_CCC35 */
+
+  /* Syriac */
+  36, /* HB_UNICODE_COMBINING_CLASS_CCC36 */
+
+  37, 38, 39,
+  40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+  60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+  80, 81, 82, 83,
+
+  /* Telugu */
+
+  /*
+   * Modify Telugu length marks (ccc=84, ccc=91).
+   * These are the only matras in the main Indic scripts range that have
+   * a non-zero ccc.  That makes them reorder with the Halant that is
+   * ccc=9.  Just zero them, we don't need them in our Indic shaper.
+   */
+  0, /* HB_UNICODE_COMBINING_CLASS_CCC84 */
+  85, 86, 87, 88, 89, 90,
+  0, /* HB_UNICODE_COMBINING_CLASS_CCC91 */
+  92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+
+  /* Thai */
+
+  /*
+   * Modify U+0E38 and U+0E39 (ccc=104) to be reordered before U+0E3A (ccc=9).
+   * Uniscribe does this too.
+   */
+  3, /* HB_UNICODE_COMBINING_CLASS_CCC103 */
+
+  104, 105, 106,
+  107, /* HB_UNICODE_COMBINING_CLASS_CCC107 */
+  108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+
+  /* Lao */
+  118, /* HB_UNICODE_COMBINING_CLASS_CCC118 */
+  119, 120, 121,
+  122, /* HB_UNICODE_COMBINING_CLASS_CCC122 */
+  123, 124, 125, 126, 127, 128,
+
+  /* Tibetan */
+  129, /* HB_UNICODE_COMBINING_CLASS_CCC129 */
+  130, /* HB_UNICODE_COMBINING_CLASS_CCC130 */
+  131,
+  132, /* HB_UNICODE_COMBINING_CLASS_CCC133 */
+  133, 134, 135, 136, 137, 138, 139,
+
+
+  140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+  160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+  170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+  190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+
+  200, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT */
+  201,
+  202, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW */
+  203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+  214, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE */
+  215,
+  216, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT */
+  217,
+  218, /* HB_UNICODE_COMBINING_CLASS_BELOW_LEFT */
+  219,
+  220, /* HB_UNICODE_COMBINING_CLASS_BELOW */
+  221,
+  222, /* HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT */
+  223,
+  224, /* HB_UNICODE_COMBINING_CLASS_LEFT */
+  225,
+  226, /* HB_UNICODE_COMBINING_CLASS_RIGHT */
+  227,
+  228, /* HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT */
+  229,
+  230, /* HB_UNICODE_COMBINING_CLASS_ABOVE */
+  231,
+  232, /* HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT */
+  233, /* HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW */
+  234, /* HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE */
+  235, 236, 237, 238, 239,
+  240, /* HB_UNICODE_COMBINING_CLASS_IOTA_SUBSCRIPT */
+  241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255, /* HB_UNICODE_COMBINING_CLASS_INVALID */
+};
diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
index 205e4c7f5ab1..2e10d98a3b34 100644
--- a/gfx/harfbuzz/src/hb-unicode.h
+++ b/gfx/harfbuzz/src/hb-unicode.h
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2009  Red Hat, Inc.
  * Copyright © 2011  Codethink Limited
- * Copyright © 2011  Google, Inc.
+ * Copyright © 2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -40,11 +40,135 @@
 HB_BEGIN_DECLS
 
 
+/* hb_unicode_general_category_t */
+
+/* Unicode Character Database property: General_Category (gc) */
+typedef enum
+{
+  HB_UNICODE_GENERAL_CATEGORY_CONTROL,			/* Cc */
+  HB_UNICODE_GENERAL_CATEGORY_FORMAT,			/* Cf */
+  HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED,		/* Cn */
+  HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE,		/* Co */
+  HB_UNICODE_GENERAL_CATEGORY_SURROGATE,		/* Cs */
+  HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER,		/* Ll */
+  HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER,		/* Lm */
+  HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER,		/* Lo */
+  HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER,		/* Lt */
+  HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER,		/* Lu */
+  HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK,		/* Mc */
+  HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK,		/* Me */
+  HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK,		/* Mn */
+  HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER,		/* Nd */
+  HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER,		/* Nl */
+  HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER,		/* No */
+  HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION,	/* Pc */
+  HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION,		/* Pd */
+  HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION,	/* Pe */
+  HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION,	/* Pf */
+  HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION,	/* Pi */
+  HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION,	/* Po */
+  HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION,		/* Ps */
+  HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL,		/* Sc */
+  HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL,		/* Sk */
+  HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL,		/* Sm */
+  HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL,		/* So */
+  HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR,		/* Zl */
+  HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR,	/* Zp */
+  HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR		/* Zs */
+} hb_unicode_general_category_t;
+
+/* hb_unicode_combining_class_t */
+
+/* Note: newer versions of Unicode may add new values.  Clients should be ready to handle
+ * any value in the 0..254 range being returned from hb_unicode_combining_class().
+ */
+
+/* Unicode Character Database property: Canonical_Combining_Class (ccc) */
+typedef enum
+{
+  HB_UNICODE_COMBINING_CLASS_NOT_REORDERED	= 0,
+  HB_UNICODE_COMBINING_CLASS_OVERLAY		= 1,
+  HB_UNICODE_COMBINING_CLASS_NUKTA		= 7,
+  HB_UNICODE_COMBINING_CLASS_KANA_VOICING	= 8,
+  HB_UNICODE_COMBINING_CLASS_VIRAMA		= 9,
+
+  /* Hebrew */
+  HB_UNICODE_COMBINING_CLASS_CCC10	=  10,
+  HB_UNICODE_COMBINING_CLASS_CCC11	=  11,
+  HB_UNICODE_COMBINING_CLASS_CCC12	=  12,
+  HB_UNICODE_COMBINING_CLASS_CCC13	=  13,
+  HB_UNICODE_COMBINING_CLASS_CCC14	=  14,
+  HB_UNICODE_COMBINING_CLASS_CCC15	=  15,
+  HB_UNICODE_COMBINING_CLASS_CCC16	=  16,
+  HB_UNICODE_COMBINING_CLASS_CCC17	=  17,
+  HB_UNICODE_COMBINING_CLASS_CCC18	=  18,
+  HB_UNICODE_COMBINING_CLASS_CCC19	=  19,
+  HB_UNICODE_COMBINING_CLASS_CCC20	=  20,
+  HB_UNICODE_COMBINING_CLASS_CCC21	=  21,
+  HB_UNICODE_COMBINING_CLASS_CCC22	=  22,
+  HB_UNICODE_COMBINING_CLASS_CCC23	=  23,
+  HB_UNICODE_COMBINING_CLASS_CCC24	=  24,
+  HB_UNICODE_COMBINING_CLASS_CCC25	=  25,
+  HB_UNICODE_COMBINING_CLASS_CCC26	=  26,
+
+  /* Arabic */
+  HB_UNICODE_COMBINING_CLASS_CCC27	=  27,
+  HB_UNICODE_COMBINING_CLASS_CCC28	=  28,
+  HB_UNICODE_COMBINING_CLASS_CCC29	=  29,
+  HB_UNICODE_COMBINING_CLASS_CCC30	=  30,
+  HB_UNICODE_COMBINING_CLASS_CCC31	=  31,
+  HB_UNICODE_COMBINING_CLASS_CCC32	=  32,
+  HB_UNICODE_COMBINING_CLASS_CCC33	=  33,
+  HB_UNICODE_COMBINING_CLASS_CCC34	=  34,
+  HB_UNICODE_COMBINING_CLASS_CCC35	=  35,
+
+  /* Syriac */
+  HB_UNICODE_COMBINING_CLASS_CCC36	=  36,
+
+  /* Telugu */
+  HB_UNICODE_COMBINING_CLASS_CCC84	=  84,
+  HB_UNICODE_COMBINING_CLASS_CCC91	=  91,
+
+  /* Thai */
+  HB_UNICODE_COMBINING_CLASS_CCC103	= 103,
+  HB_UNICODE_COMBINING_CLASS_CCC107	= 107,
+
+  /* Lao */
+  HB_UNICODE_COMBINING_CLASS_CCC118	= 118,
+  HB_UNICODE_COMBINING_CLASS_CCC122	= 122,
+
+  /* Tibetan */
+  HB_UNICODE_COMBINING_CLASS_CCC129	= 129,
+  HB_UNICODE_COMBINING_CLASS_CCC130	= 130,
+  HB_UNICODE_COMBINING_CLASS_CCC133	= 132,
+
+
+  HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT	= 200,
+  HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW		= 202,
+  HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE		= 214,
+  HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT	= 216,
+  HB_UNICODE_COMBINING_CLASS_BELOW_LEFT			= 218,
+  HB_UNICODE_COMBINING_CLASS_BELOW			= 220,
+  HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT		= 222,
+  HB_UNICODE_COMBINING_CLASS_LEFT			= 224,
+  HB_UNICODE_COMBINING_CLASS_RIGHT			= 226,
+  HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT			= 228,
+  HB_UNICODE_COMBINING_CLASS_ABOVE			= 230,
+  HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT		= 232,
+  HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW		= 233,
+  HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE		= 234,
+
+  HB_UNICODE_COMBINING_CLASS_IOTA_SUBSCRIPT		= 240,
+
+  HB_UNICODE_COMBINING_CLASS_INVALID	= 255
+} hb_unicode_combining_class_t;
+
+
 /*
  * hb_unicode_funcs_t
  */
 
-typedef struct _hb_unicode_funcs_t hb_unicode_funcs_t;
+typedef struct hb_unicode_funcs_t hb_unicode_funcs_t;
 
 
 /*
@@ -95,7 +219,7 @@ hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs);
 
 /* typedefs */
 
-typedef unsigned int			(*hb_unicode_combining_class_func_t)	(hb_unicode_funcs_t *ufuncs,
+typedef hb_unicode_combining_class_t	(*hb_unicode_combining_class_func_t)	(hb_unicode_funcs_t *ufuncs,
 										 hb_codepoint_t      unicode,
 										 void               *user_data);
 typedef unsigned int			(*hb_unicode_eastasian_width_func_t)	(hb_unicode_funcs_t *ufuncs,
@@ -122,6 +246,32 @@ typedef hb_bool_t			(*hb_unicode_decompose_func_t)		(hb_unicode_funcs_t *ufuncs,
 										 hb_codepoint_t     *b,
 										 void               *user_data);
 
+/**
+ * hb_unicode_decompose_compatibility_func_t:
+ * @ufuncs: Unicode function structure
+ * @u: codepoint to decompose
+ * @decomposed: address of codepoint array (of length %HB_UNICODE_MAX_DECOMPOSITION_LEN) to write decomposition into
+ * @user_data: user data pointer as passed to hb_unicode_funcs_set_decompose_compatibility_func()
+ *
+ * Fully decompose @u to its Unicode compatibility decomposition. The codepoints of the decomposition will be written to @decomposed.
+ * The complete length of the decomposition will be returned.
+ *
+ * If @u has no compatibility decomposition, zero should be returned.
+ *
+ * The Unicode standard guarantees that a buffer of length %HB_UNICODE_MAX_DECOMPOSITION_LEN codepoints will always be sufficient for any
+ * compatibility decomposition plus an terminating value of 0.  Consequently, @decompose must be allocated by the caller to be at least this length.  Implementations
+ * of this function type must ensure that they do not write past the provided array.
+ *
+ * Return value: number of codepoints in the full compatibility decomposition of @u, or 0 if no decomposition available.
+ */
+typedef unsigned int			(*hb_unicode_decompose_compatibility_func_t)	(hb_unicode_funcs_t *ufuncs,
+											 hb_codepoint_t      u,
+											 hb_codepoint_t     *decomposed,
+											 void               *user_data);
+
+/* See Unicode 6.1 for details on the maximum decomposition length. */
+#define HB_UNICODE_MAX_DECOMPOSITION_LEN (18+1) /* codepoints */
+
 /* setters */
 
 void
@@ -159,10 +309,14 @@ hb_unicode_funcs_set_decompose_func (hb_unicode_funcs_t *ufuncs,
 				     hb_unicode_decompose_func_t decompose_func,
 				     void *user_data, hb_destroy_func_t destroy);
 
+void
+hb_unicode_funcs_set_decompose_compatibility_func (hb_unicode_funcs_t *ufuncs,
+						   hb_unicode_decompose_compatibility_func_t decompose_compatibility_func,
+						   void *user_data, hb_destroy_func_t destroy);
 
 /* accessors */
 
-unsigned int
+hb_unicode_combining_class_t
 hb_unicode_combining_class (hb_unicode_funcs_t *ufuncs,
 			    hb_codepoint_t unicode);
 
@@ -193,6 +347,11 @@ hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
 		      hb_codepoint_t     *a,
 		      hb_codepoint_t     *b);
 
+unsigned int
+hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
+				    hb_codepoint_t      u,
+				    hb_codepoint_t     *decomposed);
+
 HB_END_DECLS
 
 #endif /* HB_UNICODE_H */
diff --git a/gfx/harfbuzz/src/hb-uniscribe.cc b/gfx/harfbuzz/src/hb-uniscribe.cc
index 584d6412ca07..0ca87ecd7ef0 100644
--- a/gfx/harfbuzz/src/hb-uniscribe.cc
+++ b/gfx/harfbuzz/src/hb-uniscribe.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011  Google, Inc.
+ * Copyright © 2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -24,9 +24,10 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0600
 
-#include "hb-private.hh"
+#define HB_SHAPER uniscribe
+#include "hb-shaper-impl-private.hh"
 
 #include <windows.h>
 #include <usp10.h>
@@ -38,10 +39,6 @@ typedef ULONG WIN_ULONG;
 #include "hb-ot-name-table.hh"
 #include "hb-ot-tag.h"
 
-#include "hb-font-private.hh"
-#include "hb-buffer-private.hh"
-
-
 
 #ifndef HB_DEBUG_UNISCRIBE
 #define HB_DEBUG_UNISCRIBE (HB_DEBUG+0)
@@ -58,14 +55,70 @@ DWORD GetFontData(
 );
 */
 
+
+HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, face)
+HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, font)
+
+
+/*
+ * shaper face data
+ */
+
+struct hb_uniscribe_shaper_face_data_t {
+  HANDLE fh;
+};
+
+hb_uniscribe_shaper_face_data_t *
+_hb_uniscribe_shaper_face_data_create (hb_face_t *face)
+{
+  hb_uniscribe_shaper_face_data_t *data = (hb_uniscribe_shaper_face_data_t *) calloc (1, sizeof (hb_uniscribe_shaper_face_data_t));
+  if (unlikely (!data))
+    return NULL;
+
+  hb_blob_t *blob = hb_face_reference_blob (face);
+  unsigned int blob_length;
+  const char *blob_data = hb_blob_get_data (blob, &blob_length);
+  if (unlikely (!blob_length))
+    DEBUG_MSG (UNISCRIBE, face, "Face has empty blob");
+
+  DWORD num_fonts_installed;
+  data->fh = AddFontMemResourceEx ((void *) blob_data, blob_length, 0, &num_fonts_installed);
+  hb_blob_destroy (blob);
+  if (unlikely (!data->fh)) {
+    DEBUG_MSG (UNISCRIBE, face, "Face AddFontMemResourceEx() failed");
+    free (data);
+    return NULL;
+  }
+
+  return data;
+}
+
+void
+_hb_uniscribe_shaper_face_data_destroy (hb_uniscribe_shaper_face_data_t *data)
+{
+  RemoveFontMemResourceEx (data->fh);
+  free (data);
+}
+
+
+/*
+ * shaper font data
+ */
+
+struct hb_uniscribe_shaper_font_data_t {
+  HDC hdc;
+  LOGFONTW log_font;
+  HFONT hfont;
+  SCRIPT_CACHE script_cache;
+};
+
 static bool
 populate_log_font (LOGFONTW  *lf,
-		   HDC        hdc,
 		   hb_font_t *font)
 {
   memset (lf, 0, sizeof (*lf));
-  int dpi = GetDeviceCaps (hdc, LOGPIXELSY);
   lf->lfHeight = -font->y_scale;
+  lf->lfCharSet = DEFAULT_CHARSET;
 
   hb_blob_t *blob = Sanitizer<name>::sanitize (hb_face_reference_table (font->face, HB_TAG ('n','a','m','e')));
   const name *name_table = Sanitizer<name>::lock_instance (blob);
@@ -77,85 +130,55 @@ populate_log_font (LOGFONTW  *lf,
 
   if (unlikely (!len)) {
     DEBUG_MSG (UNISCRIBE, NULL, "Didn't find English name table entry");
-    return FALSE;
+    return false;
   }
   if (unlikely (len >= LF_FACESIZE)) {
     DEBUG_MSG (UNISCRIBE, NULL, "Font name too long");
-    return FALSE;
+    return false;
   }
 
   for (unsigned int i = 0; i < len; i++)
     lf->lfFaceName[i] = hb_be_uint16 (lf->lfFaceName[i]);
   lf->lfFaceName[len] = 0;
 
-  return TRUE;
+  return true;
 }
 
-
-static hb_user_data_key_t hb_uniscribe_data_key;
-
-
-static struct hb_uniscribe_face_data_t {
-  HANDLE fh;
-} _hb_uniscribe_face_data_nil = {0};
-
-static void
-_hb_uniscribe_face_data_destroy (hb_uniscribe_face_data_t *data)
+hb_uniscribe_shaper_font_data_t *
+_hb_uniscribe_shaper_font_data_create (hb_font_t *font)
 {
-  if (data->fh)
-    RemoveFontMemResourceEx (data->fh);
-  free (data);
-}
+  if (unlikely (!hb_uniscribe_shaper_face_data_ensure (font->face))) return NULL;
 
-static hb_uniscribe_face_data_t *
-_hb_uniscribe_face_get_data (hb_face_t *face)
-{
-  hb_uniscribe_face_data_t *data = (hb_uniscribe_face_data_t *) hb_face_get_user_data (face, &hb_uniscribe_data_key);
-  if (likely (data)) return data;
-
-  data = (hb_uniscribe_face_data_t *) calloc (1, sizeof (hb_uniscribe_face_data_t));
+  hb_uniscribe_shaper_font_data_t *data = (hb_uniscribe_shaper_font_data_t *) calloc (1, sizeof (hb_uniscribe_shaper_font_data_t));
   if (unlikely (!data))
-    return &_hb_uniscribe_face_data_nil;
+    return NULL;
 
+  data->hdc = GetDC (NULL);
 
-  hb_blob_t *blob = hb_face_reference_blob (face);
-  unsigned int blob_length;
-  const char *blob_data = hb_blob_get_data (blob, &blob_length);
-  if (unlikely (!blob_length))
-    DEBUG_MSG (UNISCRIBE, face, "Face has empty blob");
+  if (unlikely (!populate_log_font (&data->log_font, font))) {
+    DEBUG_MSG (UNISCRIBE, font, "Font populate_log_font() failed");
+    _hb_uniscribe_shaper_font_data_destroy (data);
+    return NULL;
+  }
 
-  DWORD num_fonts_installed;
-  data->fh = AddFontMemResourceEx ((void *) blob_data, blob_length, 0, &num_fonts_installed);
-  hb_blob_destroy (blob);
-  if (unlikely (!data->fh))
-    DEBUG_MSG (UNISCRIBE, face, "Face AddFontMemResourceEx() failed");
+  data->hfont = CreateFontIndirectW (&data->log_font);
+  if (unlikely (!data->hfont)) {
+    DEBUG_MSG (UNISCRIBE, font, "Font CreateFontIndirectW() failed");
+    _hb_uniscribe_shaper_font_data_destroy (data);
+     return NULL;
+  }
 
-
-  if (unlikely (!hb_face_set_user_data (face, &hb_uniscribe_data_key, data,
-					(hb_destroy_func_t) _hb_uniscribe_face_data_destroy,
-					FALSE)))
-  {
-    _hb_uniscribe_face_data_destroy (data);
-    data = (hb_uniscribe_face_data_t *) hb_face_get_user_data (face, &hb_uniscribe_data_key);
-    if (data)
-      return data;
-    else
-      return &_hb_uniscribe_face_data_nil;
+  if (!SelectObject (data->hdc, data->hfont)) {
+    DEBUG_MSG (UNISCRIBE, font, "Font SelectObject() failed");
+    _hb_uniscribe_shaper_font_data_destroy (data);
+     return NULL;
   }
 
   return data;
 }
 
-
-static struct hb_uniscribe_font_data_t {
-  HDC hdc;
-  LOGFONTW log_font;
-  HFONT hfont;
-  SCRIPT_CACHE script_cache;
-} _hb_uniscribe_font_data_nil = {NULL, NULL, NULL};
-
-static void
-_hb_uniscribe_font_data_destroy (hb_uniscribe_font_data_t *data)
+void
+_hb_uniscribe_shaper_font_data_destroy (hb_uniscribe_shaper_font_data_t *data)
 {
   if (data->hdc)
     ReleaseDC (NULL, data->hdc);
@@ -166,87 +189,66 @@ _hb_uniscribe_font_data_destroy (hb_uniscribe_font_data_t *data)
   free (data);
 }
 
-static hb_uniscribe_font_data_t *
-_hb_uniscribe_font_get_data (hb_font_t *font)
+
+/*
+ * shaper shape_plan data
+ */
+
+struct hb_uniscribe_shaper_shape_plan_data_t {};
+
+hb_uniscribe_shaper_shape_plan_data_t *
+_hb_uniscribe_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
+					     const hb_feature_t *user_features,
+					     unsigned int        num_user_features)
 {
-  hb_uniscribe_font_data_t *data = (hb_uniscribe_font_data_t *) hb_font_get_user_data (font, &hb_uniscribe_data_key);
-  if (likely (data)) return data;
-
-  data = (hb_uniscribe_font_data_t *) calloc (1, sizeof (hb_uniscribe_font_data_t));
-  if (unlikely (!data))
-    return &_hb_uniscribe_font_data_nil;
-
-  data->hdc = GetDC (NULL);
-
-  if (unlikely (!populate_log_font (&data->log_font, data->hdc, font)))
-    DEBUG_MSG (UNISCRIBE, font, "Font populate_log_font() failed");
-  else {
-    data->hfont = CreateFontIndirectW (&data->log_font);
-    if (unlikely (!data->hfont))
-      DEBUG_MSG (UNISCRIBE, font, "Font CreateFontIndirectW() failed");
-    if (!SelectObject (data->hdc, data->hfont))
-      DEBUG_MSG (UNISCRIBE, font, "Font SelectObject() failed");
-  }
-
-  if (unlikely (!hb_font_set_user_data (font, &hb_uniscribe_data_key, data,
-					(hb_destroy_func_t) _hb_uniscribe_font_data_destroy,
-					FALSE)))
-  {
-    _hb_uniscribe_font_data_destroy (data);
-    data = (hb_uniscribe_font_data_t *) hb_font_get_user_data (font, &hb_uniscribe_data_key);
-    if (data)
-      return data;
-    else
-      return &_hb_uniscribe_font_data_nil;
-  }
-
-  return data;
+  return (hb_uniscribe_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
 }
 
+void
+_hb_uniscribe_shaper_shape_plan_data_destroy (hb_uniscribe_shaper_shape_plan_data_t *data)
+{
+}
+
+
+/*
+ * shaper
+ */
+
 LOGFONTW *
 hb_uniscribe_font_get_logfontw (hb_font_t *font)
 {
-  hb_uniscribe_font_data_t *font_data = _hb_uniscribe_font_get_data (font);
-  if (unlikely (!font_data))
+  if (unlikely (!hb_uniscribe_shaper_font_data_ensure (font))) return NULL;
     return NULL;
+  hb_uniscribe_shaper_font_data_t *font_data =  HB_SHAPER_DATA_GET (font);
   return &font_data->log_font;
 }
 
 HFONT
 hb_uniscribe_font_get_hfont (hb_font_t *font)
 {
-  hb_uniscribe_font_data_t *font_data = _hb_uniscribe_font_get_data (font);
-  if (unlikely (!font_data))
-    return 0;
+  if (unlikely (!hb_uniscribe_shaper_font_data_ensure (font))) return NULL;
+  hb_uniscribe_shaper_font_data_t *font_data =  HB_SHAPER_DATA_GET (font);
   return font_data->hfont;
 }
 
 
 hb_bool_t
-_hb_uniscribe_shape (hb_font_t          *font,
+_hb_uniscribe_shape (hb_shape_plan_t    *shape_plan,
+		     hb_font_t          *font,
 		     hb_buffer_t        *buffer,
 		     const hb_feature_t *features,
 		     unsigned int        num_features)
 {
-  buffer->guess_properties ();
+  hb_face_t *face = font->face;
+  hb_uniscribe_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
+  hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
 
 #define FAIL(...) \
   HB_STMT_START { \
     DEBUG_MSG (UNISCRIBE, NULL, __VA_ARGS__); \
-    return FALSE; \
+    return false; \
   } HB_STMT_END;
 
-  hb_uniscribe_face_data_t *face_data = _hb_uniscribe_face_get_data (font->face);
-  if (unlikely (!face_data->fh))
-    FAIL ("Couldn't get face data");
-
-  hb_uniscribe_font_data_t *font_data = _hb_uniscribe_font_get_data (font);
-  if (unlikely (!font_data->hfont))
-    FAIL ("Couldn't get font font");
-
-  if (unlikely (!buffer->len))
-    return TRUE;
-
   HRESULT hr;
 
 retry:
@@ -258,8 +260,8 @@ retry:
 
 #define ALLOCATE_ARRAY(Type, name, len) \
   Type *name = (Type *) scratch; \
-  scratch += len * sizeof (name[0]); \
-  scratch_size -= len * sizeof (name[0]);
+  scratch += (len) * sizeof ((name)[0]); \
+  scratch_size -= (len) * sizeof ((name)[0]);
 
 #define utf16_index() var1.u32
 
@@ -295,8 +297,9 @@ retry:
   ALLOCATE_ARRAY (GOFFSET, offsets, glyphs_size);
   ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size);
 
+#undef ALLOCATE_ARRAY
 
-#define MAX_ITEMS 10
+#define MAX_ITEMS 256
 
   SCRIPT_ITEM items[MAX_ITEMS + 1];
   SCRIPT_CONTROL bidi_control = {0};
@@ -305,11 +308,11 @@ retry:
   int item_count;
 
   /* MinGW32 doesn't define fMergeNeutralItems, so we bruteforce */
-  //bidi_control.fMergeNeutralItems = TRUE;
+  //bidi_control.fMergeNeutralItems = true;
   *(uint32_t*)&bidi_control |= 1<<24;
 
   bidi_state.uBidiLevel = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
-//  bidi_state.fOverrideDirection = 1;
+  bidi_state.fOverrideDirection = 1;
 
   hr = ScriptItemizeOpenType (wchars,
 			      chars_len,
@@ -331,74 +334,83 @@ retry:
     /* TODO setup ranges */
   }
 
-  OPENTYPE_TAG language_tag = hb_ot_tag_from_language (buffer->props.language);
+  OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language));
 
   unsigned int glyphs_offset = 0;
   unsigned int glyphs_len;
-  for (unsigned int i = 0; i < item_count; i++)
+  bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
+  for (unsigned int j = 0; j < item_count; j++)
   {
-      unsigned int chars_offset = items[i].iCharPos;
-      unsigned int item_chars_len = items[i + 1].iCharPos - chars_offset;
-      OPENTYPE_TAG script_tag = script_tags[i]; /* XXX buffer->props.script */
+    unsigned int i = backward ? item_count - 1 - j : j;
+    unsigned int chars_offset = items[i].iCharPos;
+    unsigned int item_chars_len = items[i + 1].iCharPos - chars_offset;
 
-      hr = ScriptShapeOpenType (font_data->hdc,
-				&font_data->script_cache,
-				&items[i].a,
-				script_tag,
-				language_tag,
-				range_char_counts,
-				range_properties,
-				range_count,
-				wchars + chars_offset,
-				item_chars_len,
-				glyphs_size - glyphs_offset,
-				/* out */
-				log_clusters + chars_offset,
-				char_props + chars_offset,
-				glyphs + glyphs_offset,
-				glyph_props + glyphs_offset,
-				(int *) &glyphs_len);
+  retry_shape:
+    hr = ScriptShapeOpenType (font_data->hdc,
+			      &font_data->script_cache,
+			      &items[i].a,
+			      script_tags[i],
+			      language_tag,
+			      range_char_counts,
+			      range_properties,
+			      range_count,
+			      wchars + chars_offset,
+			      item_chars_len,
+			      glyphs_size - glyphs_offset,
+			      /* out */
+			      log_clusters + chars_offset,
+			      char_props + chars_offset,
+			      glyphs + glyphs_offset,
+			      glyph_props + glyphs_offset,
+			      (int *) &glyphs_len);
 
-      for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++)
-        log_clusters[j] += glyphs_offset;
-
-      if (unlikely (items[i].a.fNoGlyphIndex))
-	FAIL ("ScriptShapeOpenType() set fNoGlyphIndex");
-      if (unlikely (hr == E_OUTOFMEMORY))
-      {
-        buffer->ensure (buffer->allocated * 2);
-	if (buffer->in_error)
-	  FAIL ("Buffer resize failed");
-	goto retry;
-      }
-      if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT))
+    if (unlikely (items[i].a.fNoGlyphIndex))
+      FAIL ("ScriptShapeOpenType() set fNoGlyphIndex");
+    if (unlikely (hr == E_OUTOFMEMORY))
+    {
+      buffer->ensure (buffer->allocated * 2);
+      if (buffer->in_error)
+	FAIL ("Buffer resize failed");
+      goto retry;
+    }
+    if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT))
+    {
+      if (items[i].a.eScript == SCRIPT_UNDEFINED)
 	FAIL ("ScriptShapeOpenType() failed: Font doesn't support script");
-      if (unlikely (FAILED (hr)))
-	FAIL ("ScriptShapeOpenType() failed: 0x%08xL", hr);
+      items[i].a.eScript = SCRIPT_UNDEFINED;
+      goto retry_shape;
+    }
+    if (unlikely (FAILED (hr)))
+    {
+      FAIL ("ScriptShapeOpenType() failed: 0x%08xL", hr);
+    }
 
-      hr = ScriptPlaceOpenType (font_data->hdc,
-				&font_data->script_cache,
-				&items[i].a,
-				script_tag,
-				language_tag,
-				range_char_counts,
-				range_properties,
-				range_count,
-				wchars + chars_offset,
-				log_clusters + chars_offset,
-				char_props + chars_offset,
-				item_chars_len,
-				glyphs + glyphs_offset,
-				glyph_props + glyphs_offset,
-				glyphs_len,
-				/* out */
-				advances + glyphs_offset,
-				offsets + glyphs_offset,
-				NULL);
-      if (unlikely (FAILED (hr)))
-	FAIL ("ScriptPlaceOpenType() failed: 0x%08xL", hr);
+    for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++)
+      log_clusters[j] += glyphs_offset;
 
-      glyphs_offset += glyphs_len;
+    hr = ScriptPlaceOpenType (font_data->hdc,
+			      &font_data->script_cache,
+			      &items[i].a,
+			      script_tags[i],
+			      language_tag,
+			      range_char_counts,
+			      range_properties,
+			      range_count,
+			      wchars + chars_offset,
+			      log_clusters + chars_offset,
+			      char_props + chars_offset,
+			      item_chars_len,
+			      glyphs + glyphs_offset,
+			      glyph_props + glyphs_offset,
+			      glyphs_len,
+			      /* out */
+			      advances + glyphs_offset,
+			      offsets + glyphs_offset,
+			      NULL);
+    if (unlikely (FAILED (hr)))
+      FAIL ("ScriptPlaceOpenType() failed: 0x%08xL", hr);
+
+    glyphs_offset += glyphs_len;
   }
   glyphs_len = glyphs_offset;
 
@@ -412,13 +424,13 @@ retry:
     uint32_t *p = &vis_clusters[log_clusters[buffer->info[i].utf16_index()]];
     *p = MIN (*p, buffer->info[i].cluster);
   }
-  if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) {
+  if (!backward) {
     for (unsigned int i = 1; i < glyphs_len; i++)
-      if (!glyph_props[i].sva.fClusterStart)
+      if (vis_clusters[i] == -1)
 	vis_clusters[i] = vis_clusters[i - 1];
   } else {
     for (int i = glyphs_len - 2; i >= 0; i--)
-      if (!glyph_props[i].sva.fClusterStart)
+      if (vis_clusters[i] == -1)
 	vis_clusters[i] = vis_clusters[i + 1];
   }
 
@@ -459,7 +471,7 @@ retry:
   }
 
   /* Wow, done! */
-  return TRUE;
+  return true;
 }
 
 
diff --git a/gfx/harfbuzz/src/hb-uniscribe.h b/gfx/harfbuzz/src/hb-uniscribe.h
index 216610ebd885..bb99f3987d78 100644
--- a/gfx/harfbuzz/src/hb-uniscribe.h
+++ b/gfx/harfbuzz/src/hb-uniscribe.h
@@ -29,7 +29,7 @@
 
 #include "hb.h"
 
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0600
 #include <windows.h>
 
 HB_BEGIN_DECLS
diff --git a/gfx/harfbuzz/src/hb-warning.cc b/gfx/harfbuzz/src/hb-warning.cc
index 6b5585fffd36..8ff4d20e836a 100644
--- a/gfx/harfbuzz/src/hb-warning.cc
+++ b/gfx/harfbuzz/src/hb-warning.cc
@@ -28,26 +28,20 @@
 #include "hb-mutex-private.hh"
 
 
-#if !defined(HB_NO_MT) && defined(HB_ATOMIC_INT_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any system to define atomic_int macros, library will NOT be thread-safe")
-#else
-#warning "Could not find any system to define atomic_int macros, library will NOT be thread-safe"
+#if defined(HB_ATOMIC_INT_NIL)
+#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe.")
 #endif
+#if defined(HB_MUTEX_IMPL_NIL)
+#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe.")
+#endif
+#if defined(HB_ATOMIC_INT_NIL) || defined(HB_MUTEX_IMPL_NIL)
+#pragma message("To suppress these warnings, define HB_NO_MT.")
 #endif
 
-#if !defined(HB_NO_MT) && defined(HB_MUTEX_IMPL_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any system to define mutex macros, library will NOT be thread-safe")
-#else
-#warning "Could not find any system to define mutex macros, library will NOT be thread-safe"
-#endif
-#endif
 
-#if !defined(HB_NO_MT) && (defined(HB_ATOMIC_INT_NIL) || defined(HB_MUTEX_IMPL_NIL))
-#ifdef _MSC_VER
-#pragma message("To suppress these warnings, define HB_NO_MT")
-#else
-#warning "To suppress these warnings, define HB_NO_MT"
-#endif
+#include "hb-unicode-private.hh"
+
+#if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
+#pragma message("Could not find any Unicode functions implementation, you have to provide your own.")
+#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS.")
 #endif
diff --git a/gfx/harfbuzz/src/indic.cc b/gfx/harfbuzz/src/indic.cc
index e00311d8d6eb..991a7723bd71 100644
--- a/gfx/harfbuzz/src/indic.cc
+++ b/gfx/harfbuzz/src/indic.cc
@@ -39,8 +39,13 @@ main (void)
     unsigned int category = type & 0x0F;
     unsigned int position = type >> 4;
 
-    hb_codepoint_t a, b;
-    if (!hb_unicode_decompose (funcs, u, &a, &b))
-      printf ("U+%04X\n", u);
+    hb_unicode_general_category_t cat = hb_unicode_general_category (funcs, u);
+    unsigned int ccc = hb_unicode_combining_class (funcs, u);
+    if (category == OT_M && ccc)
+      printf ("U+%04X %d\n", u, ccc);
+
+//    hb_codepoint_t a, b;
+//    if (!hb_unicode_decompose (funcs, u, &a, &b))
+//      printf ("U+%04X %x %x\n", u, category, position);
   }
 }
diff --git a/gfx/harfbuzz/src/main.cc b/gfx/harfbuzz/src/main.cc
index 03b6e6ce9e62..07d3d69be746 100644
--- a/gfx/harfbuzz/src/main.cc
+++ b/gfx/harfbuzz/src/main.cc
@@ -49,7 +49,7 @@ main (int argc, char **argv)
   int len = 0;
 
 #ifdef HAVE_GLIB
-  GMappedFile *mf = g_mapped_file_new (argv[1], FALSE, NULL);
+  GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
   font_data = g_mapped_file_get_contents (mf);
   len = g_mapped_file_get_length (mf);
 #else
diff --git a/gfx/harfbuzz/src/test-would-substitute.cc b/gfx/harfbuzz/src/test-would-substitute.cc
new file mode 100644
index 000000000000..bf64a2955d7d
--- /dev/null
+++ b/gfx/harfbuzz/src/test-would-substitute.cc
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2010,2011  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "hb.h"
+#include "hb-ot.h"
+
+#ifdef HAVE_GLIB
+#include <glib.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef HAVE_FREETYPE
+#include "hb-ft.h"
+#endif
+
+int
+main (int argc, char **argv)
+{
+  hb_blob_t *blob = NULL;
+
+  if (argc != 4 && argc != 5) {
+    fprintf (stderr, "usage: %s font-file lookup-index first-glyph [second-glyph]\n", argv[0]);
+    exit (1);
+  }
+
+  /* Create the blob */
+  {
+    const char *font_data;
+    unsigned int len;
+    hb_destroy_func_t destroy;
+    void *user_data;
+    hb_memory_mode_t mm;
+
+#ifdef HAVE_GLIB
+    GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
+    font_data = g_mapped_file_get_contents (mf);
+    len = g_mapped_file_get_length (mf);
+    destroy = (hb_destroy_func_t) g_mapped_file_unref;
+    user_data = (void *) mf;
+    mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE;
+#else
+    FILE *f = fopen (argv[1], "rb");
+    fseek (f, 0, SEEK_END);
+    len = ftell (f);
+    fseek (f, 0, SEEK_SET);
+    font_data = (const char *) malloc (len);
+    if (!font_data) len = 0;
+    len = fread ((char *) font_data, 1, len, f);
+    destroy = free;
+    user_data = (void *) font_data;
+    fclose (f);
+    mm = HB_MEMORY_MODE_WRITABLE;
+#endif
+
+    blob = hb_blob_create (font_data, len, mm, user_data, destroy);
+  }
+
+  /* Create the face */
+  hb_face_t *face = hb_face_create (blob, 0 /* first face */);
+  hb_blob_destroy (blob);
+  blob = NULL;
+
+  unsigned int len = argc - 3;
+  hb_codepoint_t glyphs[2] = {strtol (argv[3], NULL, 0), argc > 4 ? strtol (argv[4], NULL, 0) : (hb_codepoint_t) -1};
+  return !hb_ot_layout_would_substitute_lookup (face, glyphs, len, strtol (argv[2], NULL, 0));
+}
diff --git a/gfx/harfbuzz/src/test.cc b/gfx/harfbuzz/src/test.cc
index bdf017c94d5c..22108b86b7a5 100644
--- a/gfx/harfbuzz/src/test.cc
+++ b/gfx/harfbuzz/src/test.cc
@@ -59,7 +59,7 @@ main (int argc, char **argv)
     hb_memory_mode_t mm;
 
 #ifdef HAVE_GLIB
-    GMappedFile *mf = g_mapped_file_new (argv[1], FALSE, NULL);
+    GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
     font_data = g_mapped_file_get_contents (mf);
     len = g_mapped_file_get_length (mf);
     destroy = (hb_destroy_func_t) g_mapped_file_unref;
diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in
index 4a5c70ecf8cb..c47e864bdbbb 100644
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index d01acb98c631..781e11a83f58 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -228,8 +228,8 @@ Layer::Layer(LayerManager* aManager, void* aImplData) :
   mPrevSibling(nullptr),
   mImplData(aImplData),
   mMaskLayer(nullptr),
-  mXScale(1.0f),
-  mYScale(1.0f),
+  mPostXScale(1.0f),
+  mPostYScale(1.0f),
   mOpacity(1.0),
   mContentFlags(0),
   mUseClipRect(false),
@@ -605,7 +605,10 @@ const gfx3DMatrix
 Layer::GetTransform()
 {
   gfx3DMatrix transform = mTransform;
-  transform.Scale(mXScale, mYScale, 1);
+  if (ContainerLayer* c = AsContainerLayer()) {
+    transform.Scale(c->GetPreXScale(), c->GetPreYScale(), 1.0f);
+  }
+  transform.ScalePost(mPostXScale, mPostYScale, 1.0f);
   return transform;
 }
 
@@ -617,7 +620,10 @@ Layer::GetLocalTransform()
     transform = shadow->GetShadowTransform();
   else
     transform = mTransform;
-  transform.Scale(mXScale, mYScale, 1);
+  if (ContainerLayer* c = AsContainerLayer()) {
+    transform.Scale(c->GetPreXScale(), c->GetPreYScale(), 1.0f);
+  }
+  transform.ScalePost(mPostXScale, mPostYScale, 1.0f);
   return transform;
 }
 
@@ -658,7 +664,7 @@ Layer::ComputeEffectiveTransformForMaskLayer(const gfx3DMatrix& aTransformToSurf
 void
 ContainerLayer::FillSpecificAttributes(SpecificLayerAttributes& aAttrs)
 {
-  aAttrs = ContainerLayerAttributes(GetFrameMetrics());
+  aAttrs = ContainerLayerAttributes(GetFrameMetrics(), mPreXScale, mPreYScale);
 }
 
 bool
@@ -944,6 +950,9 @@ Layer::PrintInfo(nsACString& aTo, const char* aPrefix)
   if (mUseClipRect) {
     AppendToString(aTo, mClipRect, " [clip=", "]");
   }
+  if (1.0 != mPostXScale || 1.0 != mPostYScale) {
+    aTo.AppendPrintf(" [postScale=%g, %g]", mPostXScale, mPostYScale);
+  }
   if (!mTransform.IsIdentity()) {
     AppendToString(aTo, mTransform, " [transform=", "]");
   }
@@ -986,6 +995,9 @@ ContainerLayer::PrintInfo(nsACString& aTo, const char* aPrefix)
   if (UseIntermediateSurface()) {
     aTo += " [usesTmpSurf]";
   }
+  if (1.0 != mPreXScale || 1.0 != mPreYScale) {
+    aTo.AppendPrintf(" [preScale=%g, %g]", mPreXScale, mPreYScale);
+  }
   return aTo;
 }
 
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 808cdcc42995..73f517b05ee0 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -393,7 +393,7 @@ public:
    */
   bool HasUserData(void* aKey)
   {
-    return GetUserData(aKey);
+    return mUserData.Has(static_cast<gfx::UserDataKey*>(aKey));
   }
   /**
    * This getter can be used anytime. Ownership is retained by the layer
@@ -654,10 +654,10 @@ public:
     Mutated();
   }
 
-  void SetScale(float aXScale, float aYScale)
+  void SetPostScale(float aXScale, float aYScale)
   {
-    mXScale = aXScale;
-    mYScale = aYScale;
+    mPostXScale = aXScale;
+    mPostYScale = aYScale;
     Mutated();
   }
 
@@ -698,8 +698,8 @@ public:
   virtual Layer* GetLastChild() { return nullptr; }
   const gfx3DMatrix GetTransform();
   const gfx3DMatrix& GetBaseTransform() { return mTransform; }
-  float GetXScale() { return mXScale; }
-  float GetYScale() { return mYScale; }
+  float GetPostXScale() { return mPostXScale; }
+  float GetPostYScale() { return mPostYScale; }
   bool GetIsFixedPosition() { return mIsFixedPosition; }
   gfxPoint GetFixedPositionAnchor() { return mAnchor; }
   Layer* GetMaskLayer() { return mMaskLayer; }
@@ -756,7 +756,7 @@ public:
    */
   bool HasUserData(void* aKey)
   {
-    return GetUserData(aKey);
+    return mUserData.Has(static_cast<gfx::UserDataKey*>(aKey));
   }
   /**
    * This getter can be used anytime. Ownership is retained by the layer
@@ -953,8 +953,8 @@ protected:
   gfx::UserData mUserData;
   nsIntRegion mVisibleRegion;
   gfx3DMatrix mTransform;
-  float mXScale;
-  float mYScale;
+  float mPostXScale;
+  float mPostYScale;
   gfx3DMatrix mEffectiveTransform;
   AnimationArray mAnimations;
   InfallibleTArray<AnimData> mAnimationData;
@@ -1108,6 +1108,13 @@ public:
     Mutated();
   }
 
+  void SetPreScale(float aXScale, float aYScale)
+  {
+    mPreXScale = aXScale;
+    mPreYScale = aYScale;
+    Mutated();
+  }
+
   virtual void FillSpecificAttributes(SpecificLayerAttributes& aAttrs);
 
   void SortChildrenBy3DZOrder(nsTArray<Layer*>& aArray);
@@ -1119,6 +1126,8 @@ public:
   virtual Layer* GetFirstChild() { return mFirstChild; }
   virtual Layer* GetLastChild() { return mLastChild; }
   const FrameMetrics& GetFrameMetrics() { return mFrameMetrics; }
+  float GetPreXScale() { return mPreXScale; }
+  float GetPreYScale() { return mPreYScale; }
 
   MOZ_LAYER_DECL_NAME("ContainerLayer", TYPE_CONTAINER)
 
@@ -1169,6 +1178,8 @@ protected:
     : Layer(aManager, aImplData),
       mFirstChild(nullptr),
       mLastChild(nullptr),
+      mPreXScale(1.0f),
+      mPreYScale(1.0f),
       mUseIntermediateSurface(false),
       mSupportsComponentAlphaChildren(false),
       mMayHaveReadbackChild(false)
@@ -1192,6 +1203,8 @@ protected:
   Layer* mFirstChild;
   Layer* mLastChild;
   FrameMetrics mFrameMetrics;
+  float mPreXScale;
+  float mPreYScale;
   bool mUseIntermediateSurface;
   bool mSupportsComponentAlphaChildren;
   bool mMayHaveReadbackChild;
diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index 96a726ae9092..71ea596a88d6 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = \
diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp
index 5f38457de1fe..7ac951dbdd90 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -697,8 +697,7 @@ void AsyncPanZoomController::RequestContentRepaint() {
 }
 
 bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSampleTime,
-                                                            const FrameMetrics& aFrame,
-                                                            Layer* aLayer,
+                                                            ContainerLayer* aLayer,
                                                             gfx3DMatrix* aNewTransform) {
   // The eventual return value of this function. The compositor needs to know
   // whether or not to advance by a frame as soon as it can. For example, if a
@@ -716,7 +715,7 @@ bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSa
   nsIntPoint metricsScrollOffset(0, 0);
   nsIntPoint scrollOffset;
   float localScaleX, localScaleY;
-
+  const FrameMetrics& frame = aLayer->GetFrameMetrics();
   {
     MonitorAutoLock mon(mMonitor);
 
@@ -731,8 +730,8 @@ bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSa
     localScaleX = mFrameMetrics.mResolution.width;
     localScaleY = mFrameMetrics.mResolution.height;
 
-    if (aFrame.IsScrollable()) {
-      metricsScrollOffset = aFrame.mViewportScrollOffset;
+    if (frame.IsScrollable()) {
+      metricsScrollOffset = frame.mViewportScrollOffset;
     }
 
     scrollOffset = mFrameMetrics.mViewportScrollOffset;
@@ -748,9 +747,12 @@ bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSa
   // The transform already takes the resolution scale into account.  Since we
   // will apply the resolution scale again when computing the effective
   // transform, we must apply the inverse resolution scale here.
-  aNewTransform->Scale(1.0f/aLayer->GetXScale(),
-                       1.0f/aLayer->GetYScale(),
+  aNewTransform->Scale(1.0f/aLayer->GetPreXScale(),
+                       1.0f/aLayer->GetPreYScale(),
                        1);
+  aNewTransform->ScalePost(1.0f/aLayer->GetPostXScale(),
+                           1.0f/aLayer->GetPostYScale(),
+                           1);
 
   mLastSampleTime = aSampleTime;
 
diff --git a/gfx/layers/ipc/AsyncPanZoomController.h b/gfx/layers/ipc/AsyncPanZoomController.h
index e1fb725ce4bd..2322b06e5037 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.h
+++ b/gfx/layers/ipc/AsyncPanZoomController.h
@@ -20,6 +20,7 @@ namespace layers {
 
 class CompositorParent;
 class GestureEventListener;
+class ContainerLayer;
 
 /**
  * Controller for all panning and zooming logic. Any time a user input is
@@ -117,8 +118,7 @@ public:
    * composite.
    */
   bool SampleContentTransformForFrame(const TimeStamp& aSampleTime,
-                                      const FrameMetrics& aFrame,
-                                      Layer* aLayer,
+                                      ContainerLayer* aLayer,
                                       gfx3DMatrix* aNewTransform);
 
   /**
diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index 5a95f21cb280..ed50e97fc5e0 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -418,6 +418,16 @@ private:
     gfx3DMatrix m(aContainer->GetTransform());
     m.Translate(gfxPoint3D(-fm.mViewportScrollOffset.x,
                            -fm.mViewportScrollOffset.y, 0));
+
+    // The transform already takes the resolution scale into account.  Since we
+    // will apply the resolution scale again when computing the effective
+    // transform, we must apply the inverse resolution scale here.
+    m.Scale(1.0f/c->GetPreXScale(),
+            1.0f/c->GetPreYScale(),
+            1);
+    m.ScalePost(1.0f/c->GetPostXScale(),
+                1.0f/c->GetPostYScale(),
+                1);
     aContainer->AsShadowLayer()->SetShadowTransform(m);
   }
 
@@ -519,11 +529,19 @@ CompositorParent::TransformFixedLayers(Layer* aLayer,
     gfxPoint translation(aTranslation.x - (anchor.x - anchor.x / aScaleDiff.x),
                          aTranslation.y - (anchor.y - anchor.y / aScaleDiff.y));
 
-    // We are only translating the transform, so it is OK to translate the
-    // transform without the resolution scale.  This allows us to avoid applying
-    // the resolution scale and its inverse an extra time.
-    gfx3DMatrix layerTransform = aLayer->GetBaseTransform();
+    // The transform already takes the resolution scale into account.  Since we
+    // will apply the resolution scale again when computing the effective
+    // transform, we must apply the inverse resolution scale here.
+    gfx3DMatrix layerTransform = aLayer->GetTransform();
     Translate2D(layerTransform, translation);
+    if (ContainerLayer* c = aLayer->AsContainerLayer()) {
+      layerTransform.Scale(1.0f/c->GetPreXScale(),
+                           1.0f/c->GetPreYScale(),
+                           1);
+    }
+    layerTransform.ScalePost(1.0f/aLayer->GetPostXScale(),
+                             1.0f/aLayer->GetPostYScale(),
+                             1);
     ShadowLayer* shadow = aLayer->AsShadowLayer();
     shadow->SetShadowTransform(layerTransform);
 
@@ -691,8 +709,7 @@ CompositorParent::ApplyAsyncContentTransformToTree(TimeStamp aCurrentFrame,
     gfx3DMatrix newTransform;
     *aWantNextFrame |=
       controller->SampleContentTransformForFrame(aCurrentFrame,
-                                                 container->GetFrameMetrics(),
-                                                 aLayer,
+                                                 container,
                                                  &newTransform);
 
     shadow->SetShadowTransform(newTransform);
@@ -724,7 +741,7 @@ CompositorParent::TransformShadowTree(TimeStamp aCurrentFrame)
 
   // FIXME/bug 775437: unify this interface with the ~native-fennec
   // derived code
-  // 
+  //
   // Attempt to apply an async content transform to any layer that has
   // an async pan zoom controller (which means that it is rendered
   // async using Gecko). If this fails, fall back to transforming the
@@ -814,9 +831,12 @@ CompositorParent::TransformShadowTree(TimeStamp aCurrentFrame)
     // will apply the resolution scale again when computing the effective
     // transform, we must apply the inverse resolution scale here.
     gfx3DMatrix computedTransform = treeTransform * currentTransform;
-    computedTransform.Scale(1.0f/layer->GetXScale(),
-                            1.0f/layer->GetYScale(),
+    computedTransform.Scale(1.0f/container->GetPreXScale(),
+                            1.0f/container->GetPreYScale(),
                             1);
+    computedTransform.ScalePost(1.0f/container->GetPostXScale(),
+                                1.0f/container->GetPostYScale(),
+                                1);
     shadow->SetShadowTransform(computedTransform);
     TransformFixedLayers(layer, offset, scaleDiff);
   }
diff --git a/gfx/layers/ipc/PLayers.ipdl b/gfx/layers/ipc/PLayers.ipdl
index b135e6508416..768e7aab4130 100644
--- a/gfx/layers/ipc/PLayers.ipdl
+++ b/gfx/layers/ipc/PLayers.ipdl
@@ -165,8 +165,8 @@ struct Animation {
 struct CommonLayerAttributes {
   nsIntRegion visibleRegion;
   TransformMatrix transform;
-  float xScale;
-  float yScale;
+  float postXScale;
+  float postYScale;
   PRUint32 contentFlags;
   Opacity opacity;
   bool useClipRect;
@@ -181,11 +181,15 @@ struct CommonLayerAttributes {
 struct ThebesLayerAttributes {
   nsIntRegion validRegion;
 };
-struct ContainerLayerAttributes{ FrameMetrics metrics; };
-struct ColorLayerAttributes    { Color color; };
-struct CanvasLayerAttributes   { GraphicsFilterType filter; };
-struct RefLayerAttributes      { int64_t id; };
-struct ImageLayerAttributes    {
+struct ContainerLayerAttributes {
+  FrameMetrics metrics;
+  float preXScale;
+  float preYScale;
+};
+struct ColorLayerAttributes     { Color color; };
+struct CanvasLayerAttributes    { GraphicsFilterType filter; };
+struct RefLayerAttributes       { int64_t id; };
+struct ImageLayerAttributes     {
   GraphicsFilterType filter;
   bool forceSingleTile;
 };
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index f0b225f6c42b..8ec60280a897 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -298,8 +298,8 @@ ShadowLayerForwarder::EndTransaction(InfallibleTArray<EditReply>* aReplies)
     LayerAttributes attrs;
     CommonLayerAttributes& common = attrs.common();
     common.visibleRegion() = mutant->GetVisibleRegion();
-    common.xScale() = mutant->GetXScale();
-    common.yScale() = mutant->GetYScale();
+    common.postXScale() = mutant->GetPostXScale();
+    common.postYScale() = mutant->GetPostYScale();
     common.transform() = mutant->GetBaseTransform();
     common.contentFlags() = mutant->GetContentFlags();
     common.opacity() = mutant->GetOpacity();
diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp
index f3bca517f160..dad931ba88c5 100644
--- a/gfx/layers/ipc/ShadowLayersParent.cpp
+++ b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -217,7 +217,7 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       layer->SetOpacity(common.opacity().value());
       layer->SetClipRect(common.useClipRect() ? &common.clipRect() : NULL);
       layer->SetBaseTransform(common.transform().value());
-      layer->SetScale(common.xScale(), common.yScale());
+      layer->SetPostScale(common.postXScale(), common.postYScale());
       static bool fixedPositionLayersEnabled = getenv("MOZ_ENABLE_FIXED_POSITION_LAYERS") != 0;
       if (fixedPositionLayersEnabled) {
         layer->SetIsFixedPosition(common.isFixedPosition());
@@ -248,13 +248,17 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
 
         break;
       }
-      case Specific::TContainerLayerAttributes:
+      case Specific::TContainerLayerAttributes: {
         MOZ_LAYERS_LOG(("[ParentSide]   container layer"));
 
-        static_cast<ContainerLayer*>(layer)->SetFrameMetrics(
-          specific.get_ContainerLayerAttributes().metrics());
+        ContainerLayer* containerLayer =
+          static_cast<ContainerLayer*>(layer);
+        const ContainerLayerAttributes& attrs =
+          specific.get_ContainerLayerAttributes();
+        containerLayer->SetFrameMetrics(attrs.metrics());
+        containerLayer->SetPreScale(attrs.preXScale(), attrs.preYScale());
         break;
-
+      }
       case Specific::TColorLayerAttributes:
         MOZ_LAYERS_LOG(("[ParentSide]   color layer"));
 
diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in
index 61ba8b94a25c..1f30cef495ac 100644
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -25,7 +25,7 @@
 #
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in
index 8bcad3f368e5..e0c9a51751b9 100644
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index 530f98377b59..1dde43ef5aa8 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 8e495b9eb27c..f2c2d51900ee 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in
index 9e2ebfc40164..cf2ec5070663 100644
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = gfx/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in
index 01e7c2528277..24f9281e1782 100644
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/gfx/thebes/gfx3DMatrix.cpp b/gfx/thebes/gfx3DMatrix.cpp
index 0552328760aa..a34d041b8633 100644
--- a/gfx/thebes/gfx3DMatrix.cpp
+++ b/gfx/thebes/gfx3DMatrix.cpp
@@ -182,6 +182,25 @@ gfx3DMatrix::TranslatePost(const gfxPoint3D& aPoint)
     _43 += _44 * aPoint.z;
 }
 
+void
+gfx3DMatrix::ScalePost(float aX, float aY, float aZ)
+{
+  _11 *= aX;
+  _21 *= aX;
+  _31 *= aX;
+  _41 *= aX;
+
+  _12 *= aY;
+  _22 *= aY;
+  _32 *= aY;
+  _42 *= aY;
+
+  _13 *= aZ;
+  _23 *= aZ;
+  _33 *= aZ;
+  _43 *= aZ;
+}
+
 void
 gfx3DMatrix::SkewXY(double aSkew)
 {
diff --git a/gfx/thebes/gfx3DMatrix.h b/gfx/thebes/gfx3DMatrix.h
index abf8a2601bb6..b8cdb6e51681 100644
--- a/gfx/thebes/gfx3DMatrix.h
+++ b/gfx/thebes/gfx3DMatrix.h
@@ -213,7 +213,7 @@ public:
    * a single transformation and post-multiply it onto the current
    * matrix.
    */
-  
+
   /**
    * Add a translation by aPoint after the matrix.
    * This is functionally equivalent to:
@@ -221,6 +221,8 @@ public:
    */
   void TranslatePost(const gfxPoint3D& aPoint);
 
+  void ScalePost(float aX, float aY, float aZ);
+
   /**
    * Transforms a point according to this matrix.
    */
diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index e6eda0a6e6d7..a6db090f3654 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -46,7 +46,7 @@ class gfxShapedWord;
 
 class nsILanguageAtomService;
 
-typedef struct _hb_blob_t hb_blob_t;
+typedef struct hb_blob_t hb_blob_t;
 
 #define FONT_MAX_SIZE                  2000.0
 
diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
index 306cc3971972..94d70a5b3e0b 100644
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
@@ -645,13 +645,15 @@ HBGetHKerning(hb_font_t *font, void *font_data,
  */
 
 static hb_codepoint_t
-HBGetMirroring(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
+HBGetMirroring(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
+               void *user_data)
 {
     return GetMirroredChar(aCh);
 }
 
 static hb_unicode_general_category_t
-HBGetGeneralCategory(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
+HBGetGeneralCategory(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
+                     void *user_data)
 {
     return hb_unicode_general_category_t(GetGeneralCategory(aCh));
 }
@@ -659,18 +661,19 @@ HBGetGeneralCategory(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_
 static hb_script_t
 HBGetScript(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
 {
-    return hb_script_t(GetScriptTagForCode
-        (GetScriptCode(aCh)));
+    return hb_script_t(GetScriptTagForCode(GetScriptCode(aCh)));
 }
 
-static unsigned int
-HBGetCombiningClass(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
+static hb_unicode_combining_class_t
+HBGetCombiningClass(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
+                    void *user_data)
 {
-    return GetCombiningClass(aCh);
+    return hb_unicode_combining_class_t(GetCombiningClass(aCh));
 }
 
 static unsigned int
-HBGetEastAsianWidth(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
+HBGetEastAsianWidth(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
+                    void *user_data)
 {
     return GetEastAsianWidth(aCh);
 }
diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index 05eb9c4ee962..7affe164ae90 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -1,4 +1,4 @@
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
            $(NULL)
 endif
 else
-ifeq ($(OS_ARCH),Linux)
-CPPSRCS += yuv_row_posix.cpp \
-           $(NULL)
-else
-ifeq ($(OS_ARCH),SunOS)
-CPPSRCS += yuv_row_posix.cpp \
-           $(NULL)
-else
-ifeq ($(OS_ARCH),Darwin)
+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
 CPPSRCS += yuv_row_posix.cpp \
            $(NULL)
 else
 CPPSRCS += yuv_row_other.cpp \
            $(NULL)
-endif # Darwin
-endif # SunOS
-endif # linux
+endif # posix
 endif # windows
 
 ifeq (arm,$(findstring arm,$(OS_TEST)))
diff --git a/hal/Hal.cpp b/hal/Hal.cpp
index 468536d671d0..a5b6d732b142 100644
--- a/hal/Hal.cpp
+++ b/hal/Hal.cpp
@@ -22,6 +22,11 @@
 #include "WindowIdentifier.h"
 #include "mozilla/dom/ScreenOrientation.h"
 
+#ifdef XP_WIN
+#include <process.h>
+#define getpid _getpid
+#endif
+
 using namespace mozilla::services;
 
 #define PROXY_IF_SANDBOXED(_call)                 \
@@ -728,5 +733,16 @@ SetAlarm(PRInt32 aSeconds, PRInt32 aNanoseconds)
   RETURN_PROXY_IF_SANDBOXED(SetAlarm(aSeconds, aNanoseconds));
 }
 
+void
+SetProcessPriority(int aPid, ProcessPriority aPriority)
+{
+  if (InSandbox()) {
+    hal_sandbox::SetProcessPriority(aPid, aPriority);
+  }
+  else {
+    hal_impl::SetProcessPriority(aPid, aPriority);
+  }
+}
+
 } // namespace hal
 } // namespace mozilla
diff --git a/hal/Hal.h b/hal/Hal.h
index a2d84c9990c3..84d96241a456 100644
--- a/hal/Hal.h
+++ b/hal/Hal.h
@@ -402,6 +402,15 @@ void NotifyAlarmFired();
  */
 bool SetAlarm(PRInt32 aSeconds, PRInt32 aNanoseconds);
 
+/**
+ * Set the priority of the given process.
+ *
+ * Exactly what this does will vary between platforms.  On *nix we might give
+ * background processes higher nice values.  On other platforms, we might
+ * ignore this call entirely.
+ */
+void SetProcessPriority(int aPid, hal::ProcessPriority aPriority);
+
 } // namespace MOZ_HAL_NAMESPACE
 } // namespace mozilla
 
diff --git a/hal/HalTypes.h b/hal/HalTypes.h
index 8687d3710c0c..1833297655a3 100644
--- a/hal/HalTypes.h
+++ b/hal/HalTypes.h
@@ -54,11 +54,13 @@ enum SwitchState {
 };
 
 typedef Observer<SwitchEvent> SwitchObserver;
-} // namespace hal
-} // namespace mozilla
 
-namespace mozilla {
-namespace hal {
+enum ProcessPriority {
+  PROCESS_PRIORITY_BACKGROUND,
+  PROCESS_PRIORITY_FOREGROUND,
+  PROCESS_PRIORITY_MASTER,
+  NUM_PROCESS_PRIORITY
+};
 
 /**
  * Used by ModifyWakeLock
@@ -69,8 +71,8 @@ enum WakeLockControl {
   WAKE_LOCK_ADD_ONE    = 1,
 };
 
-}
-}
+} // namespace hal
+} // namespace mozilla
 
 namespace IPC {
 
@@ -134,6 +136,13 @@ struct ParamTraits<mozilla::hal::SwitchDevice>:
                         mozilla::hal::NUM_SWITCH_DEVICE> {
 };
 
+template <>
+struct ParamTraits<mozilla::hal::ProcessPriority>:
+  public EnumSerializer<mozilla::hal::ProcessPriority,
+                        mozilla::hal::PROCESS_PRIORITY_BACKGROUND,
+                        mozilla::hal::NUM_PROCESS_PRIORITY> {
+};
+
 
 } // namespace IPC
 
diff --git a/hal/Makefile.in b/hal/Makefile.in
index 00125636a777..5c37019aea90 100644
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = \
@@ -124,6 +124,7 @@ CPPSRCS += \
   FallbackWakeLocks.cpp \
   FallbackSwitch.cpp \
   FallbackScreenPower.cpp \
+  FallbackProcessPriority.cpp \
   $(NULL)
 endif #}
 
diff --git a/hal/fallback/FallbackProcessPriority.cpp b/hal/fallback/FallbackProcessPriority.cpp
new file mode 100644
index 000000000000..f7a528592b61
--- /dev/null
+++ b/hal/fallback/FallbackProcessPriority.cpp
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Hal.h"
+
+using namespace mozilla::hal;
+
+namespace mozilla {
+namespace hal_impl {
+
+void
+SetProcessPriority(int aPid, ProcessPriority aPriority)
+{
+  HAL_LOG(("FallbackProcessPriority - SetProcessPriority(%d, %d)\n", aPid, aPriority));
+}
+
+} // hal_impl
+} // namespace mozilla
diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp
index 50aba0fa531d..9ac8fc97bf4d 100644
--- a/hal/gonk/GonkHal.cpp
+++ b/hal/gonk/GonkHal.cpp
@@ -21,6 +21,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <sys/syscall.h>
+#include <sys/resource.h>
 #include <time.h>
 
 #include "android/log.h"
@@ -39,7 +40,9 @@
 #include "mozilla/FileUtils.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
 #include "nsAlgorithm.h"
+#include "nsPrintfCString.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIRunnable.h"
@@ -56,7 +59,8 @@
 #define NsecPerSec   1000000000
 
 
-using mozilla::hal::WindowIdentifier;
+using namespace mozilla;
+using namespace mozilla::hal;
 
 namespace mozilla {
 namespace hal_impl {
@@ -800,5 +804,50 @@ SetAlarm(PRInt32 aSeconds, PRInt32 aNanoseconds)
   return true;
 }
 
+void
+SetProcessPriority(int aPid, ProcessPriority aPriority)
+{
+  HAL_LOG(("SetProcessPriority(pid=%d, priority=%d)", aPid, aPriority));
+
+  const char* priorityStr = NULL;
+  switch (aPriority) {
+  case PROCESS_PRIORITY_BACKGROUND:
+    priorityStr = "background";
+    break;
+  case PROCESS_PRIORITY_FOREGROUND:
+    priorityStr = "foreground";
+    break;
+  case PROCESS_PRIORITY_MASTER:
+    priorityStr = "master";
+    break;
+  default:
+    MOZ_NOT_REACHED();
+  }
+
+  // Notice that you can disable oom_adj and renice by deleting the prefs
+  // hal.processPriorityManager{foreground,background,master}{OomAdjust,Nice}.
+
+  PRInt32 oomAdj = 0;
+  nsresult rv = Preferences::GetInt(nsPrintfCString(
+    "hal.processPriorityManager.gonk.%sOomAdjust", priorityStr).get(), &oomAdj);
+  if (NS_SUCCEEDED(rv)) {
+    HAL_LOG(("Setting oom_adj for pid %d to %d", aPid, oomAdj));
+    WriteToFile(nsPrintfCString("/proc/%d/oom_adj", aPid).get(),
+                nsPrintfCString("%d", oomAdj).get());
+  }
+
+  PRInt32 nice = 0;
+  rv = Preferences::GetInt(nsPrintfCString(
+    "hal.processPriorityManager.gonk.%sNice", priorityStr).get(), &nice);
+  if (NS_SUCCEEDED(rv)) {
+    HAL_LOG(("Setting nice for pid %d to %d", aPid, nice));
+
+    int success = setpriority(PRIO_PROCESS, aPid, nice);
+    if (success != 0) {
+      HAL_LOG(("Failed to set nice for pid %d to %d", aPid, nice));
+    }
+  }
+}
+
 } // hal_impl
 } // mozilla
diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl
index 79b4621f0ea4..0e35bf2efaad 100644
--- a/hal/sandbox/PHal.ipdl
+++ b/hal/sandbox/PHal.ipdl
@@ -21,6 +21,7 @@ using mozilla::hal::SensorAccuracyType;
 using mozilla::hal::WakeLockControl;
 using mozilla::hal::SwitchState;
 using mozilla::hal::SwitchDevice;
+using mozilla::hal::ProcessPriority;
 using nsIntRect;
 using PRTime;
 
@@ -71,7 +72,8 @@ struct ScreenConfiguration {
   uint32_t colorDepth;
   uint32_t pixelDepth;
 };
-}
+
+} // namespace hal
 
 namespace hal_sandbox {
 
@@ -138,6 +140,8 @@ parent:
     sync GetCurrentSwitchState(SwitchDevice aDevice)
       returns (SwitchState aState);
 
+    SetProcessPriority(int aPid, ProcessPriority aPriority);
+
 child:
     NotifySensorChange(SensorData aSensorData);
 
diff --git a/hal/sandbox/SandboxHal.cpp b/hal/sandbox/SandboxHal.cpp
index 756bce7b0597..ed6bdfb63955 100644
--- a/hal/sandbox/SandboxHal.cpp
+++ b/hal/sandbox/SandboxHal.cpp
@@ -280,6 +280,12 @@ SetAlarm(PRInt32 aSeconds, PRInt32 aNanoseconds)
   return false;
 }
 
+void
+SetProcessPriority(int aPid, ProcessPriority aPriority)
+{
+  Hal()->SendSetProcessPriority(aPid, aPriority);
+}
+
 class HalParent : public PHalParent
                 , public BatteryObserver
                 , public NetworkObserver
@@ -568,6 +574,15 @@ public:
     *aState = hal::GetCurrentSwitchState(aDevice);
     return true;
   }
+
+  virtual bool
+  RecvSetProcessPriority(const int& aPid, const ProcessPriority& aPriority)
+  {
+    // TODO As a security check, we should ensure that aPid is either the pid
+    // of our child, or the pid of one of the child's children.
+    hal::SetProcessPriority(aPid, aPriority);
+    return true;
+  }
 };
 
 class HalChild : public PHalChild {
diff --git a/image/Makefile.in b/image/Makefile.in
index b640b3dedd7e..5eaebb5d51d6 100644
--- a/image/Makefile.in
+++ b/image/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/build/Makefile.in b/image/build/Makefile.in
index 3ccffc459b34..be66aa9cc5bd 100644
--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in
index 0bdb72886ea9..48f572094295 100644
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in
index 6a4c06e1428b..b2a2d5be8ca1 100644
--- a/image/decoders/icon/Makefile.in
+++ b/image/decoders/icon/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in
index d8f2214fa4a0..18d7b406bb6a 100644
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in
index 5db225569a07..f1dab5152fc0 100644
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/mac/Makefile.in b/image/decoders/icon/mac/Makefile.in
index cff67c24ea16..cd99b51487df 100644
--- a/image/decoders/icon/mac/Makefile.in
+++ b/image/decoders/icon/mac/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/os2/Makefile.in b/image/decoders/icon/os2/Makefile.in
index c18eb04f0e78..265d2670971f 100644
--- a/image/decoders/icon/os2/Makefile.in
+++ b/image/decoders/icon/os2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in
index 27cbb623be69..422b561533d2 100644
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/qt/public/Makefile.in b/image/decoders/icon/qt/public/Makefile.in
index a78edbcbb067..fa3023546aa7 100644
--- a/image/decoders/icon/qt/public/Makefile.in
+++ b/image/decoders/icon/qt/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/decoders/icon/win/Makefile.in b/image/decoders/icon/win/Makefile.in
index 26c4b2ff9b7a..4ecec439a838 100644
--- a/image/decoders/icon/win/Makefile.in
+++ b/image/decoders/icon/win/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/encoders/Makefile.in b/image/encoders/Makefile.in
index 22f8b17e7189..bdfa9f0e008e 100644
--- a/image/encoders/Makefile.in
+++ b/image/encoders/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in
index ebe20150988d..d21311ad0b81 100644
--- a/image/encoders/bmp/Makefile.in
+++ b/image/encoders/bmp/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in
index fc42129aa7b1..fdf467b76bef 100644
--- a/image/encoders/ico/Makefile.in
+++ b/image/encoders/ico/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/encoders/jpeg/Makefile.in b/image/encoders/jpeg/Makefile.in
index cd64912ba02a..489e942c3bd4 100644
--- a/image/encoders/jpeg/Makefile.in
+++ b/image/encoders/jpeg/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in
index 86c6cfac3527..6fb29369144f 100644
--- a/image/encoders/png/Makefile.in
+++ b/image/encoders/png/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/public/Makefile.in b/image/public/Makefile.in
index 5212f4c5abb4..8da0b64d2ba1 100644
--- a/image/public/Makefile.in
+++ b/image/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/src/Makefile.in b/image/src/Makefile.in
index 200ef64bd883..0ded054c0ee5 100644
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/image/test/Makefile.in b/image/test/Makefile.in
index 20e510afa179..3f47460a8834 100644
--- a/image/test/Makefile.in
+++ b/image/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = image/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/image/test/browser/Makefile.in b/image/test/browser/Makefile.in
index 783ac15b07ef..c021eed9a214 100644
--- a/image/test/browser/Makefile.in
+++ b/image/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = image/test/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/image/test/mochitest/Makefile.in b/image/test/mochitest/Makefile.in
index f3eb0c2c462e..f779aa55988c 100644
--- a/image/test/mochitest/Makefile.in
+++ b/image/test/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = image/test/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index d15f33816047..432c80ea4af1 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in
index 8b2a821bbafe..11bb2c54a037 100644
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/chardet/Makefile.in b/intl/chardet/Makefile.in
index 2fa8872edfb5..a40a06552d75 100644
--- a/intl/chardet/Makefile.in
+++ b/intl/chardet/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/chardet/public/Makefile.in b/intl/chardet/public/Makefile.in
index 7c680f2ef9bf..0a4a35a5cd3c 100644
--- a/intl/chardet/public/Makefile.in
+++ b/intl/chardet/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in
index b10f1a205757..32489598a12c 100644
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/hyphenation/Makefile.in b/intl/hyphenation/Makefile.in
index 7cc6b077676b..4404ec5c73a6 100644
--- a/intl/hyphenation/Makefile.in
+++ b/intl/hyphenation/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/hyphenation/public/Makefile.in b/intl/hyphenation/public/Makefile.in
index dac7d2cf9d8b..6e20f6d1ef3a 100644
--- a/intl/hyphenation/public/Makefile.in
+++ b/intl/hyphenation/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/hyphenation/src/Makefile.in b/intl/hyphenation/src/Makefile.in
index 3f90a274b1a4..32c5c302f188 100644
--- a/intl/hyphenation/src/Makefile.in
+++ b/intl/hyphenation/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/intl/locale/Makefile.in b/intl/locale/Makefile.in
index 9e5859028d52..9a8f125c729e 100644
--- a/intl/locale/Makefile.in
+++ b/intl/locale/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/idl/Makefile.in b/intl/locale/idl/Makefile.in
index 4bd19a7b5758..73243c824beb 100644
--- a/intl/locale/idl/Makefile.in
+++ b/intl/locale/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/public/Makefile.in b/intl/locale/public/Makefile.in
index aff6c1a5fa8a..8880c23fa286 100644
--- a/intl/locale/public/Makefile.in
+++ b/intl/locale/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in
index 933e537e1b8c..28b6367b7624 100644
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in
index 1bd175390ba9..bce4a57692ec 100644
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in
index 3d0c81c868b3..a471db8450dd 100644
--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in
index 5accdf9a06d6..52fdd6724987 100644
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in
index 5dabd76b6feb..3a1312774240 100644
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/locale/tests/Makefile.in b/intl/locale/tests/Makefile.in
index 3c8ea79434fe..104d652e691c 100644
--- a/intl/locale/tests/Makefile.in
+++ b/intl/locale/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = intl/locale/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in
index eafdc843eb16..4490abd17ee6 100644
--- a/intl/locales/Makefile.in
+++ b/intl/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = intl/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/intl/lwbrk/Makefile.in b/intl/lwbrk/Makefile.in
index 88e19162e397..a935401a568e 100644
--- a/intl/lwbrk/Makefile.in
+++ b/intl/lwbrk/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/lwbrk/idl/Makefile.in b/intl/lwbrk/idl/Makefile.in
index 1e365b6cdd98..25c680f7fa95 100644
--- a/intl/lwbrk/idl/Makefile.in
+++ b/intl/lwbrk/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/lwbrk/public/Makefile.in b/intl/lwbrk/public/Makefile.in
index 240ca479047f..db804d335cea 100644
--- a/intl/lwbrk/public/Makefile.in
+++ b/intl/lwbrk/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in
index a3d93dc120c5..8c2b7b74a8b3 100644
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/lwbrk/tests/Makefile.in b/intl/lwbrk/tests/Makefile.in
index e168d1fe3aef..2f5f2ada87cb 100644
--- a/intl/lwbrk/tests/Makefile.in
+++ b/intl/lwbrk/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/strres/Makefile.in b/intl/strres/Makefile.in
index 8fc1eaba4eb3..56786a26cff4 100644
--- a/intl/strres/Makefile.in
+++ b/intl/strres/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/strres/public/Makefile.in b/intl/strres/public/Makefile.in
index e8618ed9c357..c1d97511005b 100644
--- a/intl/strres/public/Makefile.in
+++ b/intl/strres/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in
index 6ce1217999ca..a411b2525de4 100644
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/strres/tests/Makefile.in b/intl/strres/tests/Makefile.in
index ecf41aaebdea..ad49797a8f1e 100644
--- a/intl/strres/tests/Makefile.in
+++ b/intl/strres/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = intl/strres/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/intl/uconv/Makefile.in b/intl/uconv/Makefile.in
index d2bb97c8ce3c..c337c5426022 100644
--- a/intl/uconv/Makefile.in
+++ b/intl/uconv/Makefile.in
@@ -15,7 +15,7 @@
 # 12/09/1999   IBM Corp.       Support for IBM codepages - 850,852,855,857,862,864
 #
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/idl/Makefile.in b/intl/uconv/idl/Makefile.in
index b11e4ecbd094..11bdd1136a44 100644
--- a/intl/uconv/idl/Makefile.in
+++ b/intl/uconv/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/public/Makefile.in b/intl/uconv/public/Makefile.in
index fd2e822ac8c9..e600717f96f1 100644
--- a/intl/uconv/public/Makefile.in
+++ b/intl/uconv/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in
index 08f3b3878434..842779fc8a05 100644
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in
index 23f65ae0aca6..e2933fdec250 100644
--- a/intl/uconv/tests/Makefile.in
+++ b/intl/uconv/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = intl/uconv/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -30,7 +30,7 @@ XPCSHELL_TESTS	= unit
 #
 #SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
-relativesrcdir	= intl/uconv/tests
+relativesrcdir	= @relativesrcdir@
 
 MOCHITEST_FILES =	\
 		test_bug335816.html \
diff --git a/intl/uconv/tools/Makefile.in b/intl/uconv/tools/Makefile.in
index 7a5cd4effeaa..2afda789c233 100644
--- a/intl/uconv/tools/Makefile.in
+++ b/intl/uconv/tools/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in
index cd486203c9a4..83d849a97dee 100644
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in
index bbbc0a189a8f..ac68ed4e55bb 100644
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in
index 15d59160a3d5..366b4500e2a0 100644
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in
index b8ab0b2842c2..831562941436 100644
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in
index 54ec67185f5f..d7d373842804 100644
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in
index cf87adf3244e..6bde9b2bcb38 100644
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in
index 560e289fdd34..e3548a7a0c99 100644
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in
index 1c4b512c1938..2423b30b3d96 100644
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/Makefile.in b/intl/unicharutil/Makefile.in
index 7e41100c6ea1..76396be65859 100644
--- a/intl/unicharutil/Makefile.in
+++ b/intl/unicharutil/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/idl/Makefile.in b/intl/unicharutil/idl/Makefile.in
index 5328cb879d8a..be4e03bd3b3b 100644
--- a/intl/unicharutil/idl/Makefile.in
+++ b/intl/unicharutil/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/public/Makefile.in b/intl/unicharutil/public/Makefile.in
index a9e203f3c3b9..5f670ba50499 100644
--- a/intl/unicharutil/public/Makefile.in
+++ b/intl/unicharutil/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/src/Makefile.in b/intl/unicharutil/src/Makefile.in
index 4a591cf53077..0f12f6f0bec3 100644
--- a/intl/unicharutil/src/Makefile.in
+++ b/intl/unicharutil/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/tables/Makefile.in b/intl/unicharutil/tables/Makefile.in
index 90d7cef03ec2..caff6062e6e5 100644
--- a/intl/unicharutil/tables/Makefile.in
+++ b/intl/unicharutil/tables/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in
index 4b571dd528f2..bea0c3ba69b7 100644
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = intl/unicharutil/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/intl/unicharutil/tools/Makefile.in b/intl/unicharutil/tools/Makefile.in
index 446d1c74e0fa..023fb4f4759b 100644
--- a/intl/unicharutil/tools/Makefile.in
+++ b/intl/unicharutil/tools/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in
index 3156c22bd248..09947efc4d6e 100644
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in
index e2e0bd9b8841..9766d64746b4 100644
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/ipc/Makefile.in b/ipc/Makefile.in
index ef0556897177..972aab03a8e3 100644
--- a/ipc/Makefile.in
+++ b/ipc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in
index 4cd6bb4bf144..461d42da9e1e 100644
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
index 79f8ff0c00d9..7cf4ae129d5a 100644
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in
index 6005e24636a3..bdbb93dc6134 100644
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in
index 41da46ece8bc..77bec25bcc67 100644
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in
index d4fbaad2c376..dc9032afa938 100644
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/ipdl/test/Makefile.in b/ipc/ipdl/test/Makefile.in
index 3ff4dabd4fd9..c83dd58b2366 100644
--- a/ipc/ipdl/test/Makefile.in
+++ b/ipc/ipdl/test/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in
index 68613cdce212..03ce15d9d892 100644
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in
index cb848123e3f7..221ce7c446e4 100644
--- a/ipc/ipdl/test/cxx/app/Makefile.in
+++ b/ipc/ipdl/test/cxx/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/ipdl/test/ipdl/Makefile.in b/ipc/ipdl/test/ipdl/Makefile.in
index ed1539fce524..e42a7651f09a 100644
--- a/ipc/ipdl/test/ipdl/Makefile.in
+++ b/ipc/ipdl/test/ipdl/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in
index a2ff2a2ee3db..fefc2e823cb2 100644
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in
index 5dd89cb7dcc6..61d47b92eb34 100644
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = ipc/testshell
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in
index d86be4c18f5c..f656a08a8211 100644
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = js/ductwork/debugger
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in
index d941bebfefd4..9a02d86a704b 100644
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/js/ipc/tests/Makefile.in b/js/ipc/tests/Makefile.in
index 8e562b34f987..40eb41682ff1 100644
--- a/js/ipc/tests/Makefile.in
+++ b/js/ipc/tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 856f56081ecb..9fcbb08fd3df 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -6,11 +6,11 @@
 
 
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
-relativesrcdir  = js/jsd
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/jsd/idl/Makefile.in b/js/jsd/idl/Makefile.in
index faa009587f9d..15d81a088cde 100644
--- a/js/jsd/idl/Makefile.in
+++ b/js/jsd/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/jsd/test/Makefile.in b/js/jsd/test/Makefile.in
index efd77ca6265e..59a633d1d765 100644
--- a/js/jsd/test/Makefile.in
+++ b/js/jsd/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = js/jsd/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index e382f75e2de2..39b88e95bd5e 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -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/.
 
-DEPTH		= .
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 
@@ -915,6 +915,10 @@ $(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
 $(addsuffix .$(OBJ_SUFFIX),jsprobes jsinterp jsobj): $(CURDIR)/javascript-trace.h
 endif
 
+ifdef HAVE_LINUX_PERF_EVENT_H
+pm_linux.$(OBJ_SUFFIX): CXXFLAGS += $(LINUX_HEADERS_INCLUDES)
+endif
+
 ###############################################
 # BEGIN kludges for the Nitro assembler
 #
diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4
index 631621891721..7fd7ad3ce0cd 100644
--- a/js/src/aclocal.m4
+++ b/js/src/aclocal.m4
@@ -3,6 +3,7 @@ dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
 dnl
 
+builtin(include, build/autoconf/config.status.m4)dnl
 builtin(include, build/autoconf/toolchain.m4)dnl
 builtin(include, build/autoconf/ccache.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
@@ -21,5 +22,6 @@ builtin(include, build/autoconf/expandlibs.m4)dnl
 builtin(include, build/autoconf/arch.m4)dnl
 builtin(include, build/autoconf/android.m4)dnl
 builtin(include, build/autoconf/zlib.m4)dnl
+builtin(include, build/autoconf/linux.m4)dnl
 
 MOZ_PROG_CHECKMSYS()
diff --git a/js/src/build/ConfigStatus.py b/js/src/build/ConfigStatus.py
new file mode 100644
index 000000000000..6b53b07c2380
--- /dev/null
+++ b/js/src/build/ConfigStatus.py
@@ -0,0 +1,325 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Combined with build/autoconf/config.status.m4, ConfigStatus is an almost
+# drop-in replacement for autoconf 2.13's config.status, with features
+# borrowed from autoconf > 2.5, and additional features.
+
+from __future__ import with_statement
+from optparse import OptionParser
+import sys, re, os, posixpath, ntpath
+from StringIO import StringIO
+# Standalone js doesn't have virtualenv.
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config'))
+from Preprocessor import Preprocessor
+
+# Basic logging facility
+verbose = False
+def log(string):
+    if verbose:
+        print >>sys.stderr, string
+
+# We need relpath, but it is introduced in python 2.6
+# http://docs.python.org/library/os.path.html
+def my_relpath(path, start):
+    """
+    Return a relative version of a path
+    from /usr/lib/python2.6/posixpath.py
+    """
+
+    if not path:
+        raise ValueError("no path specified")
+
+    start_list = os.path.abspath(start).split(os.path.sep)
+    path_list = os.path.abspath(path).split(os.path.sep)
+
+    # Work out how much of the filepath is shared by start and path.
+    i = len(os.path.commonprefix([start_list, path_list]))
+
+    rel_list = [os.path.pardir] * (len(start_list)-i) + path_list[i:]
+    if not rel_list:
+        return os.curdir
+    return os.path.join(*rel_list)
+
+relpath = getattr(os.path, "relpath", my_relpath)
+
+def ensureParentDir(file):
+    '''Ensures the directory parent to the given file exists'''
+    dir = os.path.dirname(file)
+    if dir and not os.path.exists(dir):
+        try:
+            os.makedirs(dir)
+        except OSError, error:
+            if error.errno != errno.EEXIST:
+                raise
+
+class FileAvoidWrite(StringIO):
+    '''file-like object that buffers its output and only writes it to disk
+    if the new contents are different from what the file may already contain.
+    '''
+    def __init__(self, filename):
+        self.filename = filename
+        StringIO.__init__(self)
+
+    def close(self):
+        buf = self.getvalue()
+        StringIO.close(self)
+        try:
+            file = open(self.filename, 'rU')
+        except IOError:
+            pass
+        else:
+            try:
+                 if file.read() == buf:
+                     log("%s is unchanged" % relpath(self.filename, os.curdir))
+                     return
+            except IOError:
+                pass
+            finally:
+                file.close()
+
+        log("creating %s" % relpath(self.filename, os.curdir))
+        ensureParentDir(self.filename)
+        with open(self.filename, 'w') as file:
+            file.write(buf)
+
+    def __enter__(self):
+        return self
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+def shell_escape(s):
+    '''Escape some characters with a backslash, and double dollar signs.
+    '''
+    return re.sub('''([ \t`#$^&*(){}\\|;'"<>?\[\]])''', r'\\\1', str(s)).replace('$', '$$')
+
+class ConfigEnvironment(object):
+    '''A ConfigEnvironment is defined by a source directory and a build
+    directory. It preprocesses files from the source directory and stores
+    the result in the object directory.
+
+     There are two types of files: config files and config headers,
+     each treated through a different member function.
+
+     Creating a ConfigEnvironment requires a few arguments:
+       - topsrcdir and topobjdir are, respectively, the top source and
+         the top object directory.
+       - defines is a list of (name, value) tuples. In autoconf, these are
+         set with AC_DEFINE and AC_DEFINE_UNQUOTED
+       - non_global_defines are a list of names appearing in defines above
+         that are not meant to be exported in ACDEFINES and ALLDEFINES (see
+         below)
+       - substs is a list of (name, value) tuples. In autoconf, these are
+         set with AC_SUBST.
+
+     ConfigEnvironment automatically defines two additional substs variables
+     from all the defines not appearing in non_global_defines:
+       - ACDEFINES contains the defines in the form -DNAME=VALUE, for use on
+         preprocessor command lines. The order in which defines were given
+         when creating the ConfigEnvironment is preserved.
+       - ALLDEFINES contains the defines in the form #define NAME VALUE, in
+         sorted order, for use in config files, for an automatic listing of
+         defines.
+
+    ConfigEnvironment expects a "top_srcdir" subst to be set with the top
+    source directory, in msys format on windows. It is used to derive a
+    "srcdir" subst when treating config files. It can either be an absolute
+    path or a path relative to the topobjdir.
+    '''
+
+    def __init__(self, topobjdir = '.', topsrcdir = '.',
+                 defines = [], non_global_defines = [], substs = []):
+        self.defines = dict(defines)
+        self.substs = dict(substs)
+        self.topsrcdir = topsrcdir
+        self.topobjdir = topobjdir
+        global_defines = [name for name, value in defines if not name in non_global_defines]
+        self.substs['ACDEFINES'] = ' '.join(["-D%s=%s" % (name, shell_escape(self.defines[name])) for name in global_defines])
+        self.substs['ALLDEFINES'] = '\n'.join(sorted(["#define %s %s" % (name, self.defines[name]) for name in global_defines]))
+
+    def get_relative_srcdir(self, file):
+        '''Returns the relative source directory for the given file, always
+        using / as a path separator.
+        '''
+        assert(isinstance(file, basestring))
+        dir = posixpath.dirname(relpath(file, self.topobjdir).replace(os.sep, '/'))
+        if dir:
+            return dir
+        return '.'
+
+    def get_top_srcdir(self, file):
+        '''Returns a normalized top_srcdir for the given file: if
+        substs['top_srcdir'] is a relative path, it is relative to the
+        topobjdir. Adjust it to be relative to the file path.'''
+        top_srcdir = self.substs['top_srcdir']
+        if posixpath.isabs(top_srcdir) or ntpath.isabs(top_srcdir):
+            return top_srcdir
+        return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))
+
+    def get_file_srcdir(self, file):
+        '''Returns the srcdir for the given file, where srcdir is in msys
+        format on windows, thus derived from top_srcdir.
+        '''
+        dir = self.get_relative_srcdir(file)
+        top_srcdir = self.get_top_srcdir(file)
+        return posixpath.normpath(posixpath.join(top_srcdir, dir))
+
+    def get_depth(self, file):
+        '''Returns the DEPTH for the given file, that is, the path to the
+        object directory relative to the directory containing the given file.
+        Always uses / as a path separator.
+        '''
+        return relpath(self.topobjdir, os.path.dirname(file)).replace(os.sep, '/')
+
+    def get_input(self, file):
+        '''Returns the input file path in the source tree that can be used
+        to create the given config file or header.
+        '''
+        assert(isinstance(file, basestring))
+        return os.path.normpath(os.path.join(self.topsrcdir, "%s.in" % relpath(file, self.topobjdir)))
+
+    def create_config_file(self, path):
+        '''Creates the given config file. A config file is generated by
+        taking the corresponding source file and replacing occurences of
+        "@VAR@" by the value corresponding to "VAR" in the substs dict.
+
+        Additional substs are defined according to the file being treated:
+            "srcdir" for its the path to its source directory
+            "relativesrcdir" for its source directory relative to the top
+            "DEPTH" for the path to the top object directory
+        '''
+        input = self.get_input(path)
+        pp = Preprocessor()
+        pp.context.update(self.substs)
+        pp.context.update(top_srcdir = self.get_top_srcdir(path))
+        pp.context.update(srcdir = self.get_file_srcdir(path))
+        pp.context.update(relativesrcdir = self.get_relative_srcdir(path))
+        pp.context.update(DEPTH = self.get_depth(path))
+        pp.do_filter('attemptSubstitution')
+        pp.setMarker(None)
+        with FileAvoidWrite(path) as pp.out:
+            pp.do_include(input)
+
+    def create_config_header(self, path):
+        '''Creates the given config header. A config header is generated by
+        taking the corresponding source file and replacing some #define/#undef
+        occurences:
+            "#undef NAME" is turned into "#define NAME VALUE"
+            "#define NAME" is unchanged
+            "#define NAME ORIGINAL_VALUE" is turned into "#define NAME VALUE"
+            "#undef UNKNOWN_NAME" is turned into "/* #undef UNKNOWN_NAME */"
+            Whitespaces are preserved.
+        '''
+        with open(self.get_input(path), 'rU') as input:
+            ensureParentDir(path)
+            output = FileAvoidWrite(path)
+            r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+            for l in input:
+                m = r.match(l)
+                if m:
+                    cmd = m.group('cmd')
+                    name = m.group('name')
+                    value = m.group('value')
+                    if name:
+                        if name in self.defines:
+                            if cmd == 'define' and value:
+                                l = l[:m.start('value')] + str(self.defines[name]) + l[m.end('value'):]
+                            elif cmd == 'undef':
+                                l = l[:m.start('cmd')] + 'define' + l[m.end('cmd'):m.end('name')] + ' ' + str(self.defines[name]) + l[m.end('name'):]
+                        elif cmd == 'undef':
+                           l = '/* ' + l[:m.end('name')] + ' */' + l[m.end('name'):]
+
+                output.write(l)
+            output.close()
+
+def config_status(topobjdir = '.', topsrcdir = '.',
+                  defines = [], non_global_defines = [], substs = [],
+                  files = [], headers = []):
+    '''Main function, providing config.status functionality.
+
+    Contrary to config.status, it doesn't use CONFIG_FILES or CONFIG_HEADERS
+    variables, but like config.status from autoconf 2.6, single files may be
+    generated with the --file and --header options. Several such options can
+    be given to generate several files at the same time.
+
+    Without the -n option, this program acts as config.status and considers
+    the current directory as the top object directory, even when config.status
+    is in a different directory. It will, however, treat the directory
+    containing config.status as the top object directory with the -n option,
+    while files given to the --file and --header arguments are considered
+    relative to the current directory.
+
+    The --recheck option, like with the original config.status, runs configure
+    again, with the options given in the "ac_configure_args" subst.
+
+    The options to this function are passed when creating the
+    ConfigEnvironment, except for files and headers, which contain the list
+    of files and headers to be generated by default. These lists, as well as
+    the actual wrapper script around this function, are meant to be generated
+    by configure. See build/autoconf/config.status.m4.
+
+    Unlike config.status behaviour with CONFIG_FILES and CONFIG_HEADERS,
+    but like config.status behaviour with --file and --header, providing
+    files or headers on the command line inhibits the default generation of
+    files when given headers and headers when given files.
+
+    Unlike config.status, the FILE:TEMPLATE syntax is not supported for
+    files and headers. The template is always the filename suffixed with
+    '.in', in the corresponding directory under the top source directory.
+    '''
+
+    if 'CONFIG_FILES' in os.environ:
+        raise Exception, 'Using the CONFIG_FILES environment variable is not supported. Use --file instead.'
+    if 'CONFIG_HEADERS' in os.environ:
+        raise Exception, 'Using the CONFIG_HEADERS environment variable is not supported. Use --header instead.'
+
+    parser = OptionParser()
+    parser.add_option('--recheck', dest='recheck', action='store_true',
+                      help='update config.status by reconfiguring in the same conditions')
+    parser.add_option('--file', dest='files', metavar='FILE', action='append',
+                      help='instantiate the configuration file FILE')
+    parser.add_option('--header', dest='headers', metavar='FILE', action='append',
+                      help='instantiate the configuration header FILE')
+    parser.add_option('-v', '--verbose', dest='verbose', action='store_true',
+                      help='display verbose output')
+    parser.add_option('-n', dest='not_topobjdir', action='store_true',
+                      help='do not consider current directory as top object directory')
+    (options, args) = parser.parse_args()
+
+    # Without -n, the current directory is meant to be the top object directory
+    if not options.not_topobjdir:
+        topobjdir = '.'
+
+    env = ConfigEnvironment(topobjdir = topobjdir, topsrcdir = topsrcdir,
+                            defines = defines, non_global_defines = non_global_defines,
+                            substs = substs)
+
+    if options.recheck:
+        # Execute configure from the top object directory
+        if not os.path.isabs(topsrcdir):
+            topsrcdir = relpath(topsrcdir, topobjdir)
+        os.chdir(topobjdir)
+        os.execlp('sh', 'sh', '-c', ' '.join([os.path.join(topsrcdir, 'configure'), env.substs['ac_configure_args'], '--no-create', '--no-recursion']))
+
+    if options.files:
+        files = options.files
+        headers = []
+    if options.headers:
+        headers = options.headers
+        if not options.files:
+            files = []
+    # Default to display messages when giving --file or --headers on the
+    # command line.
+    if options.files or options.headers or options.verbose:
+        global verbose
+        verbose = True
+    if not options.files and not options.headers:
+        print >>sys.stderr, "creating config files and headers..."
+        files = [os.path.join(topobjdir, f) for f in files]
+        headers = [os.path.join(topobjdir, f) for f in headers]
+
+    for file in files:
+        env.create_config_file(file)
+    for header in headers:
+        env.create_config_header(header)
diff --git a/js/src/build/autoconf/acoutput-fast.pl b/js/src/build/autoconf/acoutput-fast.pl
deleted file mode 100644
index 5837122d47f1..000000000000
--- a/js/src/build/autoconf/acoutput-fast.pl
+++ /dev/null
@@ -1,170 +0,0 @@
-#! /usr/bin/env perl
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# acoutput-fast.pl - Quickly create makefiles that are in a common format.
-#
-# Most of the makefiles in mozilla only refer to two configure variables:
-#     @srcdir@
-#     @top_srcdir@
-# However, configure does not know any better and it runs sed on each file
-# with over 150 replacement rules (slow as molasses).
-#
-# This script takes a list of makefiles as input. For example,
-#   
-#     echo $MAKEFILES | acoutput-fast.pl
-#
-# The script creates each Makefile that only references @srcdir@ and
-# @top_srcdir@. For other files, it lists them in a shell command that is
-# printed to stdout:
-#
-#     CONFIG_FILES="unhandled_files..."; export CONFIG_FILES
-#
-# This command can be used to have config.status create the unhandled
-# files. For example,
-#
-#     eval "echo $MAKEFILES | acoutput-fast.pl"
-#     AC_OUTPUT($MAKEFILES)
-#
-# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
-
-#use File::Basename;
-sub dirname {
-  my $dir = $_[0];
-  return '.' if not $dir =~ m%/%;
-  $dir =~ s%/[^/][^/]*$%%;
-  return $dir;
-}
-
-# Create one directory. Assumes it doesn't already exist.
-# Will create parent(s) if needed.
-sub create_directory {
-  my $dir = $_[0];
-  my $parent = dirname($dir);
-  create_directory($parent) if not -d $parent;
-  mkdir "$dir",0777;
-}
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-sub create_directories {
-  my @makefiles = @_;
-  my @dirs = ();
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    push @dirs, dirname($ac_file);
-  }
-  # Call mkdir with the directories sorted by subdir count (how many /'s)
-  if (@dirs) {
-    foreach $dir (@dirs) {
-      if (not -d $dir) {
-        print STDERR "Creating directory $dir\n";
-        create_directory($dir);
-      }
-    }
-  }
-}
-
-while($arg = shift) {
-    if ($arg =~ /^--srcdir=/) {
-        $ac_given_srcdir = (split /=/, $arg)[1];
-    }
-    if ($arg =~ /^--cygwin-srcdir/) {
-        $ac_cygwin_srcdir = (split /=/, $arg)[1];
-    }
-}
-
-if (!$ac_given_srcdir) {
-  $ac_given_srcdir = $0;
-  $ac_given_srcdir =~ s|/?build/autoconf/.*$||;
-  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
-}
-
-if (!$ac_cygwin_srcdir) {
-    $ac_cygwin_srcdir = $ac_given_srcdir;
-}
-
-# Read list of makefiles from the stdin or,
-#   from files listed on the command-line.
-#
-@makefiles=();
-push @makefiles, split while (<STDIN>);
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-create_directories(@makefiles);
-
-# Output the makefiles.
-#
-@unhandled=();
-foreach $ac_file (@makefiles) {
-  if (not $ac_file =~ /Makefile$/ or $ac_file =~ /:/) {
-    push @unhandled, $ac_file;
-    next;
-  }
-  $ac_file_in = "$ac_given_srcdir/$ac_file.in";
-  $ac_dir = dirname($ac_file);
-  if ($ac_dir eq '.') {
-    $ac_dir_suffix = '';
-    $ac_dots = '';
-  } else {
-    $ac_dir_suffix = "/$ac_dir";
-    $ac_dir_suffix =~ s%^/\./%/%;
-    $ac_dots = $ac_dir_suffix;
-    $ac_dots =~ s%/[^/]*%../%g;
-  }
-  if ($ac_given_srcdir eq '.') {
-    $srcdir = '.';
-    if ($ac_dots eq '') {
-      $top_srcdir = '.'
-    } else {
-      $top_srcdir = $ac_dots;
-      $top_srcdir =~ s%/$%%;
-    }
-  } elsif ($ac_cygwin_srcdir =~ m%^/% or $ac_cygwin_srcdir =~ m%^.:/%) {
-    $srcdir     = "$ac_cygwin_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_cygwin_srcdir";
-  } else {
-    $srcdir     = "$ac_dots$ac_cygwin_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_dots$ac_cygwin_srcdir";
-  }
-
-  if (-e $ac_file) {
-    next if -M _ < -M $ac_file_in;
-    print STDERR "updating $ac_file\n";
-  } else {
-    print STDERR "creating $ac_file\n";
-  }
-
-  open (INFILE, "<$ac_file_in")
-    or ( die "can't read $ac_file_in: No such file or directory\n");
-  open (OUTFILE, ">$ac_file")
-    or ( warn "Unable to create $ac_file\n" and next);
-
-  while (<INFILE>) {
-    #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
-    #  warn "Two defines on a line:$ac_file:$.:$_";
-    #  push @unhandled, $ac_file;
-    #  last;
-    #}
-
-    s/\@srcdir\@/$srcdir/g;
-    s/\@top_srcdir\@/$top_srcdir/g;
-
-    if (/\@[_a-zA-Z]*\@/) {
-      warn "Unknown variable:$ac_file:$.:$_";
-      push @unhandled, $ac_file;
-      last;
-    }
-    print OUTFILE;
-  }
-  close INFILE;
-  close OUTFILE;
-}
-
-# Print the shell command to be evaluated by configure.
-#
-print "CONFIG_FILES=\"".join(' ', @unhandled)."\"; export CONFIG_FILES\n";
-
diff --git a/js/src/build/autoconf/android.m4 b/js/src/build/autoconf/android.m4
index 209053b5028d..9a1d46a68540 100644
--- a/js/src/build/autoconf/android.m4
+++ b/js/src/build/autoconf/android.m4
@@ -15,12 +15,20 @@ MOZ_ARG_WITH_STRING(android-toolchain,
                           location of the android toolchain],
     android_toolchain=$withval)
 
+dnl default android_version is different per target cpu
+case "$target_cpu" in
+arm)
+    android_version=5
+    ;;
+i?86|mipsel)
+    android_version=9
+    ;;
+esac
 
 MOZ_ARG_WITH_STRING(android-version,
 [  --with-android-version=VER
-                          android platform version, default 5],
-    android_version=$withval,
-    android_version=5)
+                          android platform version, default 5 for arm, 9 for x86/mips],
+    android_version=$withval)
 
 MOZ_ARG_WITH_STRING(android-platform,
 [  --with-android-platform=DIR
diff --git a/js/src/build/autoconf/config.status.m4 b/js/src/build/autoconf/config.status.m4
new file mode 100644
index 000000000000..9c43b3021602
--- /dev/null
+++ b/js/src/build/autoconf/config.status.m4
@@ -0,0 +1,170 @@
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+dnl For use in AC_SUBST replacement
+define([MOZ_DIVERSION_SUBST], 11)
+
+dnl Replace AC_SUBST to store values in a format suitable for python.
+dnl The necessary comma after the tuple can't be put here because it
+dnl can mess around with things like:
+dnl    AC_SOMETHING(foo,AC_SUBST(),bar)
+define([AC_SUBST],
+[ifdef([AC_SUBST_$1], ,
+[define([AC_SUBST_$1], )dnl
+AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
+        (''' $1 ''', r''' [$]$1 ''')
+AC_DIVERT_POP()dnl
+])])
+
+dnl Wrap AC_DEFINE to store values in a format suitable for python.
+dnl autoconf's AC_DEFINE still needs to be used to fill confdefs.h,
+dnl which is #included during some compile checks.
+dnl The necessary comma after the tuple can't be put here because it
+dnl can mess around with things like:
+dnl    AC_SOMETHING(foo,AC_DEFINE(),bar)
+define([_MOZ_AC_DEFINE], defn([AC_DEFINE]))
+define([AC_DEFINE],
+[cat >> confdefs.pytmp <<\EOF
+        (''' $1 ''', ifelse($#, 2, [r''' $2 '''], $#, 3, [r''' $2 '''], ' 1 '))
+EOF
+ifelse($#, 2, _MOZ_AC_DEFINE([$1], [$2]), $#, 3, _MOZ_AC_DEFINE([$1], [$2], [$3]),_MOZ_AC_DEFINE([$1]))dnl
+])
+
+dnl Wrap AC_DEFINE_UNQUOTED to store values in a format suitable for
+dnl python.
+define([_MOZ_AC_DEFINE_UNQUOTED], defn([AC_DEFINE_UNQUOTED]))
+define([AC_DEFINE_UNQUOTED],
+[cat >> confdefs.pytmp <<EOF
+        (''' $1 ''', ifelse($#, 2, [r''' $2 '''], $#, 3, [r''' $2 '''], ' 1 '))
+EOF
+ifelse($#, 2, _MOZ_AC_DEFINE_UNQUOTED($1, $2), $#, 3, _MOZ_AC_DEFINE_UNQUOTED($1, $2, $3),_MOZ_AC_DEFINE_UNQUOTED($1))dnl
+])
+
+dnl Replace AC_OUTPUT to create and call a python config.status
+define([AC_OUTPUT],
+[dnl Top source directory in Windows format (as opposed to msys format).
+WIN_TOP_SRC=
+encoding=utf-8
+case "$host_os" in
+mingw*)
+    WIN_TOP_SRC=`cd $srcdir; pwd -W`
+    encoding=mbcs
+    ;;
+esac
+AC_SUBST(WIN_TOP_SRC)
+
+dnl Used in all Makefile.in files
+top_srcdir=$srcdir
+AC_SUBST(top_srcdir)
+
+dnl Picked from autoconf 2.13
+trap '' 1 2 15
+AC_CACHE_SAVE
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+: ${CONFIG_STATUS=./config.status}
+
+dnl We're going to need [ ] for python syntax.
+changequote(<<<, >>>)dnl
+echo creating $CONFIG_STATUS
+
+cat > $CONFIG_STATUS <<EOF
+#!${PYTHON}
+# coding=$encoding
+
+import os, sys
+dnl topsrcdir is the top source directory in native form, as opposed to a
+dnl form suitable for make.
+topsrcdir = '''${WIN_TOP_SRC:-$srcdir}'''
+if not os.path.isabs(topsrcdir):
+    topsrcdir = os.path.normpath(os.path.join(os.path.dirname(<<<__file__>>>), topsrcdir))
+dnl Don't rely on virtualenv here. Standalone js doesn't use it.
+sys.path.append(os.path.join(topsrcdir, ${COMM_BUILD:+'mozilla',} 'build'))
+from ConfigStatus import config_status
+
+args = {
+    'topsrcdir': topsrcdir,
+    'topobjdir': os.path.dirname(<<<__file__>>>),
+
+dnl All defines and substs are stored with an additional space at the beginning
+dnl and at the end of the string, to avoid any problem with values starting or
+dnl ending with quotes.
+    'defines': [(name[1:-1], value[1:-1]) for name, value in [
+EOF
+
+dnl confdefs.pytmp contains AC_DEFINEs, in the expected format, but
+dnl lacks the final comma (see above).
+sed 's/$/,/' confdefs.pytmp >> $CONFIG_STATUS
+rm confdefs.pytmp confdefs.h
+
+cat >> $CONFIG_STATUS <<\EOF
+    ] ],
+
+    'substs': [(name[1:-1], value[1:-1]) for name, value in [
+EOF
+
+dnl The MOZ_DIVERSION_SUBST output diversion contains AC_SUBSTs, in the
+dnl expected format, but lacks the final comma (see above).
+sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+undivert(MOZ_DIVERSION_SUBST)dnl
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+    ] ],
+
+dnl List of files to apply AC_SUBSTs to. This is the list of files given
+dnl as an argument to AC_OUTPUT ($1)
+    'files': [
+EOF
+
+for out in $1; do
+  echo "        '$out'," >> $CONFIG_STATUS
+done
+
+cat >> $CONFIG_STATUS <<\EOF
+    ],
+
+dnl List of header files to apply AC_DEFINEs to. This is stored in the
+dnl AC_LIST_HEADER m4 macro by AC_CONFIG_HEADER.
+    'headers': [
+EOF
+
+ifdef(<<<AC_LIST_HEADER>>>, <<<
+HEADERS="AC_LIST_HEADER"
+for header in $HEADERS; do
+  echo "        '$header'," >> $CONFIG_STATUS
+done
+>>>)dnl
+
+cat >> $CONFIG_STATUS <<\EOF
+    ],
+
+dnl List of AC_DEFINEs that aren't to be exposed in ALLDEFINES
+    'non_global_defines': [
+EOF
+
+if test -n "$_NON_GLOBAL_ACDEFINES"; then
+  for var in $_NON_GLOBAL_ACDEFINES; do
+    echo "        '$var'," >> $CONFIG_STATUS
+  done
+fi
+
+cat >> $CONFIG_STATUS <<\EOF
+    ]
+}
+
+dnl Do the actual work
+config_status(**args)
+EOF
+changequote([, ])
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+dnl Execute config.status, unless --no-create was passed to configure.
+test "$no_create" = yes || ${PYTHON} $CONFIG_STATUS || exit 1
+])
diff --git a/js/src/build/autoconf/linux.m4 b/js/src/build/autoconf/linux.m4
new file mode 100644
index 000000000000..10a8cab857aa
--- /dev/null
+++ b/js/src/build/autoconf/linux.m4
@@ -0,0 +1,39 @@
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+AC_DEFUN([MOZ_LINUX_PERF_EVENT],
+[
+
+MOZ_ARG_WITH_STRING(linux-headers,
+[  --with-linux-headers=DIR
+                          location where the Linux kernel headers can be found],
+    linux_headers=$withval)
+
+LINUX_HEADERS_INCLUDES=
+
+if test "$linux_headers"; then
+    LINUX_HEADERS_INCLUDES="-I$linux_headers"
+fi
+
+_SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES"
+
+dnl Performance measurement headers.
+MOZ_CHECK_HEADER(linux/perf_event.h,
+    [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
+        [AC_TRY_COMPILE([#include <asm/unistd.h>],[return sizeof(__NR_perf_event_open);],
+        ac_cv_perf_event_open=yes,
+        ac_cv_perf_event_open=no)])])
+if test "$ac_cv_perf_event_open" = "yes"; then
+    HAVE_LINUX_PERF_EVENT_H=1
+else
+    HAVE_LINUX_PERF_EVENT_H=
+    LINUX_HEADERS_INCLUDES=
+fi
+AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
+AC_SUBST(LINUX_HEADERS_INCLUDES)
+
+CFLAGS="$_SAVE_CFLAGS"
+
+])
diff --git a/js/src/build/autoconf/make-makefile b/js/src/build/autoconf/make-makefile
deleted file mode 100644
index c35adc5fbb3e..000000000000
--- a/js/src/build/autoconf/make-makefile
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/usr/bin/env perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-use Getopt::Long;
-
-use Benchmark;
-use Cwd;
-use File::Basename;
-use File::Copy;
-use File::Path      qw{mkpath};
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(2.0);
-
-##--------------------##
-##---]  INCLUDES  [---##
-##--------------------##
-
-##############################################################
-# pymake: special case path handling for windows cmd shell.
-#   if invoked by cmd.exe and msys-perl is in play
-#     $0 may contain a drive letter
-#     modules use-or-expect msys/unix paths
-#     adjust $0 => C:/foo => /c/foo so string tests and
-#     manipulation can by applied properly.
-##############################################################
-sub BEGIN
-{
-    if ($^O eq 'msys' && $ENV{PATH} =~ m!\w:/!)
-    {
-	$0 =~ s!^(\w):!/$1!;
-    }
-    eval 'use FindBin';
-    die $@ if ($@);
-}
-
-use lib $FindBin::Bin;
-use makemakefile;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-my %argv;
-
-my $t0 = Benchmark->new();
-sub END
-{
-    if ($argv{bench})
-    {
-        my $t1 = Benchmark->new();
-        my $delta = timediff($t1, $t0);
-        print STDERR timestr($delta), "\n";
-    }
-}
-
-##----------------##
-##---]  MAIN  [---##
-##----------------##
-umask 0;
-
-my $debug = $argv{debug} || 0;
-
-my $pwdcmd = ($^O eq 'msys') ? 'pwd -W' : 'pwd';
-
-# Determine various tree path variables
-#
-my ($topsrcdir, $ptopsrcdir, $depth, @makefiles) = parse_arguments(@ARGV);
-
-my $object_fullpath = `$pwdcmd`; # Cwd::getcwd()
-chdir $depth;
-my $object_root = `$pwdcmd`;  # Cwd::getcwd()
-chomp $object_fullpath;
-chomp $object_root;
-
-# $source_subdir is the path from the object root to where
-#    'make-makefile' was called. For example, if make-makefile was
-#    called from "mozilla/gfx/src", then $source_subdir would be
-#    "gfx/src/".
-my $source_subdir = "$object_fullpath/";
-my $quoted_object_root = quotemeta($object_root);
-$source_subdir =~ s|^$quoted_object_root/||;
-
-# Prefix makefiles with $source_subdir so that paths
-# will be relative to the top of the object tree.
-#
-my $makefile;
-for $makefile (@makefiles) { # dead code ?
-  $makefile = "$source_subdir$makefile";
-}
-
-# Find the path to the source directory based on how 'make-makefile'
-#  was invoked. The path is either relative to the object directory
-#  or an absolute path.
-my $given_srcdir = find_srcdir($topsrcdir, $depth);
-my $pgiven_srcdir = find_srcdir($ptopsrcdir, $depth);
-
-if ($debug) {
-  warn "object_fullpath = $object_fullpath\n";
-  warn "object_root     = $object_root\n";
-  warn "source_subdir   = $source_subdir\n";
-  warn "makefiles       = @makefiles\n";
-  warn "given_srcdir    = $given_srcdir\n";
-}
-
-my @errors;
-my @unhandled = update_makefiles_legacy($given_srcdir, $pgiven_srcdir, @makefiles);
-push(@errors, $@) if ($@);
-
-run_config_status(@unhandled);
-push(@errors, $@) if ($@ && $argv{'no-warnings'});
-
-exit scalar(@errors);
-
-# end of Main
-############################################################
-
-###########################################################################
-# find_depth: Pull the value of DEPTH out of a Makefile (or Makefile.in)
-###########################################################################
-sub find_depth {
-  my $depth = '';
-  open(MAKEFILE, "<$_[0]") || die "Unable to open $_[0]: $!\n";
-  while (<MAKEFILE>) {
-    next unless /^DEPTH\s*=\s*(\..*)/;
-    $depth = $1;
-    last;
-  }
-  close MAKEFILE;
-  return $depth;
-}
-
-###########################################################################
-## Intent: Parse command line arguments and assign values
-###########################################################################
-sub parse_arguments {
-  my @args = @_;
-  my @makefiles = ();
-
-  my @arglist = qw(badtokens! bench
-                   chdir=s
-                   debug
-                   depth|d=s
-                   enhanced
-                   obj=s top|t=s ptop|p=s
-                   src=s dst=s
-                   );
-  unless(GetOptions(\%argv, @arglist))
-  {
-      my $script = join('/', $FindBin::RealBin, $FindBin::Script);
-      system("perldoc $script </dev/null");
-      exit
-  }
-  @args = @ARGV;
-
-  my $topsrcdir = $argv{top} || '';
-  if (! $topsrcdir)
-  {
-      $topsrcdir = $argv{top} = getTopDir();
-  }
-
-  my $ptopsrcdir ||= $argv{ptop} || $topsrcdir || '';
-
-  ## Init --no- switch values
-  foreach my $var (qw(badtokens exclusions warnings))
-  {
-      $argv{"no-${var}"} = $argv{$var} || 0;
-  }
-  # Propogate parsed arguments for module use [--debug, --verbose]
-  while (my($k, $v) = each %argv)
-  {
-      $main::argv{$k} = $v;
-  }
-
-  if ($argv{chdir})
-  {
-      chdir $argv{chdir} || die "chdir $argv{chdir} failed: $!";
-  }
-
-  ##############################################################
-  ## Arguments allowing make-makefile to be invoked from $topsrc
-  ##############################################################
-  if (!$argv{top} || !$argv{obj})
-  {
-  }
-  ## Limit access to container makefiles for now
-  elsif ($argv{enhanced})
-  {
-      my @errors;
-
-      ## iterate over @ARGV to preserve original filename for 'unhandled'
-      my @files = map{ getRelPath($_) } @ARGV;
-
-      my $top = getTopDir();
-      my $obj = getObjDir();
-
-      mkdirr(map{ "$obj/$_" } @files);
-      push(@errors, $@) if ($@); # legacy behavior: do not exit with status
-
-      my $exclude = join('/', $FindBin::RealBin, $FindBin::Script);
-      $exclude .= '.excl'; # $argv{exclude}
-      my %exclude = getExclusions($exclude);
-      my @unhandled;
-      foreach my $relpath (@files)
-      {
-          my $rel = join('/', $relpath, 'Makefile.in');
-          my $mf = join('/', $top, $rel);
-          next if ($exclude{$rel});
-          print STDERR " ** relpath=[$relpath], mf=[$mf]\n" if ($main::argv{debug});
-
-          my $rc = updateMakefiles($relpath, {depth=>$depth, obj=>$obj, top=>$top});
-          if ($@)
-          {
-            push(@errors, $@);
-          }
-          elsif ($rc eq 'badtokens')
-          {
-            push(@unhandled, $mf);
-          }
-      }
-
-      run_config_status(@unhandled);
-      push(@errors, $@) if ($@ && $argv{'no-warnings'});
-      exit scalar(@errors);
-  }
-
-
-  my $depth = $argv{depth} || '';
-  if (! $depth)
-  {
-      foreach my $fyl (@args)
-      {
-          if (my $tmp = find_depth($fyl))
-          {
-              $depth = $tmp;
-              last;
-          }
-      }
-  }
-
-  if (! $depth) {
-    # Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
-    if (-e "Makefile.in") {
-      $depth = find_depth("Makefile.in");
-    } elsif (-e "Makefile") {
-      $depth = find_depth("Makefile");
-    } elsif (-e "../Makefile") {
-      $depth = "../".find_depth("../Makefile");
-      $depth =~ s/\/\.$//;
-    } else {
-      warn "Unable to determine depth (e.g. ../..) to root of objdir tree.\n";
-      die  "No Makefile(.in) present. Try running with '-d <depth>'\n";
-    }
-  } 
-
-  # Build the list of makefiles to generate
-  #
-  @makefiles = ();
-  while (@args)
-  {
-      next unless my $makefile = shift @args;
-      $makefile =~ s/\.in$//;
-      $makefile =~ s/\/$//;
-      $makefile =~ /Makefile$/
-        or $makefile =~ /^\.\//
-        or $makefile .= "/Makefile";
-    push @makefiles, "$makefile";
-  }
-  @makefiles = "Makefile" unless @makefiles;
-
-  return ($topsrcdir, $ptopsrcdir, $depth, @makefiles);
-}
-
-# Find the top of the source directory
-# (Assuming that the executable is in $top_srcdir/build/autoconf)
-sub find_srcdir {
-  my ($ac_given_srcdir, $depth) = @_;
-
-  if ($debug) {
-    print "ac_given_srcdir = $ac_given_srcdir\n";
-    print "depth           = $depth\n";
-  }
-  if ($ac_given_srcdir =~ /^\./ and $depth ne '.') {
-    my $quoted_depth = quotemeta($depth);
-    $ac_given_srcdir =~ s|^$quoted_depth/?||;
-  }
-  if ($debug) {
-    print "ac_given_srcdir = $ac_given_srcdir\n";
-  }
-  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
-  return $ac_given_srcdir;
-}
-
-1;
-###########################################################################
-## perldoc 
-###########################################################################
-__END__
-
-=head1 NAME
-
-make-makefile - Generate a Makefile from a F<Makefile.in> template
-
-=head1 SYNOPSIS
-
-make-makefile [--top t] [--obj o] [--depth d] foo/bar/Makefile.in tans/fans/Makefile foo/bar
-
-=head1 DESCRIPTION
-
-Given options and makefile path arguments determine path to the template
-F<Makefile.in> beneath a source directory and path to generated F<Makefile>
-beneath $MOZ_OBJDIR.  DEPTH from destination directory to the 'root' will
-also be determined.  F<Makefile.in> will be read in, template strings of the
-gorm @token@ will be replaced with derived values and a generated makefile
-will be written out as F<Makefile>.
-
-Makefile DEPTH= can be determined in a few different ways:
-  o The string C<DEPTH=../../..> may be embedded within F<Makefile.in>.
-  o Search parent directories for F<Makefile.in> and use it to assign the child.
-
-
-=head2 Option List
-
-=over 4
-
-=item --chdir
-
-Move to this directory before doing anything else
-
-=item -d, --depth
-
-Explicitly specify the relative path from directory containing Makefile.in
-to the top sandbox directory.  memory/makefile, DEPTH=../.., js/src/config, DEPTH=..
-
-=item --enhanced
-
-Use alternate/simplified path construction when options --top and --obj are
-passed.  This feature will be used by container makefiles to support makefile
-generation while cd'd into the sandbox top directory.
-
-=item -t, --top
-
-Path the root of a development sandbox.
-
-=item --obj
-
-Path to object directory where generated makefile will be written ($MOZ_OBJDIR).
-
-=item --ptop
-
-Print top source dir
-
-=back
-
-
-=head2 Options List DEBUG
-
-=over 4
-
-=item --bench
-
-Enable script benchmarking, report elapsed runtime.
-
-=item --debug
-
-Enable script debug mode.
-
-=back
-
-
-=head2 Options List --NO-
-
-=over 4
-
-=item --no-badtokens (wip)
-
-Handle unexpanded @token@ makefile tokens as an error condition.
-Do not rely on system(config.status) to externally supply values.
-
-=item --no-excludes
-
-Ignore file entries on the exclusion list, generate everything.
-
-=item --no-warnings
-
-Warnings are handled as an error condition.
-
-=back
-
-
-=head2 Examples
-
-=over 4
-
-=item * make-makefile -t /mozilla/nightly -d . memory/mozalloc
-
-cd $MOZ_OBJDIR;
---top and --depth are explicitly set for generting memory/mozalloc/Makefile.
-
-=item * make-makefile -t /mozilla/nightly -d ../../../.. html5lib_tree_construction/Makefile
-
-cd $MOZ_OBJDIR/parser/htmlparser/tests/mochitest
-
---top and --depth are explicitly set for generting a makefile from within
-a subdirectory of $MOZ_OBJDIR
-
-=item * make-makefile --top /mozilla/nightly --obj /mozilla/nightly/obj memory/mozalloc
-
-With --top and --obj explicitly set generate $MOZ_OBJDIR/memory/mozalloc/Makefile
-while sitting in the sandbox root.
-
-=back
-
-
-=head2 Work In Progress
-
-=over 4
-
-=item --no-badtokens
-
-Fail on unexpanded @foo@ makefile tokens.  Any tokens that can be expanded
-directly by make-makefile will avoid config.status shell overhead.
-
-=item Depth from delta(--obj, --top)
-
-If DEPTH= has not been embedded within a makefile the value could
-be set directly if --top and --obj are specified and the paths overlap.
-
-=back
-
-
-=head1 SEE ALSO
-
-L<config/rules.mk>
-
-=cut
diff --git a/js/src/build/autoconf/make-makefile.excl b/js/src/build/autoconf/make-makefile.excl
deleted file mode 100644
index 74fea3517466..000000000000
--- a/js/src/build/autoconf/make-makefile.excl
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-###########################################################################
-## Intent: Exclusion list for container make builds
-###########################################################################
-
-# EOF
diff --git a/js/src/build/autoconf/makemakefile.pm b/js/src/build/autoconf/makemakefile.pm
deleted file mode 100644
index b2559cbcd8da..000000000000
--- a/js/src/build/autoconf/makemakefile.pm
+++ /dev/null
@@ -1,711 +0,0 @@
-package makemakefile;
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-# use feature 'state'; 5.10+ not available everywhere
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(2.0);
-use Exporter;
-our @ISA = qw(Exporter);
-our @EXPORT = qw(dirname_legacy
-                 getConfig getDepth getRelPath getObjDir getTopDir mkdirr
-                 getExclusions
-                 run_config_status
-                 updateMakefiles
-                 update_makefiles_legacy
-                 );
-
-##--------------------##
-##---]  INCLUDES  [---##
-##--------------------##
-use Cwd;
-use Cwd     qw{abs_path};
-use FindBin;
-use File::Basename;
-use File::Copy;
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-umask 0;
-my $cwd = Cwd::abs_path('.');
-my %argv;
-
-
-###########################################################################
-## Intent: Helper function, retrieve contents of a file with error checking
-## -----------------------------------------------------------------------
-## Args:
-##   scalar   path to input file
-## Returns:
-##   array    contents of the given file
-##   $@       set on error
-###########################################################################
-sub cat
-{
-    my $fyl = shift || '';
-    $@ = '';
-    my @data;
-
-    local *FYL;
-    if (!open(FYL, $fyl))
-    {
-        $@ = "open($fyl) failed: $!";
-    }
-    else
-    {
-        @data = <FYL>;
-        close(FYL);
-    }
-    return @data;
-} # cat
-
-###########################################################################
-## Intent: Return directory path for a given argument
-## -----------------------------------------------------------------------
-## -----------------------------------------------------------------------
-## Todo:
-##   o Check if function can be replaced by File::Basename::dirname()
-###########################################################################
-sub dirname_legacy
-{
-    my $str = (@_ && defined($_[0])) ? shift : '';
-    return $str =~ /(.*)\/.*/ ? "$1" : '.';
-}
-
-###########################################################################
-## Intent: Given a list of makefile paths recursively create all
-##         directories between file and the root
-## -----------------------------------------------------------------------
-## Args:
-##   array   A list of makefiles
-##   fargs   Function arguments
-##     mode  Filesystem mode used for directory creation
-## Returns:
-##   $@      Set on error
-##   0       on success
-## -----------------------------------------------------------------------
-## Note:
-##   Reporting directory creation can be enabled by the --verbose
-##   command line argument.
-###########################################################################
-sub mkdirr
-{
-    my %fargs = (@_ && ref($_[$#_])) ? %{ (pop) } : ();
-    my $mode = $fargs{mode} || 0755;
-    my $verbose = $main::argv{verbose} || 0;
-    $@ = '' unless ($fargs{recursive});
-    $fargs{recursive} = 1;
-
-    my @errors;
-    push(@errors, $@) if ($@);
-    foreach my $path (@_)
-    {
-        (my $dir = $path) =~ s%/?Makefile[^/]*$%%o;
-        next unless (length($dir));
-        next if (-e $dir);
-        mkdirr( dirname($dir), \%fargs);
-        eval{ File::Path::mkpath($dir, $verbose, 0755); };
-        push(@errors, $@) if ($@);
-    }
-    $@ = join("\n", @errors);
-    return $@ ? 0 : 1;
-} # mkdirr
-
-###########################################################################
-## Intent: Read in configure values and return a hash of key/value pairs
-## -----------------------------------------------------------------------
-## Args:
-##   fargs  Function arguments
-##     reset   clear value storage and repopulate
-## Returns:
-##   hash  configure data to use for makefile substitutions
-## -----------------------------------------------------------------------
-## Todo: wrapper for reading config* and run_config_status
-###########################################################################
-my %_CONFIG_; # todo: state %config; w/5.10
-sub getConfig
-{
-    my %fargs = (@_ && ref($_[$#_]) eq 'HASH') ? %{ (pop) } : ();
-    if ($fargs{reset})
-    {
-        %_CONFIG_ = ();
-        shift;
-    }
-
-    #my $ac_file_in    = "$ac_given_srcdir/${ac_file}.in";
-    #my $ac_dir        = dirname_legacy($ac_file);
-    #my $ac_dots       = '';
-    #my $ac_dir_suffix = '';
-    #my $srcdir        = '.';
-    #my $top_srcdir    = '.';
-    unless (%_CONFIG_)
-    {
-        while (@_)
-        {
-            my ($k, $v) = splice(@_, 0, 2);
-            $_CONFIG_{$k} = $v;
-        }
-    }
-
-    return %_CONFIG_;
-} # getConfig
-
-###########################################################################
-## Intent: Determine path depth between leaf and root directory.
-##   o DEPTH= may be set by makefile content
-##   o DEPTH= may be set by Makefile in a parent
-##   o Manually determine by relpath form leaf to sandbox top
-## -----------------------------------------------------------------------
-## Args:
-##   scalar  Path to makefile or directory to determine DEPTH for
-## Returns:
-##   scalar  Relative path from leaf to root directory
-## -----------------------------------------------------------------------
-###########################################################################
-sub getDepth($)
-{
-    my $fyl = shift || '';
-
-    my @path = split(m%/%o, $fyl);
-    pop(@path) if ('Makefile' eq substr($path[$#path], 0, 8));
-    my $depth;
-    my @depth;
-
-    my $top = getTopDir();
-    my @top = split(m%/%o, $top);
-    my @pathNoTop = @path;
-    splice(@pathNoTop, 0, scalar(@top));
-
-    SEARCH:
-    while (@path)
-    {
-        ## Search for a file containing DEPTH=../..
-        foreach my $fyl ( qw{Makefile.in Makefile} )
-        {
-            my $path = join('/', @path, $fyl);
-            local *FYL;
-            if (!open(FYL, $path)) {} # NOP
-            elsif (my @tmp = map{ /^\s*DEPTH\s*=\s*([\.\/]+)/o ? $1 : () } <FYL>)
-            {
-                $depth = join('/', @depth, shift @tmp);
-                last SEARCH;
-            }
-            close(FYL);
-        }
-        pop @path;
-        pop @pathNoTop;
-
-        if (0 == scalar(@pathNoTop))
-        {
-            $depth = join('/', @depth);
-            last;
-        }
-        
-        ## Construct path manually
-        push(@depth, '..');
-    }
-    return $depth;
-} # getDepth
-
-###########################################################################
-## Intent: Read in the exclusion file
-###########################################################################
-sub getExclusions
-{
-    my $file = shift || '';
-    
-    return () if ($main::argv{'no-exclusions'});
-
-    my %exclude;
-    if ($file)
-    {
-        my @data = cat($file);
-        foreach (@data)
-        {
-            next unless ($_);
-            next if (/^\s*\#/o);
-            next unless (m%/%);
-            chomp;
-            $exclude{$_}++;
-        }
-    }
-    return %exclude;
-} # getExclusions
-
-###########################################################################
-## Intent: Given the path to a makefile beneath either src or obj
-##         derive the relative path prefix between makefile and root.
-###########################################################################
-sub getRelPath
-{
-    my $path0 =  shift;
-    my $abspath;
-
-    # Determine type and orientation
-    my $name = basename($path0);
-    my $haveMF = ($name eq 'Makefile.in') ? 1
-        : ($name eq 'Makefile') ? -1
-        : 0
-        ;
-
-    ####################################################
-    ## Prep work: form a relative path with ../ removed
-    ####################################################
-    my $top = getTopDir();
-    my $obj = getObjDir();
-    ## If the same Makefile will be created alongside Makefile.in
-    my $topQM = quotemeta($top);
-    my $objQM = quotemeta($obj);
-
-    if ('..' eq substr($path0, 0, 2))
-    {
-        my @cwd = split(m%/%, $cwd);
-        my @pth = split(m%/%, $path0);
-        while (@pth && $pth[0] eq '..')
-        {
-            pop(@cwd);
-            shift @pth;
-        }
-        $path0 = join('/', @cwd, @pth);
-        $abspath = $path0;
-    }
-
-    if ('/' eq substr($path0, 0, 1))
-    {
-        $path0 =~ s%^$objQM\/?%%;
-        $path0 =~ s%^$topQM\/?%%;
-    }
-
-    #######################################################################
-    ## Build a list of directories to search.  Input source will be one
-    ## of path to Makefile.in, path to Makefile, directory, file within
-    ## a directory or relative path from cwd.
-    #######################################################################
-    my @subdirs;
-    my $path = (0 == $haveMF) ? $path0 : dirname($path0);
-    push(@subdirs, $path); # containing directory
-    push(@subdirs, dirname($path)) if (0 == $haveMF && -f $path); # Arg is file within a directory
-    push(@subdirs, $cwd);  # relative to pwd
-
-    # obj - path to generated makefile
-    # top - path to Makefile.in source template
-    my @prefixes = ('/' ne substr($path0, 0, 1))
-        ? (&getTopDir, &getObjDir)
-        : ()
-        ;
-
-  ON_SAFARI:
-    for my $prefix (@prefixes)
-    {
-        next unless ($prefix); # no command line not passed
-        foreach my $subdir (@subdirs)
-        {
-            foreach my $mf ('Makefile.in', 'Makefile')
-            {
-                my $path = join('/', $prefix, $subdir, $mf);
-                if (-e $path)
-                {
-                    $name = $mf;
-                    $haveMF = ($mf eq 'Makefile.in') ? 1 : -1;
-                    $abspath = $path;
-                    last ON_SAFARI;
-                }
-            }
-        }
-    }
-
-    #######################################################################
-    ## Generated makefile does not yet exist or path is invalid.
-    ## Should this conditon be handled to detect non-existent Makefile.in:
-    ##   Makefile.am => Makefile.in => Makefile but Makefile.in
-    #######################################################################
-    if (!$abspath && -1 == $haveMF && $obj)
-    {
-        $abspath = ('/' eq substr($path0, 0, 1)) 
-            ? $path0
-            : join('/', $obj, $path0)
-            ;
-    }
-
-    ########################################################
-    ## If --top and/or --obj specified extract relative path
-    ########################################################
-    my $relpath;
-    if (! $abspath)
-    {
-        # Error, fall through
-    }
-    elsif (1 == $haveMF) # Makefile.in
-    {
-        ## err w/o --top
-        (my $tmp = $abspath) =~ s%^$topQM/?%%;
-        $relpath = dirname($tmp) unless ($tmp eq $abspath);
-    }
-    elsif (-1 == $haveMF) # Makefile
-    {
-        ## err w/o --obj
-        (my $tmp = $abspath) =~ s%^$objQM/?%%;
-        $relpath = dirname($tmp) unless ($tmp eq $abspath);
-    }
-
-    $relpath ||= '';
-    $relpath =~ s%/./%/%og; # filter ./
-
-    $@ = ($relpath) ? '' : "ERROR($path0): Unable to locate sources";
-    return $relpath || '';
-} # getRelPath
-
-###########################################################################
-## Intent: Determine sandbox root from script startup directory
-## -----------------------------------------------------------------------
-## Args:
-##    _set_    optional, if passed use the given value as path
-##    _reset_  clear cached directory path to reassign
-## Returns:
-##   scalar - absolute path to the sandbox root directory
-## -----------------------------------------------------------------------
-###########################################################################
-my $gtd_dir;
-sub getTopDir
-{
-    if (@_) # testing override
-    {
-        $gtd_dir = abs_path($_[1] || '.') if ($_[0] eq '_set_');
-        $gtd_dir = ''    if ($_[0] eq '_reset_');
-    }
-
-    unless ($gtd_dir)
-    {
-        ## Set by command line
-        if ($main::argv{top})
-        {
-            $gtd_dir = $main::argv{top};
-        }
-        else
-        {
-            my $path = abs_path($FindBin::RealBin);
-            my @path = split(m%/%o, $path);
-            ## --2 memory/mozalloc/Makefile.in
-            ## --3 was this for FindBin::Script ?
-            splice(@path, -2);
-            $gtd_dir = join('/', @path);
-        }
-    }
-    return $gtd_dir;
-} # getTopDir
-
-###########################################################################
-## Intent: Determine path to MOZ_OBJDIR/object directory
-## -----------------------------------------------------------------------
-## Args:
-##   _set_    optional testing arg, if passed re-compute cached value
-## Returns:
-##   scalar - absolute path to the sandbox object directory
-## -----------------------------------------------------------------------
-###########################################################################
-my $god_dir;
-sub getObjDir
-{
-    if (@_) # testing override
-    {
-        if ($_[0] eq '_reset_')
-        {
-            $god_dir = '';
-            shift;
-        }
-        elsif ($_[0] eq '_set_')
-        {
-            shift;
-            my $path = $_[0] || '.';
-            $god_dir = abs_path($path);
-            shift;
-        }
-    }
-
-    ## extract $obj from given path
-    unless ($god_dir)
-    {
-        if ($main::argv{obj})
-        {
-            $god_dir = $main::argv{obj};
-        }
-        elsif (@_ && 'Makefile' eq substr($_, -8))
-        {
-            $god_dir = abs_path(shift);
-        }
-        else # assume we are sitting in moz_objdir
-        {
-            $god_dir = abs_path('.');
-        }
-    }
-
-    return $god_dir;
-} # getObjDir
-
-###########################################################################
-## Intent: Generate Makefile from a given Makefile.in template
-## -----------------------------------------------------------------------
-## Args:
-##   scalar  Relative path to a directory containing a makefile
-##   fargs   Hash ref of function arguments.
-##     obj     Absolute path to MOZ_OBJ/a destination directory
-##     top     Absolute path to the sandbox root
-## Returns:
-##    $@     Set on error
-##    scalar
-##      1     True if the makefile was updated
-##      0     Otherwise
-##      badtokens - If the makefile contains unexpandable @token@ strings
-## -----------------------------------------------------------------------
-###########################################################################
-sub updateMakefiles
-{
-    my %fargs = (@_ && ref($_[$#_])) ? %{ (pop) } : ();
-    local $_;
-    $@ = '';
-
-    my $top = $fargs{top};
-    my $obj = $fargs{obj};
-
-    my $relpath = shift || '';
-    my $src = join('/',  $top, $relpath, 'Makefile.in');
-    my $depth = getDepth($src);
-
-    my @src = cat($src);
-    return 0 if ($@);
-
-    my $dst = join('/', $obj, $relpath, 'Makefile');
-    my @dst = cat($dst);
-    $@ = '';
-
-    my $dstD = dirname($dst);
-    mkdirr($dstD);
-    return 0 if ($@);
-
-    my %data =
-        ( getConfig(),
-          depth      => $depth,
-          srcdir     => join('/', $top, $relpath),
-          top_srcdir => $top,
-        );
-
-    my $line = 0;
-    my @data;
-    while (scalar @src)
-    {
-        $line++;
-        $_ = shift(@src);
-
-        ## Expand embedded @foo@
-        while (/\@[^\@\s\$]+\@/go)
-        {
-            my $end = pos($_);
-            my $val = $&;
-            my $len = length($val);
-            $val =~ s/^\@\s*//o;
-            $val =~ s/\s*\@$//o;
-
-            ## Identify expansions to see if we can avoid shell overhead
-            if (!defined $data{$val} && !$argv{'no-badtokens'})
-            {
-                if (1) # warnings
-                {
-                    print STDERR "WARNING: token $val not defined\n";
-                    print STDERR "   line $line, src: $src\n";
-                }
-                return 'badtokens';
-            }
-
-            # Insert $(error txt) makefile macros for invalid tokens
-            my $val1 = defined($data{$val})
-                ? $data{$val}
-                : "\$(error $FindBin::Script: variable ${val} is undefined)"
-                ;
-            substr($_, ($end-$len), $len, $val1);
-        }
-        push(@data, $_);
-    }
-
-    if (("@data" eq "@dst") && scalar(@data))
-    {
-        print "Skipping up2date makefile: $dst\n" if ($argv{verbose});
-    }
-    else
-    {
-        my $action = (scalar @dst) ? 'Updating' : 'Creating';
-        print "$action makefile: $dst\n";
-
-        my $tmp = join('.', $dst, "tmp_$$");
-        if (!open(FYL, "> $tmp"))
-        {
-            $@ = "open($tmp) failed: $!";
-        }
-        else
-        {
-            print FYL @data;
-            close(FYL);
-
-            ## Install the new makefile
-            File::Copy::move($tmp, $dst)
-                || ($@ = "move($tmp, $dst) failed: $!");
-        }
-    }
-
-    return $@ ? 0 : 1;
-} # updateMakefiles
-
-# Output the makefiles.
-#
-sub update_makefiles_legacy {
-  my ($ac_given_srcdir, $pac_given_srcdir, @makefiles) = @_;
-  my $debug = $main::argv{debug} || 0;
-  my $pwdcmd = ($^O eq 'msys') ? 'pwd -W' : 'pwd';
-  my @unhandled=();
-
-  my @warn;
-
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    my $ac_file_in    = "$ac_given_srcdir/${ac_file}.in";
-    my $ac_dir        = dirname_legacy($ac_file);
-    my $ac_dots       = '';
-    my $ac_dir_suffix = '';
-    my $srcdir        = '.';
-    my $top_srcdir    = '.';
-
-    # Determine $srcdir and $top_srcdir
-    #
-    if ($ac_dir ne '.') {
-      $ac_dir_suffix = "/$ac_dir";
-      $ac_dir_suffix =~ s%^/\./%/%;
-      $ac_dots = $ac_dir_suffix;
-      # Remove .. components from the provided dir suffix, and
-      # also the forward path components they were reversing.
-      my $backtracks = $ac_dots =~ s%\.\.(/|$)%%g;
-      while ($backtracks--) {
-        $ac_dots =~ s%/[^/]*%%;
-      }
-      $ac_dots =~ s%/[^/]*%../%g;
-    }
-    if ($ac_given_srcdir eq '.') {
-      if ($ac_dots ne '') {
-        $top_srcdir = $ac_dots;
-        $top_srcdir =~ s%/$%%;
-      }
-    } elsif ($pac_given_srcdir =~ m%^/% or $pac_given_srcdir =~ m%^.:/%) {
-      $srcdir     = "$pac_given_srcdir$ac_dir_suffix";
-      $top_srcdir = "$pac_given_srcdir";
-    } else {
-      if ($debug) {
-              print "ac_dots       = $ac_dots\n";
-        print "ac_dir_suffix = $ac_dir_suffix\n";
-      }
-      $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
-      $top_srcdir = "$ac_dots$ac_given_srcdir";
-    }
-
-    if ($debug) {
-      print "ac_dir     = $ac_dir\n";
-      print "ac_file    = $ac_file\n";
-      print "ac_file_in = $ac_file_in\n";
-      print "srcdir     = $srcdir\n";
-      print "top_srcdir = $top_srcdir\n";
-      print "cwd        = " . `$pwdcmd` . "\n";
-    }
-
-    # Copy the file and make substitutions.
-    #    @srcdir@     -> value of $srcdir
-    #    @top_srcdir@ -> value of $top_srcdir
-    #
-    if (-e $ac_file) {
-      next if -M _ < -M $ac_file_in;  # Next if Makefile is up-to-date.
-      warn "updating $ac_file\n";
-    } else {
-      warn "creating $ac_file\n";
-    }
-
-    mkdirr(dirname($ac_file));
-
-    open INFILE, "<$ac_file_in" or do {
-      warn "$0: Cannot read $ac_file_in: No such file or directory\n";
-      next;
-    };
-    open OUTFILE, ">$ac_file" or do {
-      warn "$0: Unable to create $ac_file\n";
-      next;
-    };
-
-    while (<INFILE>) {
-      s/\@srcdir\@/$srcdir/g;
-      s/\@top_srcdir\@/$top_srcdir/g;
-
-      if (/\@[_a-zA-Z]*\@/) {
-        #warn "Unknown variable:$ac_file:$.:$_";
-        push @unhandled, $ac_file;
-        last;
-      }
-      print OUTFILE;
-    }
-    close INFILE;
-    close OUTFILE;
-  }
-  return @unhandled;
-} # update_makefiles_legacy
-
-###########################################################################
-## Intent: Invoke config.status for unknown makefiles to create
-##         directory hierarchy for the tree.
-## -----------------------------------------------------------------------
-## Args:
-##   array   an optional list of makefiles to process
-## Returns:
-##   0    on success
-##   $#   set on error
-## -----------------------------------------------------------------------
-## Note: Is this function needed anymore ?  Undefined tokens should fail
-##   at time of expansion rather than having to source config.status.
-##   Also config.status could be parsed to define values and avoide the
-##   shell overhead altogether.
-###########################################################################
-sub run_config_status {
-  my @unhandled = @_;
-
-  # Run config.status with any unhandled files.
-  #
-  my @errors;
-  if (@unhandled) {
-    local $ENV{CONFIG_FILES}= join ' ', @unhandled;
-
-    my $conf = 'config.status';
-    if (! -e $conf) # legacy behavior, warn rather than err
-    {
-        my $cwd = cwd();
-        my $err = "$FindBin::Script ERROR: Config file $conf does not exist, cwd=$cwd";
-        push(@errors, $err);
-    }
-    elsif (0 != system("./config.status"))
-    {
-        my $cwd = cwd();
-        push(@errors, "config.status failed \$?=$?, \$!=$!, cwd: $cwd");
-    }
-  }
-  $@ = join("\n", @errors);
-
-  ## Legacy behavior: config.status problems are not fatal {yet}.
-  ## Display warning since caller will not be calling die.
-  warn $@ if ($@ && $argv{'no-warnings'});
-  return $@ ? 1 : 0;
-}
-
-1;
diff --git a/js/src/build/check-sync-exceptions b/js/src/build/check-sync-exceptions
new file mode 100644
index 000000000000..0d20b6487c61
--- /dev/null
+++ b/js/src/build/check-sync-exceptions
@@ -0,0 +1 @@
+*.pyc
diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
index 07643520cf13..0f08f417f7e7 100644
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/src/config/Preprocessor.py b/js/src/config/Preprocessor.py
index b45d92653519..c9192a83e3aa 100644
--- a/js/src/config/Preprocessor.py
+++ b/js/src/config/Preprocessor.py
@@ -92,10 +92,17 @@ class Preprocessor:
     """
     Set the marker to be used for processing directives.
     Used for handling CSS files, with pp.setMarker('%'), for example.
+    The given marker may be None, in which case no markers are processed.
     """
     self.marker = aMarker
-    self.instruction = re.compile('%s(?P<cmd>[a-z]+)(?:\s(?P<args>.*))?$'%aMarker, re.U)
-    self.comment = re.compile(aMarker, re.U)
+    if aMarker:
+      self.instruction = re.compile('%s(?P<cmd>[a-z]+)(?:\s(?P<args>.*))?$'%aMarker, re.U)
+      self.comment = re.compile(aMarker, re.U)
+    else:
+      class NoMatch(object):
+        def match(self, *args):
+          return False
+      self.instruction = self.comment = NoMatch()
   
   def clone(self):
     """
@@ -392,7 +399,7 @@ class Preprocessor:
         return str(self.context[varname])
       if fatal:
         raise Preprocessor.Error(self, 'UNDEFINED_VAR', varname)
-      return ''
+      return matchobj.group(0)
     return self.varsubst.sub(repl, aLine)
   def filter_attemptSubstitution(self, aLine):
     return self.filter_substitution(aLine, fatal=False)
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 813fc818029a..b2f82b6df083 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -9,7 +9,6 @@ target          = @target@
 ac_configure_args = @ac_configure_args@
 MOZILLA_VERSION = @MOZILLA_VERSION@
 
-MOZ_BUILD_APP = @MOZ_BUILD_APP@
 MOZ_APP_NAME	= @MOZ_APP_NAME@
 MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
@@ -36,8 +35,6 @@ MOZ_DEBUG_ENABLE_DEFS		= @MOZ_DEBUG_ENABLE_DEFS@
 MOZ_DEBUG_DISABLE_DEFS	= @MOZ_DEBUG_DISABLE_DEFS@
 MOZ_DEBUG_FLAGS	= @MOZ_DEBUG_FLAGS@
 MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
-MOZ_EXTENSIONS  = @MOZ_EXTENSIONS@
-MOZ_JSDEBUGGER  = @MOZ_JSDEBUGGER@
 MOZ_MEMORY      = @MOZ_MEMORY@
 MOZ_PROFILING   = @MOZ_PROFILING@
 MOZ_JPROF       = @MOZ_JPROF@
@@ -56,8 +53,6 @@ INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
 ENABLE_TESTS	= @ENABLE_TESTS@
 
-TAR=@TAR@
-
 # The MOZ_UI_LOCALE var is used to build a particular locale. Do *not*
 # use the var to change any binary files. Do *not* use this var unless you
 # write rules for the "clean-locale" and "locale" targets.
@@ -68,9 +63,6 @@ MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@
 
 MOZ_FIX_LINK_PATHS=@MOZ_FIX_LINK_PATHS@
 
-XPCOM_FROZEN_LDOPTS=@XPCOM_FROZEN_LDOPTS@
-XPCOM_LIBS=@XPCOM_LIBS@
-
 ENABLE_STRIP	= @ENABLE_STRIP@
 PKG_SKIP_STRIP	= @PKG_SKIP_STRIP@
 
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index cc0d6e36395d..e361689fcf12 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -126,13 +126,12 @@ MKDIR ?= mkdir
 SLEEP ?= sleep
 TOUCH ?= touch
 
-ifndef .PYMAKE
-PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
-else
+ifdef .PYMAKE
 PYCOMMANDPATH += $(topsrcdir)/config
-PYTHON_PATH = %pythonpath main
 endif
 
+PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
+
 # determine debug-related options
 _DEBUG_ASFLAGS :=
 _DEBUG_CFLAGS :=
diff --git a/js/src/config/mkdepend/Makefile.in b/js/src/config/mkdepend/Makefile.in
index b2c13119a66d..31d4df693457 100644
--- a/js/src/config/mkdepend/Makefile.in
+++ b/js/src/config/mkdepend/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 640894f887d2..28508b7a43b0 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1153,27 +1153,28 @@ GARBAGE_DIRS += $(_JAVA_DIR)
 ###############################################################################
 
 ifndef NO_MAKEFILE_RULE
-# Note: Passing depth to make-makefile is optional.
-#       It saves the script some work, though.
 Makefile: Makefile.in
-	@$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(DEPTH)
+	@$(PYTHON) $(DEPTH)/config.status -n --file=Makefile
+	@$(TOUCH) $@
 endif
 
 ifndef NO_SUBMAKEFILES_RULE
 ifdef SUBMAKEFILES
 # VPATH does not work on some machines in this case, so add $(srcdir)
 $(SUBMAKEFILES): % : $(srcdir)/%.in
-	$(if $(subsrcdir),cd $(subsrcdir) && )$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir)$(addprefix /,$(subsrcdir)) -d $(DEPTH) $(@:$(subsrcdir)/%=%)
+	$(PYTHON) $(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@
+	@$(TOUCH) $@
 endif
 endif
 
 ifdef AUTOUPDATE_CONFIGURE
 $(topsrcdir)/configure: $(topsrcdir)/configure.in
-	(cd $(topsrcdir) && $(AUTOCONF)) && (cd $(DEPTH) && ./config.status --recheck)
+	(cd $(topsrcdir) && $(AUTOCONF)) && $(PYTHON) $(DEPTH)/config.status -n --recheck)
 endif
 
 $(DEPTH)/config/autoconf.mk: $(topsrcdir)/config/autoconf.mk.in
-	cd $(DEPTH) && CONFIG_HEADERS= CONFIG_FILES=config/autoconf.mk ./config.status
+	$(PYTHON) $(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk
+	$(TOUCH) $@
 
 ###############################################################################
 # Bunch of things that extend the 'export' rule (in order):
@@ -1385,11 +1386,14 @@ libs::
 endif
 
 ################################################################################
-# Copy each element of EXTRA_JS_MODULES to $(FINAL_TARGET)/modules
+# Copy each element of EXTRA_JS_MODULES to JS_MODULES_PATH, or
+# $(FINAL_TARGET)/modules if that isn't defined.
+JS_MODULES_PATH ?= $(FINAL_TARGET)/modules
+
 ifdef EXTRA_JS_MODULES
 libs:: $(EXTRA_JS_MODULES)
 ifndef NO_DIST_INSTALL
-	$(call install_cmd,$(IFLAGS1) $^ $(FINAL_TARGET)/modules)
+	$(call install_cmd,$(IFLAGS1) $^ $(JS_MODULES_PATH))
 endif
 
 endif
@@ -1398,9 +1402,9 @@ ifdef EXTRA_PP_JS_MODULES
 libs:: $(EXTRA_PP_JS_MODULES)
 ifndef NO_DIST_INSTALL
 	$(EXIT_ON_ERROR) \
-	$(NSINSTALL) -D $(FINAL_TARGET)/modules; \
+	$(NSINSTALL) -D $(JS_MODULES_PATH); \
 	for i in $^; do \
-	  dest=$(FINAL_TARGET)/modules/`basename $$i`; \
+	  dest=$(JS_MODULES_PATH)/`basename $$i`; \
 	  $(RM) -f $$dest; \
 	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
 	done
@@ -1550,23 +1554,6 @@ libs::
 
 endif
 
-ifneq (,$(filter flat symlink,$(MOZ_CHROME_FILE_FORMAT)))
-_JAR_REGCHROME_DISABLE_JAR=1
-else
-_JAR_REGCHROME_DISABLE_JAR=0
-endif
-
-REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
-	$(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \
-	$(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(FINAL_TARGET)/chrome/installed-chrome.txt \
-	$(_JAR_REGCHROME_DISABLE_JAR)
-
-REGCHROME_INSTALL = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \
-	$(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \
-	$(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt \
-	$(_JAR_REGCHROME_DISABLE_JAR)
-
-
 #############################################################################
 # Dependency system
 #############################################################################
diff --git a/js/src/configure.in b/js/src/configure.in
index 1b9df68a4b5f..f01515cbb9d0 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -874,7 +874,6 @@ ASM_SUFFIX=s
 IMPORT_LIB_SUFFIX=
 TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
-WIN_TOP_SRC=
 MOZ_USER_DIR=".mozilla"
 
 MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@@ -2595,18 +2594,7 @@ case $target in
 	;;
 esac
 
-dnl Performance measurement headers.
-MOZ_CHECK_HEADER(linux/perf_event.h,
-    [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
-        [AC_TRY_COMPILE([#include <sys/syscall.h>],[return sizeof(__NR_perf_event_open);],
-        ac_cv_perf_event_open=yes,
-        ac_cv_perf_event_open=no)])])
-if test "$ac_cv_perf_event_open" = "yes"; then
-    HAVE_LINUX_PERF_EVENT_H=1
-else
-    HAVE_LINUX_PERF_EVENT_H=
-fi
-AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
+MOZ_LINUX_PERF_EVENT
 
 dnl Checks for libraries.
 dnl ========================================================
@@ -4497,14 +4485,6 @@ dnl ========================================================
 AC_HAVE_FUNCS(setlocale)
 AC_HAVE_FUNCS(localeconv)
 
-case "$host_os" in
-mingw*)
-    WIN_TOP_SRC=`cd $srcdir; pwd -W`
-    ;;
-esac
-
-AC_SUBST(WIN_TOP_SRC)
-
 AC_SUBST(MOZILLA_VERSION)
 
 AC_SUBST(ac_configure_args)
@@ -4512,71 +4492,8 @@ AC_SUBST(ac_configure_args)
 dnl Spit out some output
 dnl ========================================================
 
-# Save the defines header file before autoconf removes it.
-# (Do not add AC_DEFINE calls after this line.)
-  _CONFIG_TMP=confdefs-tmp.h
-  _CONFIG_DEFS_H=js-confdefs.h
-
-  cat > $_CONFIG_TMP <<\EOF
-/* List of defines generated by configure. Included with preprocessor flag,
- * -include, to avoid long list of -D defines on the compile command-line.
- * Do not edit.
- */
-
-#ifndef _JS_CONFDEFS_H_
-#define _JS_CONFDEFS_H_
-EOF
-
-_EGREP_PATTERN='^#define ('
-if test -n "$_NON_GLOBAL_ACDEFINES"; then
-    for f in $_NON_GLOBAL_ACDEFINES; do
-        _EGREP_PATTERN="${_EGREP_PATTERN}$f|"
-    done
-fi
-_EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
-
-  sort confdefs.h | egrep -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
-
-  if test "$?" != 0; then
-    AC_MSG_ERROR([Error outputting config definitions])
-  fi
-
-  cat >> $_CONFIG_TMP <<\EOF
-
-/* The c99 defining the limit macros (UINT32_MAX for example), says:
- * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
- * is defined before <stdint.h> is included. */
-#define __STDC_LIMIT_MACROS
-
-#endif /* _JS_CONFDEFS_H_ */
-
-EOF
-
-  # Only write js-confdefs.h when something changes (or it doesn't exist)
-  if cmp -s $_CONFIG_TMP $_CONFIG_DEFS_H; then
-    rm $_CONFIG_TMP
-  else
-    AC_MSG_RESULT("creating $_CONFIG_DEFS_H")
-    mv -f $_CONFIG_TMP $_CONFIG_DEFS_H
-
-    echo ==== $_CONFIG_DEFS_H =================================
-    cat $_CONFIG_DEFS_H
-  fi
-
-dnl Probably shouldn't call this manually but we always want the output of DEFS
-rm -f confdefs.h.save
-mv confdefs.h confdefs.h.save
-egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
-if test "$?" != 0; then
-  AC_MSG_ERROR([Error outputting confdefs.h])
-fi
-AC_OUTPUT_MAKE_DEFS()
-ACDEFINES=$DEFS
-AC_SUBST(ACDEFINES)
-rm -f confdefs.h
-mv confdefs.h.save confdefs.h
-
 MAKEFILES="
+  js-confdefs.h
   Makefile
   shell/Makefile
   config/Makefile
@@ -4603,37 +4520,10 @@ if test "$ENABLE_TESTS"; then
   "
 fi
 
-dnl
-dnl Run a perl script to quickly create the makefiles.
-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
-dnl   for the files it cannot handle correctly. This way, config.status
-dnl   will handle these files.
-dnl If it fails, nothing is set and config.status will run as usual.
-dnl
-dnl This does not change the $MAKEFILES variable.
-dnl
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
-res="$?"
-if test "$res" != 0; then
-    exit $res
-fi
-. ./conftest.sh
-rm conftest.sh
-
 echo $MAKEFILES > unallmakefiles
 
-mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
-
 AC_OUTPUT($MAKEFILES)
 
-dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
-if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
-  echo "config/autoconf.mk is unchanged"
-  mv -f config/autoconf.mk.orig config/autoconf.mk 2> /dev/null
-else
-  rm -f config/autoconf.mk.orig 2> /dev/null
-fi
-
 # Produce the js-config script at configure time; see the comments for
 # 'js-config' in Makefile.in.
 AC_MSG_RESULT(invoking $MAKE to create js-config script)
diff --git a/js/src/editline/Makefile.in b/js/src/editline/Makefile.in
index 38a16fbf37c0..31b79247ab1d 100644
--- a/js/src/editline/Makefile.in
+++ b/js/src/editline/Makefile.in
@@ -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/.
 
-DEPTH = ..
+DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH           = @srcdir@
diff --git a/js/src/jit-test/tests/basic/string-contains.js b/js/src/jit-test/tests/basic/string-contains.js
new file mode 100644
index 000000000000..017b94f7eccf
--- /dev/null
+++ b/js/src/jit-test/tests/basic/string-contains.js
@@ -0,0 +1,42 @@
+assertEq("abc".contains("a"), true);
+assertEq("abc".contains("b"), true);
+assertEq("abc".contains("abc"), true);
+assertEq("abc".contains("bc"), true);
+assertEq("abc".contains("d"), false);
+assertEq("abc".contains("abcd"), false);
+assertEq("abc".contains("ac"), false);
+assertEq("abc".contains("abc", 0), true);
+assertEq("abc".contains("bc", 0), true);
+assertEq("abc".contains("de", 0), false);
+assertEq("abc".contains("bc", 1), true);
+assertEq("abc".contains("c", 1), true);
+assertEq("abc".contains("a", 1), false);
+assertEq("abc".contains("abc", 1), false);
+assertEq("abc".contains("c", 2), true);
+assertEq("abc".contains("d", 2), false);
+assertEq("abc".contains("dcd", 2), false);
+assertEq("abc".contains("a", 42), false);
+assertEq("abc".contains("a", Infinity), false);
+assertEq("abc".contains("ab", -43), true);
+assertEq("abc".contains("cd", -42), false);
+assertEq("abc".contains("ab", -Infinity), true);
+assertEq("abc".contains("cd", -Infinity), false);
+assertEq("abc".contains("ab", NaN), true);
+assertEq("abc".contains("cd", NaN), false);
+var myobj = {toString : (function () "abc"), contains : String.prototype.contains};
+assertEq(myobj.contains("abc"), true);
+assertEq(myobj.contains("cd"), false);
+var gotStr = false, gotPos = false;
+myobj = {toString : (function () {
+    assertEq(gotPos, false);
+    gotStr = true;
+    return "xyz";
+}),
+contains : String.prototype.contains};
+var idx = {valueOf : (function () {
+    assertEq(gotStr, true);
+    gotPos = true;
+    return 42;
+})};
+myobj.contains("elephant", idx);
+assertEq(gotPos, true);
diff --git a/js/src/jit-test/tests/basic/string-endswith.js b/js/src/jit-test/tests/basic/string-endswith.js
new file mode 100644
index 000000000000..a3bdccc1badb
--- /dev/null
+++ b/js/src/jit-test/tests/basic/string-endswith.js
@@ -0,0 +1,39 @@
+assertEq("abc".endsWith("abc"), true);
+assertEq("abcd".endsWith("bcd"), true);
+assertEq("abc".endsWith("c"), true);
+assertEq("abc".endsWith("abcd"), false);
+assertEq("abc".endsWith("bbc"), false);
+assertEq("abc".endsWith("b"), false);
+assertEq("abc".endsWith("abc", 3), true);
+assertEq("abc".endsWith("bc", 3), true);
+assertEq("abc".endsWith("a", 3), false);
+assertEq("abc".endsWith("bc", 3), true);
+assertEq("abc".endsWith("a", 1), true);
+assertEq("abc".endsWith("abc", 1), false);
+assertEq("abc".endsWith("b", 2), true);
+assertEq("abc".endsWith("d", 2), false);
+assertEq("abc".endsWith("dcd", 2), false);
+assertEq("abc".endsWith("a", 42), false);
+assertEq("abc".endsWith("bc", Infinity), true);
+assertEq("abc".endsWith("a", Infinity), false);
+assertEq("abc".endsWith("bc", undefined), true);
+assertEq("abc".endsWith("bc", -43), false);
+assertEq("abc".endsWith("bc", -Infinity), false);
+assertEq("abc".endsWith("bc", NaN), false);
+var myobj = {toString : (function () "abc"), endsWith : String.prototype.endsWith};
+assertEq(myobj.endsWith("abc"), true);
+assertEq(myobj.endsWith("ab"), false);
+var gotStr = false, gotPos = false;
+myobj = {toString : (function () {
+    assertEq(gotPos, false);
+    gotStr = true;
+    return "xyz";
+}),
+endsWith : String.prototype.endsWith};
+var idx = {valueOf : (function () {
+    assertEq(gotStr, true);
+    gotPos = true;
+    return 42;
+})};
+myobj.endsWith("elephant", idx);
+assertEq(gotPos, true);
diff --git a/js/src/jit-test/tests/basic/string-startswith.js b/js/src/jit-test/tests/basic/string-startswith.js
new file mode 100644
index 000000000000..8dd4ffbfaee6
--- /dev/null
+++ b/js/src/jit-test/tests/basic/string-startswith.js
@@ -0,0 +1,39 @@
+assertEq("abc".startsWith("abc"), true);
+assertEq("abcd".startsWith("abc"), true);
+assertEq("abc".startsWith("a"), true);
+assertEq("abc".startsWith("abcd"), false);
+assertEq("abc".startsWith("bcde"), false);
+assertEq("abc".startsWith("b"), false);
+assertEq("abc".startsWith("abc", 0), true);
+assertEq("abc".startsWith("bc", 0), false);
+assertEq("abc".startsWith("bc", 1), true);
+assertEq("abc".startsWith("c", 1), false);
+assertEq("abc".startsWith("abc", 1), false);
+assertEq("abc".startsWith("c", 2), true);
+assertEq("abc".startsWith("d", 2), false);
+assertEq("abc".startsWith("dcd", 2), false);
+assertEq("abc".startsWith("a", 42), false);
+assertEq("abc".startsWith("a", Infinity), false);
+assertEq("abc".startsWith("a", NaN), true);
+assertEq("abc".startsWith("b", NaN), false);
+assertEq("abc".startsWith("ab", -43), true);
+assertEq("abc".startsWith("ab", -Infinity), true);
+assertEq("abc".startsWith("bc", -42), false);
+assertEq("abc".startsWith("bc", -Infinity), false);
+var myobj = {toString : (function () "abc"), startsWith : String.prototype.startsWith};
+assertEq(myobj.startsWith("abc"), true);
+assertEq(myobj.startsWith("bc"), false);
+var gotStr = false, gotPos = false;
+myobj = {toString : (function () {
+    assertEq(gotPos, false);
+    gotStr = true;
+    return "xyz";
+}),
+startsWith : String.prototype.startsWith};
+var idx = {valueOf : (function () {
+    assertEq(gotStr, true);
+    gotPos = true;
+    return 42;
+})};
+myobj.startsWith("elephant", idx);
+assertEq(gotPos, true);
diff --git a/js/src/js-confdefs.h.in b/js/src/js-confdefs.h.in
new file mode 100644
index 000000000000..77a0204f727a
--- /dev/null
+++ b/js/src/js-confdefs.h.in
@@ -0,0 +1,17 @@
+/* List of defines generated by configure. Included with preprocessor flag,
+ * -include, to avoid long list of -D defines on the compile command-line.
+ * Do not edit.
+ */
+
+#ifndef _JS_CONFDEFS_H_
+#define _JS_CONFDEFS_H_
+
+@ALLDEFINES@
+
+/* The c99 defining the limit macros (UINT32_MAX for example), says:
+ * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+ * is defined before <stdint.h> is included. */
+#define __STDC_LIMIT_MACROS
+
+#endif /* _JS_CONFDEFS_H_ */
+
diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
index 20b689b69012..c4bcc09a7d5f 100644
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@@ -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/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index c4fa70f5c1af..8c72d4b13ca8 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -586,6 +586,20 @@ JS_ValueToECMAUint32(JSContext *cx, jsval v, uint32_t *ip)
     return JS::ToUint32(cx, value, ip);
 }
 
+JS_PUBLIC_API(JSBool)
+JS_ValueToInt64(JSContext *cx, jsval v, int64_t *ip)
+{
+    RootedValue value(cx, v);
+    return JS::ToInt64(cx, value, ip);
+}
+
+JS_PUBLIC_API(JSBool)
+JS_ValueToUint64(JSContext *cx, jsval v, uint64_t *ip)
+{
+    RootedValue value(cx, v);
+    return JS::ToUint64(cx, value, ip);
+}
+
 JS_PUBLIC_API(JSBool)
 JS_ValueToInt32(JSContext *cx, jsval v, int32_t *ip)
 {
@@ -1678,12 +1692,11 @@ JS_TransplantObject(JSContext *cx, JSObject *origobjArg, JSObject *targetArg)
 }
 
 /*
- * The location object is special. There is the location object itself and
- * then the location object wrapper. Because there are no direct references to
- * the location object itself, we don't want the old obj (|origobj| here) to
- * become the new wrapper but the wrapper itself instead. This leads to very
- * subtle differences between js_TransplantObjectWithWrapper and
- * JS_TransplantObject.
+ * Some C++ objects (such as the location object and XBL) require both an XPConnect
+ * reflector and a security wrapper for that reflector. We expect that there are
+ * no live references to the reflector, so when we perform the transplant we turn
+ * the security wrapper into a cross-compartment wrapper. Just in case there
+ * happen to be live references to the reflector, we swap it out to limit the harm.
  */
 JS_FRIEND_API(JSObject *)
 js_TransplantObjectWithWrapper(JSContext *cx,
@@ -1739,12 +1752,25 @@ js_TransplantObjectWithWrapper(JSContext *cx,
     // Lastly, update things in the original compartment. Our invariants dictate
     // that the original compartment can only have one cross-compartment wrapper
     // to the new object. So we choose to update |origwrapper|, not |origobj|,
-    // since theoretically there should have been no direct intra-compartment
-    // references to |origobj|.
+    // since there are probably no live direct intra-compartment references to
+    // |origobj|.
     {
         AutoCompartment ac(cx, origobj);
+        if (!ac.enter())
+            return NULL;
+
+        // We can't be sure that the reflector is completely dead. This is bad,
+        // because it is in a weird state. To minimize potential harm we create
+        // a new unreachable dummy object and swap it with the reflector.
+        // After the swap we have a possibly-live object that isn't dangerous,
+        // and a possibly-dangerous object that isn't live.
+        RootedObject reflectorGuts(cx, NewDeadProxyObject(cx, JS_GetGlobalForObject(cx, origobj)));
+        if (!reflectorGuts || !origobj->swap(cx, reflectorGuts))
+            return NULL;
+
+        // Turn origwrapper into a CCW to the new object.
         RootedObject wrapperGuts(cx, targetobj);
-        if (!ac.enter() || !JS_WrapObject(cx, wrapperGuts.address()))
+        if (!JS_WrapObject(cx, wrapperGuts.address()))
             return NULL;
         if (!origwrapper->swap(cx, wrapperGuts))
             return NULL;
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index cac48fe0082f..225a6078f72b 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2755,6 +2755,20 @@ JS_DoubleToUint32(double d);
 extern JS_PUBLIC_API(JSBool)
 JS_ValueToECMAInt32(JSContext *cx, jsval v, int32_t *ip);
 
+/*
+ * Convert a value to a number, then to an int64_t, according to the WebIDL
+ * rules for ToInt64: http://dev.w3.org/2006/webapi/WebIDL/#es-long-long
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToInt64(JSContext *cx, jsval v, int64_t *ip);
+
+/*
+ * Convert a value to a number, then to an uint64_t, according to the WebIDL
+ * rules for ToUint64: http://dev.w3.org/2006/webapi/WebIDL/#es-unsigned-long-long
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToUint64(JSContext *cx, jsval v, uint64_t *ip);
+
 #ifdef __cplusplus
 namespace js {
 /* DO NOT CALL THIS.  Use JS::ToInt16. */
@@ -2768,6 +2782,14 @@ ToInt32Slow(JSContext *cx, const JS::Value &v, int32_t *out);
 /* DO NOT CALL THIS.  Use JS::ToUint32. */
 extern JS_PUBLIC_API(bool)
 ToUint32Slow(JSContext *cx, const JS::Value &v, uint32_t *out);
+
+/* DO NOT CALL THIS. Use JS::ToInt64. */
+extern JS_PUBLIC_API(bool)
+ToInt64Slow(JSContext *cx, const JS::Value &v, int64_t *out);
+
+/* DO NOT CALL THIS. Use JS::ToUint64. */
+extern JS_PUBLIC_API(bool)
+ToUint64Slow(JSContext *cx, const JS::Value &v, uint64_t *out);
 } /* namespace js */
 
 namespace JS {
@@ -2820,6 +2842,42 @@ ToUint32(JSContext *cx, const js::Value &v, uint32_t *out)
     return js::ToUint32Slow(cx, v, out);
 }
 
+JS_ALWAYS_INLINE bool
+ToInt64(JSContext *cx, const js::Value &v, int64_t *out)
+{
+    AssertArgumentsAreSane(cx, v);
+    {
+        JS::SkipRoot skip(cx, &v);
+        MaybeCheckStackRoots(cx);
+    }
+
+    if (v.isInt32()) {
+        *out = int64_t(v.toInt32());
+        return true;
+    }
+
+    return js::ToInt64Slow(cx, v, out);
+}
+
+JS_ALWAYS_INLINE bool
+ToUint64(JSContext *cx, const js::Value &v, uint64_t *out)
+{
+    AssertArgumentsAreSane(cx, v);
+    {
+        SkipRoot skip(cx, &v);
+        MaybeCheckStackRoots(cx);
+    }
+
+    if (v.isInt32()) {
+        // Account for sign extension of negatives into the longer 64bit space.
+        *out = uint64_t(int64_t(v.toInt32()));
+        return true;
+    }
+
+    return js::ToUint64Slow(cx, v, out);
+}
+
+
 } /* namespace JS */
 #endif /* __cplusplus */
 
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 4fb9697f887e..5ec465378e05 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1521,10 +1521,40 @@ class AutoArrayCycleDetector
   protected:
 };
 
-static JSBool
-array_toString_sub(JSContext *cx, HandleObject obj, JSBool locale,
-                   HandleString sepstr, CallArgs &args)
+static bool
+array_join_sub(JSContext *cx, CallArgs &args, bool locale)
 {
+    // This method is shared by Array.prototype.join and
+    // Array.prototype.toLocaleString. The steps in ES5 are nearly the same, so
+    // the annotations in this function apply to both toLocaleString and join.
+
+    // Step 1
+    RootedObject obj(cx, ToObject(cx, &args.thisv()));
+    if (!obj)
+        return false;
+
+    AutoArrayCycleDetector detector(cx, obj);
+    if (!detector.init())
+        return false;
+
+    if (detector.foundCycle()) {
+        args.rval().setString(cx->runtime->atomState.emptyAtom);
+        return true;
+    }
+
+    // Steps 2 and 3
+    uint32_t length;
+    if (!js_GetLengthProperty(cx, obj, &length))
+        return false;
+
+
+    // Steps 4 and 5
+    RootedString sepstr(cx, NULL);
+    if (!locale && args.hasDefined(0)) {
+        sepstr = ToString(cx, args[0]);
+        if (!sepstr)
+            return false;
+    }
     static const jschar comma = ',';
     const jschar *sep;
     size_t seplen;
@@ -1536,21 +1566,11 @@ array_toString_sub(JSContext *cx, HandleObject obj, JSBool locale,
         seplen = 1;
     }
 
-    AutoArrayCycleDetector detector(cx, obj);
-    if (!detector.init())
-        return false;
-
-    if (detector.foundCycle()) {
-        args.rval().setString(cx->runtime->atomState.emptyAtom);
-        return true;
-    }
-
-    uint32_t length;
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return false;
+    // Step 6 is implicit in the loops below
 
     StringBuffer sb(cx);
 
+    // Various optimized versions of steps 7-10
     if (!locale && !seplen && obj->isDenseArray() && !js_PrototypeHasIndexedProperties(cx, obj)) {
         const Value *start = obj->getDenseArrayElements();
         const Value *end = start + obj->getDenseArrayInitializedLength();
@@ -1616,6 +1636,7 @@ array_toString_sub(JSContext *cx, HandleObject obj, JSBool locale,
         }
     }
 
+    // Step 11
     JSString *str = sb.finishString();
     if (!str)
         return false;
@@ -1660,22 +1681,25 @@ array_toString(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
+/* ES5 15.4.4.3 */
 static JSBool
 array_toLocaleString(JSContext *cx, unsigned argc, Value *vp)
 {
     JS_CHECK_RECURSION(cx, return false);
 
     CallArgs args = CallArgsFromVp(argc, vp);
-    RootedObject obj(cx, ToObject(cx, &args.thisv()));
-    if (!obj)
-        return false;
 
-    /*
-     *  Passing comma here as the separator. Need a way to get a
-     *  locale-specific version.
-     */
-    Rooted<JSString*> none(cx, NULL);
-    return array_toString_sub(cx, obj, JS_TRUE, none, args);
+    return array_join_sub(cx, args, true);
+}
+
+/* ES5 15.4.4.5 */
+static JSBool
+array_join(JSContext *cx, unsigned argc, Value *vp)
+{
+    JS_CHECK_RECURSION(cx, return false);
+
+    CallArgs args = CallArgsFromVp(argc, vp);
+    return array_join_sub(cx, args, false);
 }
 
 static inline bool
@@ -1774,30 +1798,6 @@ InitArrayElements(JSContext *cx, HandleObject obj, uint32_t start, uint32_t coun
     return true;
 }
 
-/*
- * Perl-inspired join, reverse, and sort.
- */
-static JSBool
-array_join(JSContext *cx, unsigned argc, Value *vp)
-{
-    JS_CHECK_RECURSION(cx, return false);
-
-    CallArgs args = CallArgsFromVp(argc, vp);
-    RootedString str(cx);
-    if (args.hasDefined(0)) {
-        str = ToString(cx, args[0]);
-        if (!str)
-            return JS_FALSE;
-        args[0].setString(str);
-    } else {
-        str = NULL;
-    }
-    RootedObject obj(cx, ToObject(cx, &args.thisv()));
-    if (!obj)
-        return false;
-    return array_toString_sub(cx, obj, JS_FALSE, str, args);
-}
-
 static JSBool
 array_reverse(JSContext *cx, unsigned argc, Value *vp)
 {
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index e649600f8fcd..481c72ea8f18 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -1400,6 +1400,44 @@ ToNumberSlow(JSContext *cx, Value v, double *out)
     return true;
 }
 
+/*
+ * Convert a value to an int64_t, according to the WebIDL rules for long long
+ * conversion. Return converted value in *out on success, false on failure.
+ */
+JS_PUBLIC_API(bool)
+ToInt64Slow(JSContext *cx, const Value &v, int64_t *out)
+{
+    JS_ASSERT(!v.isInt32());
+    double d;
+    if (v.isDouble()) {
+        d = v.toDouble();
+    } else {
+        if (!ToNumberSlow(cx, v, &d))
+            return false;
+    }
+    *out = ToInt64(d);
+    return true;
+}
+
+/*
+ * Convert a value to an uint64_t, according to the WebIDL rules for unsigned long long
+ * conversion. Return converted value in *out on success, false on failure.
+ */
+JS_PUBLIC_API(bool)
+ToUint64Slow(JSContext *cx, const Value &v, uint64_t *out)
+{
+    JS_ASSERT(!v.isInt32());
+    double d;
+    if (v.isDouble()) {
+        d = v.toDouble();
+    } else {
+        if (!ToNumberSlow(cx, v, &d))
+            return false;
+    }
+    *out = ToUint64(d);
+    return true;
+}
+
 JS_PUBLIC_API(bool)
 ToInt32Slow(JSContext *cx, const Value &v, int32_t *out)
 {
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 10eee2c209f5..598de34e5e94 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -1126,6 +1126,47 @@ RopeMatch(JSContext *cx, JSString *textstr, const jschar *pat, uint32_t patlen,
     return true;
 }
 
+/* ES6 20120708 draft 15.5.4.24. */
+static JSBool
+str_contains(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    // Steps 1 and 2
+    RootedString str(cx, ThisToStringForStringProto(cx, args));
+    if (!str)
+        return false;
+
+    // Step 3
+    Rooted<JSLinearString *> patstr(cx, ArgToRootedString(cx, args, 0));
+    if (!patstr)
+        return false;
+
+    // Step 5
+    uint32_t textlen = str->length();
+    const jschar *text = str->getChars(cx);
+    if (!text)
+        return false;
+
+    if (args.hasDefined(1)) {
+        // Step 4
+        double posDouble;
+        if (!ToInteger(cx, args[1], &posDouble))
+            return false;
+
+        // Step 6
+        text += uint32_t(Min(double(textlen), Max(0.0, posDouble)));
+    }
+
+    // Step 7
+    uint32_t patlen = patstr->length();
+    const jschar *pat = patstr->chars();
+
+    // Step 8
+    args.rval().setBoolean(StringMatch(text, textlen, pat, patlen) >= 0);
+    return true;
+}
+
 static JSBool
 str_indexOf(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -1261,6 +1302,90 @@ str_lastIndexOf(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
+/* ES6 20120708 draft 15.5.4.22. */
+static JSBool
+str_startsWith(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    // Steps 1 and 2
+    RootedString str(cx, ThisToStringForStringProto(cx, args));
+    if (!str)
+        return false;
+
+    // Step 3
+    Rooted<JSLinearString *> patstr(cx, ArgToRootedString(cx, args, 0));
+    if (!patstr)
+        return false;
+
+    // Step 5
+    uint32_t textlen = str->length();
+    const jschar *text = str->getChars(cx);
+    if (!text)
+        return false;
+
+    if (args.hasDefined(1)) {
+        // Step 4
+        double posDouble;
+        if (!ToInteger(cx, args[1], &posDouble))
+            return false;
+
+        // Step 6
+        uint32_t position = Min(double(textlen), Max(0.0, posDouble));
+        text += position;
+        textlen -= position;
+    }
+
+    // Step 7
+    uint32_t patlen = patstr->length();
+    const jschar *pat = patstr->chars();
+
+    // Steps 8, 9, and 10.
+    args.rval().setBoolean(textlen >= patlen && PodEqual(text, pat, patlen));
+    return true;
+}
+
+/* ES6 20120708 draft 15.5.4.23. */
+static JSBool
+str_endsWith(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    // Steps 1 and 2
+    RootedString str(cx, ThisToStringForStringProto(cx, args));
+    if (!str)
+        return false;
+
+    // Step 3
+    Rooted<JSLinearString *> patstr(cx, ArgToRootedString(cx, args, 0));
+    if (!patstr)
+        return false;
+
+    // Step 4
+    uint32_t textlen = str->length();
+    const jschar *text = str->getChars(cx);
+    if (!text)
+        return false;
+
+    if (args.hasDefined(1)) {
+        // Step 5
+        double endPosDouble;
+        if (!ToInteger(cx, args[1], &endPosDouble))
+            return false;
+
+        // Step 6
+        textlen = Min(double(textlen), Max(0.0, endPosDouble));
+    }
+
+    // Step 7
+    uint32_t patlen = patstr->length();
+    const jschar *pat = patstr->chars();
+
+    // Steps 8-11
+    args.rval().setBoolean(textlen >= patlen && PodEqual(text + textlen - patlen, pat, patlen));
+    return true;
+}
+
 static JSBool
 js_TrimString(JSContext *cx, Value *vp, JSBool trimLeft, JSBool trimRight)
 {
@@ -2805,51 +2930,56 @@ tagify(JSContext *cx, const char *begin, JSLinearString *param, const char *end,
 
     size_t beglen = strlen(begin);
     size_t taglen = 1 + beglen + 1;                     /* '<begin' + '>' */
-    size_t parlen = 0; /* Avoid warning. */
     if (param) {
-        parlen = param->length();
-        taglen += 2 + parlen + 1;                       /* '="param"' */
+        size_t numChars = param->length();
+        const jschar *parchars = param->chars();
+        for (size_t i = 0, parlen = numChars; i < parlen; ++i) {
+            if (parchars[i] == '"')
+                numChars += 5;                          /* len(&quot;) - len(") */
+        }
+        taglen += 2 + numChars + 1;                     /* '="param"' */
     }
     size_t endlen = strlen(end);
     taglen += str->length() + 2 + endlen + 1;           /* 'str</end>' */
 
-    if (taglen >= ~(size_t)0 / sizeof(jschar)) {
-        js_ReportAllocationOverflow(cx);
-        return false;
-    }
 
-    jschar *tagbuf = (jschar *) cx->malloc_((taglen + 1) * sizeof(jschar));
-    if (!tagbuf)
+    StringBuffer sb(cx);
+    if (!sb.reserve(taglen))
         return false;
 
-    size_t j = 0;
-    tagbuf[j++] = '<';
-    for (size_t i = 0; i < beglen; i++)
-        tagbuf[j++] = (jschar)begin[i];
+    sb.infallibleAppend('<');
+
+    MOZ_ALWAYS_TRUE(sb.appendInflated(begin, beglen));
+
     if (param) {
-        tagbuf[j++] = '=';
-        tagbuf[j++] = '"';
-        js_strncpy(&tagbuf[j], param->chars(), parlen);
-        j += parlen;
-        tagbuf[j++] = '"';
+        sb.infallibleAppend('=');
+        sb.infallibleAppend('"');
+        const jschar *parchars = param->chars();
+        for (size_t i = 0, parlen = param->length(); i < parlen; ++i) {
+            if (parchars[i] != '"') {
+                sb.infallibleAppend(parchars[i]);
+            } else {
+                MOZ_ALWAYS_TRUE(sb.append("&quot;"));
+            }
+        }
+        sb.infallibleAppend('"');
     }
-    tagbuf[j++] = '>';
+    
+    sb.infallibleAppend('>');
 
-    js_strncpy(&tagbuf[j], str->chars(), str->length());
-    j += str->length();
-    tagbuf[j++] = '<';
-    tagbuf[j++] = '/';
-    for (size_t i = 0; i < endlen; i++)
-        tagbuf[j++] = (jschar)end[i];
-    tagbuf[j++] = '>';
-    JS_ASSERT(j == taglen);
-    tagbuf[j] = 0;
+    MOZ_ALWAYS_TRUE(sb.append(str));
 
-    JSString *retstr = js_NewString(cx, tagbuf, taglen);
-    if (!retstr) {
-        Foreground::free_((char *)tagbuf);
+    sb.infallibleAppend('<');
+    sb.infallibleAppend('/');
+
+    MOZ_ALWAYS_TRUE(sb.appendInflated(end, endlen));
+
+    sb.infallibleAppend('>');
+
+    JSFixedString *retstr = sb.finishString();
+    if (!retstr)
         return false;
-    }
+
     call.rval().setString(retstr);
     return true;
 }
@@ -2957,8 +3087,11 @@ static JSFunctionSpec string_methods[] = {
     JS_FN("toUpperCase",       str_toUpperCase,       0,JSFUN_GENERIC_NATIVE),
     JS_FN("charAt",            js_str_charAt,         1,JSFUN_GENERIC_NATIVE),
     JS_FN("charCodeAt",        js_str_charCodeAt,     1,JSFUN_GENERIC_NATIVE),
+    JS_FN("contains",          str_contains,          1,JSFUN_GENERIC_NATIVE),
     JS_FN("indexOf",           str_indexOf,           1,JSFUN_GENERIC_NATIVE),
     JS_FN("lastIndexOf",       str_lastIndexOf,       1,JSFUN_GENERIC_NATIVE),
+    JS_FN("startsWith",        str_startsWith,        1,JSFUN_GENERIC_NATIVE),
+    JS_FN("endsWith",          str_endsWith,          1,JSFUN_GENERIC_NATIVE),
     JS_FN("trim",              str_trim,              0,JSFUN_GENERIC_NATIVE),
     JS_FN("trimLeft",          str_trimLeft,          0,JSFUN_GENERIC_NATIVE),
     JS_FN("trimRight",         str_trimRight,         0,JSFUN_GENERIC_NATIVE),
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 45910d185d1f..c5f44966eb19 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -1033,6 +1033,13 @@ int DeadObjectProxy::sDeadObjectFamily;
 
 } // namespace js
 
+JSObject *
+js::NewDeadProxyObject(JSContext *cx, JSObject *parent)
+{
+    return NewProxyObject(cx, &DeadObjectProxy::singleton, NullValue(),
+                          NULL, parent, NULL, NULL);
+}
+
 void
 js::NukeCrossCompartmentWrapper(JSObject *wrapper)
 {
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index ec66cd33f869..ea775ef59f22 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -370,6 +370,9 @@ UnwrapOneChecked(JSContext *cx, JSObject *obj);
 JS_FRIEND_API(bool)
 IsCrossCompartmentWrapper(RawObject obj);
 
+JSObject *
+NewDeadProxyObject(JSContext *cx, JSObject *parent);
+
 void
 NukeCrossCompartmentWrapper(JSObject *wrapper);
 
diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
index bd89df84c597..90a277939e4e 100644
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@@ -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/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/src/tests/Makefile.in b/js/src/tests/Makefile.in
index f515185d3c38..326857b4a33e 100644
--- a/js/src/tests/Makefile.in
+++ b/js/src/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/src/tests/ecma_5/Array/join-01.js b/js/src/tests/ecma_5/Array/join-01.js
index e4c15df17378..3cc6cccd0dc5 100644
--- a/js/src/tests/ecma_5/Array/join-01.js
+++ b/js/src/tests/ecma_5/Array/join-01.js
@@ -56,6 +56,13 @@ count = 0;
 assertEq(undefiney.join(stringifyCounter), "1objobj3obj4obj5");
 assertEq(count, 1);
 
+var log = '';
+arr = {length: {valueOf: function () { log += "L"; return 2; }},
+      0: "x", 1: "z"};
+var sep = {toString: function () { log += "S"; return "y"; }};
+assertEq(Array.prototype.join.call(arr, sep), "xyz");
+assertEq(log, "LS");
+
 var funky =
   {
     toString: function()
diff --git a/js/src/tests/ecma_5/Array/toLocaleString-01.js b/js/src/tests/ecma_5/Array/toLocaleString-01.js
index d5734ec9185f..458283e635df 100644
--- a/js/src/tests/ecma_5/Array/toLocaleString-01.js
+++ b/js/src/tests/ecma_5/Array/toLocaleString-01.js
@@ -23,6 +23,12 @@ assertEq(Array.prototype.toLocaleString.call(o), "7,baz");
 o = {};
 assertEq(Array.prototype.toLocaleString.call(o), "");
 
+var log = '';
+arr = {length: {valueOf: function () { log += "L"; return 2; }},
+      0: "x", 1: "z"};
+assertEq(Array.prototype.toLocaleString.call(arr), "x,z");
+assertEq(log, "L");
+
 /******************************************************************************/
 
 reportCompare(true, true);
diff --git a/js/src/tests/lib/manifest.py b/js/src/tests/lib/manifest.py
index eff52867a270..e5e725c7622e 100644
--- a/js/src/tests/lib/manifest.py
+++ b/js/src/tests/lib/manifest.py
@@ -105,30 +105,23 @@ class NullXULInfoTester:
     def test(self, cond):
         return False
 
-def _parse_one(parts, xul_tester):
-    script = None
-    enable = True
-    expect = True
-    random = False
-    slow = False
-    debugMode = False
-    allowXml = False
-
+def _parse_one(testcase, xul_tester):
     pos = 0
+    parts = testcase.terms.split()
     while pos < len(parts):
         if parts[pos] == 'fails':
-            expect = False
+            testcase.expect = False
             pos += 1
         elif parts[pos] == 'skip':
-            expect = enable = False
+            testcase.expect = testcase.enable = False
             pos += 1
         elif parts[pos] == 'random':
-            random = True
+            testcase.random = True
             pos += 1
         elif parts[pos].startswith('fails-if'):
             cond = parts[pos][len('fails-if('):-1]
             if xul_tester.test(cond):
-                expect = False
+                testcase.expect = False
             pos += 1
         elif parts[pos].startswith('asserts-if'):
             # This directive means we may flunk some number of
@@ -137,52 +130,58 @@ def _parse_one(parts, xul_tester):
         elif parts[pos].startswith('skip-if'):
             cond = parts[pos][len('skip-if('):-1]
             if xul_tester.test(cond):
-                expect = enable = False
+                testcase.expect = testcase.enable = False
             pos += 1
         elif parts[pos].startswith('random-if'):
             cond = parts[pos][len('random-if('):-1]
             if xul_tester.test(cond):
-                random = True
+                testcase.random = True
             pos += 1
         elif parts[pos].startswith('require-or'):
             cond = parts[pos][len('require-or('):-1]
             (preconditions, fallback_action) = re.split(",", cond)
             for precondition in re.split("&&", preconditions):
                 if precondition == 'debugMode':
-                    debugMode = True
+                    testcase.options.append('-d')
                 elif precondition == 'true':
                     pass
                 else:
                     if fallback_action == "skip":
-                        expect = enable = False
+                        testcase.expect = testcase.enable = False
                     elif fallback_action == "fail":
-                        expect = False
+                        testcase.expect = False
                     elif fallback_action == "random":
-                        random = True
+                        testcase.random = True
                     else:
                         raise Exception(("Invalid precondition '%s' or fallback " +
                                          " action '%s'") % (precondition, fallback_action))
                     break
             pos += 1
-        elif parts[pos] == 'script':
-            script = parts[pos+1]
-            pos += 2
         elif parts[pos] == 'slow':
-            slow = True
+            testcase.slow = True
             pos += 1
         elif parts[pos] == 'silentfail':
             # silentfails use tons of memory, and Darwin doesn't support ulimit.
             if xul_tester.test("xulRuntime.OS == 'Darwin'"):
-                expect = enable = False
+                testcase.expect = testcase.enable = False
             pos += 1
         elif parts[pos] == 'pref(javascript.options.xml.content,true)':
-            allowXml = True
+            testcase.options += ['-e', 'options("allow_xml");']
             pos += 1
         else:
             print 'warning: invalid manifest line element "%s"'%parts[pos]
             pos += 1
 
-    return script, (enable, expect, random, slow, debugMode, allowXml)
+def _build_manifest_script_entry(script_name, test):
+    line = []
+    if test.terms:
+        line.append(test.terms)
+    line.append("script")
+    line.append(script_name)
+    if test.comment:
+        line.append("#")
+        line.append(test.comment)
+    return ' '.join(line)
 
 def _map_prefixes_left(test_list):
     """
@@ -200,6 +199,12 @@ def _map_prefixes_left(test_list):
     return byprefix
 
 def _emit_manifest_at(location, relative, test_list, depth):
+    """
+    location  - str: absolute path where we want to write the manifest
+    relative  - str: relative path from topmost manifest directory to current
+    test_list - [str]: list of all test paths and directorys
+    depth     - int: number of dirs we are below the topmost manifest dir
+    """
     manifests = _map_prefixes_left(test_list)
 
     filename = os.path.join(location, 'jstests.list')
@@ -214,16 +219,8 @@ def _emit_manifest_at(location, relative, test_list, depth):
         else:
             numTestFiles += 1
             assert(len(test_list) == 1)
-            t = test_list[0]
-            line = []
-            if t.terms:
-                line.append(t.terms)
-            line.append("script")
-            line.append(k)
-            if t.comment:
-                line.append("#")
-                line.append(t.comment)
-            manifest.append(' '.join(line))
+            line = _build_manifest_script_entry(k, test_list[0])
+            manifest.append(line)
 
     # Always present our manifest in sorted order.
     manifest.sort()
@@ -280,13 +277,7 @@ def _parse_test_header(fullpath, testcase, xul_tester):
     testcase.terms = matches.group(2)
     testcase.comment = matches.group(4)
 
-    _, properties = _parse_one(testcase.terms.split(), xul_tester)
-    testcase.enable = properties[0]
-    testcase.expect = properties[1]
-    testcase.random = properties[2]
-    testcase.slow = properties[3]
-    testcase.debugMode = properties[4]
-    testcase.allowXml = properties[5]
+    _parse_one(testcase, xul_tester)
 
 def load(location, xul_tester, reldir = ''):
     """
@@ -319,13 +310,7 @@ def load(location, xul_tester, reldir = ''):
             continue
 
         # Parse the test header and load the test.
-        testcase = TestCase(os.path.join(reldir, filename),
-                            enable = True,
-                            expect = True,
-                            random = False,
-                            slow = False,
-                            debugMode = False,
-                            allowXml = False)
+        testcase = TestCase(os.path.join(reldir, filename))
         _parse_test_header(fullpath, testcase, xul_tester)
         tests.append(testcase)
     return tests
diff --git a/js/src/tests/lib/tests.py b/js/src/tests/lib/tests.py
index 6f29e99978c1..0fb5af76cf49 100644
--- a/js/src/tests/lib/tests.py
+++ b/js/src/tests/lib/tests.py
@@ -80,13 +80,7 @@ class Test(object):
 
     def get_command(self, js_cmd_prefix):
         dirname, filename = os.path.split(self.path)
-        cmd = js_cmd_prefix
-        if self.allowXml:
-            cmd = cmd + [ '-e', 'options("allow_xml")' ]
-        cmd = cmd + Test.prefix_command(dirname)
-        if self.debugMode:
-            cmd += [ '-d' ]
-        cmd += [ '-f', self.path ]
+        cmd = js_cmd_prefix + self.options + Test.prefix_command(dirname) + [ '-f', self.path ]
         return cmd
 
     def run(self, js_cmd_prefix, timeout=30.0):
@@ -98,14 +92,13 @@ class TestCase(Test):
     """A test case consisting of a test and an expected result."""
     js_cmd_prefix = None
 
-    def __init__(self, path, enable, expect, random, slow, debugMode, allowXml):
+    def __init__(self, path):
         Test.__init__(self, path)
-        self.enable = enable     # bool: True => run test, False => don't run
-        self.expect = expect     # bool: expected result, True => pass
-        self.random = random     # bool: True => ignore output as 'random'
-        self.slow = slow         # bool: True => test may run slowly
-        self.debugMode = debugMode # bool: True => must be run in debug mode
-        self.allowXml = allowXml # bool: True => test requires JSOPTION_ALLOW_XML
+        self.enable = True   # bool: True => run test, False => don't run
+        self.expect = True   # bool: expected result, True => pass
+        self.random = False  # bool: True => ignore output as 'random'
+        self.slow = False    # bool: True => test may run slowly
+        self.options = []    # [str]: Extra options to pass to the shell
 
         # The terms parsed to produce the above properties.
         self.terms = None
@@ -126,8 +119,10 @@ class TestCase(Test):
             ans += ', random'
         if self.slow:
             ans += ', slow'
-        if self.debugMode:
+        if '-d' in self.options:
             ans += ', debugMode'
+        if 'options("allow_xml");' in self.options:
+            ans += ', pref(javascript.options.xml.content,true)'
         return ans
 
     @classmethod
diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index 0939609570de..24b7dbfa71c2 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -33,25 +33,28 @@ union DoublePun {
 
 } /* namespace detail */
 
-/* ES5 9.5 ToInt32 (specialized for doubles). */
-inline int32_t
-ToInt32(double d)
+/* Numeric Conversion base. Round doubles to Ints according to ECMA or WEBIDL standards. */
+template<size_t width, typename ResultType>
+inline ResultType
+ToIntWidth(double d)
 {
 #if defined(__i386__) || defined(__i386) || defined(__x86_64__) || \
     defined(_M_IX86) || defined(_M_X64)
-    detail::DoublePun du, duh, two32;
+    detail::DoublePun du, duh, twoWidth;
     uint32_t di_h, u_tmp, expon, shift_amount;
     int32_t mask32;
 
     /*
      * Algorithm Outline
-     *  Step 1. If d is NaN, +/-Inf or |d|>=2^84 or |d|<1, then return 0
-     *          All of this is implemented based on an exponent comparison.
-     *  Step 2. If |d|<2^31, then return (int)d
+     *  Step 1. If d is NaN, +/-Inf or |d|>=2^(width + 52) or |d|<1, then return 0
+     *          All of this is implemented based on an exponent comparison,
+     *          since anything with a higher exponent is either not finite, or
+     *          going to round to 0..
+     *  Step 2. If |d|<2^(width - 1), then return (int)d
      *          The cast to integer (conversion in RZ mode) returns the correct result.
-     *  Step 3. If |d|>=2^32, d:=fmod(d, 2^32) is taken  -- but without a call
-     *  Step 4. If |d|>=2^31, then the fractional bits are cleared before
-     *          applying the correction by 2^32:  d - sign(d)*2^32
+     *  Step 3. If |d|>=2^width, d:=fmod(d, 2^width) is taken  -- but without a call
+     *  Step 4. If |d|>=2^(width - 1), then the fractional bits are cleared before
+     *          applying the correction by 2^width:  d - sign(d)*2^width
      *  Step 5. Return (int)d
      */
 
@@ -59,27 +62,40 @@ ToInt32(double d)
     di_h = du.s.hi;
 
     u_tmp = (di_h & 0x7ff00000) - 0x3ff00000;
-    if (u_tmp >= (0x45300000-0x3ff00000)) {
-        // d is Nan, +/-Inf or +/-0, or |d|>=2^(32+52) or |d|<1, in which case result=0
+    if (u_tmp >= ((width + 52) << 20)) {
+        // d is Nan, +/-Inf or +/-0, or |d|>=2^(width+52) or |d|<1, in which case result=0
+        // If we need to shift by more than (width + 52), there are no data bits
+        // to preserve, and the mod will turn out 0.
         return 0;
     }
 
-    if (u_tmp < 0x01f00000) {
-        // |d|<2^31
-        return int32_t(d);
+    if (u_tmp < ((width - 1) << 20)) {
+        // |d|<2^(width - 1)
+        return ResultType(d);
     }
 
-    if (u_tmp > 0x01f00000) {
-        // |d|>=2^32
+    if (u_tmp > ((width - 1) << 20)) {
+        // |d|>=2^width
+        // Throw away multiples of 2^width.
+        //
+        // That is, compute du.d = the value in (-2^width, 2^width)
+        // that has the same sign as d and is equal to d modulo 2^width.
+        //
+        // This can't be done simply by masking away bits of du because
+        // the implicit one-bit of the mantissa is one of the ones we want to
+        // eliminate. So instead we compute duh.d = the appropriate multiple
+        // of 2^width, which *can* be computed by masking, and then we
+        // subtract that from du.d.
         expon = u_tmp >> 20;
-        shift_amount = expon - 21;
-        duh.u64 = du.u64;
+        shift_amount = expon - (width - 11);
         mask32 = 0x80000000;
         if (shift_amount < 32) {
+            // Shift only affects top word.
             mask32 >>= shift_amount;
             duh.s.hi = du.s.hi & mask32;
             duh.s.lo = 0;
         } else {
+            // Top word all 1s, shift affects bottom word.
             mask32 >>= (shift_amount-32);
             duh.s.hi = du.s.hi;
             duh.s.lo = du.s.lo & mask32;
@@ -89,28 +105,56 @@ ToInt32(double d)
 
     di_h = du.s.hi;
 
-    // eliminate fractional bits
+    // Eliminate fractional bits
     u_tmp = (di_h & 0x7ff00000);
-    if (u_tmp >= 0x41e00000) {
-        // |d|>=2^31
+    if (u_tmp >= (0x3ff00000 + ((width - 1) << 20))) {
+        // |d|>=2^(width - 1)
         expon = u_tmp >> 20;
+
+        // Same idea as before, except save everything non-fractional.
         shift_amount = expon - (0x3ff - 11);
         mask32 = 0x80000000;
         if (shift_amount < 32) {
+            // Top word only
             mask32 >>= shift_amount;
             du.s.hi &= mask32;
             du.s.lo = 0;
         } else {
+            // Bottom word. Top word all 1s.
             mask32 >>= (shift_amount-32);
             du.s.lo &= mask32;
         }
-        two32.s.hi = 0x41f00000 ^ (du.s.hi & 0x80000000);
-        two32.s.lo = 0;
-        du.d -= two32.d;
+        // Apply step 4's 2^width correction.
+        twoWidth.s.hi = (0x3ff00000 + (width << 20)) ^ (du.s.hi & 0x80000000);
+        twoWidth.s.lo = 0;
+        du.d -= twoWidth.d;
     }
 
-    return int32_t(du.d);
-#elif defined (__arm__) && defined (__GNUC__)
+    return ResultType(du.d);
+#else
+    double twoWidth, twoWidthMin1;
+
+    if (!MOZ_DOUBLE_IS_FINITE(d))
+        return 0;
+
+    /* FIXME: This relies on undefined behavior; see bug 667739. */
+    ResultType i = (ResultType) d;
+    if ((double) i == d)
+        return ResultType(i);
+
+    twoWidth = width == 32 ? 4294967296.0 : 18446744073709551616.0;
+    twoWidthMin1 = width == 32 ? 2147483648.0 : 9223372036854775808.0;
+    d = fmod(d, twoWidth);
+    d = (d >= 0) ? floor(d) : ceil(d) + twoWidth;
+    return (ResultType) (d >= twoWidthMin1 ? d - twoWidth : d);
+#endif
+}
+
+/* ES5 9.5 ToInt32 (specialized for doubles). */
+inline int32_t
+ToInt32(double d)
+{
+#if defined (__arm__) && defined (__GNUC__)
     int32_t i;
     uint32_t    tmp0;
     uint32_t    tmp1;
@@ -232,22 +276,7 @@ ToInt32(double d)
         );
     return i;
 #else
-    int32_t i;
-    double two32, two31;
-
-    if (!MOZ_DOUBLE_IS_FINITE(d))
-        return 0;
-
-    /* FIXME: This relies on undefined behavior; see bug 667739. */
-    i = (int32_t) d;
-    if ((double) i == d)
-        return i;
-
-    two32 = 4294967296.0;
-    two31 = 2147483648.0;
-    d = fmod(d, two32);
-    d = (d >= 0) ? floor(d) : ceil(d) + two32;
-    return (int32_t) (d >= two31 ? d - two32 : d);
+    return ToIntWidth<32, int32_t>(d);
 #endif
 }
 
@@ -258,6 +287,20 @@ ToUint32(double d)
     return uint32_t(ToInt32(d));
 }
 
+/* WEBIDL 4.2.10 */
+inline int64_t
+ToInt64(double d)
+{
+    return ToIntWidth<64, int64_t>(d);
+}
+
+/* WEBIDL 4.2.11 */
+inline uint64_t
+ToUint64(double d)
+{
+    return uint64_t(ToInt64(d));
+}
+
 /* ES5 9.4 ToInteger (specialized for doubles). */
 inline double
 ToInteger(double d)
diff --git a/js/xpconnect/Makefile.in b/js/xpconnect/Makefile.in
index 17735c512a8f..475a792adc8a 100644
--- a/js/xpconnect/Makefile.in
+++ b/js/xpconnect/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/xpconnect/idl/Makefile.in b/js/xpconnect/idl/Makefile.in
index 1eb433b2d797..6e8b90bb4c3e 100644
--- a/js/xpconnect/idl/Makefile.in
+++ b/js/xpconnect/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in
index f47caa121a4e..03fccdfdd57c 100644
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH 		= ../../..
+DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/xpconnect/public/Makefile.in b/js/xpconnect/public/Makefile.in
index 219cba8359e9..908bd693b2fa 100644
--- a/js/xpconnect/public/Makefile.in
+++ b/js/xpconnect/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in
index ba68684ff98d..2a7a8c913245 100644
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index 0f660b6d0b95..cdf88fa49fb8 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp
index a82abaf94915..d0952d197a30 100644
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sw=4 et tw=78:
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -25,6 +25,7 @@
 #include "jsfriendapi.h"
 
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/PrimitiveConversions.h"
 
 using namespace xpc;
 using namespace mozilla;
@@ -372,10 +373,6 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
 
     JSContext* cx = ccx.GetJSContext();
 
-    int32_t  ti;
-    uint32_t tu;
-    double td;
-    JSBool   tb;
     JSBool isDOMString = true;
 
     if (pErr)
@@ -383,412 +380,383 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
 
     switch (type.TagPart()) {
     case nsXPTType::T_I8     :
-        if (!JS_ValueToECMAInt32(cx, s, &ti))
-            return false;
-        *((int8_t*)d)  = int8_t(ti);
-        break;
+        return ValueToPrimitive(cx, s, static_cast<int8_t*>(d));
     case nsXPTType::T_I16    :
-        if (!JS_ValueToECMAInt32(cx, s, &ti))
-            return false;
-        *((int16_t*)d)  = int16_t(ti);
-        break;
+        return ValueToPrimitive(cx, s, static_cast<int16_t*>(d));
     case nsXPTType::T_I32    :
-        if (!JS_ValueToECMAInt32(cx, s, (int32_t*)d))
-            return false;
-        break;
+        return ValueToPrimitive(cx, s, static_cast<int32_t*>(d));
     case nsXPTType::T_I64    :
-        return ValueToInt64(cx, s, (int64_t*)d);
-
+        return ValueToPrimitive(cx, s, static_cast<int64_t*>(d));
     case nsXPTType::T_U8     :
-        if (!JS_ValueToECMAUint32(cx, s, &tu))
-            return false;
-        *((uint8_t*)d)  = uint8_t(tu);
-        break;
+        return ValueToPrimitive(cx, s, static_cast<uint8_t*>(d));
     case nsXPTType::T_U16    :
-        if (!JS_ValueToECMAUint32(cx, s, &tu))
-            return false;
-        *((uint16_t*)d)  = uint16_t(tu);
-        break;
+        return ValueToPrimitive(cx, s, static_cast<uint16_t*>(d));
     case nsXPTType::T_U32    :
-        if (!JS_ValueToECMAUint32(cx, s, (uint32_t*)d))
-            return false;
-        break;
+        return ValueToPrimitive(cx, s, static_cast<uint32_t*>(d));
     case nsXPTType::T_U64    :
-        return ValueToUint64(cx, s, (uint64_t*)d);
-
+        return ValueToPrimitive(cx, s, static_cast<uint64_t*>(d));
     case nsXPTType::T_FLOAT  :
-        if (!JS_ValueToNumber(cx, s, &td))
-            return false;
-        *((float*)d) = (float) td;
-        break;
+        return ValueToPrimitive(cx, s, static_cast<float*>(d));
     case nsXPTType::T_DOUBLE :
-        if (!JS_ValueToNumber(cx, s, (double*)d))
-            return false;
-        break;
+        return ValueToPrimitive(cx, s, static_cast<double*>(d));
     case nsXPTType::T_BOOL   :
-        JS_ValueToBoolean(cx, s, &tb);
-        *((bool*)d) = tb;
-        break;
+        return ValueToPrimitive(cx, s, static_cast<bool*>(d));
     case nsXPTType::T_CHAR   :
-        {
-            JSString* str = JS_ValueToString(cx, s);
-            if (!str) {
-                return false;
-            }
-            size_t length;
-            const jschar* chars = JS_GetStringCharsAndLength(cx, str, &length);
-            if (!chars) {
-                return false;
-            }
-            jschar ch = length ? chars[0] : 0;
+    {
+        JSString* str = JS_ValueToString(cx, s);
+        if (!str) {
+            return false;
+        }
+        size_t length;
+        const jschar* chars = JS_GetStringCharsAndLength(cx, str, &length);
+        if (!chars) {
+            return false;
+        }
+        jschar ch = length ? chars[0] : 0;
 #ifdef DEBUG
-            CheckJSCharInCharRange(ch);
+        CheckJSCharInCharRange(ch);
 #endif
-            *((char*)d) = char(ch);
-            break;
-        }
+        *((char*)d) = char(ch);
+        break;
+    }
     case nsXPTType::T_WCHAR  :
-        {
-            JSString* str;
-            if (!(str = JS_ValueToString(cx, s))) {
-                return false;
-            }
-            size_t length;
-            const jschar* chars = JS_GetStringCharsAndLength(cx, str, &length);
-            if (!chars) {
-                return false;
-            }
-            if (length == 0) {
-                *((uint16_t*)d) = 0;
-                break;
-            }
-            *((uint16_t*)d) = uint16_t(chars[0]);
+    {
+        JSString* str;
+        if (!(str = JS_ValueToString(cx, s))) {
+            return false;
+        }
+        size_t length;
+        const jschar* chars = JS_GetStringCharsAndLength(cx, str, &length);
+        if (!chars) {
+            return false;
+        }
+        if (length == 0) {
+            *((uint16_t*)d) = 0;
             break;
         }
+        *((uint16_t*)d) = uint16_t(chars[0]);
+        break;
+    }
     case nsXPTType::T_JSVAL :
         *((jsval*)d) = s;
         break;
-    default:
+    case nsXPTType::T_VOID:
+        XPC_LOG_ERROR(("XPCConvert::JSData2Native : void* params not supported"));
+        NS_ERROR("void* params not supported");
+        return false;
+    case nsXPTType::T_IID:
+    {
+        const nsID* pid = nullptr;
 
-        switch (type.TagPart()) {
-        case nsXPTType::T_VOID:
-            XPC_LOG_ERROR(("XPCConvert::JSData2Native : void* params not supported"));
-            NS_ERROR("void* params not supported");
+        // There's no good reason to pass a null IID.
+        if (s.isNullOrUndefined()) {
+            if (pErr)
+                *pErr = NS_ERROR_XPC_BAD_CONVERT_JS;
             return false;
-        case nsXPTType::T_IID:
-        {
-            const nsID* pid = nullptr;
-
-            // There's no good reason to pass a null IID.
-            if (s.isNullOrUndefined()) {
-                if (pErr)
-                    *pErr = NS_ERROR_XPC_BAD_CONVERT_JS;
-                return false;
-            }
-
-            if (!s.isObject() ||
-                (!(pid = xpc_JSObjectToID(cx, &s.toObject()))) ||
-                (!(pid = (const nsID*) nsMemory::Clone(pid, sizeof(nsID))))) {
-                return false;
-            }
-            *((const nsID**)d) = pid;
-            return true;
         }
 
-        case nsXPTType::T_ASTRING:
-        {
-            isDOMString = false;
-            // Fall through to T_DOMSTRING case.
+        if (!s.isObject() ||
+            (!(pid = xpc_JSObjectToID(cx, &s.toObject()))) ||
+            (!(pid = (const nsID*) nsMemory::Clone(pid, sizeof(nsID))))) {
+            return false;
         }
-        case nsXPTType::T_DOMSTRING:
-        {
-            static const PRUnichar EMPTY_STRING[] = { '\0' };
-            static const PRUnichar VOID_STRING[] = { 'u', 'n', 'd', 'e', 'f', 'i', 'n', 'e', 'd', '\0' };
+        *((const nsID**)d) = pid;
+        return true;
+    }
 
-            const PRUnichar* chars = nullptr;
-            JSString* str = nullptr;
-            JSBool isNewString = false;
-            PRUint32 length = 0;
+    case nsXPTType::T_ASTRING:
+    {
+        isDOMString = false;
+        // Fall through to T_DOMSTRING case.
+    }
+    case nsXPTType::T_DOMSTRING:
+    {
+        static const PRUnichar EMPTY_STRING[] = { '\0' };
+        static const PRUnichar VOID_STRING[] = { 'u', 'n', 'd', 'e', 'f', 'i', 'n', 'e', 'd', '\0' };
 
-            if (JSVAL_IS_VOID(s)) {
-                if (isDOMString) {
-                    chars  = VOID_STRING;
-                    length = ArrayLength(VOID_STRING) - 1;
-                } else {
-                    chars = EMPTY_STRING;
-                    length = 0;
-                }
-            } else if (!JSVAL_IS_NULL(s)) {
-                str = JS_ValueToString(cx, s);
-                if (!str)
+        const PRUnichar* chars = nullptr;
+        JSString* str = nullptr;
+        JSBool isNewString = false;
+        PRUint32 length = 0;
+
+        if (JSVAL_IS_VOID(s)) {
+            if (isDOMString) {
+                chars  = VOID_STRING;
+                length = ArrayLength(VOID_STRING) - 1;
+            } else {
+                chars = EMPTY_STRING;
+                length = 0;
+            }
+        } else if (!JSVAL_IS_NULL(s)) {
+            str = JS_ValueToString(cx, s);
+            if (!str)
+                return false;
+
+            length = (PRUint32) JS_GetStringLength(str);
+            if (length) {
+                chars = JS_GetStringCharsZ(cx, str);
+                if (!chars)
+                    return false;
+                if (STRING_TO_JSVAL(str) != s)
+                    isNewString = true;
+            } else {
+                str = nullptr;
+                chars = EMPTY_STRING;
+            }
+        }
+
+        if (useAllocator) {
+            // XXX extra string copy when isNewString
+            if (str && !isNewString) {
+                size_t strLength;
+                const jschar *strChars = JS_GetStringCharsZAndLength(cx, str, &strLength);
+                if (!strChars)
                     return false;
 
-                length = (PRUint32) JS_GetStringLength(str);
-                if (length) {
-                    chars = JS_GetStringCharsZ(cx, str);
-                    if (!chars)
-                        return false;
-                    if (STRING_TO_JSVAL(str) != s)
-                        isNewString = true;
-                } else {
-                    str = nullptr;
-                    chars = EMPTY_STRING;
-                }
-            }
+                XPCReadableJSStringWrapper *wrapper =
+                    ccx.NewStringWrapper(strChars, strLength);
+                if (!wrapper)
+                    return false;
 
-            if (useAllocator) {
-                // XXX extra string copy when isNewString
-                if (str && !isNewString) {
-                    size_t strLength;
-                    const jschar *strChars = JS_GetStringCharsZAndLength(cx, str, &strLength);
-                    if (!strChars)
-                        return false;
+                *((const nsAString**)d) = wrapper;
+            } else if (JSVAL_IS_NULL(s)) {
+                XPCReadableJSStringWrapper *wrapper =
+                    new XPCReadableJSStringWrapper();
+                if (!wrapper)
+                    return false;
 
-                    XPCReadableJSStringWrapper *wrapper =
-                        ccx.NewStringWrapper(strChars, strLength);
-                    if (!wrapper)
-                        return false;
-
-                    *((const nsAString**)d) = wrapper;
-                } else if (JSVAL_IS_NULL(s)) {
-                    XPCReadableJSStringWrapper *wrapper =
-                        new XPCReadableJSStringWrapper();
-                    if (!wrapper)
-                        return false;
-
-                    *((const nsAString**)d) = wrapper;
-                } else {
-                    // use nsString to encourage sharing
-                    const nsAString *rs = new nsString(chars, length);
-                    if (!rs)
-                        return false;
-                    *((const nsAString**)d) = rs;
-                }
+                *((const nsAString**)d) = wrapper;
             } else {
-                nsAString* ws = *((nsAString**)d);
-
-                if (JSVAL_IS_NULL(s) || (!isDOMString && JSVAL_IS_VOID(s))) {
-                    ws->Truncate();
-                    ws->SetIsVoid(true);
-                } else
-                    ws->Assign(chars, length);
+                // use nsString to encourage sharing
+                const nsAString *rs = new nsString(chars, length);
+                if (!rs)
+                    return false;
+                *((const nsAString**)d) = rs;
             }
+        } else {
+            nsAString* ws = *((nsAString**)d);
+
+            if (JSVAL_IS_NULL(s) || (!isDOMString && JSVAL_IS_VOID(s))) {
+                ws->Truncate();
+                ws->SetIsVoid(true);
+            } else
+                ws->Assign(chars, length);
+        }
+        return true;
+    }
+
+    case nsXPTType::T_CHAR_STR:
+    {
+        if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
+            *((char**)d) = nullptr;
             return true;
         }
 
-        case nsXPTType::T_CHAR_STR:
-        {
-            if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
-                *((char**)d) = nullptr;
-                return true;
-            }
-
-            JSString* str = JS_ValueToString(cx, s);
-            if (!str) {
-                return false;
-            }
+        JSString* str = JS_ValueToString(cx, s);
+        if (!str) {
+            return false;
+        }
 #ifdef DEBUG
-            const jschar* chars=nullptr;
-            if (nullptr != (chars = JS_GetStringCharsZ(cx, str))) {
-                bool legalRange = true;
-                int len = JS_GetStringLength(str);
-                const jschar* t;
-                PRInt32 i=0;
-                for (t=chars; (i< len) && legalRange ; i++,t++) {
-                    if (!CheckJSCharInCharRange(*t))
-                        break;
-                }
-            }
-#endif // DEBUG
-            size_t length = JS_GetStringEncodingLength(cx, str);
-            if (length == size_t(-1)) {
-                return false;
-            }
-            char *buffer = static_cast<char *>(nsMemory::Alloc(length + 1));
-            if (!buffer) {
-                return false;
-            }
-            JS_EncodeStringToBuffer(str, buffer, length);
-            buffer[length] = '\0';
-            *((void**)d) = buffer;
-            return true;
-        }
-
-        case nsXPTType::T_WCHAR_STR:
-        {
-            const jschar* chars=nullptr;
-            JSString* str;
-
-            if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
-                *((jschar**)d) = nullptr;
-                return true;
-            }
-
-            if (!(str = JS_ValueToString(cx, s))) {
-                return false;
-            }
-            if (!(chars = JS_GetStringCharsZ(cx, str))) {
-                return false;
-            }
+        const jschar* chars=nullptr;
+        if (nullptr != (chars = JS_GetStringCharsZ(cx, str))) {
+            bool legalRange = true;
             int len = JS_GetStringLength(str);
-            int byte_len = (len+1)*sizeof(jschar);
-            if (!(*((void**)d) = nsMemory::Alloc(byte_len))) {
-                // XXX should report error
-                return false;
+            const jschar* t;
+            PRInt32 i=0;
+            for (t=chars; (i< len) && legalRange ; i++,t++) {
+                if (!CheckJSCharInCharRange(*t))
+                    break;
             }
-            jschar* destchars = *((jschar**)d);
-            memcpy(destchars, chars, byte_len);
-            destchars[len] = 0;
-
-            return true;
         }
-
-        case nsXPTType::T_UTF8STRING:
-        {
-            const jschar* chars;
-            PRUint32 length;
-            JSString* str;
-
-            if (JSVAL_IS_NULL(s) || JSVAL_IS_VOID(s)) {
-                if (useAllocator) {
-                    nsACString *rs = new nsCString();
-                    if (!rs)
-                        return false;
-
-                    rs->SetIsVoid(true);
-                    *((nsACString**)d) = rs;
-                } else {
-                    nsCString* rs = *((nsCString**)d);
-                    rs->Truncate();
-                    rs->SetIsVoid(true);
-                }
-                return true;
-            }
-
-            // The JS val is neither null nor void...
-
-            if (!(str = JS_ValueToString(cx, s))||
-                !(chars = JS_GetStringCharsZ(cx, str))) {
-                return false;
-            }
-
-            length = JS_GetStringLength(str);
-
-            nsCString *rs;
-            if (useAllocator) {
-                // Use nsCString to enable sharing
-                rs = new nsCString();
-                if (!rs)
-                    return false;
-
-                *((const nsCString**)d) = rs;
-            } else {
-                rs = *((nsCString**)d);
-            }
-            const PRUnichar* start = (const PRUnichar*)chars;
-            const PRUnichar* end = start + length;
-            CopyUTF16toUTF8(nsDependentSubstring(start, end), *rs);
-            return true;
-        }
-
-        case nsXPTType::T_CSTRING:
-        {
-            if (JSVAL_IS_NULL(s) || JSVAL_IS_VOID(s)) {
-                if (useAllocator) {
-                    nsACString *rs = new nsCString();
-                    if (!rs)
-                        return false;
-
-                    rs->SetIsVoid(true);
-                    *((nsACString**)d) = rs;
-                } else {
-                    nsACString* rs = *((nsACString**)d);
-                    rs->Truncate();
-                    rs->SetIsVoid(true);
-                }
-                return true;
-            }
-
-            // The JS val is neither null nor void...
-            JSString* str = JS_ValueToString(cx, s);
-            if (!str) {
-                return false;
-            }
-
-            size_t length = JS_GetStringEncodingLength(cx, str);
-            if (length == size_t(-1)) {
-                return false;
-            }
-
-            nsACString *rs;
-            if (useAllocator) {
-                rs = new nsCString();
-                if (!rs)
-                    return false;
-                *((const nsACString**)d) = rs;
-            } else {
-                rs = *((nsACString**)d);
-            }
-
-            rs->SetLength(PRUint32(length));
-            if (rs->Length() != PRUint32(length)) {
-                return false;
-            }
-            JS_EncodeStringToBuffer(str, rs->BeginWriting(), length);
-
-            return true;
-        }
-
-        case nsXPTType::T_INTERFACE:
-        case nsXPTType::T_INTERFACE_IS:
-        {
-            NS_ASSERTION(iid,"can't do interface conversions without iid");
-
-            if (iid->Equals(NS_GET_IID(nsIVariant))) {
-                XPCVariant* variant = XPCVariant::newVariant(ccx, s);
-                if (!variant)
-                    return false;
-                *((nsISupports**)d) = static_cast<nsIVariant*>(variant);
-                return true;
-            } else if (iid->Equals(NS_GET_IID(nsIAtom)) &&
-                       JSVAL_IS_STRING(s)) {
-                // We're trying to pass a string as an nsIAtom.  Let's atomize!
-                JSString* str = JSVAL_TO_STRING(s);
-                const PRUnichar* chars = JS_GetStringCharsZ(cx, str);
-                if (!chars) {
-                    if (pErr)
-                        *pErr = NS_ERROR_XPC_BAD_CONVERT_JS_NULL_REF;
-                    return false;
-                }
-                PRUint32 length = JS_GetStringLength(str);
-                nsIAtom* atom = NS_NewAtom(nsDependentSubstring(chars,
-                                                                chars + length));
-                if (!atom && pErr)
-                    *pErr = NS_ERROR_OUT_OF_MEMORY;
-                *((nsISupports**)d) = atom;
-                return atom != nullptr;
-            }
-            //else ...
-
-            if (s.isNullOrUndefined()) {
-                *((nsISupports**)d) = nullptr;
-                return true;
-            }
-
-            // only wrap JSObjects
-            if (!s.isObject()) {
-                if (pErr && s.isInt32() && 0 == s.toInt32())
-                    *pErr = NS_ERROR_XPC_BAD_CONVERT_JS_ZERO_ISNOT_NULL;
-                return false;
-            }
-
-            return JSObject2NativeInterface(ccx, (void**)d, &s.toObject(), iid,
-                                            nullptr, pErr);
-        }
-        default:
-            NS_ERROR("bad type");
+#endif // DEBUG
+        size_t length = JS_GetStringEncodingLength(cx, str);
+        if (length == size_t(-1)) {
             return false;
         }
+        char *buffer = static_cast<char *>(nsMemory::Alloc(length + 1));
+        if (!buffer) {
+            return false;
+        }
+        JS_EncodeStringToBuffer(str, buffer, length);
+        buffer[length] = '\0';
+        *((void**)d) = buffer;
+        return true;
+    }
+
+    case nsXPTType::T_WCHAR_STR:
+    {
+        const jschar* chars=nullptr;
+        JSString* str;
+
+        if (JSVAL_IS_VOID(s) || JSVAL_IS_NULL(s)) {
+            *((jschar**)d) = nullptr;
+            return true;
+        }
+
+        if (!(str = JS_ValueToString(cx, s))) {
+            return false;
+        }
+        if (!(chars = JS_GetStringCharsZ(cx, str))) {
+            return false;
+        }
+        int len = JS_GetStringLength(str);
+        int byte_len = (len+1)*sizeof(jschar);
+        if (!(*((void**)d) = nsMemory::Alloc(byte_len))) {
+            // XXX should report error
+            return false;
+        }
+        jschar* destchars = *((jschar**)d);
+        memcpy(destchars, chars, byte_len);
+        destchars[len] = 0;
+
+        return true;
+    }
+
+    case nsXPTType::T_UTF8STRING:
+    {
+        const jschar* chars;
+        PRUint32 length;
+        JSString* str;
+
+        if (JSVAL_IS_NULL(s) || JSVAL_IS_VOID(s)) {
+            if (useAllocator) {
+                nsACString *rs = new nsCString();
+                if (!rs)
+                    return false;
+
+                rs->SetIsVoid(true);
+                *((nsACString**)d) = rs;
+            } else {
+                nsCString* rs = *((nsCString**)d);
+                rs->Truncate();
+                rs->SetIsVoid(true);
+            }
+            return true;
+        }
+
+        // The JS val is neither null nor void...
+
+        if (!(str = JS_ValueToString(cx, s))||
+            !(chars = JS_GetStringCharsZ(cx, str))) {
+            return false;
+        }
+
+        length = JS_GetStringLength(str);
+
+        nsCString *rs;
+        if (useAllocator) {
+            // Use nsCString to enable sharing
+            rs = new nsCString();
+            if (!rs)
+                return false;
+
+            *((const nsCString**)d) = rs;
+        } else {
+            rs = *((nsCString**)d);
+        }
+        const PRUnichar* start = (const PRUnichar*)chars;
+        const PRUnichar* end = start + length;
+        CopyUTF16toUTF8(nsDependentSubstring(start, end), *rs);
+        return true;
+    }
+
+    case nsXPTType::T_CSTRING:
+    {
+        if (JSVAL_IS_NULL(s) || JSVAL_IS_VOID(s)) {
+            if (useAllocator) {
+                nsACString *rs = new nsCString();
+                if (!rs)
+                    return false;
+
+                rs->SetIsVoid(true);
+                *((nsACString**)d) = rs;
+            } else {
+                nsACString* rs = *((nsACString**)d);
+                rs->Truncate();
+                rs->SetIsVoid(true);
+            }
+            return true;
+        }
+
+        // The JS val is neither null nor void...
+        JSString* str = JS_ValueToString(cx, s);
+        if (!str) {
+            return false;
+        }
+
+        size_t length = JS_GetStringEncodingLength(cx, str);
+        if (length == size_t(-1)) {
+            return false;
+        }
+
+        nsACString *rs;
+        if (useAllocator) {
+            rs = new nsCString();
+            if (!rs)
+                return false;
+            *((const nsACString**)d) = rs;
+        } else {
+            rs = *((nsACString**)d);
+        }
+
+        rs->SetLength(PRUint32(length));
+        if (rs->Length() != PRUint32(length)) {
+            return false;
+        }
+        JS_EncodeStringToBuffer(str, rs->BeginWriting(), length);
+
+        return true;
+    }
+
+    case nsXPTType::T_INTERFACE:
+    case nsXPTType::T_INTERFACE_IS:
+    {
+        NS_ASSERTION(iid,"can't do interface conversions without iid");
+
+        if (iid->Equals(NS_GET_IID(nsIVariant))) {
+            XPCVariant* variant = XPCVariant::newVariant(ccx, s);
+            if (!variant)
+                return false;
+            *((nsISupports**)d) = static_cast<nsIVariant*>(variant);
+            return true;
+        } else if (iid->Equals(NS_GET_IID(nsIAtom)) &&
+                   JSVAL_IS_STRING(s)) {
+            // We're trying to pass a string as an nsIAtom.  Let's atomize!
+            JSString* str = JSVAL_TO_STRING(s);
+            const PRUnichar* chars = JS_GetStringCharsZ(cx, str);
+            if (!chars) {
+                if (pErr)
+                    *pErr = NS_ERROR_XPC_BAD_CONVERT_JS_NULL_REF;
+                return false;
+            }
+            PRUint32 length = JS_GetStringLength(str);
+            nsIAtom* atom = NS_NewAtom(nsDependentSubstring(chars,
+                                                            chars + length));
+            if (!atom && pErr)
+                *pErr = NS_ERROR_OUT_OF_MEMORY;
+            *((nsISupports**)d) = atom;
+            return atom != nullptr;
+        }
+        //else ...
+
+        if (s.isNullOrUndefined()) {
+            *((nsISupports**)d) = nullptr;
+            return true;
+        }
+
+        // only wrap JSObjects
+        if (!s.isObject()) {
+            if (pErr && s.isInt32() && 0 == s.toInt32())
+                *pErr = NS_ERROR_XPC_BAD_CONVERT_JS_ZERO_ISNOT_NULL;
+            return false;
+        }
+
+        return JSObject2NativeInterface(ccx, (void**)d, &s.toObject(), iid,
+                                        nullptr, pErr);
+    }
+    default:
+        NS_ERROR("bad type");
+        return false;
     }
     return true;
 }
diff --git a/js/xpconnect/src/codegen.py b/js/xpconnect/src/codegen.py
index a3ca94cfde4a..08181c7199b1 100644
--- a/js/xpconnect/src/codegen.py
+++ b/js/xpconnect/src/codegen.py
@@ -95,12 +95,12 @@ argumentUnboxingTemplates = {
 
     'long long':
         "    int64_t ${name};\n"
-        "    if (!xpc::ValueToInt64(cx, ${argVal}, &${name}))\n"
+        "    if (!JS::ToInt64(cx, ${argVal}, &${name}))\n"
         "        return JS_FALSE;\n",
 
     'unsigned long long':
         "    uint64_t ${name};\n"
-        "    if (!xpc::ValueToUint64(cx, ${argVal}, &${name}))\n"
+        "    if (!JS::ToUint64(cx, ${argVal}, &${name}))\n"
         "        return JS_FALSE;\n",
 
     'float':
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index bbbe23998e54..d1f040bd008f 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -176,8 +176,6 @@ members = [
     'nsIDOMProgressEvent.loaded',
     'nsIDOMProgressEvent.total',
     #XXX Can't quickstub initProgressEvent because it has long long parameters.
-    'nsIDOMNSEvent.originalTarget',
-    'nsIDOMNSEvent.getPreventDefault',
     'nsIDOMUIEvent.which',
     'nsIDOMUIEvent.rangeParent',
     'nsIDOMUIEvent.rangeOffset',
diff --git a/js/xpconnect/src/qsgen.py b/js/xpconnect/src/qsgen.py
index 90b863f0c573..976693e5d2e5 100644
--- a/js/xpconnect/src/qsgen.py
+++ b/js/xpconnect/src/qsgen.py
@@ -424,12 +424,12 @@ argumentUnboxingTemplates = {
 
     'long long':
         "    int64_t ${name};\n"
-        "    if (!xpc::ValueToInt64(cx, ${argVal}, &${name}))\n"
+        "    if (!JS::ToInt64(cx, ${argVal}, &${name}))\n"
         "        return JS_FALSE;\n",
 
     'unsigned long long':
         "    uint64_t ${name};\n"
-        "    if (!xpc::ValueToUint64(cx, ${argVal}, &${name}))\n"
+        "    if (!JS::ToUint64(cx, ${argVal}, &${name}))\n"
         "        return JS_FALSE;\n",
 
     'float':
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index cff0a49375cf..6bef8b1efb68 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -280,56 +280,6 @@ ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  nsIMemoryMultiReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotal = NULL);
 
-/**
- * Convert a jsval to PRInt64. Return true on success.
- */
-inline bool
-ValueToInt64(JSContext *cx, JS::Value v, int64_t *result)
-{
-    if (JSVAL_IS_INT(v)) {
-        int32_t intval;
-        if (!JS_ValueToECMAInt32(cx, v, &intval))
-            return false;
-        *result = static_cast<int64_t>(intval);
-    } else {
-        double doubleval;
-        if (!JS_ValueToNumber(cx, v, &doubleval))
-            return false;
-        // Be careful with non-finite doubles
-        if (NS_finite(doubleval))
-            // XXXbz this isn't quite right either; need to do the mod thing
-            *result = static_cast<int64_t>(doubleval);
-        else
-            *result = 0;
-    }
-    return true;
-}
-
-/**
- * Convert a jsval to uint64_t. Return true on success.
- */
-inline bool
-ValueToUint64(JSContext *cx, JS::Value v, uint64_t *result)
-{
-    if (JSVAL_IS_INT(v)) {
-        uint32_t intval;
-        if (!JS_ValueToECMAUint32(cx, v, &intval))
-            return false;
-        *result = static_cast<uint64_t>(intval);
-    } else {
-        double doubleval;
-        if (!JS_ValueToNumber(cx, v, &doubleval))
-            return false;
-        // Be careful with non-finite doubles
-        if (NS_finite(doubleval))
-            // XXXbz this isn't quite right either; need to do the mod thing
-            *result = static_cast<uint64_t>(doubleval);
-        else
-            *result = 0;
-    }
-    return true;
-}
-
 /**
  * Given an arbitrary object, Unwrap will return the wrapped object if the
  * passed-in object is a wrapper that Unwrap knows about *and* the
diff --git a/js/xpconnect/tests/Makefile.in b/js/xpconnect/tests/Makefile.in
index c996196ef815..33452755a401 100644
--- a/js/xpconnect/tests/Makefile.in
+++ b/js/xpconnect/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = js/xpconnect/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/xpconnect/tests/browser/Makefile.in b/js/xpconnect/tests/browser/Makefile.in
index 7f61480e828f..1eb39f8b5d14 100644
--- a/js/xpconnect/tests/browser/Makefile.in
+++ b/js/xpconnect/tests/browser/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = js/xpconnect/tests/browser
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in
index e6df9832aed4..40364ce36ad6 100644
--- a/js/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = js/xpconnect/tests/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in
index c5005db56452..3efc8999da0f 100644
--- a/js/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in
index fdb94d66ab13..62702d39b423 100644
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/js/xpconnect/tests/idl/Makefile.in b/js/xpconnect/tests/idl/Makefile.in
index 8042933cdd35..ee7fe9840ab2 100644
--- a/js/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index ef8e2ff0360a..8d3bb14d499a 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = js/xpconnect/tests/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in
index 46eaf5d0d25e..6442f830847b 100644
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH 		= ../../..
+DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/Makefile.in b/layout/Makefile.in
index e9108da5da14..143bcde6a309 100644
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 1732d16b2e00..e6c608089b22 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -947,7 +947,6 @@ ContainerState::CreateOrRecycleColorLayer()
     // We will reapply any necessary clipping.
     layer->SetClipRect(nullptr);
     layer->SetMaskLayer(nullptr);
-    layer->SetScale(1.0f, 1.0f);
   } else {
     // Create a new layer
     layer = mManager->CreateColorLayer();
@@ -971,7 +970,6 @@ ContainerState::CreateOrRecycleImageLayer()
     // We will reapply any necessary clipping.
     layer->SetClipRect(nullptr);
     layer->SetMaskLayer(nullptr);
-    layer->SetScale(1.0f, 1.0f);
   } else {
     // Create a new layer
     layer = mManager->CreateImageLayer();
@@ -1063,7 +1061,6 @@ ContainerState::CreateOrRecycleThebesLayer(nsIFrame* aActiveScrolledRoot)
     // We will reapply any necessary clipping.
     layer->SetClipRect(nullptr);
     layer->SetMaskLayer(nullptr);
-    layer->SetScale(1.0f, 1.0f);
 
     data = static_cast<ThebesDisplayItemLayerUserData*>
         (layer->GetUserData(&gThebesDisplayItemLayerUserData));
@@ -1118,7 +1115,6 @@ ContainerState::CreateOrRecycleThebesLayer(nsIFrame* aActiveScrolledRoot)
   gfxMatrix matrix;
   matrix.Translate(gfxPoint(pixOffset.x, pixOffset.y));
   layer->SetBaseTransform(gfx3DMatrix::From2D(matrix));
-  layer->SetScale(1.0f, 1.0f);
 
   // FIXME: Temporary workaround for bug 681192 and bug 724786.
 #ifndef MOZ_JAVA_COMPOSITOR
@@ -1270,10 +1266,8 @@ ContainerState::PopThebesLayerData()
       nsRefPtr<ImageLayer> imageLayer = CreateOrRecycleImageLayer();
       imageLayer->SetContainer(imageContainer);
       data->mImage->ConfigureLayer(imageLayer);
-      // The layer's current transform is applied first, then the result is scaled.
-      gfx3DMatrix transform = imageLayer->GetTransform()*
-        gfx3DMatrix::ScalingMatrix(mParameters.mXScale, mParameters.mYScale, 1.0f);
-      imageLayer->SetBaseTransform(transform);
+      imageLayer->SetPostScale(mParameters.mXScale,
+                               mParameters.mYScale);
       if (data->mItemClip.mHaveClipRect) {
         nsIntRect clip = ScaleToNearestPixels(data->mItemClip.mClipRect);
         imageLayer->IntersectClipRect(clip);
@@ -1286,8 +1280,8 @@ ContainerState::PopThebesLayerData()
 
       // Copy transform
       colorLayer->SetBaseTransform(data->mLayer->GetBaseTransform());
-      colorLayer->SetScale(data->mLayer->GetXScale(), data->mLayer->GetYScale());
-      
+      colorLayer->SetPostScale(data->mLayer->GetPostXScale(), data->mLayer->GetPostYScale());
+
       // Clip colorLayer to its visible region, since ColorLayers are
       // allowed to paint outside the visible region. Here we rely on the
       // fact that uniform display items fill rectangles; obviously the
@@ -1782,10 +1776,8 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
       // If it's not a ContainerLayer, we need to apply the scale transform
       // ourselves.
       if (!ownLayer->AsContainerLayer()) {
-        // The layer's current transform is applied first, then the result is scaled.
-        gfx3DMatrix transform = ownLayer->GetTransform()*
-            gfx3DMatrix::ScalingMatrix(mParameters.mXScale, mParameters.mYScale, 1.0f);
-        ownLayer->SetBaseTransform(transform);
+        ownLayer->SetPostScale(mParameters.mXScale,
+                               mParameters.mYScale);
       }
 
       ownLayer->SetIsFixedPosition(
@@ -2129,9 +2121,10 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
     scale = gfxSize(1.0, 1.0);
   }
 
-  // Apply the inverse of our resolution-scale before the rest of our transform
-  transform = gfx3DMatrix::ScalingMatrix(1.0/scale.width, 1.0/scale.height, 1.0)*transform;
+  // Store the inverse of our resolution-scale on the layer
   aLayer->SetBaseTransform(transform);
+  aLayer->SetPreScale(1.0f/float(scale.width),
+                      1.0f/float(scale.height));
 
   FrameLayerBuilder::ContainerParameters
     result(scale.width, scale.height, aIncomingScale);
@@ -2338,7 +2331,7 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
 
     Clip clip;
     state.ProcessDisplayItems(aChildren, clip, stateFlags);
- 
+
     // Set CONTENT_COMPONENT_ALPHA if any of our children have it.
     // This is suboptimal ... a child could have text that's over transparent
     // pixels in its own layer, but over opaque parts of previous siblings.
@@ -2512,44 +2505,53 @@ FrameLayerBuilder::GetDedicatedLayer(nsIFrame* aFrame, PRUint32 aDisplayItemKey)
   return nullptr;
 }
 
-bool
-FrameLayerBuilder::GetThebesLayerResolutionForFrame(nsIFrame* aFrame,
-                                                    double* aXres, double* aYres,
-                                                    gfxPoint* aPoint)
+static gfxSize
+PredictScaleForContent(nsIFrame* aFrame, nsIFrame* aAncestorWithScale,
+                       const gfxSize& aScale)
 {
-  nsTArray<DisplayItemData> *array = GetDisplayItemDataArrayForFrame(aFrame);
-  if (array) {
-    for (PRUint32 i = 0; i < array->Length(); ++i) {
-      Layer* layer = array->ElementAt(i).mLayer;
-      if (layer->HasUserData(&gThebesDisplayItemLayerUserData)) {
-        ThebesDisplayItemLayerUserData* data =
-          static_cast<ThebesDisplayItemLayerUserData*>
-            (layer->GetUserData(&gThebesDisplayItemLayerUserData));
-        *aXres = data->mXScale;
-        *aYres = data->mYScale;
-        *aPoint = data->mActiveScrolledRootPosition;
-        return true;
+  gfx3DMatrix transform =
+    gfx3DMatrix::ScalingMatrix(aScale.width, aScale.height, 1.0);
+  // aTransform is applied first, then the scale is applied to the result
+  transform = nsLayoutUtils::GetTransformToAncestor(aFrame, aAncestorWithScale)*transform;
+  gfxMatrix transform2d;
+  if (transform.CanDraw2D(&transform2d)) {
+     return transform2d.ScaleFactors(true);
+  }
+  return gfxSize(1.0, 1.0);
+}
+
+gfxSize
+FrameLayerBuilder::GetThebesLayerScaleForFrame(nsIFrame* aFrame)
+{
+  nsIFrame* last;
+  for (nsIFrame* f = aFrame; f; f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
+    last = f;
+    if (f->GetStateBits() & NS_FRAME_HAS_CONTAINER_LAYER) {
+      nsTArray<DisplayItemData>* array = GetDisplayItemDataArrayForFrame(f);
+	  // Some frames with NS_FRAME_HAS_CONTAINER_LAYER may not have display items.
+	  // In particular the root frame probably doesn't!
+      if (!array)
+	    continue;
+      for (PRUint32 i = 0; i < array->Length(); ++i) {
+        Layer* layer = array->ElementAt(i).mLayer;
+        ContainerLayer* container = layer->AsContainerLayer();
+        if (!container) {
+          continue;
+        }
+        for (Layer* l = container->GetFirstChild(); l; l = l->GetNextSibling()) {
+          ThebesDisplayItemLayerUserData* data =
+              static_cast<ThebesDisplayItemLayerUserData*>
+                (l->GetUserData(&gThebesDisplayItemLayerUserData));
+          if (data) {
+            return PredictScaleForContent(aFrame, f, gfxSize(data->mXScale, data->mYScale));
+          }
+        }
       }
     }
   }
 
-  nsIFrame::ChildListIterator lists(aFrame);
-  for (; !lists.IsDone(); lists.Next()) {
-    if (lists.CurrentID() == nsIFrame::kPopupList ||
-        lists.CurrentID() == nsIFrame::kSelectPopupList) {
-      continue;
-    }
-
-    nsFrameList::Enumerator childFrames(lists.CurrentList());
-    for (; !childFrames.AtEnd(); childFrames.Next()) {
-      if (GetThebesLayerResolutionForFrame(childFrames.get(),
-                                           aXres, aYres, aPoint)) {
-        return true;
-      }
-    }
-  }
-
-  return false;
+  return PredictScaleForContent(aFrame, last,
+      last->PresContext()->PresShell()->GetResolution());
 }
 
 #ifdef MOZ_DUMP_PAINTING
diff --git a/layout/base/FrameLayerBuilder.h b/layout/base/FrameLayerBuilder.h
index 085dfc512b52..9513460235bc 100644
--- a/layout/base/FrameLayerBuilder.h
+++ b/layout/base/FrameLayerBuilder.h
@@ -369,15 +369,13 @@ public:
   nsIntPoint GetLastPaintOffset(ThebesLayer* aLayer);
 
   /**
-   * Return resolution and scroll offset of ThebesLayer content associated
-   * with aFrame's subtree.
-   * Returns true if some ThebesLayer was found.
-   * This just looks for the first ThebesLayer and returns its data. There
-   * could be other ThebesLayers with different resolution and offsets.
+   * Return the resolution at which we expect to render aFrame's contents,
+   * assuming they are being painted to retained layers. This takes into account
+   * the resolution the contents of the ContainerLayer containing aFrame are
+   * being rendered at, as well as any currently-inactive transforms between
+   * aFrame and that container layer.
    */
-  static bool GetThebesLayerResolutionForFrame(nsIFrame* aFrame,
-                                               double* aXRes, double* aYRes,
-                                               gfxPoint* aPoint);
+  static gfxSize GetThebesLayerScaleForFrame(nsIFrame* aFrame);
 
   /**
    * Clip represents the intersection of an optional rectangle with a
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index 01162fc299e7..e6a185f7925c 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -40,8 +40,7 @@ EXPORTS		= \
 		nsDisplayList.h \
 		nsFrameManager.h \
 		nsFrameManagerBase.h \
-		nsFrameTraversal.h \
-		nsIFrameTraversal.h \
+		nsFrameIterator.h \
 		nsILayoutDebugger.h \
 		nsILayoutHistoryState.h \
 		nsIPercentHeightObserver.h  \
@@ -77,7 +76,7 @@ CPPSRCS		= \
 		nsDisplayList.cpp \
 		nsDocumentViewer.cpp \
 		nsFrameManager.cpp \
-		nsFrameTraversal.cpp \
+		nsFrameIterator.cpp \
 		nsGenConList.cpp \
 		nsImageLoader.cpp \
 		nsLayoutDebugger.cpp \
diff --git a/layout/base/nsBidiPresUtils.h b/layout/base/nsBidiPresUtils.h
index 7778cce18fe2..c35fbe08978a 100644
--- a/layout/base/nsBidiPresUtils.h
+++ b/layout/base/nsBidiPresUtils.h
@@ -10,7 +10,6 @@
 #define nsBidiPresUtils_h___
 
 #include "nsTArray.h"
-#include "nsIFrame.h"
 #include "nsBidi.h"
 #include "nsBidiUtils.h"
 #include "nsCOMPtr.h"
@@ -24,6 +23,7 @@
 
 struct BidiParagraphData;
 struct BidiLineData;
+class nsIFrame;
 
 /**
  * A structure representing some continuation state for each frame on the line,
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index fea72e703767..750373a8c0a6 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -375,6 +375,17 @@ IsInlineFrame(const nsIFrame* aFrame)
   return aFrame->IsFrameOfType(nsIFrame::eLineParticipant);
 }
 
+/**
+ * True if aFrame is an instance of an SVG frame class or is an inline/block
+ * frame being used for SVG text.
+ */
+static bool
+IsFrameForSVG(const nsIFrame* aFrame)
+{
+  return aFrame->IsFrameOfType(nsIFrame::eSVG) ||
+         aFrame->IsSVGText();
+}
+
 /**
  * Returns true iff aFrame explicitly prevents its descendants from floating
  * (at least, down to the level of descendants which themselves are
@@ -5233,7 +5244,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
     // Don't create frames for non-SVG element children of SVG elements.
     if (aNameSpaceID != kNameSpaceID_SVG &&
         aParentFrame &&
-        aParentFrame->IsFrameOfType(nsIFrame::eSVG) &&
+        IsFrameForSVG(aParentFrame) &&
         !aParentFrame->IsFrameOfType(nsIFrame::eSVGForeignObject)
         ) {
       SetAsUndisplayedContent(aItems, element, styleContext,
@@ -5498,12 +5509,14 @@ nsCSSFrameConstructor::ConstructFramesFromItem(nsFrameConstructorState& aState,
     // We don't do it for content that may have XBL anonymous siblings,
     // because they make it difficult to correctly create the frame
     // due to dynamic changes.
-    // We don't do it for text that's not a line participant (i.e. SVG text).
+    // We don't do it for SVG text, since we might need to position and
+    // measure the white space glyphs due to x/y/dx/dy attributes.
     if (AtLineBoundary(aIter) &&
         !styleContext->GetStyleText()->NewlineIsSignificant() &&
         aIter.List()->ParentHasNoXBLChildren() &&
         !(aState.mAdditionalStateBits & NS_FRAME_GENERATED_CONTENT) &&
         (item.mFCData->mBits & FCDATA_IS_LINE_PARTICIPANT) &&
+        !(item.mFCData->mBits & FCDATA_IS_SVG_TEXT) &&
         item.IsWhitespace(aState))
       return NS_OK;
 
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index dfda68a7c2c4..e19b9df9a40f 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsStyleConsts.h"
-#include "nsIFrame.h"
 #include "nsPoint.h"
 #include "nsRect.h"
 #include "nsIViewManager.h"
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index ba854e3918ee..5e77158822fd 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -989,8 +989,8 @@ void nsDisplayList::PaintForFrame(nsDisplayListBuilder* aBuilder,
     return;
   }
   // Root is being scaled up by the X/Y resolution. Scale it back down.
-  root->SetScale(1.0f/containerParameters.mXScale,
-                 1.0f/containerParameters.mYScale);
+  root->SetPostScale(1.0f/containerParameters.mXScale,
+                     1.0f/containerParameters.mYScale);
 
   ViewID id = presContext->IsRootContentDocument() ? FrameMetrics::ROOT_SCROLL_ID
                                                    : FrameMetrics::NULL_SCROLL_ID;
@@ -1650,7 +1650,6 @@ nsDisplayBackground::ConfigureLayer(ImageLayer* aLayer)
   transform.Scale(mDestRect.width/imageSize.width,
                   mDestRect.height/imageSize.height);
   aLayer->SetBaseTransform(gfx3DMatrix::From2D(transform));
-
   aLayer->SetVisibleRegion(nsIntRect(0, 0, imageSize.width, imageSize.height));
 }
 
diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameIterator.cpp
similarity index 51%
rename from layout/base/nsFrameTraversal.cpp
rename to layout/base/nsFrameIterator.cpp
index 1b38ad401170..ff5c681e48f2 100644
--- a/layout/base/nsFrameTraversal.cpp
+++ b/layout/base/nsFrameIterator.cpp
@@ -2,215 +2,34 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "nsCOMPtr.h"
-#include "nsGkAtoms.h"
 
-#include "nsFrameTraversal.h"
-#include "nsFrameList.h"
+#include "nsFrameIterator.h"
+#include "nsIFrame.h"
+#include "nsGkAtoms.h"
 #include "nsPlaceholderFrame.h"
 
-
-class nsFrameIterator : public nsIFrameEnumerator
-{
-public:
-  typedef nsIFrame::ChildListID ChildListID;
-
-  NS_DECL_ISUPPORTS
-
-  virtual ~nsFrameIterator() {}
-
-  virtual void First();
-  virtual void Next();
-  virtual nsIFrame* CurrentItem();
-  virtual bool IsDone();
-
-  virtual void Last();
-  virtual void Prev();
-
-  nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
-                  nsIteratorType aType, bool aLockScroll, bool aFollowOOFs);
-
-protected:
-  void      setCurrent(nsIFrame *aFrame){mCurrent = aFrame;}
-  nsIFrame *getCurrent(){return mCurrent;}
-  void      setStart(nsIFrame *aFrame){mStart = aFrame;}
-  nsIFrame *getStart(){return mStart;}
-  nsIFrame *getLast(){return mLast;}
-  void      setLast(nsIFrame *aFrame){mLast = aFrame;}
-  PRInt8    getOffEdge(){return mOffEdge;}
-  void      setOffEdge(PRInt8 aOffEdge){mOffEdge = aOffEdge;}
-  void      SetLockInScrollView(bool aLockScroll){mLockScroll = aLockScroll;}
-
-  /*
-   Our own versions of the standard frame tree navigation
-   methods, which, if the iterator is following out-of-flows,
-   apply the following rules for placeholder frames:
-   
-   - If a frame HAS a placeholder frame, getting its parent
-   gets the placeholder's parent.
-   
-   - If a frame's first child or next/prev sibling IS a
-   placeholder frame, then we instead return the real frame.
-   
-   - If a frame HAS a placeholder frame, getting its next/prev
-   sibling gets the placeholder frame's next/prev sibling.
-   
-   These are all applied recursively to support multiple levels of
-   placeholders.
-   */  
-  
-  nsIFrame* GetParentFrame(nsIFrame* aFrame);
-  // like GetParentFrame but returns null once a popup frame is reached
-  nsIFrame* GetParentFrameNotPopup(nsIFrame* aFrame);
-
-  nsIFrame* GetFirstChild(nsIFrame* aFrame);
-  nsIFrame* GetLastChild(nsIFrame* aFrame);
-
-  nsIFrame* GetNextSibling(nsIFrame* aFrame);
-  nsIFrame* GetPrevSibling(nsIFrame* aFrame);
-
-  /*
-   These methods are overridden by the bidi visual iterator to have the
-   semantics of "get first child in visual order", "get last child in visual
-   order", "get next sibling in visual order" and "get previous sibling in visual
-   order".
-  */
-  
-  virtual nsIFrame* GetFirstChildInner(nsIFrame* aFrame);
-  virtual nsIFrame* GetLastChildInner(nsIFrame* aFrame);  
-
-  virtual nsIFrame* GetNextSiblingInner(nsIFrame* aFrame);
-  virtual nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame);
-
-  nsIFrame* GetPlaceholderFrame(nsIFrame* aFrame);
-  bool      IsPopupFrame(nsIFrame* aFrame);
-
-  nsPresContext* mPresContext;
-  bool mLockScroll;
-  bool mFollowOOFs;
-  nsIteratorType mType;
-
-private:
-  nsIFrame *mStart;
-  nsIFrame *mCurrent;
-  nsIFrame *mLast; //the last one that was in current;
-  PRInt8    mOffEdge; //0= no -1 to far prev, 1 to far next;
-};
-
-
-
-// Bidi visual iterator
-class nsVisualIterator: public nsFrameIterator
-{
-public:
-  nsVisualIterator(nsPresContext* aPresContext, nsIFrame *aStart,
-                   nsIteratorType aType, bool aLockScroll, bool aFollowOOFs) :
-  nsFrameIterator(aPresContext, aStart, aType, aLockScroll, aFollowOOFs) {}
-
-protected:
-  nsIFrame* GetFirstChildInner(nsIFrame* aFrame);
-  nsIFrame* GetLastChildInner(nsIFrame* aFrame);  
-  
-  nsIFrame* GetNextSiblingInner(nsIFrame* aFrame);
-  nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame);  
-};
-
-/************IMPLEMENTATIONS**************/
-
-nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = nullptr;
-
-  nsCOMPtr<nsIFrameTraversal> t(new nsFrameTraversal());
-
-  *aResult = t;
-  NS_ADDREF(*aResult);
-
-  return NS_OK;
-}
-
-nsresult
-NS_NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
-                     nsPresContext* aPresContext,
-                     nsIFrame *aStart,
-                     nsIteratorType aType,
-                     bool aVisual,
-                     bool aLockInScrollView,
-                     bool aFollowOOFs)
-{
-  if (!aEnumerator || !aStart)
-    return NS_ERROR_NULL_POINTER;
-  nsCOMPtr<nsIFrameEnumerator> trav;
-  if (aVisual) {
-    trav = new nsVisualIterator(aPresContext, aStart, aType,
-                                aLockInScrollView, aFollowOOFs);
-  } else {
-    trav = new nsFrameIterator(aPresContext, aStart, aType,
-                               aLockInScrollView, aFollowOOFs);
-  }
-  trav.forget(aEnumerator);
-  return NS_OK;
-}
-
-
-nsFrameTraversal::nsFrameTraversal()
-{
-}
-
-nsFrameTraversal::~nsFrameTraversal()
-{
-}
-
-NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal)
-
-NS_IMETHODIMP 
- nsFrameTraversal::NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
-                                     nsPresContext* aPresContext,
-                                     nsIFrame *aStart,
-                                     PRInt32 aType,
-                                     bool aVisual,
-                                     bool aLockInScrollView,
-                                     bool aFollowOOFs)
-{
-  return NS_NewFrameTraversal(aEnumerator, aPresContext, aStart,
-                              static_cast<nsIteratorType>(aType),
-                              aVisual, aLockInScrollView, aFollowOOFs);  
-}
-
-// nsFrameIterator implementation
-
-NS_IMPL_ISUPPORTS1(nsFrameIterator, nsIFrameEnumerator)
-
 nsFrameIterator::nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
-                                 nsIteratorType aType, bool aLockInScrollView,
-                                 bool aFollowOOFs)
+                                 nsIteratorType aType, PRUint32 aFlags)
+  : mPresContext(aPresContext)
+  , mOffEdge(0)
+  , mType(aType)
 {
-  mOffEdge = 0;
-  mPresContext = aPresContext;
-  if (aFollowOOFs && aStart)
+  mFollowOOFs = (aFlags & FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW) != 0;
+  mLockScroll = (aFlags & FrameIteratorFlags::FLAG_LOCK_SCROLL) != 0;
+  mVisual = (aFlags & FrameIteratorFlags::FLAG_VISUAL) != 0;
+  if (mFollowOOFs && aStart)
     aStart = nsPlaceholderFrame::GetRealFrameFor(aStart);
   setStart(aStart);
   setCurrent(aStart);
   setLast(aStart);
-  mType = aType;
-  SetLockInScrollView(aLockInScrollView);
-  mFollowOOFs = aFollowOOFs;
 }
 
-
-
 nsIFrame*
 nsFrameIterator::CurrentItem()
 {
-  if (mOffEdge)
-    return nullptr;
-
-  return mCurrent;
+  return mOffEdge ? nullptr : mCurrent;
 }
 
-
-
 bool
 nsFrameIterator::IsDone()
 {
@@ -246,7 +65,7 @@ nsFrameIterator::Last()
   while ((result = GetLastChild(parent))) {
     parent = result;
   }
-  
+
   setCurrent(parent);
   if (!parent)
     setOffEdge(1);
@@ -327,7 +146,7 @@ nsFrameIterator::Prev()
     if (result)
       parent = result;
   }
-  
+
   if (parent != getCurrent()) {
     result = parent;
   } else {
@@ -370,7 +189,7 @@ nsFrameIterator::GetParentFrame(nsIFrame* aFrame)
     aFrame = GetPlaceholderFrame(aFrame);
   if (aFrame)
     return aFrame->GetParent();
-  
+
   return nullptr;
 }
 
@@ -384,7 +203,7 @@ nsFrameIterator::GetParentFrameNotPopup(nsIFrame* aFrame)
     if (!IsPopupFrame(parent))
       return parent;
   }
-    
+
   return nullptr;
 }
 
@@ -396,7 +215,7 @@ nsFrameIterator::GetFirstChild(nsIFrame* aFrame)
     return nullptr;
   if (result && mFollowOOFs) {
     result = nsPlaceholderFrame::GetRealFrameFor(result);
-    
+
     if (IsPopupFrame(result))
       result = GetNextSibling(result);
   }
@@ -411,7 +230,7 @@ nsFrameIterator::GetLastChild(nsIFrame* aFrame)
     return nullptr;
   if (result && mFollowOOFs) {
     result = nsPlaceholderFrame::GetRealFrameFor(result);
-    
+
     if (IsPopupFrame(result))
       result = GetPrevSibling(result);
   }
@@ -456,25 +275,42 @@ nsFrameIterator::GetPrevSibling(nsIFrame* aFrame)
 
 nsIFrame*
 nsFrameIterator::GetFirstChildInner(nsIFrame* aFrame) {
+  if (mVisual) {
+    return aFrame->PrincipalChildList().GetNextVisualFor(nullptr);
+  }
   return aFrame->GetFirstPrincipalChild();
 }
 
 nsIFrame*
 nsFrameIterator::GetLastChildInner(nsIFrame* aFrame) {
+  if (mVisual) {
+    return aFrame->PrincipalChildList().GetPrevVisualFor(nullptr);
+  }
   return aFrame->PrincipalChildList().LastChild();
 }
 
 nsIFrame*
 nsFrameIterator::GetNextSiblingInner(nsIFrame* aFrame) {
+  if (mVisual) {
+    nsIFrame* parent = GetParentFrame(aFrame);
+    if (!parent)
+      return nullptr;
+    return parent->PrincipalChildList().GetNextVisualFor(aFrame);
+  }
   return aFrame->GetNextSibling();
 }
 
 nsIFrame*
 nsFrameIterator::GetPrevSiblingInner(nsIFrame* aFrame) {
+  if (mVisual) {
+    nsIFrame* parent = GetParentFrame(aFrame);
+    if (!parent)
+      return nullptr;
+    return parent->PrincipalChildList().GetPrevVisualFor(aFrame);
+  }
   return aFrame->GetPrevSibling();
 }
 
-
 nsIFrame*
 nsFrameIterator::GetPlaceholderFrame(nsIFrame* aFrame)
 {
@@ -499,30 +335,3 @@ nsFrameIterator::IsPopupFrame(nsIFrame* aFrame)
           aFrame->GetStyleDisplay()->mDisplay == NS_STYLE_DISPLAY_POPUP);
 }
 
-// nsVisualIterator implementation
-
-nsIFrame*
-nsVisualIterator::GetFirstChildInner(nsIFrame* aFrame) {
-  return aFrame->PrincipalChildList().GetNextVisualFor(nullptr);
-}
-
-nsIFrame*
-nsVisualIterator::GetLastChildInner(nsIFrame* aFrame) {
-  return aFrame->PrincipalChildList().GetPrevVisualFor(nullptr);
-}
-
-nsIFrame*
-nsVisualIterator::GetNextSiblingInner(nsIFrame* aFrame) {
-  nsIFrame* parent = GetParentFrame(aFrame);
-  if (!parent)
-    return nullptr;
-  return parent->PrincipalChildList().GetNextVisualFor(aFrame);
-}
-
-nsIFrame*
-nsVisualIterator::GetPrevSiblingInner(nsIFrame* aFrame) {
-  nsIFrame* parent = GetParentFrame(aFrame);
-  if (!parent)
-    return nullptr;
-  return parent->PrincipalChildList().GetPrevVisualFor(aFrame);
-}
diff --git a/layout/base/nsFrameIterator.h b/layout/base/nsFrameIterator.h
new file mode 100644
index 000000000000..b2d9fb531158
--- /dev/null
+++ b/layout/base/nsFrameIterator.h
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef NSFRAMEITERATOR_H
+#define NSFRAMEITERATOR_H
+
+#include "prtypes.h"
+
+class nsPresContext;
+class nsIFrame;
+
+enum nsIteratorType {
+  eLeaf,
+  ePreOrder,
+  ePostOrder
+};
+
+enum FrameIteratorFlags {
+  FLAG_NONE = 0,
+  FLAG_LOCK_SCROLL = 1 << 1,
+  FLAG_FOLLOW_OUT_OF_FLOW = 1 << 2,
+  FLAG_VISUAL = 1 << 3
+};
+
+class nsFrameIterator
+{
+public:
+  nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
+                  nsIteratorType aType, PRUint32 aFlags);
+
+  ~nsFrameIterator() {}
+
+  void First();
+  void Next();
+  nsIFrame* CurrentItem();
+  bool IsDone();
+
+  void Last();
+  void Prev();
+protected:
+  void      setCurrent(nsIFrame *aFrame){mCurrent = aFrame;}
+  nsIFrame *getCurrent(){return mCurrent;}
+  void      setStart(nsIFrame *aFrame){mStart = aFrame;}
+  nsIFrame *getStart(){return mStart;}
+  nsIFrame *getLast(){return mLast;}
+  void      setLast(nsIFrame *aFrame){mLast = aFrame;}
+  PRInt8    getOffEdge(){return mOffEdge;}
+  void      setOffEdge(PRInt8 aOffEdge){mOffEdge = aOffEdge;}
+  void      SetLockInScrollView(bool aLockScroll){mLockScroll = aLockScroll;}
+
+  /*
+   Our own versions of the standard frame tree navigation
+   methods, which, if the iterator is following out-of-flows,
+   apply the following rules for placeholder frames:
+
+   - If a frame HAS a placeholder frame, getting its parent
+   gets the placeholder's parent.
+
+   - If a frame's first child or next/prev sibling IS a
+   placeholder frame, then we instead return the real frame.
+
+   - If a frame HAS a placeholder frame, getting its next/prev
+   sibling gets the placeholder frame's next/prev sibling.
+
+   These are all applied recursively to support multiple levels of
+   placeholders.
+   */
+
+  nsIFrame* GetParentFrame(nsIFrame* aFrame);
+  // like GetParentFrame but returns null once a popup frame is reached
+  nsIFrame* GetParentFrameNotPopup(nsIFrame* aFrame);
+
+  nsIFrame* GetFirstChild(nsIFrame* aFrame);
+  nsIFrame* GetLastChild(nsIFrame* aFrame);
+
+  nsIFrame* GetNextSibling(nsIFrame* aFrame);
+  nsIFrame* GetPrevSibling(nsIFrame* aFrame);
+
+  /*
+   These methods are different in visual mode to have the
+   semantics of "get first child in visual order", "get last child in visual
+   order", "get next sibling in visual order" and "get previous sibling in visual
+   order".
+  */
+
+  nsIFrame* GetFirstChildInner(nsIFrame* aFrame);
+  nsIFrame* GetLastChildInner(nsIFrame* aFrame);
+
+  nsIFrame* GetNextSiblingInner(nsIFrame* aFrame);
+  nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame);
+
+  nsIFrame* GetPlaceholderFrame(nsIFrame* aFrame);
+  bool      IsPopupFrame(nsIFrame* aFrame);
+
+  nsPresContext* mPresContext;
+  nsIFrame *mStart;
+  nsIFrame *mCurrent;
+  nsIFrame *mLast; //the last one that was in current;
+  PRInt8    mOffEdge; //0= no -1 to far prev, 1 to far next;
+  nsIteratorType mType;
+  bool mLockScroll;
+  bool mFollowOOFs;
+  bool mVisual;
+};
+
+#endif //NSFRAMEITERATOR_H
diff --git a/layout/base/nsFrameTraversal.h b/layout/base/nsFrameTraversal.h
deleted file mode 100644
index de7efd5d6b91..000000000000
--- a/layout/base/nsFrameTraversal.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef NSFRAMETRAVERSAL_H
-#define NSFRAMETRAVERSAL_H
-
-#include "nsIFrame.h"
-#include "nsIFrameTraversal.h"
-
-nsresult NS_NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
-                              nsPresContext* aPresContext,
-                              nsIFrame *aStart,
-                              nsIteratorType aType,
-                              bool aVisual,
-                              bool aLockInScrollView,
-                              bool aFollowOOFs);
-
-nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
-
-class nsFrameTraversal : public nsIFrameTraversal
-{
-public:
-  nsFrameTraversal();
-  virtual ~nsFrameTraversal();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
-                               nsPresContext* aPresContext,
-                               nsIFrame *aStart,
-                               PRInt32 aType,
-                               bool aVisual,
-                               bool aLockInScrollView,
-                               bool aFollowOOFs);
-};
-
-#endif //NSFRAMETRAVERSAL_H
diff --git a/layout/base/nsIFrameTraversal.h b/layout/base/nsIFrameTraversal.h
deleted file mode 100644
index 7853b6c0f29c..000000000000
--- a/layout/base/nsIFrameTraversal.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef NSIFRAMETRAVERSAL_H
-#define NSIFRAMETRAVERSAL_H
-
-#include "nsISupports.h"
-#include "nsIFrame.h"
-
-#define NS_IFRAMEENUMERATOR_IID \
-{ 0x7c633f5d, 0x91eb, 0x494e, \
-  { 0xa1, 0x40, 0x17, 0x46, 0x17, 0x4c, 0x23, 0xd3 } }
-
-class nsIFrameEnumerator : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFRAMEENUMERATOR_IID)
-
-  virtual void First() = 0;
-  virtual void Next() = 0;
-  virtual nsIFrame* CurrentItem() = 0;
-  virtual bool IsDone() = 0;
-
-  virtual void Last() = 0;
-  virtual void Prev() = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIFrameEnumerator, NS_IFRAMEENUMERATOR_IID)
-
-enum nsIteratorType {
-  eLeaf,
-  ePreOrder,
-  ePostOrder
-};
-
-// {9d469828-9bf2-4151-a385-05f30219221b}
-#define NS_IFRAMETRAVERSAL_IID \
-{ 0x9d469828, 0x9bf2, 0x4151, { 0xa3, 0x85, 0x05, 0xf3, 0x02, 0x19, 0x22, 0x1b } }
-
-class nsIFrameTraversal : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFRAMETRAVERSAL_IID)
-
-  /**
-   * Create a frame iterator with the specified properties.
-   * @param aEnumerator [out] the created iterator
-   * @param aPresContext [in]
-   * @param aStart [in] the frame to start iterating from
-   * @param aType [in] the type of the iterator: leaf, pre-order, or post-order
-   * @param aVisual [in] whether the iterator should traverse frames in visual
-   *        bidi order
-   * @param aLockInScrollView [in] whether to stop iterating when exiting a
-   *        scroll view
-   * @param aFollowOOFs [in] whether the iterator should follow out-of-flows.
-   *        If true, when reaching a placeholder frame while going down will get
-   *        the real frame. Going back up will go on past the placeholder,
-   *        so the placeholders are logically part of the frame tree.
-   */
-  NS_IMETHOD NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
-                               nsPresContext* aPresContext,
-                               nsIFrame *aStart,
-                               PRInt32 aType,
-                               bool aVisual,
-                               bool aLockInScrollView,
-                               bool aFollowOOFs) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIFrameTraversal, NS_IFRAMETRAVERSAL_IID)
-
-#endif //NSIFRAMETRAVERSAL_H
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 9bd77a2e12cf..79169524b073 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -1196,6 +1196,7 @@ public:
    * The resolution defaults to 1.0.
    */
   virtual nsresult SetResolution(float aXResolution, float aYResolution) = 0;
+  gfxSize GetResolution() { return gfxSize(mXResolution, mYResolution); }
   float GetXResolution() { return mXResolution; }
   float GetYResolution() { return mYResolution; }
 
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index f04611b8f40b..0947b606d507 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -116,6 +116,7 @@ public:
 #define NS_AUTHOR_SPECIFIED_BACKGROUND      (1 << 0)
 #define NS_AUTHOR_SPECIFIED_BORDER          (1 << 1)
 #define NS_AUTHOR_SPECIFIED_PADDING         (1 << 2)
+#define NS_AUTHOR_SPECIFIED_TEXT_SHADOW     (1 << 3)
 
 class nsRootPresContext;
 
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 65a1f677ef10..2cd590c29182 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -1178,45 +1178,46 @@ nsresult PresShell::ClearPreferenceStyleRules(void)
   return result;
 }
 
-nsresult PresShell::CreatePreferenceStyleSheet(void)
+nsresult
+PresShell::CreatePreferenceStyleSheet()
 {
   NS_TIME_FUNCTION_MIN(1.0);
 
   NS_ASSERTION(!mPrefStyleSheet, "prefStyleSheet already exists");
-  nsresult result = NS_NewCSSStyleSheet(getter_AddRefs(mPrefStyleSheet));
-  if (NS_SUCCEEDED(result)) {
-    NS_ASSERTION(mPrefStyleSheet, "null but no error");
-    nsCOMPtr<nsIURI> uri;
-    result = NS_NewURI(getter_AddRefs(uri), "about:PreferenceStyleSheet", nullptr);
-    if (NS_SUCCEEDED(result)) {
-      NS_ASSERTION(uri, "null but no error");
-      mPrefStyleSheet->SetURIs(uri, uri, uri);
-      mPrefStyleSheet->SetComplete();
-      PRUint32 index;
-      result =
-        mPrefStyleSheet->InsertRuleInternal(NS_LITERAL_STRING("@namespace url(http://www.w3.org/1999/xhtml);"),
-                                            0, &index);
-      if (NS_SUCCEEDED(result)) {
-        mStyleSet->AppendStyleSheet(nsStyleSet::eUserSheet, mPrefStyleSheet);
-      }
-    }
-  }
-
-#ifdef DEBUG_attinasi
-  printf("CreatePrefStyleSheet completed: error=%ld\n",(long)result);
-#endif
-
-  if (NS_FAILED(result)) {
+  mPrefStyleSheet = new nsCSSStyleSheet();
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = NS_NewURI(getter_AddRefs(uri), "about:PreferenceStyleSheet", nullptr);
+  if (NS_FAILED(rv)) {
     mPrefStyleSheet = nullptr;
+    return rv;
+  }
+  NS_ASSERTION(uri, "null but no error");
+  mPrefStyleSheet->SetURIs(uri, uri, uri);
+  mPrefStyleSheet->SetComplete();
+  PRUint32 index;
+  rv =
+    mPrefStyleSheet->InsertRuleInternal(NS_LITERAL_STRING("@namespace svg url(http://www.w3.org/2000/svg);"),
+                                        0, &index);
+  if (NS_FAILED(rv)) {
+    mPrefStyleSheet = nullptr;
+    return rv;
+  }
+  rv =
+    mPrefStyleSheet->InsertRuleInternal(NS_LITERAL_STRING("@namespace url(http://www.w3.org/1999/xhtml);"),
+                                        0, &index);
+  if (NS_FAILED(rv)) {
+    mPrefStyleSheet = nullptr;
+    return rv;
   }
 
-  return result;
+  mStyleSet->AppendStyleSheet(nsStyleSet::eUserSheet, mPrefStyleSheet);
+  return NS_OK;
 }
 
-// XXX We want these after the @namespace rule.  Does order matter
+// XXX We want these after the @namespace rules.  Does order matter
 // for these rules, or can we call StyleRule::StyleRuleCount()
 // and just "append"?
-static PRUint32 sInsertPrefSheetRulesAt = 1;
+static PRUint32 sInsertPrefSheetRulesAt = 2;
 
 nsresult
 PresShell::SetPrefNoScriptRule()
@@ -1351,7 +1352,7 @@ nsresult PresShell::SetPrefLinkRules(void)
     // NOTE: these must go in the agent stylesheet or they cannot be
     //       overridden by authors
     rv = mPrefStyleSheet->
-      InsertRuleInternal(NS_LITERAL_STRING("*|*:-moz-any-link{text-decoration:underline}"),
+      InsertRuleInternal(NS_LITERAL_STRING("*|*:-moz-any-link:not(svg|a){text-decoration:underline}"),
                          sInsertPrefSheetRulesAt, &index);
   } else {
     rv = mPrefStyleSheet->
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 84d9ffbcd042..738f05df126b 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -24,6 +24,7 @@
 #include "nsContentUtils.h"
 #include "mozilla/Preferences.h"
 #include "nsIViewManager.h"
+#include "sampler.h"
 
 using mozilla::TimeStamp;
 using mozilla::TimeDuration;
@@ -298,6 +299,8 @@ NS_IMPL_ISUPPORTS1(nsRefreshDriver, nsITimerCallback)
 NS_IMETHODIMP
 nsRefreshDriver::Notify(nsITimer *aTimer)
 {
+  SAMPLE_LABEL("nsRefreshDriver", "Notify");
+
   NS_PRECONDITION(!mFrozen, "Why are we notified while frozen?");
   NS_PRECONDITION(mPresContext, "Why are we notified after disconnection?");
   NS_PRECONDITION(!nsContentUtils::GetCurrentJSContext(),
diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index a82dce7287e2..6afb389e89ce 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= layout/base/tests
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in
index 94da1a6d7cc4..bcb21fe533c4 100644
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -40,6 +40,7 @@ MOCHITEST_CHROME_FILES = \
 	     printpreview_bug396024_helper.xul \
 	test_printpreview_bug482976.xul \
 	     printpreview_bug482976_helper.xul \
+	test_scrolling_repaints.html \
 	test_transformed_scrolling_repaints.html \
 	test_transformed_scrolling_repaints_2.html \
 	$(NULL)
diff --git a/layout/base/tests/chrome/test_scrolling_repaints.html b/layout/base/tests/chrome/test_scrolling_repaints.html
new file mode 100644
index 000000000000..db163207eee3
--- /dev/null
+++ b/layout/base/tests/chrome/test_scrolling_repaints.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that we don't get unnecessary repaints due to subpixel shifts</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="paint_listener.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+</head>
+<!-- Need a timeout here to allow paint unsuppression before we start the test -->
+<body onload="setTimeout(startTest,0)">
+<div id="t" style="width:400px; height:100px; background:yellow; overflow:hidden">
+  <div style="height:40px;"></div>
+  <div id="e" style="height:30px; background:lime"></div>
+  <div style="height:60.4px; background:pink"></div>
+</div>
+<pre id="test">
+<script type="application/javascript">
+SimpleTest.waitForExplicitFinish();
+
+var t = document.getElementById("t");
+var e = document.getElementById("e");
+var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+               getInterface(Components.interfaces.nsIDOMWindowUtils);
+
+function startTest() {
+  // Do a scroll to ensure we trigger activity heuristics.
+  waitForAllPaintsFlushed(function () {
+    t.scrollTop = 5;
+	// Scroll down as far as we can, to put our rendering layer at a subpixel offset within the layer
+    waitForAllPaintsFlushed(function () {
+      t.scrollTop = 1000;
+      waitForAllPaintsFlushed(function () {
+        // Clear paint state now and scroll again.
+        utils.checkAndClearPaintedState(e);
+		// scroll up a little bit. This should not cause anything to be repainted.
+        t.scrollTop = t.scrollTop - 10;
+        waitForAllPaintsFlushed(function () {
+          var painted = utils.checkAndClearPaintedState(e);
+          is(painted, false, "Fully-visible scrolled element should not have been painted");
+          SimpleTest.finish();
+        });
+      });
+    });
+  });
+}
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/base/tests/chrome/test_transformed_scrolling_repaints_2.html b/layout/base/tests/chrome/test_transformed_scrolling_repaints_2.html
index 0651e165eeae..45eaac49c28b 100644
--- a/layout/base/tests/chrome/test_transformed_scrolling_repaints_2.html
+++ b/layout/base/tests/chrome/test_transformed_scrolling_repaints_2.html
@@ -34,11 +34,7 @@ function startTest() {
         t.scrollTop = 33;
         waitForAllPaintsFlushed(function () {
           var painted = utils.checkAndClearPaintedState(e);
-          if (navigator.platform.indexOf("Mac") >= 0) {
-            todo_is(painted, false, "Fully-visible scrolled element should not have been painted (disabled on Mac, see bug 753497)");
-          } else {
-            is(painted, false, "Fully-visible scrolled element should not have been painted");
-          }
+          is(painted, false, "Fully-visible scrolled element should not have been painted");
           SimpleTest.finish();
         });
       });
diff --git a/layout/base/tests/cpp-tests/Makefile.in b/layout/base/tests/cpp-tests/Makefile.in
index b33be726b113..9814c5eaf831 100644
--- a/layout/base/tests/cpp-tests/Makefile.in
+++ b/layout/base/tests/cpp-tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH := ../../../..
+DEPTH := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir := @srcdir@
 VPATH := @srcdir@
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 71a50587b3bc..5586bf1fd3cd 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
index 3e24d438a6ea..d686ef662368 100644
--- a/layout/build/nsLayoutCID.h
+++ b/layout/build/nsLayoutCID.h
@@ -6,10 +6,6 @@
 #ifndef nsLayoutCID_h__
 #define nsLayoutCID_h__
 
-// {1691E1F4-EE41-11d4-9885-00C04FA0CF4B}
-#define NS_FRAMETRAVERSAL_CID \
-{ 0x1691e1f4, 0xee41, 0x11d4, { 0x98, 0x85, 0x0, 0xc0, 0x4f, 0xa0, 0xcf, 0x4b } }
-
 /* a6cf90f9-15b3-11d2-932e-00805f8add32 */
 #define NS_LAYOUT_DEBUGGER_CID \
  { 0xa6cf90f9, 0x15b3, 0x11d2,{0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}}
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 4ff25163c7cc..63091db0aa68 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -45,7 +45,6 @@
 #include "nsContentAreaDragDrop.h"
 #include "nsContentList.h"
 #include "nsBox.h"
-#include "nsIFrameTraversal.h"
 #include "nsLayoutCID.h"
 #include "nsStyleSheetService.h"
 #include "nsFocusManager.h"
@@ -413,8 +412,6 @@ nsresult NS_NewCanvasRenderingContext2D(nsIDOMCanvasRenderingContext2D** aResult
 nsresult NS_NewCanvasRenderingContext2DThebes(nsIDOMCanvasRenderingContext2D** aResult);
 nsresult NS_NewCanvasRenderingContextWebGL(nsIDOMWebGLRenderingContext** aResult);
 
-nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
-
 nsresult NS_NewDomSelection(nsISelection** aResult);
 nsresult NS_NewContentViewer(nsIContentViewer** aResult);
 nsresult NS_NewGenRegularIterator(nsIContentIterator** aResult);
@@ -469,7 +466,6 @@ MAKE_CTOR(CreateNewFrameUtil,             nsIFrameUtil,                NS_NewFra
 MAKE_CTOR(CreateNewLayoutDebugger,        nsILayoutDebugger,           NS_NewLayoutDebugger)
 #endif
 
-MAKE_CTOR(CreateNewFrameTraversal,      nsIFrameTraversal,      NS_CreateFrameTraversal)
 MAKE_CTOR(CreateNewPresShell,           nsIPresShell,           NS_NewPresShell)
 MAKE_CTOR(CreateNewBoxObject,           nsIBoxObject,           NS_NewBoxObject)
 
@@ -663,7 +659,6 @@ Construct_nsIScriptSecurityManager(nsISupports *aOuter, REFNSIID aIID,
 NS_DEFINE_NAMED_CID(NS_FRAME_UTIL_CID);
 NS_DEFINE_NAMED_CID(NS_LAYOUT_DEBUGGER_CID);
 #endif
-NS_DEFINE_NAMED_CID(NS_FRAMETRAVERSAL_CID);
 NS_DEFINE_NAMED_CID(NS_PRESSHELL_CID);
 NS_DEFINE_NAMED_CID(NS_BOXOBJECT_CID);
 #ifdef MOZ_XUL
@@ -937,7 +932,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_FRAME_UTIL_CID, false, NULL, CreateNewFrameUtil },
   { &kNS_LAYOUT_DEBUGGER_CID, false, NULL, CreateNewLayoutDebugger },
 #endif
-  { &kNS_FRAMETRAVERSAL_CID, false, NULL, CreateNewFrameTraversal },
   { &kNS_PRESSHELL_CID, false, NULL, CreateNewPresShell },
   { &kNS_BOXOBJECT_CID, false, NULL, CreateNewBoxObject },
 #ifdef MOZ_XUL
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index f935f4fae9f4..767ec622b9f0 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -94,11 +94,13 @@
 #include "nsHyphenationManager.h"
 #include "nsEditorSpellCheck.h"
 #include "nsWindowMemoryReporter.h"
+#include "mozilla/dom/ipc/ProcessPriorityManager.h"
 
 extern void NS_ShutdownChainItemPool();
 
 using namespace mozilla;
 using namespace mozilla::dom;
+using namespace mozilla::dom::ipc;
 
 nsrefcnt nsLayoutStatics::sLayoutStaticRefcnt = 0;
 
@@ -243,6 +245,8 @@ nsLayoutStatics::Initialize()
 
   nsSVGUtils::Init();
 
+  InitProcessPriorityManager();
+
   return NS_OK;
 }
 
diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in
index f396a9de693f..c2bf02fcee7c 100644
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index ffaa098581cf..958a1a1bedd7 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -33,7 +33,6 @@
 #include "nsContentCreatorFunctions.h"
 #include "nsContentUtils.h"
 #include "nsDisplayList.h"
-#include "nsIDOMNSEvent.h"
 #include "nsEventListenerManager.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -275,10 +274,9 @@ bool ShouldProcessMouseClick(nsIDOMEvent* aMouseEvent)
 {
   // only allow the left button
   nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aMouseEvent);
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aMouseEvent);
-  NS_ENSURE_TRUE(mouseEvent && domNSEvent, false);
+  NS_ENSURE_TRUE(mouseEvent, false);
   bool defaultPrevented = false;
-  domNSEvent->GetPreventDefault(&defaultPrevented);
+  aMouseEvent->GetPreventDefault(&defaultPrevented);
   if (defaultPrevented) {
     return false;
   }
@@ -403,10 +401,8 @@ nsFileControlFrame::BrowseMouseListener::HandleEvent(nsIDOMEvent* aEvent)
     return input ? input->FireAsyncClickHandler() : NS_OK;
   }
 
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aEvent);
-  NS_ENSURE_STATE(domNSEvent);
   bool defaultPrevented = false;
-  domNSEvent->GetPreventDefault(&defaultPrevented);
+  aEvent->GetPreventDefault(&defaultPrevented);
   if (defaultPrevented) {
     return NS_OK;
   }
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 6dede73274e7..9340d5a11a7a 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -33,7 +33,6 @@
 #include "nsIComponentManager.h"
 #include "nsFontMetrics.h"
 #include "nsIScrollableFrame.h"
-#include "nsIDOMNSEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIServiceManager.h"
 #include "nsINodeInfo.h"
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 7f5b58e79394..755a488a8818 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -51,7 +51,6 @@
 #include "nsIStyleRule.h"//observe documents to send onchangenotifications
 #include "nsIDOMEventListener.h"//observe documents to send onchangenotifications
 #include "nsGUIEvent.h"
-#include "nsIDOMNSEvent.h"
 
 #include "nsIDOMCharacterData.h" //for selection setting helper func
 #include "nsIDOMNodeList.h" //for selection setting helper func
diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in
index 07d796ee2c05..9167c472a30f 100644
--- a/layout/forms/test/Makefile.in
+++ b/layout/forms/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/forms/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/forms/test/test_bug348236.html b/layout/forms/test/test_bug348236.html
index 0c8955de71ba..f71c84d8bd94 100644
--- a/layout/forms/test/test_bug348236.html
+++ b/layout/forms/test/test_bug348236.html
@@ -43,7 +43,7 @@ addLoadEvent(function test() {
                    .getInterface(CI.nsIDOMWindowUtils),
         sec = netscape.security,
         eSelect = $("eSelect"),
-        IDOMNSEvent = CI.nsIDOMNSEvent,
+        IDOMEvent = CI.nsIDOMEvent,
         IDOMKeyEvent = CI.nsIDOMKeyEvent,
         timeout = 0 // Choose a larger value like 500 ms if you want to see what's happening.
 
@@ -105,10 +105,10 @@ addLoadEvent(function test() {
     is(eSelect.value, "2", "SELECT value should be 2 after pressing Down.")
       
     // Test ALT-Down.
-    testKey(IDOMKeyEvent.DOM_VK_DOWN, IDOMNSEvent.ALT_MASK, "ALT-Down", nextKey1)
+    testKey(IDOMKeyEvent.DOM_VK_DOWN, IDOMEvent.ALT_MASK, "ALT-Down", nextKey1)
     function nextKey1() {
         // Test ALT-Up.
-        testKey(IDOMKeyEvent.DOM_VK_UP, IDOMNSEvent.ALT_MASK, "ALT-Up", nextKey2)
+        testKey(IDOMKeyEvent.DOM_VK_UP, IDOMEvent.ALT_MASK, "ALT-Up", nextKey2)
     }
     function nextKey2() {
         // Test the F4 key on OS/2 and Windows.
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index 6a87bfe87e74..c5d5c8a1094c 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -32,6 +32,7 @@ EXPORTS		= \
 		nsIObjectFrame.h \
 		nsIPageSequenceFrame.h \
 		nsIScrollableFrame.h \
+		ScrollbarActivity.h \
 		nsIStatefulFrame.h \
 		nsFrameSelection.h \
 		nsSubDocumentFrame.h \
@@ -82,6 +83,7 @@ CPPSRCS		= \
 		nsPageContentFrame.cpp \
 		nsPageFrame.cpp \
 		nsPlaceholderFrame.cpp \
+		ScrollbarActivity.cpp \
 		nsSelection.cpp \
 		nsSimplePageSequence.cpp \
 		nsSplittableFrame.cpp \
diff --git a/layout/generic/ScrollbarActivity.cpp b/layout/generic/ScrollbarActivity.cpp
new file mode 100644
index 000000000000..cec763ac1746
--- /dev/null
+++ b/layout/generic/ScrollbarActivity.cpp
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ScrollbarActivity.h"
+#include "nsContentUtils.h"
+#include "nsIFrame.h"
+#include "nsIScrollableFrame.h"
+
+namespace mozilla {
+
+ScrollbarActivity::~ScrollbarActivity()
+{
+  CancelActivityFinishedTimer();
+}
+
+void
+ScrollbarActivity::ActivityOccurred()
+{
+  CancelActivityFinishedTimer();
+  StartActivityFinishedTimer();
+
+  SetIsActive(true);
+  NS_ASSERTION(mIsActive, "need to be active during activity");
+}
+
+void
+ScrollbarActivity::ActivityFinished()
+{
+  SetIsActive(false);
+  NS_ASSERTION(!mIsActive, "need to be unactive once activity is finished");
+}
+
+
+static void
+SetBooleanAttribute(nsIContent* aContent, nsIAtom* aAttribute, bool aValue)
+{
+  if (aContent) {
+    if (aValue) {
+      aContent->SetAttr(kNameSpaceID_None, aAttribute,
+                        NS_LITERAL_STRING("true"), true);
+    } else {
+      aContent->UnsetAttr(kNameSpaceID_None, aAttribute, true);
+    }
+  }
+}
+
+void
+ScrollbarActivity::SetIsActive(bool aNewActive)
+{
+  if (mIsActive == aNewActive)
+    return;
+  mIsActive = aNewActive;
+
+  SetBooleanAttribute(GetHorizontalScrollbar(), nsGkAtoms::active, mIsActive);
+  SetBooleanAttribute(GetVerticalScrollbar(), nsGkAtoms::active, mIsActive);
+}
+
+void
+ScrollbarActivity::StartActivityFinishedTimer()
+{
+  NS_ASSERTION(!mActivityFinishedTimer, "timer already alive!");
+  mActivityFinishedTimer = do_CreateInstance("@mozilla.org/timer;1");
+  mActivityFinishedTimer->InitWithFuncCallback(ActivityFinishedTimerFired, this,
+                                            kScrollbarActivityFinishedDelay,
+                                            nsITimer::TYPE_ONE_SHOT);
+}
+
+void
+ScrollbarActivity::CancelActivityFinishedTimer()
+{
+  if (mActivityFinishedTimer) {
+    mActivityFinishedTimer->Cancel();
+    mActivityFinishedTimer = nsnull;
+  }
+}
+
+nsIContent*
+ScrollbarActivity::GetScrollbarContent(bool aVertical)
+{
+  nsIFrame* box = mScrollableFrame->GetScrollbarBox(aVertical);
+  return box ? box->GetContent() : nsnull;
+
+  return nsnull;
+}
+
+} // namespace mozilla
diff --git a/layout/generic/ScrollbarActivity.h b/layout/generic/ScrollbarActivity.h
new file mode 100644
index 000000000000..e2c41b52a284
--- /dev/null
+++ b/layout/generic/ScrollbarActivity.h
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef ScrollbarActivity_h___
+#define ScrollbarActivity_h___
+
+#include "nsCOMPtr.h"
+#include "mozilla/TimeStamp.h"
+
+class nsIContent;
+class nsITimer;
+class nsIAtom;
+class nsIScrollableFrame;
+
+namespace mozilla {
+
+/**
+ * ScrollbarActivity
+ *
+ * This class manages scrollbar active state. When some activity occured
+ * the 'active' attribute of the both the horizontal scrollbar and vertical
+ * scrollbar is set.
+ * After a small amount of time of inactivity this attribute is unset from
+ * both scrollbars.
+ * Some css specific rules can affect the scrollbar, like showing/hiding it
+ * with a fade transition.
+ *
+ * Initial scrollbar activity needs to be reported by the scrollbar frame that
+ * owns the ScrollbarActivity instance. This needs to happen via a call to
+ * ActivityOccurred(), for example when the current scroll position or the size
+ * of the scroll area changes.
+ *
+ * ScrollbarActivity then wait until a timeout has expired or a new call to
+ * ActivityOccured() has been made. When the timeout expires ActivityFinished()
+ * is call and reset the active state.
+ */
+
+class ScrollbarActivity {
+public:
+  ScrollbarActivity(nsIScrollableFrame* aScrollableFrame)
+   : mIsActive(false)
+   , mScrollableFrame(aScrollableFrame)
+  {}
+
+  void ActivityOccurred();
+  void ActivityFinished();
+  ~ScrollbarActivity();
+
+protected:
+  /*
+   * mIsActive is true once any type of activity occurent on the scrollable
+   * frame and until kScrollbarActivityFinishedDelay has expired.
+   * This does not reflect the value of the 'active' attributes on scrollbars.
+   */
+  bool mIsActive;
+
+  /*
+   * Hold a reference to the scrollable frame in order to retrieve the
+   * horizontal and vertical scrollbar boxes where to set the 'active'
+   * attribute.
+   */
+  nsIScrollableFrame* mScrollableFrame;
+
+  nsCOMPtr<nsITimer> mActivityFinishedTimer;
+
+  void SetIsActive(bool aNewActive);
+
+  enum { kScrollbarActivityFinishedDelay = 450 }; // milliseconds
+  static void ActivityFinishedTimerFired(nsITimer* aTimer, void* aSelf) {
+    reinterpret_cast<ScrollbarActivity*>(aSelf)->ActivityFinished();
+  }
+  void StartActivityFinishedTimer();
+  void CancelActivityFinishedTimer();
+
+  nsIContent* GetScrollbarContent(bool aVertical);
+  nsIContent* GetHorizontalScrollbar() {
+    return GetScrollbarContent(false);
+  }
+  nsIContent* GetVerticalScrollbar() {
+    return GetScrollbarContent(true);
+  }
+};
+
+} // namespace mozilla
+
+#endif /* ScrollbarActivity_h___ */
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index d4a7a9cdf155..5c4826c58670 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -52,7 +52,7 @@
 #include "nsCSSPseudoElements.h"
 #include "nsCSSFrameConstructor.h"
 
-#include "nsFrameTraversal.h"
+#include "nsFrameIterator.h"
 #include "nsStyleChangeList.h"
 #include "nsIDOMRange.h"
 #include "nsRange.h"
@@ -5782,16 +5782,12 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
       //resultFrame is not a block frame
       result = NS_ERROR_FAILURE;
 
-      nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-      result = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                    aPresContext, resultFrame,
-                                    ePostOrder,
-                                    false, // aVisual
-                                    aPos->mScrollViewStop,
-                                    false     // aFollowOOFs
-                                    );
-      if (NS_FAILED(result))
-        return result;
+      PRUint32 flags = FrameIteratorFlags::FLAG_NONE;
+      if (aPos->mScrollViewStop) {
+        flags |= FrameIteratorFlags::FLAG_LOCK_SCROLL;
+      }
+      nsFrameIterator frameTraversal(aPresContext, resultFrame,
+                                     ePostOrder, flags);
       nsIFrame *storeOldResultFrame = resultFrame;
       while ( !found ){
         nsPoint point;
@@ -5868,21 +5864,21 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
         if (aPos->mDirection == eDirNext && (resultFrame == nearStoppingFrame))
           break;
         //always try previous on THAT line if that fails go the other way
-        frameTraversal->Prev();
-        resultFrame = frameTraversal->CurrentItem();
+        frameTraversal.Prev();
+        resultFrame = frameTraversal.CurrentItem();
         if (!resultFrame)
           return NS_ERROR_FAILURE;
       }
 
       if (!found){
         resultFrame = storeOldResultFrame;
-        result = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                      aPresContext, resultFrame,
-                                      eLeaf,
-                                      false, // aVisual
-                                      aPos->mScrollViewStop,
-                                      false     // aFollowOOFs
-                                      );
+
+        PRUint32 flags = FrameIteratorFlags::FLAG_NONE;
+        if (aPos->mScrollViewStop) {
+          flags |= FrameIteratorFlags::FLAG_LOCK_SCROLL;
+        }
+        frameTraversal = nsFrameIterator(aPresContext, resultFrame,
+                                         eLeaf, flags);
       }
       while ( !found ){
         nsPoint point(aPos->mDesiredX, 0);
@@ -5913,8 +5909,8 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
         if (aPos->mDirection == eDirNext && (resultFrame == farStoppingFrame))
           break;
         //previous didnt work now we try "next"
-        frameTraversal->Next();
-        nsIFrame *tempFrame = frameTraversal->CurrentItem();
+        frameTraversal.Next();
+        nsIFrame *tempFrame = frameTraversal.CurrentItem();
         if (!tempFrame)
           break;
         resultFrame = tempFrame;
@@ -6638,23 +6634,22 @@ nsIFrame::GetFrameFromDirection(nsDirection aDirection, bool aVisual,
         return NS_ERROR_FAILURE; //we are done. cannot jump lines
     }
 
-    nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-    result = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                  presContext, traversedFrame,
-                                  eLeaf,
-                                  aVisual && presContext->BidiEnabled(),
-                                  aScrollViewStop,
-                                  true     // aFollowOOFs
-                                  );
-    if (NS_FAILED(result))
-      return result;
+    PRUint32 flags = FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW;
+    if (aScrollViewStop) {
+      flags |= FrameIteratorFlags::FLAG_LOCK_SCROLL;
+    }
+    if (aVisual && presContext->BidiEnabled()) {
+      flags |= FrameIteratorFlags::FLAG_VISUAL;
+    }
+    nsFrameIterator frameTraversal(presContext, traversedFrame,
+                                   eLeaf, flags);
 
     if (aDirection == eDirNext)
-      frameTraversal->Next();
+      frameTraversal.Next();
     else
-      frameTraversal->Prev();
+      frameTraversal.Prev();
 
-    traversedFrame = frameTraversal->CurrentItem();
+    traversedFrame = frameTraversal.CurrentItem();
     if (!traversedFrame)
       return NS_ERROR_FAILURE;
     traversedFrame->IsSelectable(&selectable, nullptr);
@@ -7620,7 +7615,7 @@ nsFrame::GetPrefSize(nsBoxLayoutState& aState)
 
   // get our size in CSS.
   bool widthSet, heightSet;
-  bool completelyRedefined = nsIBox::AddCSSPrefSize(this, size, widthSet, heightSet);
+  bool completelyRedefined = nsIFrame::AddCSSPrefSize(this, size, widthSet, heightSet);
 
   // Refresh our caches with new sizes.
   if (!completelyRedefined) {
@@ -7657,7 +7652,7 @@ nsFrame::GetMinSize(nsBoxLayoutState& aState)
   // get our size in CSS.
   bool widthSet, heightSet;
   bool completelyRedefined =
-    nsIBox::AddCSSMinSize(aState, this, size, widthSet, heightSet);
+    nsIFrame::AddCSSMinSize(aState, this, size, widthSet, heightSet);
 
   // Refresh our caches with new sizes.
   if (!completelyRedefined) {
@@ -7820,7 +7815,7 @@ nsFrame::BoxReflow(nsBoxLayoutState&        aState,
 
   //printf("width=%d, height=%d\n", aWidth, aHeight);
   /*
-  nsIBox* parent;
+  nsIFrame* parent;
   GetParentBox(&parent);
 
  // if (parent->GetStateBits() & NS_STATE_CURRENTLY_IN_DEBUG)
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 482869d48a6a..547e3d514f77 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -53,6 +53,7 @@
 #include "nsSubDocumentFrame.h"
 #include "nsSVGOuterSVGFrame.h"
 #include "mozilla/Attributes.h"
+#include "ScrollbarActivity.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -305,7 +306,7 @@ static nsSize ComputeInsideBorderSize(ScrollReflowState* aState,
 }
 
 static void
-GetScrollbarMetrics(nsBoxLayoutState& aState, nsIBox* aBox, nsSize* aMin,
+GetScrollbarMetrics(nsBoxLayoutState& aState, nsIFrame* aBox, nsSize* aMin,
                     nsSize* aPref, bool aVertical)
 {
   NS_ASSERTION(aState.GetRenderingContext(),
@@ -478,8 +479,9 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowState* aState,
     computedMaxHeight = NS_UNCONSTRAINEDSIZE;
   }
   if (aAssumeHScroll) {
-    nsSize hScrollbarPrefSize = 
-      mInner.mHScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState->mBoxState));
+    nsSize hScrollbarPrefSize;
+    GetScrollbarMetrics(aState->mBoxState, mInner.mHScrollbarBox,
+                        nsnull, &hScrollbarPrefSize, false);
     if (computedHeight != NS_UNCONSTRAINEDSIZE)
       computedHeight = NS_MAX(0, computedHeight - hScrollbarPrefSize.height);
     computedMinHeight = NS_MAX(0, computedMinHeight - hScrollbarPrefSize.height);
@@ -488,8 +490,9 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowState* aState,
   }
 
   if (aAssumeVScroll) {
-    nsSize vScrollbarPrefSize = 
-      mInner.mVScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState->mBoxState));
+    nsSize vScrollbarPrefSize;
+    GetScrollbarMetrics(aState->mBoxState, mInner.mVScrollbarBox,
+                        &vScrollbarPrefSize, nsnull, true);
     availWidth = NS_MAX(0, availWidth - vScrollbarPrefSize.width);
   }
 
@@ -1197,7 +1200,7 @@ nsXULScrollFrame::GetPrefSize(nsBoxLayoutState& aState)
 
   AddBorderAndPadding(pref);
   bool widthSet, heightSet;
-  nsIBox::AddCSSPrefSize(this, pref, widthSet, heightSet);
+  nsIFrame::AddCSSPrefSize(this, pref, widthSet, heightSet);
   return pref;
 }
 
@@ -1232,7 +1235,7 @@ nsXULScrollFrame::GetMinSize(nsBoxLayoutState& aState)
 
   AddBorderAndPadding(min);
   bool widthSet, heightSet;
-  nsIBox::AddCSSMinSize(aState, this, min, widthSet, heightSet);
+  nsIFrame::AddCSSMinSize(aState, this, min, widthSet, heightSet);
   return min;
 }
 
@@ -1247,7 +1250,7 @@ nsXULScrollFrame::GetMaxSize(nsBoxLayoutState& aState)
 
   AddBorderAndPadding(maxSize);
   bool widthSet, heightSet;
-  nsIBox::AddCSSMaxSize(this, maxSize, widthSet, heightSet);
+  nsIFrame::AddCSSMaxSize(this, maxSize, widthSet, heightSet);
   return maxSize;
 }
 
@@ -1607,6 +1610,10 @@ nsGfxScrollFrameInner::nsGfxScrollFrameInner(nsContainerFrame* aOuter,
   , mShouldBuildLayer(false)
 {
   mScrollingActive = IsAlwaysActive();
+
+  if (LookAndFeel::GetInt(LookAndFeel::eIntID_ShowHideScrollbars) != 0) {
+    mScrollbarActivity = new ScrollbarActivity(do_QueryFrame(aOuter));
+  }
 }
 
 nsGfxScrollFrameInner::~nsGfxScrollFrameInner()
@@ -1960,38 +1967,34 @@ void nsGfxScrollFrameInner::ScrollVisual(nsPoint aOldScrolledFramePos)
 }
 
 /**
- * Adjust the desired scroll value in given range
- * in order to get resulting scroll by whole amount of layer pixels.
- * Current implementation is not checking that result value is the best.
- * Ideally it's would be possible to find best value by implementing
- * test function which is repeating last part of CreateOrRecycleThebesLayer,
- * and checking other points in allowed range, but that may cause another perf hit.
- * Let's keep it as TODO.
+ * Return an appunit value close to aDesired and between aLower and aUpper
+ * such that (aDesired - aCurrent)*aRes/aAppUnitsPerPixel is an integer (or
+ * as close as we can get modulo rounding to appunits). If that
+ * can't be done, just returns aDesired.
  */
 static nscoord
-RestrictToLayerPixels(nscoord aDesired, nscoord aLower,
-                      nscoord aUpper, nscoord aAppUnitsPerPixel,
-                      double aRes, double aCurrentLayerOffset)
+AlignWithLayerPixels(nscoord aDesired, nscoord aLower,
+                     nscoord aUpper, nscoord aAppUnitsPerPixel,
+                     double aRes, nscoord aCurrent)
 {
-  // convert the result to layer pixels
-  double layerVal = aRes * double(aDesired) / aAppUnitsPerPixel;
+  double currentLayerVal = (aRes*aCurrent)/aAppUnitsPerPixel;
+  double desiredLayerVal = (aRes*aDesired)/aAppUnitsPerPixel;
+  double delta = desiredLayerVal - currentLayerVal;
+  double nearestVal = NS_round(delta) + currentLayerVal;
 
-  // Correct value using current layer offset
-  layerVal -= aCurrentLayerOffset;
-
-  // Try nearest pixel bound first
-  double nearestVal = NS_round(layerVal);
+  // Convert back from ThebesLayer space to appunits relative to the top-left
+  // of the scrolled frame.
   nscoord nearestAppUnitVal =
-    NSToCoordRoundWithClamp(nearestVal * aAppUnitsPerPixel / aRes);
+    NSToCoordRoundWithClamp(nearestVal*aAppUnitsPerPixel/aRes);
 
   // Check if nearest layer pixel result fit into allowed and scroll range
   if (nearestAppUnitVal >= aLower && nearestAppUnitVal <= aUpper) {
     return nearestAppUnitVal;
-  } else if (nearestVal != layerVal) {
+  } else if (nearestVal != desiredLayerVal) {
     // Check if opposite pixel boundary fit into scroll range
-    double oppositeVal = nearestVal + ((nearestVal < layerVal) ? 1 : -1);
+    double oppositeVal = nearestVal + ((nearestVal < desiredLayerVal) ? 1 : -1);
     nscoord oppositeAppUnitVal =
-      NSToCoordRoundWithClamp(oppositeVal * aAppUnitsPerPixel / aRes);
+      NSToCoordRoundWithClamp(oppositeVal*aAppUnitsPerPixel/aRes);
     if (oppositeAppUnitVal >= aLower && oppositeAppUnitVal <= aUpper) {
       return oppositeAppUnitVal;
     }
@@ -2000,17 +2003,17 @@ RestrictToLayerPixels(nscoord aDesired, nscoord aLower,
 }
 
 /**
- * Clamp desired scroll position aPt to aBounds (if aBounds is non-null) and then snap
- * it to the nearest layer pixel edges, keeping it within aRange during snapping
- * (if aRange is non-null). aCurrScroll is the current scroll position.
+ * Clamp desired scroll position aPt to aBounds and then snap
+ * it to the same layer pixel edges as aCurrent, keeping it within aRange
+ * during snapping. aCurrent is the current scroll position.
  */
 static nsPoint
-ClampAndRestrictToLayerPixels(const nsPoint& aPt,
-                              const nsRect& aBounds,
-                              nscoord aAppUnitsPerPixel,
-                              const nsRect& aRange,
-                              double aXRes, double aYRes,
-                              const gfxPoint& aCurrScroll)
+ClampAndAlignWithLayerPixels(const nsPoint& aPt,
+                             const nsRect& aBounds,
+                             const nsRect& aRange,
+                             const nsPoint& aCurrent,
+                             nscoord aAppUnitsPerPixel,
+                             const gfxSize& aScale)
 {
   nsPoint pt = aBounds.ClampPoint(aPt);
   // Intersect scroll range with allowed range, by clamping the corners
@@ -2018,10 +2021,10 @@ ClampAndRestrictToLayerPixels(const nsPoint& aPt,
   nsPoint rangeTopLeft = aBounds.ClampPoint(aRange.TopLeft());
   nsPoint rangeBottomRight = aBounds.ClampPoint(aRange.BottomRight());
 
-  return nsPoint(RestrictToLayerPixels(pt.x, rangeTopLeft.x, rangeBottomRight.x,
-                                       aAppUnitsPerPixel, aXRes, aCurrScroll.x),
-                 RestrictToLayerPixels(pt.y, rangeTopLeft.y, rangeBottomRight.y,
-                                       aAppUnitsPerPixel, aYRes, aCurrScroll.y));
+  return nsPoint(AlignWithLayerPixels(pt.x, rangeTopLeft.x, rangeBottomRight.x,
+                                      aAppUnitsPerPixel, aScale.width, aCurrent.x),
+                 AlignWithLayerPixels(pt.y, rangeTopLeft.y, rangeBottomRight.y,
+                                      aAppUnitsPerPixel, aScale.height, aCurrent.y));
 }
 
 /* static */ void
@@ -2054,19 +2057,28 @@ nsGfxScrollFrameInner::ScrollToImpl(nsPoint aPt, const nsRect& aRange)
 {
   nsPresContext* presContext = mOuter->PresContext();
   nscoord appUnitsPerDevPixel = presContext->AppUnitsPerDevPixel();
-
-  double xres = 1.0, yres = 1.0;
-  gfxPoint activeScrolledRootPosition;
-  FrameLayerBuilder::GetThebesLayerResolutionForFrame(mScrolledFrame, &xres, &yres,
-                                                      &activeScrolledRootPosition);
-  nsPoint pt =
-    ClampAndRestrictToLayerPixels(aPt,
-                                  GetScrollRangeForClamping(),
-                                  appUnitsPerDevPixel,
-                                  aRange, xres, yres,
-                                  activeScrolledRootPosition);
-
+  // 'scale' is our estimate of the scale factor that will be applied
+  // when rendering the scrolled content to its own ThebesLayer.
+  gfxSize scale = FrameLayerBuilder::GetThebesLayerScaleForFrame(mScrolledFrame);
   nsPoint curPos = GetScrollPosition();
+  // Try to align aPt with curPos so they have an integer number of layer
+  // pixels between them. This gives us the best chance of scrolling without
+  // having to invalidate due to changes in subpixel rendering.
+  // Note that when we actually draw into a ThebesLayer, the coordinates
+  // that get mapped onto the layer buffer pixels are from the display list,
+  // which are relative to the display root frame's top-left increasing down,
+  // whereas here our coordinates are scroll positions which increase upward
+  // and are relative to the scrollport top-left. This difference doesn't actually
+  // matter since all we are about is that there be an integer number of
+  // layer pixels between pt and curPos.
+  nsPoint pt =
+    ClampAndAlignWithLayerPixels(aPt,
+                                 GetScrollRangeForClamping(),
+                                 aRange,
+                                 curPos,
+                                 appUnitsPerDevPixel,
+                                 scale);
+
   if (pt == curPos) {
     return;
   }
@@ -2847,6 +2859,10 @@ nsGfxScrollFrameInner::AppendAnonymousContentTo(nsBaseContentList& aElements,
 void
 nsGfxScrollFrameInner::Destroy()
 {
+  if (mScrollbarActivity) {
+    mScrollbarActivity = nsnull;
+  }
+
   // Unbind any content created in CreateAnonymousContent from the tree
   nsContentUtils::DestroyAnonymousContent(&mHScrollbarContent);
   nsContentUtils::DestroyAnonymousContent(&mVScrollbarContent);
@@ -2890,6 +2906,10 @@ void nsGfxScrollFrameInner::CurPosAttributeChanged(nsIContent* aContent)
                (mVScrollbarBox && mVScrollbarBox->GetContent() == aContent),
                "unexpected child");
 
+  if (mScrollbarActivity) {
+    mScrollbarActivity->ActivityOccurred();
+  }
+
   // Attribute changes on the scrollbars happen in one of three ways:
   // 1) The scrollbar changed the attribute in response to some user event
   // 2) We changed the attribute in response to a ScrollPositionDidChange
@@ -3747,9 +3767,11 @@ nsGfxScrollFrameInner::LayoutScrollbars(nsBoxLayoutState& aState,
     nsRect vRect(mScrollPort);
     vRect.width = aContentArea.width - mScrollPort.width;
     vRect.x = scrollbarOnLeft ? aContentArea.x : mScrollPort.XMost();
-    nsMargin margin;
-    mVScrollbarBox->GetMargin(margin);
-    vRect.Deflate(margin);
+    if (mHasVerticalScrollbar) {
+      nsMargin margin;
+      mVScrollbarBox->GetMargin(margin);
+      vRect.Deflate(margin);
+    }
     AdjustScrollbarRectForResizer(mOuter, presContext, vRect, hasResizer, true);
     LayoutAndInvalidate(aState, mVScrollbarBox, vRect, !mHasVerticalScrollbar);
   }
@@ -3759,9 +3781,11 @@ nsGfxScrollFrameInner::LayoutScrollbars(nsBoxLayoutState& aState,
     nsRect hRect(mScrollPort);
     hRect.height = aContentArea.height - mScrollPort.height;
     hRect.y = true ? mScrollPort.YMost() : aContentArea.y;
-    nsMargin margin;
-    mHScrollbarBox->GetMargin(margin);
-    hRect.Deflate(margin);
+    if (mHasHorizontalScrollbar) {
+      nsMargin margin;
+      mHScrollbarBox->GetMargin(margin);
+      hRect.Deflate(margin);
+    }
     AdjustScrollbarRectForResizer(mOuter, presContext, hRect, hasResizer, false);
     LayoutAndInvalidate(aState, mHScrollbarBox, hRect, !mHasHorizontalScrollbar);
   }
@@ -3811,6 +3835,10 @@ nsGfxScrollFrameInner::SetCoordAttribute(nsIContent* aContent, nsIAtom* aAtom,
     return;
 
   aContent->SetAttr(kNameSpaceID_None, aAtom, newValue, true);
+
+  if (mScrollbarActivity) {
+    mScrollbarActivity->ActivityOccurred();
+  }
 }
 
 static void
@@ -3929,7 +3957,7 @@ nsGfxScrollFrameInner::GetActualScrollbarSizes() const
 }
 
 void
-nsGfxScrollFrameInner::SetScrollbarVisibility(nsIBox* aScrollbar, bool aVisible)
+nsGfxScrollFrameInner::SetScrollbarVisibility(nsIFrame* aScrollbar, bool aVisible)
 {
   nsScrollbarFrame* scrollbar = do_QueryFrame(aScrollbar);
   if (scrollbar) {
@@ -3943,7 +3971,7 @@ nsGfxScrollFrameInner::SetScrollbarVisibility(nsIBox* aScrollbar, bool aVisible)
 }
 
 nscoord
-nsGfxScrollFrameInner::GetCoordAttribute(nsIBox* aBox, nsIAtom* aAtom,
+nsGfxScrollFrameInner::GetCoordAttribute(nsIFrame* aBox, nsIAtom* aAtom,
                                          nscoord aDefaultValue,
                                          nscoord* aRangeStart,
                                          nscoord* aRangeLength)
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 408e44274e20..abdfb94c359f 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -32,6 +32,10 @@ class nsIScrollFrameInternal;
 class nsPresState;
 struct ScrollReflowState;
 
+namespace mozilla {
+class ScrollbarActivity;
+}
+
 // When set, the next scroll operation on the scrollframe will invalidate its
 // entire contents. Useful for text-overflow.
 // This bit is cleared after each time the scrollframe is scrolled. Whoever
@@ -112,14 +116,13 @@ public:
     nsGfxScrollFrameInner *mInner;
   };
 
-  static void FinishReflowForScrollbar(nsIContent* aContent, nscoord aMinXY,
-                                       nscoord aMaxXY, nscoord aCurPosXY,
-                                       nscoord aPageIncrement,
-                                       nscoord aIncrement);
+  void FinishReflowForScrollbar(nsIContent* aContent, nscoord aMinXY,
+                                nscoord aMaxXY, nscoord aCurPosXY,
+                                nscoord aPageIncrement,
+                                nscoord aIncrement);
   static void SetScrollbarEnabled(nsIContent* aContent, nscoord aMaxPos);
-  static void SetCoordAttribute(nsIContent* aContent, nsIAtom* aAtom,
-                                nscoord aSize);
-  nscoord GetCoordAttribute(nsIBox* aFrame, nsIAtom* aAtom, nscoord aDefaultValue,
+  void SetCoordAttribute(nsIContent* aContent, nsIAtom* aAtom, nscoord aSize);
+  nscoord GetCoordAttribute(nsIFrame* aFrame, nsIAtom* aAtom, nscoord aDefaultValue,
                             nscoord* aRangeStart, nscoord* aRangeLength);
 
   // Update scrollbar curpos attributes to reflect current scroll position
@@ -175,7 +178,7 @@ public:
   void RestoreState(nsPresState* aState);
 
   nsIFrame* GetScrolledFrame() const { return mScrolledFrame; }
-  nsIBox* GetScrollbarBox(bool aVertical) const {
+  nsIFrame* GetScrollbarBox(bool aVertical) const {
     return aVertical ? mVScrollbarBox : mHScrollbarBox;
   }
 
@@ -186,7 +189,7 @@ public:
     mListeners.RemoveElement(aListener);
   }
 
-  static void SetScrollbarVisibility(nsIBox* aScrollbar, bool aVisible);
+  static void SetScrollbarVisibility(nsIFrame* aScrollbar, bool aVisible);
 
   /**
    * GetScrolledRect is designed to encapsulate deciding which
@@ -262,13 +265,14 @@ public:
   nsRevocableEventPtr<ScrollEvent> mScrollEvent;
   nsRevocableEventPtr<AsyncScrollPortEvent> mAsyncScrollPortEvent;
   nsRevocableEventPtr<ScrolledAreaEvent> mScrolledAreaEvent;
-  nsIBox* mHScrollbarBox;
-  nsIBox* mVScrollbarBox;
+  nsIFrame* mHScrollbarBox;
+  nsIFrame* mVScrollbarBox;
   nsIFrame* mScrolledFrame;
-  nsIBox* mScrollCornerBox;
-  nsIBox* mResizerBox;
+  nsIFrame* mScrollCornerBox;
+  nsIFrame* mResizerBox;
   nsContainerFrame* mOuter;
   nsRefPtr<AsyncScroll> mAsyncScroll;
+  nsAutoPtr<mozilla::ScrollbarActivity> mScrollbarActivity;
   nsTArray<nsIScrollPositionListener*> mListeners;
   nsRect mScrollPort;
   // Where we're currently scrolling to, if we're scrolling asynchronously.
@@ -489,7 +493,7 @@ public:
   virtual void RemoveScrollPositionListener(nsIScrollPositionListener* aListener) {
     mInner.RemoveScrollPositionListener(aListener);
   }
-  virtual nsIBox* GetScrollbarBox(bool aVertical) {
+  virtual nsIFrame* GetScrollbarBox(bool aVertical) {
     return mInner.GetScrollbarBox(aVertical);
   }
   virtual void CurPosAttributeChanged(nsIContent* aChild) {
@@ -734,7 +738,7 @@ public:
   virtual void RemoveScrollPositionListener(nsIScrollPositionListener* aListener) {
     mInner.RemoveScrollPositionListener(aListener);
   }
-  virtual nsIBox* GetScrollbarBox(bool aVertical) {
+  virtual nsIFrame* GetScrollbarBox(bool aVertical) {
     return mInner.GetScrollbarBox(aVertical);
   }
   virtual void CurPosAttributeChanged(nsIContent* aChild) {
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 4e712b62038f..b8147d08eb1e 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -22,14 +22,12 @@
 
 #include <stdio.h>
 #include "nsQueryFrame.h"
-#include "nsEvent.h"
 #include "nsStyleContext.h"
 #include "nsStyleStruct.h"
 #include "nsStyleStructFwd.h"
-#include "nsIContent.h"
 #include "nsHTMLReflowMetrics.h"
-#include "gfxMatrix.h"
 #include "nsFrameList.h"
+#include "nsIContent.h"
 #include "nsAlgorithm.h"
 #include "mozilla/layout/FrameChildList.h"
 #include "FramePropertyTable.h"
@@ -54,6 +52,7 @@
 struct nsHTMLReflowState;
 class nsHTMLReflowCommand;
 
+struct gfxMatrix;
 class nsIAtom;
 class nsPresContext;
 class nsIPresShell;
@@ -90,8 +89,6 @@ class Layer;
 }
 }
 
-typedef class nsIFrame nsIBox;
-
 /**
  * Indication of how the frame can be split. This is used when doing runaround
  * of floats, and when pulling up child frames from a next-in-flow.
@@ -2678,17 +2675,17 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty()))
   virtual void SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRect,
                          bool aRemoveOverflowAreas = false) = 0;
   NS_HIDDEN_(nsresult) Layout(nsBoxLayoutState& aBoxLayoutState);
-  nsIBox* GetChildBox() const
+  nsIFrame* GetChildBox() const
   {
     // box layout ends at box-wrapped frames, so don't allow these frames
     // to report child boxes.
     return IsBoxFrame() ? GetFirstPrincipalChild() : nullptr;
   }
-  nsIBox* GetNextBox() const
+  nsIFrame* GetNextBox() const
   {
     return (mParent && mParent->IsBoxFrame()) ? mNextSibling : nullptr;
   }
-  nsIBox* GetParentBox() const
+  nsIFrame* GetParentBox() const
   {
     return (mParent && mParent->IsBoxFrame()) ? mParent : nullptr;
   }
@@ -2710,7 +2707,7 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty()))
   bool IsNormalDirection() const { return (mState & NS_STATE_IS_DIRECTION_NORMAL) != 0; }
 
   NS_HIDDEN_(nsresult) Redraw(nsBoxLayoutState& aState, const nsRect* aRect = nullptr);
-  NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild)=0;
+  NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild)=0;
   // XXX take this out after we've branched
   virtual bool GetMouseThrough() const { return false; }
 
@@ -2727,11 +2724,11 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty()))
    */
   virtual bool HasTerminalNewline() const;
 
-  static bool AddCSSPrefSize(nsIBox* aBox, nsSize& aSize, bool& aWidth, bool& aHeightSet);
-  static bool AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox,
-                              nsSize& aSize, bool& aWidth, bool& aHeightSet);
-  static bool AddCSSMaxSize(nsIBox* aBox, nsSize& aSize, bool& aWidth, bool& aHeightSet);
-  static bool AddCSSFlex(nsBoxLayoutState& aState, nsIBox* aBox, nscoord& aFlex);
+  static bool AddCSSPrefSize(nsIFrame* aBox, nsSize& aSize, bool& aWidth, bool& aHeightSet);
+  static bool AddCSSMinSize(nsBoxLayoutState& aState, nsIFrame* aBox,
+                            nsSize& aSize, bool& aWidth, bool& aHeightSet);
+  static bool AddCSSMaxSize(nsIFrame* aBox, nsSize& aSize, bool& aWidth, bool& aHeightSet);
+  static bool AddCSSFlex(nsBoxLayoutState& aState, nsIFrame* aBox, nscoord& aFlex);
 
   // END OF BOX LAYOUT METHODS
   // The above methods have been migrated from nsIBox and are in the process of
diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h
index 565ed798e256..51a564ca8b8f 100644
--- a/layout/generic/nsIScrollableFrame.h
+++ b/layout/generic/nsIScrollableFrame.h
@@ -13,12 +13,12 @@
 #include "nsISupports.h"
 #include "nsCoord.h"
 #include "nsPresContext.h"
-#include "nsIFrame.h" // to get nsIBox, which is a typedef
 
 #define NS_DEFAULT_VERTICAL_SCROLL_DISTANCE 3
 
 class nsBoxLayoutState;
 class nsIScrollPositionListener;
+class nsIFrame;
 
 /**
  * Interface for frames that are scrollable. This interface exposes
@@ -179,7 +179,7 @@ public:
    * setting up a scrollbar mediator if you want to redirect scrollbar
    * input.
    */
-  virtual nsIBox* GetScrollbarBox(bool aVertical) = 0;
+  virtual nsIFrame* GetScrollbarBox(bool aVertical) = 0;
 
   /**
    * Internal method used by scrollbars to notify their scrolling
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index e9137298dd7a..f71cf87dab05 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1290,7 +1290,6 @@ nsDisplayImage::ConfigureLayer(ImageLayer *aLayer)
   transform.Scale(destRect.Width()/imageWidth,
                   destRect.Height()/imageHeight);
   aLayer->SetBaseTransform(gfx3DMatrix::From2D(transform));
-
   aLayer->SetVisibleRegion(nsIntRect(0, 0, imageWidth, imageHeight));
 }
 
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 604438349f27..9be7f1e52b11 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -45,7 +45,6 @@
 #include "nsIDOMHTMLAppletElement.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDocumentEncoder.h"
 #include "nsXPIDLString.h"
 #include "nsIDOMRange.h"
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 9b21f89c0860..21e68e9a34c7 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -40,14 +40,12 @@
 #include "nsTextFragment.h"
 
 // for IBMBIDI
-#include "nsFrameTraversal.h"
+#include "nsFrameIterator.h"
 #include "nsILineIterator.h"
 #include "nsGkAtoms.h"
-#include "nsIFrameTraversal.h"
 #include "nsLayoutUtils.h"
 #include "nsLayoutCID.h"
 #include "nsBidiPresUtils.h"
-static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 #include "nsTextFrame.h"
 
 #include "nsIDOMText.h"
@@ -1229,30 +1227,17 @@ nsFrameSelection::GetFrameFromLevel(nsIFrame    *aFrameIn,
   PRUint8 foundLevel = 0;
   nsIFrame *foundFrame = aFrameIn;
 
-  nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-  nsresult result;
-  nsCOMPtr<nsIFrameTraversal> trav(do_CreateInstance(kFrameTraversalCID,&result));
-  if (NS_FAILED(result))
-      return result;
-
-  result = trav->NewFrameTraversal(getter_AddRefs(frameTraversal),
-                                   mShell->GetPresContext(), aFrameIn,
-                                   eLeaf,
-                                   false, // aVisual
-                                   false, // aLockInScrollView
-                                   false     // aFollowOOFs
-                                   );
-  if (NS_FAILED(result))
-    return result;
+  nsFrameIterator frameTraversal(mShell->GetPresContext(), aFrameIn,
+                                 eLeaf, FrameIteratorFlags::FLAG_NONE);
 
   do {
     *aFrameOut = foundFrame;
     if (aDirection == eDirNext)
-      frameTraversal->Next();
-    else 
-      frameTraversal->Prev();
+      frameTraversal.Next();
+    else
+      frameTraversal.Prev();
 
-    foundFrame = frameTraversal->CurrentItem();
+    foundFrame = frameTraversal.CurrentItem();
     if (!foundFrame)
       return NS_ERROR_FAILURE;
     foundLevel = NS_GET_EMBEDDING_LEVEL(foundFrame);
@@ -3363,24 +3348,28 @@ Selection::FindInsertionPoint(
   *aPoint = 0;
   PRInt32 beginSearch = 0;
   PRInt32 endSearch = aElementArray->Length(); // one beyond what to check
-  while (endSearch - beginSearch > 0) {
-    PRInt32 center = (endSearch - beginSearch) / 2 + beginSearch;
 
-    nsRange* range = (*aElementArray)[center].mRange;
+  if (endSearch) {
+    PRInt32 center = endSearch - 1; // Check last index, then binary search
+    do {
+      nsRange* range = (*aElementArray)[center].mRange;
 
-    PRInt32 cmp;
-    nsresult rv = aComparator(aPointNode, aPointOffset, range, &cmp);
-    NS_ENSURE_SUCCESS(rv, rv);
+      PRInt32 cmp;
+      nsresult rv = aComparator(aPointNode, aPointOffset, range, &cmp);
+      NS_ENSURE_SUCCESS(rv, rv);
 
-    if (cmp < 0) {        // point < cur
-      endSearch = center;
-    } else if (cmp > 0) { // point > cur
-      beginSearch = center + 1;
-    } else {              // found match, done
-      beginSearch = center;
-      break;
-    }
+      if (cmp < 0) {        // point < cur
+        endSearch = center;
+      } else if (cmp > 0) { // point > cur
+        beginSearch = center + 1;
+      } else {              // found match, done
+        beginSearch = center;
+        break;
+      }
+      center = (endSearch - beginSearch) / 2 + beginSearch;
+    } while (endSearch - beginSearch > 0);
   }
+
   *aPoint = beginSearch;
   return NS_OK;
 }
diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
index d667a53ad5ee..3a352909e649 100644
--- a/layout/generic/nsTextFrame.h
+++ b/layout/generic/nsTextFrame.h
@@ -23,18 +23,24 @@ class PropertyProvider;
 
 #define TEXT_HAS_FONT_INFLATION          NS_FRAME_STATE_BIT(61)
 
-class nsTextFrame : public nsFrame {
+typedef nsFrame nsTextFrameBase;
+
+class nsTextFrame : public nsTextFrameBase {
 public:
+  NS_DECL_QUERYFRAME_TARGET(nsTextFrame)
   NS_DECL_FRAMEARENA_HELPERS
 
   friend class nsContinuingTextFrame;
 
   nsTextFrame(nsStyleContext* aContext)
-    : nsFrame(aContext)
+    : nsTextFrameBase(aContext)
   {
     NS_ASSERTION(mContentOffset == 0, "Bogus content offset");
   }
   
+  // nsQueryFrame
+  NS_DECL_QUERYFRAME
+
   // nsIFrame
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                               const nsRect&           aDirtyRect,
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index bf2a7debe183..37aedc2697bc 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -304,6 +304,10 @@ public:
                                       float* aRelativeSize,
                                       PRUint8* aStyle);
 
+  // if this returns false, no text-shadow was specified for the selection
+  // and the *aShadow parameter was not modified.
+  bool GetSelectionShadow(nsCSSShadowArray** aShadow);
+
   nsPresContext* PresContext() const { return mPresContext; }
 
   enum {
@@ -337,13 +341,15 @@ protected:
   nsTextFrame*   mFrame;
   nsPresContext* mPresContext;
   bool           mInitCommonColors;
-  bool           mInitSelectionColors;
+  bool           mInitSelectionColorsAndShadow;
 
   // Selection data
 
   PRInt16      mSelectionStatus; // see nsIDocument.h SetDisplaySelection()
   nscolor      mSelectionTextColor;
   nscolor      mSelectionBGColor;
+  nsRefPtr<nsCSSShadowArray> mSelectionShadow;
+  bool                       mHasSelectionShadow;
 
   // Common data
 
@@ -365,7 +371,7 @@ protected:
 
   // Color initializations
   void InitCommonColors();
-  bool InitSelectionColors();
+  bool InitSelectionColorsAndShadow();
 
   nsSelectionStyle* GetSelectionStyle(PRInt32 aIndex);
   void InitSelectionStyle(PRInt32 aIndex);
@@ -2398,6 +2404,10 @@ BuildTextRunsScanner::AssignTextRun(gfxTextRun* aTextRun, float aInflation)
   }
 }
 
+NS_QUERYFRAME_HEAD(nsTextFrame)
+  NS_QUERYFRAME_ENTRY(nsTextFrame)
+NS_QUERYFRAME_TAIL_INHERITING(nsTextFrameBase)
+
 gfxSkipCharsIterator
 nsTextFrame::EnsureTextRun(TextRunType aWhichTextRun,
                            gfxContext* aReferenceContext,
@@ -3390,7 +3400,8 @@ nsTextPaintStyle::nsTextPaintStyle(nsTextFrame* aFrame)
   : mFrame(aFrame),
     mPresContext(aFrame->PresContext()),
     mInitCommonColors(false),
-    mInitSelectionColors(false)
+    mInitSelectionColorsAndShadow(false),
+    mHasSelectionShadow(false)
 {
   for (PRUint32 i = 0; i < ArrayLength(mSelectionStyle); i++)
     mSelectionStyle[i].mInit = false;
@@ -3434,7 +3445,7 @@ nsTextPaintStyle::GetSelectionColors(nscolor* aForeColor,
   NS_ASSERTION(aForeColor, "aForeColor is null");
   NS_ASSERTION(aBackColor, "aBackColor is null");
 
-  if (!InitSelectionColors())
+  if (!InitSelectionColorsAndShadow())
     return false;
 
   *aForeColor = mSelectionTextColor;
@@ -3566,9 +3577,9 @@ FindElementAncestorForMozSelection(nsIContent* aContent)
 }
 
 bool
-nsTextPaintStyle::InitSelectionColors()
+nsTextPaintStyle::InitSelectionColorsAndShadow()
 {
-  if (mInitSelectionColors)
+  if (mInitSelectionColorsAndShadow)
     return true;
 
   PRInt16 selectionFlags;
@@ -3581,7 +3592,7 @@ nsTextPaintStyle::InitSelectionColors()
     return false;
   }
 
-  mInitSelectionColors = true;
+  mInitSelectionColorsAndShadow = true;
 
   nsIFrame* nonGeneratedAncestor = nsLayoutUtils::GetNonGeneratedAncestor(mFrame);
   Element* selectionElement =
@@ -3599,6 +3610,13 @@ nsTextPaintStyle::InitSelectionColors()
       mSelectionBGColor =
         sc->GetVisitedDependentColor(eCSSProperty_background_color);
       mSelectionTextColor = sc->GetVisitedDependentColor(eCSSProperty_color);
+      mHasSelectionShadow =
+        nsRuleNode::HasAuthorSpecifiedRules(sc,
+                                            NS_AUTHOR_SPECIFIED_TEXT_SHADOW,
+                                            true);
+      if (mHasSelectionShadow) {
+        mSelectionShadow = sc->GetStyleText()->mTextShadow;
+      }
       return true;
     }
   }
@@ -3759,6 +3777,21 @@ nsTextPaintStyle::GetSelectionUnderline(nsPresContext* aPresContext,
          size > 0.0f;
 }
 
+bool
+nsTextPaintStyle::GetSelectionShadow(nsCSSShadowArray** aShadow)
+{
+  if (!InitSelectionColorsAndShadow()) {
+    return false;
+  }
+
+  if (mHasSelectionShadow) {
+    *aShadow = mSelectionShadow;
+    return true;
+  }
+
+  return false;
+}
+
 inline nscolor Get40PercentColor(nscolor aForeColor, nscolor aBackColor)
 {
   nscolor foreColor = NS_RGBA(NS_GET_R(aForeColor),
@@ -4643,11 +4676,37 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
   if (IsFloatingFirstLetterChild()) {
     // The underline/overline drawable area must be contained in the overflow
     // rect when this is in floating first letter frame at *both* modes.
-    nsFontMetrics* fm = aProvider.GetFontMetrics();
-    nscoord fontAscent = fm->MaxAscent();
-    nscoord fontHeight = fm->MaxHeight();
-    nsRect fontRect(0, mAscent - fontAscent, GetSize().width, fontHeight);
-    aVisualOverflowRect->UnionRect(*aVisualOverflowRect, fontRect);
+    nsIFrame* firstLetterFrame = aBlockReflowState.frame;
+    PRUint8 decorationStyle = firstLetterFrame->GetStyleContext()->
+                                GetStyleTextReset()->GetDecorationStyle();
+    if (decorationStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
+      nsFontMetrics* fontMetrics = aProvider.GetFontMetrics();
+      nscoord underlineOffset, underlineSize;
+      fontMetrics->GetUnderline(underlineOffset, underlineSize);
+      nscoord maxAscent = fontMetrics->MaxAscent();
+
+      gfxFloat appUnitsPerDevUnit = aPresContext->AppUnitsPerDevPixel();
+      gfxFloat gfxWidth = aVisualOverflowRect->width / appUnitsPerDevUnit;
+      gfxFloat gfxAscent = gfxFloat(mAscent) / appUnitsPerDevUnit;
+      gfxFloat gfxMaxAscent = maxAscent / appUnitsPerDevUnit;
+      gfxFloat gfxUnderlineSize = underlineSize / appUnitsPerDevUnit;
+      gfxFloat gfxUnderlineOffset = underlineOffset / appUnitsPerDevUnit;
+      nsRect underlineRect =
+        nsCSSRendering::GetTextDecorationRect(aPresContext,
+          gfxSize(gfxWidth, gfxUnderlineSize), gfxAscent, gfxUnderlineOffset,
+          NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, decorationStyle);
+      nsRect overlineRect =
+        nsCSSRendering::GetTextDecorationRect(aPresContext,
+          gfxSize(gfxWidth, gfxUnderlineSize), gfxAscent, gfxMaxAscent,
+          NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, decorationStyle);
+
+      aVisualOverflowRect->UnionRect(*aVisualOverflowRect, underlineRect);
+      aVisualOverflowRect->UnionRect(*aVisualOverflowRect, overlineRect);
+
+      // XXX If strikeoutSize is much thicker than the underlineSize, it may
+      //     cause overflowing from the overflow rect.  However, such case
+      //     isn't realistic, we don't need to compute it now.
+    }
   }
   if (aIncludeTextDecorations) {
     // Since CSS 2.1 requires that text-decoration defined on ancestors maintain
@@ -4934,6 +4993,24 @@ static bool GetSelectionTextColors(SelectionType aType,
   }
 }
 
+/**
+ * This sets *aShadow to the appropriate shadow, if any, for the given
+ * type of selection. Returns true if *aShadow was set.
+ * If text-shadow was not specified, *aShadow is left untouched
+ * (NOT reset to null), and the function returns false.
+ */
+static bool GetSelectionTextShadow(SelectionType aType,
+                                   nsTextPaintStyle& aTextPaintStyle,
+                                   nsCSSShadowArray** aShadow)
+{
+  switch (aType) {
+    case nsISelectionController::SELECTION_NORMAL:
+      return aTextPaintStyle.GetSelectionShadow(aShadow);
+    default:
+      return false;
+  }
+}
+
 /**
  * This class lets us iterate over chunks of text in a uniform selection state,
  * observing cluster boundaries, in content order, maintaining the current
@@ -5217,8 +5294,13 @@ nsTextFrame::PaintTextWithSelectionColors(gfxContext* aCtx,
                            &foreground, &background);
     gfxPoint textBaselinePt(aFramePt.x + xOffset, aTextBaselinePt.y);
 
+    // Determine what shadow, if any, to draw - either from textStyle
+    // or from the ::-moz-selection pseudo-class if specified there
+    nsCSSShadowArray *shadow = textStyle->mTextShadow;
+    GetSelectionTextShadow(type, aTextPaintStyle, &shadow);
+
     // Draw shadows, if any
-    if (textStyle->mTextShadow) {
+    if (shadow) {
       gfxTextRun::Metrics shadowMetrics =
         mTextRun->MeasureText(offset, length, gfxFont::LOOSE_INK_EXTENTS,
                               nullptr, &aProvider);
@@ -5226,9 +5308,9 @@ nsTextFrame::PaintTextWithSelectionColors(gfxContext* aCtx,
         AddHyphenToMetrics(this, mTextRun, &shadowMetrics,
                            gfxFont::LOOSE_INK_EXTENTS, aCtx);
       }
-      for (PRUint32 i = textStyle->mTextShadow->Length(); i > 0; --i) {
+      for (PRUint32 i = shadow->Length(); i > 0; --i) {
         PaintOneShadow(offset, length,
-                       textStyle->mTextShadow->ShadowAt(i - 1), &aProvider,
+                       shadow->ShadowAt(i - 1), &aProvider,
                        dirtyRect, aFramePt, textBaselinePt, aCtx,
                        foreground, aClipEdges, 
                        xOffset - (mTextRun->IsRightToLeft() ?
diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in
index af9b2d551af5..f17a52efb395 100644
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/generic/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/inspector/public/Makefile.in b/layout/inspector/public/Makefile.in
index 54a2e62711a1..f61d18f89d00 100644
--- a/layout/inspector/public/Makefile.in
+++ b/layout/inspector/public/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH=../../..
+DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in
index aca270b4515c..2e50901048b2 100644
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH=../../..
+DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
diff --git a/layout/inspector/tests/Makefile.in b/layout/inspector/tests/Makefile.in
index 1857a6c30198..6f496c12c302 100644
--- a/layout/inspector/tests/Makefile.in
+++ b/layout/inspector/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= layout/inspector/tests
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/inspector/tests/chrome/Makefile.in b/layout/inspector/tests/chrome/Makefile.in
index de24cd6011d7..62231aa87325 100644
--- a/layout/inspector/tests/chrome/Makefile.in
+++ b/layout/inspector/tests/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= layout/inspector/tests/chrome
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in
index 26839d9d6648..529e373be97a 100644
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 4d1d0742c4de..896b11d9aac3 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -249,7 +249,7 @@ TransformShadowTree(nsDisplayListBuilder* aBuilder, nsFrameLoader* aFrameLoader,
 
   const FrameMetrics* metrics = GetFrameMetrics(aLayer);
 
-  gfx3DMatrix shadowTransform = aLayer->GetBaseTransform();
+  gfx3DMatrix shadowTransform = aLayer->GetTransform();
   ViewTransform layerTransform = aTransform;
 
   if (metrics && metrics->IsScrollable()) {
@@ -297,6 +297,18 @@ TransformShadowTree(nsDisplayListBuilder* aBuilder, nsFrameLoader* aFrameLoader,
     }
   }
 
+  // The transform already takes the resolution scale into account.  Since we
+  // will apply the resolution scale again when computing the effective
+  // transform, we must apply the inverse resolution scale here.
+  if (ContainerLayer* c = aLayer->AsContainerLayer()) {
+    shadowTransform.Scale(1.0f/c->GetPreXScale(),
+                          1.0f/c->GetPreYScale(),
+                          1);
+  }
+  shadowTransform.ScalePost(1.0f/aLayer->GetPostXScale(),
+                            1.0f/aLayer->GetPostYScale(),
+                            1);
+
   shadow->SetShadowTransform(shadowTransform);
   for (Layer* child = aLayer->GetFirstChild();
        child; child = child->GetNextSibling()) {
@@ -612,6 +624,8 @@ RenderFrameParent::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   if (mContainer) {
     ClearContainer(mContainer);
+    mContainer->SetPreScale(1.0f, 1.0f);
+    mContainer->SetPostScale(1.0f, 1.0f);
   }
 
   ContainerLayer* shadowRoot = GetRootLayer();
diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in
index dfc398153ee9..90411387ab77 100644
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -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/.
 
-DEPTH=../..
+DEPTH=@DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/mathml/tests/Makefile.in b/layout/mathml/tests/Makefile.in
index 9d23212a6c4c..16a16a38a6c8 100644
--- a/layout/mathml/tests/Makefile.in
+++ b/layout/mathml/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/mathml/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in
index cf32804fb7bd..bab647cde9ce 100644
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in
index d74b505bb056..02970f159074 100644
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp
index 665f0b99d255..3932360cff62 100644
--- a/layout/printing/nsPrintPreviewListener.cpp
+++ b/layout/printing/nsPrintPreviewListener.cpp
@@ -11,7 +11,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMKeyEvent.h"
-#include "nsIDOMNSEvent.h"
+#include "nsIDOMEvent.h"
 #include "nsIDocument.h"
 #include "nsIDocShell.h"
 #include "nsPresContext.h"
@@ -139,9 +139,8 @@ NS_IMETHODIMP
 nsPrintPreviewListener::HandleEvent(nsIDOMEvent* aEvent)
 {
   nsCOMPtr<nsIDOMEventTarget> target;
-  nsCOMPtr<nsIDOMNSEvent> nsEvent = do_QueryInterface(aEvent);
-  if (nsEvent)
-    nsEvent->GetOriginalTarget(getter_AddRefs(target));
+  if (aEvent)
+    aEvent->GetOriginalTarget(getter_AddRefs(target));
   nsCOMPtr<nsIContent> content(do_QueryInterface(target));
   if (content && !content->IsXUL()) {
     eEventAction action = ::GetActionForEvent(aEvent);
diff --git a/layout/reftests/Makefile.in b/layout/reftests/Makefile.in
index 8ae3bd17301d..5a78ed4d40e0 100644
--- a/layout/reftests/Makefile.in
+++ b/layout/reftests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/reftests/fonts/Makefile.in b/layout/reftests/fonts/Makefile.in
index bb5ecb437035..65d9c1a188fc 100644
--- a/layout/reftests/fonts/Makefile.in
+++ b/layout/reftests/fonts/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/reftests/fonts/mplus/Makefile.in b/layout/reftests/fonts/mplus/Makefile.in
index 43b59e9b5bc4..e5b28c9b39d4 100644
--- a/layout/reftests/fonts/mplus/Makefile.in
+++ b/layout/reftests/fonts/mplus/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/reftests/svg/filters/feComposite-paint-01-ref.svg b/layout/reftests/svg/filters/feComposite-paint-01-ref.svg
new file mode 100644
index 000000000000..eb0e773d3ac2
--- /dev/null
+++ b/layout/reftests/svg/filters/feComposite-paint-01-ref.svg
@@ -0,0 +1,9 @@
+<svg id="svg-root" width="100%" height="100%"
+  viewBox="0 0 480 360" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" shape-rendering="crispEdges">
+
+  <rect transform="translate(100 30)" fill="lime" width="120" height="120"/>
+  <rect transform="translate(249 29)" width="122" height="122" fill="#80FF80"/>
+  <rect transform="translate(99 179)" width="122" height="122" fill="#666"/>
+  <rect transform="translate(249 179)" width="122" height="122" fill="rgb(0,255,255)"/>
+</svg>
diff --git a/layout/reftests/svg/filters/feComposite-paint-01.svg b/layout/reftests/svg/filters/feComposite-paint-01.svg
new file mode 100644
index 000000000000..c6c2aac2e80e
--- /dev/null
+++ b/layout/reftests/svg/filters/feComposite-paint-01.svg
@@ -0,0 +1,35 @@
+<svg id="svg-root" width="100%" height="100%"
+  viewBox="0 0 480 360" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" shape-rendering="crispEdges">
+  <defs>
+    <filter id="composite-ident" x="0" y="0" width="1" height="1">
+      <feComposite operator="arithmetic" in="FillPaint" in2="StrokePaint" k1="0" k2="1" k3="-1" k4="0"/>
+    </filter>
+    <filter id="composite-negative" x="0" y="0" width="1" height="1">
+      <feComposite operator="arithmetic" in="FillPaint" in2="FillPaint" k1="0" k2="2" k3="-1.5" k4="0"/>
+    </filter>
+    <filter id="composite-mixed" x="0" y="0" width="1" height="1">
+      <feComposite operator="arithmetic" in="FillPaint" in2="StrokePaint" k1="1" k2="-0.5" k3="0.2" k4="-0.1"/>
+    </filter>
+    <filter id="composite-clamped" x="0" y="0" width="1" height="1">
+      <feComposite operator="arithmetic" in="FillPaint" in2="StrokePaint" k1="0" k2="10" k3="20" k4="0"/>
+    </filter>
+  </defs>
+    
+  <g transform="translate(100 30)">
+    <rect fill="lime" width="120" height="120"/>
+    <rect fill="red" stroke="red" filter="url(#composite-ident)" x="10" y="10" width="100" height="100"/>
+  </g>
+  <g transform="translate(250 30)">
+    <rect fill="#0F0" filter="url(#composite-negative)" x="10" y="10" width="100" height="100"/>
+    <rect stroke="#80FF80" x="5" y="5" width="110" height="110" stroke-width="12" fill="none"/>
+  </g>
+  <g transform="translate(100 180)">
+    <rect fill="rgb(43,17,12)" stroke="rgb(32,42,37)" filter="url(#composite-mixed)" x="10" y="10" width="100" height="100"/>
+    <rect stroke="#666" x="5" y="5" width="110" height="110" stroke-width="12" fill="none"/>
+  </g>
+  <g transform="translate(250 180)">
+    <rect fill="rgb(0,127,0)" stroke="rgb(0,0,127)" filter="url(#composite-clamped)" x="10" y="10" width="100" height="100"/>
+    <rect stroke="rgb(0,255,255)" x="5" y="5" width="110" height="110" stroke-width="12" fill="none"/>
+  </g>
+</svg>
diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list
index 76264bd2eaa2..82d1a696f1d6 100644
--- a/layout/reftests/svg/filters/reftest.list
+++ b/layout/reftests/svg/filters/reftest.list
@@ -72,6 +72,7 @@ fails == filter-marked-line-01.svg pass.svg # bug 477704
 
 == feComponentTransfer-03.svg pass.svg
 == feComposite-arguments-01.svg pass.svg
+== feComposite-paint-01.svg feComposite-paint-01-ref.svg
 == feConvolveMatrix-bias-01.svg feConvolveMatrix-bias-01-ref.svg
 == feConvolveMatrix-order-01.svg feConvolveMatrix-order-01-ref.svg
 
diff --git a/layout/reftests/text-shadow/reftest.list b/layout/reftests/text-shadow/reftest.list
index 1ba48d227694..a329513c130a 100644
--- a/layout/reftests/text-shadow/reftest.list
+++ b/layout/reftests/text-shadow/reftest.list
@@ -29,3 +29,6 @@ random-if(Android) == basic-negcoord.xul basic-negcoord-ref.xul
 # bug 692744
 == text-shadow-on-space-1.html text-shadow-on-space-1-ref.html
 
+# bug 721750
+needs-focus == text-shadow-on-selection-1.html text-shadow-on-selection-1-ref.html
+needs-focus == text-shadow-on-selection-2.html text-shadow-on-selection-2-ref.html
diff --git a/layout/reftests/text-shadow/text-shadow-on-selection-1-ref.html b/layout/reftests/text-shadow/text-shadow-on-selection-1-ref.html
new file mode 100644
index 000000000000..ece0e6de0f56
--- /dev/null
+++ b/layout/reftests/text-shadow/text-shadow-on-selection-1-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+body {
+  background: white;
+  color: black;
+  font-size: 24px;
+}
+div {
+  background: white;
+  color: blue;
+  text-shadow: red 2px 2px 0px;
+}
+span {
+  background: yellow;
+  color: white;
+}
+</style>
+</head>
+<body>
+<div>
+hello <span>selected</span> world
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text-shadow/text-shadow-on-selection-1.html b/layout/reftests/text-shadow/text-shadow-on-selection-1.html
new file mode 100644
index 000000000000..a0c29c321b93
--- /dev/null
+++ b/layout/reftests/text-shadow/text-shadow-on-selection-1.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<script type="text/javascript">
+function onload() {
+  var range = document.createRange();
+  range.selectNodeContents(document.getElementById("selectMe"));
+  var sel = window.getSelection();
+  sel.removeAllRanges();
+  sel.addRange(range);
+  window.focus();
+}
+function disableReftestWait() {
+  document.documentElement.className = '';
+}
+</script>
+<style type="text/css">
+body {
+  background: white;
+  font-size: 24px;
+}
+div {
+  color: blue;
+  text-shadow: red 2px 2px 0px;
+}
+::-moz-selection {
+  background: yellow;
+  color: white;
+}
+::selection {
+  background: yellow;
+  color: white;
+}
+</style>
+</head>
+<body onload="onload()" onfocus="disableReftestWait()">
+<div>
+hello <span id="selectMe">selected</span> world
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text-shadow/text-shadow-on-selection-2-ref.html b/layout/reftests/text-shadow/text-shadow-on-selection-2-ref.html
new file mode 100644
index 000000000000..09d9e4063a80
--- /dev/null
+++ b/layout/reftests/text-shadow/text-shadow-on-selection-2-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+body {
+  background: white;
+  color: black;
+  font-size: 24px;
+}
+div {
+  background: white;
+  color: blue;
+  text-shadow: red 2px 2px 0px;
+}
+span {
+  background: yellow;
+  color: white;
+  text-shadow: none;
+}
+</style>
+</head>
+<body>
+<div>
+hello <span>selected</span> world
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text-shadow/text-shadow-on-selection-2.html b/layout/reftests/text-shadow/text-shadow-on-selection-2.html
new file mode 100644
index 000000000000..1791f1b9fbd2
--- /dev/null
+++ b/layout/reftests/text-shadow/text-shadow-on-selection-2.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<script type="text/javascript">
+function onload() {
+  var range = document.createRange();
+  range.selectNodeContents(document.getElementById("selectMe"));
+  var sel = window.getSelection();
+  sel.removeAllRanges();
+  sel.addRange(range);
+  window.focus();
+}
+function disableReftestWait() {
+  document.documentElement.className = '';
+}
+</script>
+<style type="text/css">
+body {
+  background: white;
+  font-size: 24px;
+}
+div {
+  color: blue;
+  text-shadow: red 2px 2px 0px;
+}
+::-moz-selection {
+  background: yellow;
+  color: white;
+  text-shadow: none;
+}
+::selection {
+  background: yellow;
+  color: white;
+  text-shadow: none;
+}
+</style>
+</head>
+<body onload="onload()" onfocus="disableReftestWait()">
+<div>
+hello <span id="selectMe">selected</span> world
+</div>
+</body>
+</html>
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht
index d12bae1c4355..3cdb63515609 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht
@@ -1,15 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Test: An @supports rule with valid syntax but a failing condition must not apply rules inside it</title>
+  <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
   <link rel="help" href="http://www.w3.org/TR/#at-supports" />
   <meta name="flags" content="" />
-  <meta name="assert" content="A disjunction of two @supports conditions must cause the @supports condition to pass if one condition passes and the other fails due to being an unsupported property with an empty property value."/>
+  <meta name="assert" content="An @supports conditions must fail to parse if a declaration has an empy property value."/>
   <link rel="match" href="pass.html" />
   <style type="text/css"><![CDATA[
+    html { background-color: green }
     @supports (unknown:) or (color: green) {
-      html { background-color: green }
+      html { background-color: red }
     }
   ]]></style>
  </head>
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht
index d9bc282bdb8a..1df87995aaf6 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht
@@ -1,16 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Test: {{ brief but unique descriptive title of what's being tested }}</title>
+  <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
   <link rel="help" href="http://www.w3.org/TR/#at-supports" />
   <meta name="flags" content="" />
-  <meta name="assert" content="{{ explain precisely what is asserted when the test passes;
-                                  optional but helps coordination and review }}" />
+  <meta name="assert" content="An @supports conditions must fail to parse if a declaration has an empy property value."/>
   <link rel="match" href="pass.html" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
-    @supports (not (color: rainbow) and (color: green)) {
+    @supports (color:) or (color: green) {
       html { background-color: red }
     }
   ]]></style>
diff --git a/layout/reftests/w3c-css/submitted/conditional3/reftest.list b/layout/reftests/w3c-css/submitted/conditional3/reftest.list
index 8d132796180e..bf22315fc069 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/conditional3/reftest.list
@@ -28,3 +28,4 @@
 == css-supports-028.xht pass.html
 == css-supports-029.xht pass.html
 == css-supports-030.xht pass.html
+== css-supports-031.xht pass.html
diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index a681e28a903e..67d53f24bc69 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -230,6 +230,9 @@ CommonElementAnimationData::CanAnimatePropertyOnCompositor(const dom::Element *a
   }
 
   nsIFrame* frame = aElement->GetPrimaryFrame();
+  if (aProperty == eCSSProperty_visibility) {
+    return true;
+  }
   if (aProperty == eCSSProperty_opacity) {
     bool enabled = nsLayoutUtils::AreOpacityAnimationsEnabled();
     if (!enabled && sShouldLog) {
diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index cb8db37baa57..6dcd7346bb0a 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1080,7 +1080,6 @@ Loader::CreateSheet(nsIURI* aURI,
     mPendingDatas.Init();
   }
 
-  nsresult rv = NS_OK;
   *aSheet = nullptr;
   aSheetState = eSheetStateUnknown;
 
@@ -1199,9 +1198,9 @@ Loader::CreateSheet(nsIURI* aURI,
       originalURI = aURI;
     }
 
-    rv = NS_NewCSSStyleSheet(aSheet);
-    NS_ENSURE_SUCCESS(rv, rv);
-    (*aSheet)->SetURIs(sheetURI, originalURI, baseURI);
+    nsRefPtr<nsCSSStyleSheet> sheet = new nsCSSStyleSheet();
+    sheet->SetURIs(sheetURI, originalURI, baseURI);
+    sheet.forget(aSheet);
   }
 
   NS_ASSERTION(*aSheet, "We should have a sheet by now!");
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
index 1851556ae1cd..f23d1854bb95 100644
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index 7f9bb4ba822a..c68f67449821 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -10,9 +10,10 @@
 
 #include "nsIStyleRule.h"
 #include "nsIDOMCSSRule.h"
+#include "nsCSSStyleSheet.h"
 
 class nsIStyleSheet;
-class nsCSSStyleSheet;
+class nsIDocument;
 struct nsRuleData;
 template<class T> struct already_AddRefed;
 
@@ -76,6 +77,13 @@ public:
 
   nsCSSStyleSheet* GetStyleSheet() const { return mSheet; }
 
+  // Return the document the rule lives in, if any
+  nsIDocument* GetDocument() const
+  {
+    nsCSSStyleSheet* sheet = GetStyleSheet();
+    return sheet ? sheet->GetDocument() : nullptr;
+  }
+
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet);
 
   void SetParentRule(GroupRule* aRule) {
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 9295b8b66789..32baf3fdbdcd 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -979,13 +979,13 @@ public:
   virtual nsIDocument* DocToUpdate();
 
   // Override |AddRef| and |Release| for being a member of
-  // |DOMCSSStyleRule|.
-  NS_IMETHOD_(nsrefcnt) AddRef(void);
-  NS_IMETHOD_(nsrefcnt) Release(void);
+  // |DOMCSSStyleRule|.  Also, we need to forward QI for cycle
+  // collection things to DOMCSSStyleRule.
+  NS_DECL_ISUPPORTS_INHERITED
 
   virtual nsINode *GetParentObject()
   {
-    return nullptr;
+    return mRule ? mRule->GetDocument() : nullptr;
   }
 
   friend class css::DOMCSSStyleRule;
@@ -1013,7 +1013,8 @@ public:
   DOMCSSStyleRule(StyleRule *aRule);
   virtual ~DOMCSSStyleRule();
 
-  NS_DECL_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMCSSStyleRule)
   NS_DECL_NSIDOMCSSRULE
   NS_DECL_NSIDOMCSSSTYLERULE
 
@@ -1058,6 +1059,17 @@ inline css::DOMCSSStyleRule* DOMCSSDeclarationImpl::DomRule()
 NS_IMPL_ADDREF_USING_AGGREGATOR(DOMCSSDeclarationImpl, DomRule())
 NS_IMPL_RELEASE_USING_AGGREGATOR(DOMCSSDeclarationImpl, DomRule())
 
+NS_INTERFACE_MAP_BEGIN(DOMCSSDeclarationImpl)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  // We forward the cycle collection interfaces to DomRule(), which is
+  // never null (in fact, we're part of that object!)
+  if (aIID.Equals(NS_GET_IID(nsCycleCollectionISupports)) ||
+      aIID.Equals(NS_GET_IID(nsXPCOMCycleCollectionParticipant))) {
+    return DomRule()->QueryInterface(aIID, aInstancePtr);
+  }
+  else
+NS_IMPL_QUERY_TAIL_INHERITING(nsDOMCSSDeclaration)
+
 void
 DOMCSSDeclarationImpl::DropReference(void)
 {
@@ -1146,7 +1158,7 @@ DOMCSSStyleRule::~DOMCSSStyleRule()
 {
 }
 
-NS_INTERFACE_MAP_BEGIN(DOMCSSStyleRule)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMCSSStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsICSSStyleRuleDOMWrapper)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
@@ -1154,8 +1166,31 @@ NS_INTERFACE_MAP_BEGIN(DOMCSSStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSStyleRule)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_ADDREF(DOMCSSStyleRule)
-NS_IMPL_RELEASE(DOMCSSStyleRule)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMCSSStyleRule)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMCSSStyleRule)
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(DOMCSSStyleRule)
+
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(DOMCSSStyleRule)
+  // Trace the wrapper for our declaration.  This just expands out
+  // NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER which we can't use
+  // directly because the wrapper is on the declaration, not on us.
+  nsContentUtils::TraceWrapper(tmp->DOMDeclaration(), aCallback, aClosure);
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(DOMCSSStyleRule)
+  // Unlink the wrapper for our declaraton.  This just expands out
+  // NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER which we can't use
+  // directly because the wrapper is on the declaration, not on us.
+  nsContentUtils::ReleaseWrapper(s, tmp->DOMDeclaration());
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(DOMCSSStyleRule)
+  // Just NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS here: that will call
+  // into our Trace hook, where we do the right thing with declarations
+  // already.
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMETHODIMP
 DOMCSSStyleRule::GetType(PRUint16* aType)
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index d7773023d8dc..e15ecbc3f515 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -2487,6 +2487,15 @@ CSSParserImpl::ParseSupportsConditionInParensInsideParens(bool& aConditionMet)
         return false;
       }
 
+      if (ExpectSymbol(')', true)) {
+        const PRUnichar *params[] = {
+          propertyName.get()
+        };
+        REPORT_UNEXPECTED_P(PEValueParsingError, params);
+        UngetToken();
+        return false;
+      }
+
       nsCSSProperty propID = nsCSSProps::LookupProperty(propertyName,
                                                         nsCSSProps::eEnabled);
       if (propID == eCSSProperty_UNKNOWN) {
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 7dfdae025a61..83e1ea5787d6 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -560,6 +560,8 @@ GroupRule::List(FILE* out, PRInt32 aIndent) const
   for (PRInt32 index = 0, count = mRules.Count(); index < count; ++index) {
     mRules.ObjectAt(index)->List(out, aIndent + 1);
   }
+
+  for (PRInt32 indent = aIndent; --indent >= 0; ) fputs("  ", out);
   fputs("}\n", out);
 }
 #endif
@@ -1366,8 +1368,17 @@ DOMCI_DATA(CSSFontFaceStyleDecl, nsCSSFontFaceStyleDecl)
 
 // QueryInterface implementation for nsCSSFontFaceStyleDecl
 NS_INTERFACE_MAP_BEGIN(nsCSSFontFaceStyleDecl)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleDeclaration)
+  NS_INTERFACE_MAP_ENTRY(nsICSSDeclaration)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
+  // We forward the cycle collection interfaces to ContainingRule(), which is
+  // never null (in fact, we're part of that object!)
+  if (aIID.Equals(NS_GET_IID(nsCycleCollectionISupports)) ||
+      aIID.Equals(NS_GET_IID(nsXPCOMCycleCollectionParticipant))) {
+    return ContainingRule()->QueryInterface(aIID, aInstancePtr);
+  }
+  else
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSFontFaceStyleDecl)
 NS_INTERFACE_MAP_END
 
@@ -1574,6 +1585,28 @@ nsCSSFontFaceStyleDecl::GetParentRule(nsIDOMCSSRule** aParentRule)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsCSSFontFaceStyleDecl::GetPropertyValue(const nsCSSProperty aPropID,
+                                         nsAString& aValue)
+{
+  return
+    GetPropertyValue(NS_ConvertUTF8toUTF16(nsCSSProps::GetStringValue(aPropID)),
+                     aValue);
+}
+
+NS_IMETHODIMP
+nsCSSFontFaceStyleDecl::SetPropertyValue(const nsCSSProperty aPropID,
+                                         const nsAString& aValue)
+{
+  return SetProperty(NS_ConvertUTF8toUTF16(nsCSSProps::GetStringValue(aPropID)),
+                     aValue, EmptyString());
+}
+
+nsINode*
+nsCSSFontFaceStyleDecl::GetParentObject()
+{
+  return ContainingRule()->GetDocument();
+}
 
 // -------------------------------------------
 // nsCSSFontFaceRule
@@ -1586,13 +1619,36 @@ nsCSSFontFaceRule::Clone() const
   return clone.forget();
 }
 
-NS_IMPL_ADDREF_INHERITED(nsCSSFontFaceRule, Rule)
-NS_IMPL_RELEASE_INHERITED(nsCSSFontFaceRule, Rule)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCSSFontFaceRule)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCSSFontFaceRule)
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsCSSFontFaceRule)
+
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsCSSFontFaceRule)
+  // Trace the wrapper for our declaration.  This just expands out
+  // NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER which we can't use
+  // directly because the wrapper is on the declaration, not on us.
+  nsContentUtils::TraceWrapper(&tmp->mDecl, aCallback, aClosure);
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsCSSFontFaceRule)
+  // Unlink the wrapper for our declaraton.  This just expands out
+  // NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER which we can't use
+  // directly because the wrapper is on the declaration, not on us.
+  nsContentUtils::ReleaseWrapper(s, &tmp->mDecl);
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCSSFontFaceRule)
+  // Just NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS here: that will call
+  // into our Trace hook, where we do the right thing with declarations
+  // already.
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 DOMCI_DATA(CSSFontFaceRule, nsCSSFontFaceRule)
 
 // QueryInterface implementation for nsCSSFontFaceRule
-NS_INTERFACE_MAP_BEGIN(nsCSSFontFaceRule)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSFontFaceRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFaceRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
@@ -1731,8 +1787,14 @@ nsCSSKeyframeStyleDeclaration::~nsCSSKeyframeStyleDeclaration()
   NS_ASSERTION(!mRule, "DropReference not called.");
 }
 
-NS_IMPL_ADDREF(nsCSSKeyframeStyleDeclaration)
-NS_IMPL_RELEASE(nsCSSKeyframeStyleDeclaration)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsCSSKeyframeStyleDeclaration)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsCSSKeyframeStyleDeclaration)
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(nsCSSKeyframeStyleDeclaration)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSKeyframeStyleDeclaration)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
 
 css::Declaration*
 nsCSSKeyframeStyleDeclaration::GetCSSDeclaration(bool aAllocate)
@@ -1773,6 +1835,12 @@ nsCSSKeyframeStyleDeclaration::DocToUpdate()
   return nullptr;
 }
 
+nsINode*
+nsCSSKeyframeStyleDeclaration::GetParentObject()
+{
+  return mRule ? mRule->GetDocument() : nullptr;
+}
+
 // -------------------------------------------
 // nsCSSKeyframeRule
 //
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index c35dabf24eb1..1d0ef4317537 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -157,11 +157,14 @@ protected:
 
 // A nsCSSFontFaceStyleDecl is always embedded in a nsCSSFontFaceRule.
 class nsCSSFontFaceRule;
-class nsCSSFontFaceStyleDecl : public nsIDOMCSSStyleDeclaration
+class nsCSSFontFaceStyleDecl : public nsICSSDeclaration
 {
 public:
-  NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMCSSSTYLEDECLARATION
+  NS_DECL_NSICSSDECLARATION
+
+  virtual nsINode *GetParentObject();
 
   nsresult GetPropertyValue(nsCSSFontDesc aFontDescID,
                             nsAString & aResult) const;
@@ -193,7 +196,9 @@ public:
     // copy everything except our reference count
     : mozilla::css::Rule(aCopy), mDecl(aCopy.mDecl) {}
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSFontFaceRule,
+                                                         mozilla::css::Rule)
 
   // nsIStyleRule methods
 #ifdef DEBUG
@@ -301,18 +306,13 @@ public:
   virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv);
   virtual nsIDocument* DocToUpdate();
 
-  NS_IMETHOD_(nsrefcnt) AddRef();
-  NS_IMETHOD_(nsrefcnt) Release();
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSKeyframeStyleDeclaration,
+                                                         nsICSSDeclaration)
 
-  virtual nsINode *GetParentObject()
-  {
-    return nullptr;
-  }
+  virtual nsINode* GetParentObject();
 
 protected:
-  nsAutoRefCnt mRefCnt;
-  NS_DECL_OWNINGTHREAD
-
   // This reference is not reference-counted. The rule object tells us
   // when it's about to go away.
   nsCSSKeyframeRule *mRule;
diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp
index bc088d521972..da929111c1c2 100644
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -774,6 +774,9 @@ nsCSSStyleSheetInner::nsCSSStyleSheetInner(nsCSSStyleSheet* aPrimarySheet)
   mSheets.AppendElement(aPrimarySheet);
 
   mPrincipal = do_CreateInstance("@mozilla.org/nullprincipal;1");
+  if (!mPrincipal) {
+    NS_RUNTIMEABORT("OOM");
+  }
 }
 
 static bool SetStyleSheetReference(css::Rule* aRule, void* aSheet)
@@ -2161,24 +2164,3 @@ nsCSSStyleSheet::GetOriginalURI() const
 {
   return mInner->mOriginalSheetURI;
 }
-
-nsresult
-NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult)
-{
-  *aInstancePtrResult = nullptr;
-  nsCSSStyleSheet  *it = new nsCSSStyleSheet();
-
-  if (!it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  NS_ADDREF(it);
-
-  if (!it->mInner || !it->mInner->mPrincipal) {
-    NS_RELEASE(it);
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  
-  *aInstancePtrResult = it;
-  return NS_OK;
-}
diff --git a/layout/style/nsCSSStyleSheet.h b/layout/style/nsCSSStyleSheet.h
index f2b1cbdc071b..b3db168d29db 100644
--- a/layout/style/nsCSSStyleSheet.h
+++ b/layout/style/nsCSSStyleSheet.h
@@ -48,7 +48,6 @@ class nsCSSStyleSheetInner {
 public:
   friend class nsCSSStyleSheet;
   friend class nsCSSRuleProcessor;
-  friend nsresult NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult);
 private:
   nsCSSStyleSheetInner(nsCSSStyleSheet* aPrimarySheet);
   nsCSSStyleSheetInner(nsCSSStyleSheetInner& aCopy,
@@ -166,6 +165,9 @@ public:
   // Principal() never returns a null pointer.
   nsIPrincipal* Principal() const { return mInner->mPrincipal; }
 
+  // The document this style sheet is associated with.  May be null
+  nsIDocument* GetDocument() const { return mDocument; }
+
   void SetTitle(const nsAString& aTitle) { mTitle = aTitle; }
   void SetMedia(nsMediaList* aMedia);
   void SetOwningNode(nsIDOMNode* aOwningNode) { mOwningNode = aOwningNode; /* Not ref counted */ }
@@ -282,12 +284,9 @@ protected:
 
   friend class nsMediaList;
   friend class nsCSSRuleProcessor;
-  friend nsresult NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult);
   friend struct ChildSheetListBuilder;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsCSSStyleSheet, NS_CSS_STYLE_SHEET_IMPL_CID)
 
-nsresult NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult);
-
 #endif /* !defined(nsCSSStyleSheet_h_) */
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 6facddef449c..639e202dc09a 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -45,6 +45,7 @@
 #include "mozilla/dom/Element.h"
 #include "nsGenericElement.h"
 #include "CSSCalc.h"
+#include "nsWrapperCacheInlines.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -149,30 +150,23 @@ nsComputedDOMStyle::Shutdown()
 }
 
 
-// If nsComputedDOMStyle is changed so that any additional fields are
-// traversed by the cycle collector (for instance, if wrapper cache
-// handling is changed) then CAN_SKIP must be updated.
-NS_IMPL_CYCLE_COLLECTION_1(nsComputedDOMStyle, mContent)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsComputedDOMStyle, mContent)
 
-// nsComputedDOMStyle has only one cycle collected field, so if
-// mContent is going to be skipped, the style isn't part of a garbage
-// cycle.
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(nsComputedDOMStyle)
-  return !tmp->mContent || nsGenericElement::CanSkip(tmp->mContent, true);
+  return tmp->IsBlack();
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_END
 
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_BEGIN(nsComputedDOMStyle)
-  return !tmp->mContent || nsGenericElement::CanSkipInCC(tmp->mContent);
+  return tmp->IsBlack();
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_END
 
-// CanSkipThis returns false to avoid problems with incomplete unlinking.
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(nsComputedDOMStyle)
+  return tmp->IsBlack();
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
 
 // QueryInterface implementation for nsComputedDOMStyle
-NS_INTERFACE_MAP_BEGIN(nsComputedDOMStyle)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsComputedDOMStyle)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsComputedDOMStyle)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
 
 
@@ -993,10 +987,10 @@ nsComputedDOMStyle::DoGetTransform()
   /* First, get the display data.  We'll need it. */
   const nsStyleDisplay* display = GetStyleDisplay();
 
-  /* If the "no transforms" flag is set, then we should construct a
-   * single-element entry and hand it back.
+  /* If there are no transforms, then we should construct a single-element
+   * entry and hand it back.
    */
-  if (!display->HasTransform()) {
+  if (!display->mSpecifiedTransform) {
     nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
 
     /* Set it to "none." */
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 1233299d8176..b1a52188f5fe 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -16,21 +16,21 @@
 #include "nsCSSProps.h"
 
 #include "nsIContent.h"
-#include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsWeakReference.h"
 #include "nsAutoPtr.h"
 #include "nsStyleStruct.h"
+#include "nsStyleContext.h"
 
+class nsIFrame;
 class nsIPresShell;
 
-class nsComputedDOMStyle : public nsDOMCSSDeclaration,
-                           public nsWrapperCache
+class nsComputedDOMStyle : public nsDOMCSSDeclaration
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_CLASS_AMBIGUOUS(nsComputedDOMStyle,
-                                                     nsICSSDeclaration)
+  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsComputedDOMStyle,
+                                                                   nsICSSDeclaration)
 
   NS_DECL_NSICSSDECLARATION
 
diff --git a/layout/style/nsDOMCSSAttrDeclaration.cpp b/layout/style/nsDOMCSSAttrDeclaration.cpp
index 86d960942648..0199fe21f0d5 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.cpp
+++ b/layout/style/nsDOMCSSAttrDeclaration.cpp
@@ -17,6 +17,9 @@
 #include "nsIURI.h"
 #include "nsNodeUtils.h"
 #include "nsGenericElement.h"
+#include "nsContentUtils.h"
+#include "xpcpublic.h"
+#include "nsWrapperCacheInlines.h"
 
 namespace css = mozilla::css;
 namespace dom = mozilla::dom;
@@ -36,29 +39,36 @@ nsDOMCSSAttributeDeclaration::~nsDOMCSSAttributeDeclaration()
   MOZ_COUNT_DTOR(nsDOMCSSAttributeDeclaration);
 }
 
-// If nsDOMCSSAttributeDeclaration is changed so that any additional
-// fields are traversed by the cycle collector (for instance, if
-// wrapper cache handling is changed) then CAN_SKIP must be updated.
-NS_IMPL_CYCLE_COLLECTION_1(nsDOMCSSAttributeDeclaration, mElement)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsDOMCSSAttributeDeclaration, mElement)
 
-// nsDOMCSSAttributeDeclaration has only one cycle collected field, so
-// if mElement is going to be skipped, the attribute declaration can't
-// be part of a garbage cycle.
+// mElement holds a strong ref to us, so if it's going to be
+// skipped, the attribute declaration can't be part of a garbage
+// cycle.
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(nsDOMCSSAttributeDeclaration)
-  return !tmp->mElement || nsGenericElement::CanSkip(tmp->mElement, true);
+  if (tmp->mElement && nsGenericElement::CanSkip(tmp->mElement, true)) {
+    if (tmp->PreservingWrapper()) {
+      // Not relying on GetWrapper to unmark us gray because the
+      // side-effect thing is pretty weird.
+      JSObject* o = tmp->GetWrapperPreserveColor();
+      xpc_UnmarkGrayObject(o);
+    }
+    return true;
+  }
+  return tmp->IsBlack();
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_END
 
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_BEGIN(nsDOMCSSAttributeDeclaration)
-  return !tmp->mElement || nsGenericElement::CanSkipInCC(tmp->mElement);
+  return tmp->IsBlack() ||
+    (tmp->mElement && nsGenericElement::CanSkipInCC(tmp->mElement));
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_END
 
-// CanSkipThis returns false to avoid problems with incomplete unlinking.
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(nsDOMCSSAttributeDeclaration)
+  return tmp->IsBlack() ||
+    (tmp->mElement && nsGenericElement::CanSkipThis(tmp->mElement));
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
 
-NS_INTERFACE_MAP_BEGIN(nsDOMCSSAttributeDeclaration)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCSSAttributeDeclaration)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMCSSAttributeDeclaration)
 NS_IMPL_QUERY_TAIL_INHERITING(nsDOMCSSDeclaration)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCSSAttributeDeclaration)
diff --git a/layout/style/nsDOMCSSAttrDeclaration.h b/layout/style/nsDOMCSSAttrDeclaration.h
index bf56b3f3238a..dc3c98d48c1c 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.h
+++ b/layout/style/nsDOMCSSAttrDeclaration.h
@@ -12,7 +12,6 @@
 
 #include "nsAutoPtr.h"
 #include "nsString.h"
-#include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace css {
@@ -24,8 +23,7 @@ class Element;
 }
 }
 
-class nsDOMCSSAttributeDeclaration : public nsDOMCSSDeclaration,
-                                     public nsWrapperCache
+class nsDOMCSSAttributeDeclaration : public nsDOMCSSDeclaration
 {
 public:
   typedef mozilla::dom::Element Element;
@@ -33,8 +31,8 @@ public:
   ~nsDOMCSSAttributeDeclaration();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_CLASS_AMBIGUOUS(nsDOMCSSAttributeDeclaration,
-                                                     nsICSSDeclaration)
+  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsDOMCSSAttributeDeclaration,
+                                                                   nsICSSDeclaration)
 
   // If GetCSSDeclaration returns non-null, then the decl it returns
   // is owned by our current style rule.
diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp
index f68112a8e6c6..639a425a6373 100644
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -24,7 +24,6 @@
 
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIFrame.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"
 
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index ef51851ab37d..4f668858d583 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -13,7 +13,6 @@
 #include "nsIURL.h"
 #include "nsCSSPseudoElements.h"
 #include "nsIStyleRule.h"
-#include "nsIFrame.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsIStyleRuleProcessor.h"
 #include "nsPresContext.h"
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index 968850f2a0e5..f424385ddbbe 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -23,7 +23,6 @@
 #include "nsIURL.h"
 #include "nsMappedAttributes.h"
 #include "nsILink.h"
-#include "nsIFrame.h"
 #include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
@@ -146,20 +145,17 @@ static PLDHashTableOps MappedAttrTable_Ops = {
 
 // -----------------------------------------------------------
 
-nsHTMLStyleSheet::nsHTMLStyleSheet(void)
-  : mDocument(nullptr)
+nsHTMLStyleSheet::nsHTMLStyleSheet(nsIURI* aURL, nsIDocument* aDocument)
+  : mURL(aURL)
+  , mDocument(aDocument)
+  , mTableQuirkColorRule(new TableQuirkColorRule())
+  , mTableTHRule(new TableTHRule())
 {
+  MOZ_ASSERT(aURL);
+  MOZ_ASSERT(aDocument);
   mMappedAttrTable.ops = nullptr;
 }
 
-nsresult
-nsHTMLStyleSheet::Init()
-{
-  mTableTHRule = new TableTHRule();
-  mTableQuirkColorRule = new TableQuirkColorRule();
-  return NS_OK;
-}
-
 nsHTMLStyleSheet::~nsHTMLStyleSheet()
 {
   if (mMappedAttrTable.ops)
@@ -380,21 +376,6 @@ nsHTMLStyleSheet::SetOwningDocument(nsIDocument* aDocument)
   mDocument = aDocument; // not refcounted
 }
 
-nsresult
-nsHTMLStyleSheet::Init(nsIURI* aURL, nsIDocument* aDocument)
-{
-  NS_PRECONDITION(aURL && aDocument, "null ptr");
-  if (! aURL || ! aDocument)
-    return NS_ERROR_NULL_POINTER;
-
-  if (mURL || mDocument)
-    return NS_ERROR_ALREADY_INITIALIZED;
-
-  mDocument = aDocument; // not refcounted!
-  mURL = aURL;
-  return NS_OK;
-}
-
 void
 nsHTMLStyleSheet::Reset(nsIURI* aURL)
 {
@@ -545,44 +526,3 @@ nsHTMLStyleSheet::DOMSizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
 
   return n;
 }
-
-// XXX For convenience and backwards compatibility
-nsresult
-NS_NewHTMLStyleSheet(nsHTMLStyleSheet** aInstancePtrResult, nsIURI* aURL, 
-                     nsIDocument* aDocument)
-{
-  nsresult rv;
-  nsHTMLStyleSheet* sheet;
-  if (NS_FAILED(rv = NS_NewHTMLStyleSheet(&sheet)))
-    return rv;
-
-  if (NS_FAILED(rv = sheet->Init(aURL, aDocument))) {
-    NS_RELEASE(sheet);
-    return rv;
-  }
-
-  *aInstancePtrResult = sheet;
-  return NS_OK;
-}
-
-
-nsresult
-NS_NewHTMLStyleSheet(nsHTMLStyleSheet** aInstancePtrResult)
-{
-  NS_ASSERTION(aInstancePtrResult, "null out param");
-
-  nsHTMLStyleSheet *it = new nsHTMLStyleSheet();
-  if (!it) {
-    *aInstancePtrResult = nullptr;
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  NS_ADDREF(it);
-  nsresult rv = it->Init();
-  if (NS_FAILED(rv))
-    NS_RELEASE(it);
-
-  *aInstancePtrResult = it; // NS_ADDREF above, or set to null by NS_RELEASE
-  return rv;
-}
-
diff --git a/layout/style/nsHTMLStyleSheet.h b/layout/style/nsHTMLStyleSheet.h
index 804a77e39e5f..0def0f1d74f5 100644
--- a/layout/style/nsHTMLStyleSheet.h
+++ b/layout/style/nsHTMLStyleSheet.h
@@ -28,8 +28,7 @@ class nsHTMLStyleSheet MOZ_FINAL : public nsIStyleSheet,
                                    public nsIStyleRuleProcessor
 {
 public:
-  nsHTMLStyleSheet(void);
-  nsresult Init();
+  nsHTMLStyleSheet(nsIURI* aURL, nsIDocument* aDocument);
 
   NS_DECL_ISUPPORTS
 
@@ -68,7 +67,6 @@ public:
     SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
   size_t DOMSizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
 
-  nsresult Init(nsIURI* aURL, nsIDocument* aDocument);
   void Reset(nsIURI* aURL);
   nsresult SetLinkColor(nscolor aColor);
   nsresult SetActiveLinkColor(nscolor aColor);
@@ -150,12 +148,4 @@ private:
   PLDHashTable            mMappedAttrTable;
 };
 
-// XXX convenience method. Calls Initialize() automatically.
-nsresult
-NS_NewHTMLStyleSheet(nsHTMLStyleSheet** aInstancePtrResult, nsIURI* aURL, 
-                     nsIDocument* aDocument);
-
-nsresult
-NS_NewHTMLStyleSheet(nsHTMLStyleSheet** aInstancePtrResult);
-
 #endif /* !defined(nsHTMLStyleSheet_h_) */
diff --git a/layout/style/nsICSSDeclaration.h b/layout/style/nsICSSDeclaration.h
index 335d07211429..bfb04a3cd6f6 100644
--- a/layout/style/nsICSSDeclaration.h
+++ b/layout/style/nsICSSDeclaration.h
@@ -21,6 +21,7 @@
 
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsCSSProperty.h"
+#include "nsWrapperCache.h"
 
 // 57eb81d1-a607-4429-926b-802519d43aad
 #define NS_ICSSDECLARATION_IID \
@@ -29,7 +30,8 @@
 
 class nsINode;
 
-class nsICSSDeclaration : public nsIDOMCSSStyleDeclaration
+class nsICSSDeclaration : public nsIDOMCSSStyleDeclaration,
+                          public nsWrapperCache
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICSSDECLARATION_IID)
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 1f40f16bf558..3c809337eb1d 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -7671,8 +7671,12 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
   if (ruleTypeMask & NS_AUTHOR_SPECIFIED_PADDING)
     inheritBits |= NS_STYLE_INHERIT_BIT(Padding);
 
+  if (ruleTypeMask & NS_AUTHOR_SPECIFIED_TEXT_SHADOW)
+    inheritBits |= NS_STYLE_INHERIT_BIT(Text);
+
   // properties in the SIDS, whether or not we care about them
-  size_t nprops = 0, backgroundOffset, borderOffset, paddingOffset;
+  size_t nprops = 0,
+         backgroundOffset, borderOffset, paddingOffset, textShadowOffset;
 
   if (ruleTypeMask & NS_AUTHOR_SPECIFIED_BACKGROUND) {
     backgroundOffset = nprops;
@@ -7689,6 +7693,11 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
     nprops += nsCSSProps::PropertyCountInStruct(eStyleStruct_Padding);
   }
 
+  if (ruleTypeMask & NS_AUTHOR_SPECIFIED_TEXT_SHADOW) {
+    textShadowOffset = nprops;
+    nprops += nsCSSProps::PropertyCountInStruct(eStyleStruct_Text);
+  }
+
   void* dataStorage = alloca(nprops * sizeof(nsCSSValue));
   AutoCSSValueArray dataArray(dataStorage, nprops);
 
@@ -7708,6 +7717,10 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
     ruleData.mValueOffsets[eStyleStruct_Padding] = paddingOffset;
   }
 
+  if (ruleTypeMask & NS_AUTHOR_SPECIFIED_TEXT_SHADOW) {
+    ruleData.mValueOffsets[eStyleStruct_Text] = textShadowOffset;
+  }
+
   static const nsCSSProperty backgroundValues[] = {
     eCSSProperty_background_color,
     eCSSProperty_background_image,
@@ -7747,16 +7760,22 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
     eCSSProperty_padding_end_value,
   };
 
+  static const nsCSSProperty textShadowValues[] = {
+    eCSSProperty_text_shadow
+  };
+
   // Number of properties we care about
   size_t nValues = 0;
 
   nsCSSValue* values[NS_ARRAY_LENGTH(backgroundValues) +
                      NS_ARRAY_LENGTH(borderValues) +
-                     NS_ARRAY_LENGTH(paddingValues)];
+                     NS_ARRAY_LENGTH(paddingValues) +
+                     NS_ARRAY_LENGTH(textShadowValues)];
 
   nsCSSProperty properties[NS_ARRAY_LENGTH(backgroundValues) +
                            NS_ARRAY_LENGTH(borderValues) +
-                           NS_ARRAY_LENGTH(paddingValues)];
+                           NS_ARRAY_LENGTH(paddingValues) +
+                           NS_ARRAY_LENGTH(textShadowValues)];
 
   if (ruleTypeMask & NS_AUTHOR_SPECIFIED_BACKGROUND) {
     for (PRUint32 i = 0, i_end = ArrayLength(backgroundValues);
@@ -7782,6 +7801,14 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
     }
   }
 
+  if (ruleTypeMask & NS_AUTHOR_SPECIFIED_TEXT_SHADOW) {
+    for (PRUint32 i = 0, i_end = ArrayLength(textShadowValues);
+         i < i_end; ++i) {
+      properties[nValues] = textShadowValues[i];
+      values[nValues++] = ruleData.ValueFor(textShadowValues[i]);
+    }
+  }
+
   nsStyleContext* styleContext = aStyleContext;
 
   // We need to be careful not to count styles covered up by user-important or
diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp
index afeee9ef4fa7..0256499ab391 100644
--- a/layout/style/nsStyleContext.cpp
+++ b/layout/style/nsStyleContext.cpp
@@ -18,11 +18,14 @@
 #include "nsStyleContext.h"
 #include "prlog.h"
 #include "nsStyleAnimation.h"
+#include "mozilla/Util.h"
 
 #ifdef DEBUG
 // #define NOISY_DEBUG
 #endif
 
+using namespace mozilla;
+
 //----------------------------------------------------------------------
 
 
@@ -699,19 +702,38 @@ NS_NewStyleContext(nsStyleContext* aParentContext,
   return context;
 }
 
-static nscolor ExtractColor(nsCSSProperty aProperty,
-                            nsStyleContext *aStyleContext)
+static inline void
+ExtractAnimationValue(nsCSSProperty aProperty,
+                      nsStyleContext* aStyleContext,
+                      nsStyleAnimation::Value& aResult)
 {
-  nsStyleAnimation::Value val;
-#ifdef DEBUG
-  bool success =
-#endif
-    nsStyleAnimation::ExtractComputedValue(aProperty, aStyleContext, val);
+  DebugOnly<bool> success =
+    nsStyleAnimation::ExtractComputedValue(aProperty, aStyleContext, aResult);
   NS_ABORT_IF_FALSE(success,
                     "aProperty must be extractable by nsStyleAnimation");
+}
+
+static nscolor
+ExtractColor(nsCSSProperty aProperty,
+             nsStyleContext *aStyleContext)
+{
+  nsStyleAnimation::Value val;
+  ExtractAnimationValue(aProperty, aStyleContext, val);
   return val.GetColorValue();
 }
 
+static nscolor
+ExtractColorLenient(nsCSSProperty aProperty,
+                    nsStyleContext *aStyleContext)
+{
+  nsStyleAnimation::Value val;
+  ExtractAnimationValue(aProperty, aStyleContext, val);
+  if (val.GetUnit() == nsStyleAnimation::eUnit_Color) {
+    return val.GetColorValue();
+  }
+  return NS_RGBA(0, 0, 0, 0);
+}
+
 struct ColorIndexSet {
   PRUint8 colorIndex, alphaIndex;
 };
@@ -734,15 +756,20 @@ nsStyleContext::GetVisitedDependentColor(nsCSSProperty aProperty)
                aProperty == eCSSProperty_stroke,
                "we need to add to nsStyleContext::CalcStyleDifference");
 
+  bool isPaintProperty = aProperty == eCSSProperty_fill ||
+                         aProperty == eCSSProperty_stroke;
+
   nscolor colors[2];
-  colors[0] = ExtractColor(aProperty, this);
+  colors[0] = isPaintProperty ? ExtractColorLenient(aProperty, this)
+                              : ExtractColor(aProperty, this);
 
   nsStyleContext *visitedStyle = this->GetStyleIfVisited();
   if (!visitedStyle) {
     return colors[0];
   }
 
-  colors[1] = ExtractColor(aProperty, visitedStyle);
+  colors[1] = isPaintProperty ? ExtractColorLenient(aProperty, visitedStyle)
+                              : ExtractColor(aProperty, visitedStyle);
 
   return nsStyleContext::CombineVisitedColors(colors,
                                               this->RelevantLinkVisited());
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index f43f9a3cb40a..f8ba08840562 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -22,7 +22,6 @@
 #include "nsCSSPseudoElements.h"
 #include "nsCSSRuleProcessor.h"
 #include "nsIContent.h"
-#include "nsIFrame.h"
 #include "nsRuleData.h"
 #include "nsRuleProcessorData.h"
 #include "nsTransitionManager.h"
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 9371f1796ffb..7a2d69a4db19 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/style/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -185,6 +185,7 @@ MOCHITEST_FILES =	test_acid3_test46.html \
 		visited_image_loading_frame_empty.html \
 		test_load_events_on_stylesheets.html \
 		test_bug721136.html \
+		test_bug732153.html \
 		$(NULL)
 
 ifdef MOZ_FLEXBOX
diff --git a/layout/style/test/chrome/Makefile.in b/layout/style/test/chrome/Makefile.in
index 4790269813fb..dfea48515e7b 100644
--- a/layout/style/test/chrome/Makefile.in
+++ b/layout/style/test/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = layout/style/test/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/style/test/test_bug732153.html b/layout/style/test/test_bug732153.html
new file mode 100644
index 000000000000..892029886097
--- /dev/null
+++ b/layout/style/test/test_bug732153.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=732153
+-->
+<title>Test for Bug 732153</title>
+<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=732153">Mozilla Bug 732153</a>
+<div></div>
+<script>
+var div = document.querySelector("div");
+[
+  "",
+  "backface-visibility: hidden",
+  "transform-style: preserve-3d",
+  "backface-visibility: hidden; transform-style: preserve-3d",
+].forEach(function(style) {
+  div.setAttribute("style", style);
+  is(getComputedStyle(div).transform, "none",
+    "Computed 'transform' with style=\"" + style + '"');
+});
+</script>
diff --git a/layout/style/test/test_supports_rules.html b/layout/style/test/test_supports_rules.html
index 9b30e77edb06..a1a27f98fb10 100644
--- a/layout/style/test/test_supports_rules.html
+++ b/layout/style/test/test_supports_rules.html
@@ -13,7 +13,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=649740
     @supports ((color: green)) { }
     @supports (color: green) and (color: blue) { }
     @supports ( Font:  20px serif ! Important)  { }
-    @supports(a:) { }
   </style>
 </head>
 <body>
@@ -38,7 +37,6 @@ is(condition(sheet.cssRules[1].cssText), "(color: green)");
 is(condition(sheet.cssRules[2].cssText), "((color: green))");
 is(condition(sheet.cssRules[3].cssText), "(color: green) and (color: blue)");
 is(condition(sheet.cssRules[4].cssText), "( Font:  20px serif ! Important)");
-is(condition(sheet.cssRules[5].cssText), "(a:)");
 </script>
 </pre>
 </body>
diff --git a/layout/style/xbl-marquee/Makefile.in b/layout/style/xbl-marquee/Makefile.in
index 748b66924aff..9e790c35c25e 100644
--- a/layout/style/xbl-marquee/Makefile.in
+++ b/layout/style/xbl-marquee/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/layout/svg/base/src/Makefile.in b/layout/svg/base/src/Makefile.in
index 8c96db1cf5ec..cdb165b13979 100644
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/svg/base/src/nsSVGEffects.cpp b/layout/svg/base/src/nsSVGEffects.cpp
index 201fb03bf8a8..8805bdc1a3f9 100644
--- a/layout/svg/base/src/nsSVGEffects.cpp
+++ b/layout/svg/base/src/nsSVGEffects.cpp
@@ -10,6 +10,7 @@
 #include "nsCSSFrameConstructor.h"
 #include "nsISupportsImpl.h"
 #include "nsSVGClipPathFrame.h"
+#include "nsSVGPaintServerFrame.h"
 #include "nsSVGFilterFrame.h"
 #include "nsSVGMaskFrame.h"
 #include "nsSVGTextPathFrame.h"
@@ -424,6 +425,32 @@ nsSVGEffects::GetEffectProperties(nsIFrame *aFrame)
   return result;
 }
 
+nsSVGPaintServerFrame *
+nsSVGEffects::GetPaintServer(nsIFrame *aTargetFrame, const nsStyleSVGPaint *aPaint,
+                             const FramePropertyDescriptor *aType)
+{
+  if (aPaint->mType != eStyleSVGPaintType_Server)
+    return nullptr;
+
+  nsIFrame *frame = aTargetFrame->GetContent()->IsNodeOfType(nsINode::eTEXT) ?
+                      aTargetFrame->GetParent() : aTargetFrame;
+  nsSVGPaintingProperty *property =
+    nsSVGEffects::GetPaintingProperty(aPaint->mPaint.mPaintServer, frame, aType);
+  if (!property)
+    return nullptr;
+  nsIFrame *result = property->GetReferencedFrame();
+  if (!result)
+    return nullptr;
+
+  nsIAtom *type = result->GetType();
+  if (type != nsGkAtoms::svgLinearGradientFrame &&
+      type != nsGkAtoms::svgRadialGradientFrame &&
+      type != nsGkAtoms::svgPatternFrame)
+    return nullptr;
+
+  return static_cast<nsSVGPaintServerFrame*>(result);
+}
+ 
 nsSVGClipPathFrame *
 nsSVGEffects::EffectProperties::GetClipPathFrame(bool *aOK)
 {
diff --git a/layout/svg/base/src/nsSVGEffects.h b/layout/svg/base/src/nsSVGEffects.h
index 15664c9a5c3c..428a03112913 100644
--- a/layout/svg/base/src/nsSVGEffects.h
+++ b/layout/svg/base/src/nsSVGEffects.h
@@ -26,6 +26,7 @@ class nsIAtom;
 class nsIPresShell;
 class nsIURI;
 class nsSVGClipPathFrame;
+class nsSVGPaintServerFrame;
 class nsSVGFilterFrame;
 class nsSVGMaskFrame;
 
@@ -279,6 +280,13 @@ public:
   NS_DECLARE_FRAME_PROPERTY(HrefProperty, DestroySupports)
   NS_DECLARE_FRAME_PROPERTY(BackgroundImageProperty, DestroyHashtable)
 
+  /**
+   * Get the paint server for a aTargetFrame.
+   */
+  static nsSVGPaintServerFrame *GetPaintServer(nsIFrame *aTargetFrame,
+                                               const nsStyleSVGPaint *aPaint,
+                                               const FramePropertyDescriptor *aProperty);
+
   struct EffectProperties {
     nsSVGFilterProperty*   mFilter;
     nsSVGPaintingProperty* mMask;
diff --git a/layout/svg/base/src/nsSVGFilterInstance.cpp b/layout/svg/base/src/nsSVGFilterInstance.cpp
index f527aa5e614f..2fe0deeff7e8 100644
--- a/layout/svg/base/src/nsSVGFilterInstance.cpp
+++ b/layout/svg/base/src/nsSVGFilterInstance.cpp
@@ -10,6 +10,7 @@
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
 #include "nsIDOMSVGUnitTypes.h"
+#include "nsISVGChildFrame.h"
 #include "nsRenderingContext.h"
 #include "nsSVGFilterElement.h"
 #include "nsSVGFilterPaintCallback.h"
@@ -149,6 +150,8 @@ nsSVGFilterInstance::BuildSources()
   gfxRect filterRegion = gfxRect(0, 0, mFilterSpaceSize.width, mFilterSpaceSize.height);
   mSourceColorAlpha.mImage.mFilterPrimitiveSubregion = filterRegion;
   mSourceAlpha.mImage.mFilterPrimitiveSubregion = filterRegion;
+  mFillPaint.mImage.mFilterPrimitiveSubregion = filterRegion;
+  mStrokePaint.mImage.mFilterPrimitiveSubregion = filterRegion;
 
   nsIntRect sourceBoundsInt;
   gfxRect sourceBounds = UserSpaceToFilterSpace(mTargetBBox);
@@ -160,6 +163,8 @@ nsSVGFilterInstance::BuildSources()
 
   mSourceColorAlpha.mResultBoundingBox = sourceBoundsInt;
   mSourceAlpha.mResultBoundingBox = sourceBoundsInt;
+  mFillPaint.mResultBoundingBox = sourceBoundsInt;
+  mStrokePaint.mResultBoundingBox = sourceBoundsInt;
   return NS_OK;
 }
 
@@ -199,10 +204,12 @@ nsSVGFilterInstance::BuildPrimitives()
         sourceInfo = &mSourceColorAlpha;
       } else if (str.EqualsLiteral("SourceAlpha")) {
         sourceInfo = &mSourceAlpha;
+      } else if (str.EqualsLiteral("FillPaint")) {
+        sourceInfo = &mFillPaint;
+      } else if (str.EqualsLiteral("StrokePaint")) {
+        sourceInfo = &mStrokePaint;
       } else if (str.EqualsLiteral("BackgroundImage") ||
-                 str.EqualsLiteral("BackgroundAlpha") ||
-                 str.EqualsLiteral("FillPaint") ||
-                 str.EqualsLiteral("StrokePaint")) {
+                 str.EqualsLiteral("BackgroundAlpha")) {
         return NS_ERROR_NOT_IMPLEMENTED;
       } else if (str.EqualsLiteral("")) {
         sourceInfo = i == 0 ? &mSourceColorAlpha : &mPrimitives[i - 1];
@@ -305,12 +312,86 @@ nsSVGFilterInstance::ComputeUnionOfAllNeededBoxes()
   nsIntRect r;
   r.UnionRect(mSourceColorAlpha.mResultNeededBox,
               mSourceAlpha.mResultNeededBox);
+  r.UnionRect(r, mFillPaint.mResultNeededBox);
+  r.UnionRect(r, mStrokePaint.mResultNeededBox);
   for (PRUint32 i = 0; i < mPrimitives.Length(); ++i) {
     r.UnionRect(r, mPrimitives[i].mResultNeededBox);
   }
   return r;
 }
 
+nsresult
+nsSVGFilterInstance::BuildSourcePaint(PrimitiveInfo *aPrimitive)
+{
+  NS_ASSERTION(aPrimitive->mImageUsers > 0, "Some user must have needed this");
+
+  nsRefPtr<gfxImageSurface> image = CreateImage();
+  if (!image)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  nsRefPtr<gfxASurface> offscreen =
+    gfxPlatform::GetPlatform()->CreateOffscreenSurface(
+            gfxIntSize(mSurfaceRect.width, mSurfaceRect.height),
+            gfxASurface::CONTENT_COLOR_ALPHA);
+  if (!offscreen || offscreen->CairoStatus())
+    return NS_ERROR_OUT_OF_MEMORY;
+  offscreen->SetDeviceOffset(gfxPoint(-mSurfaceRect.x, -mSurfaceRect.y));
+
+  nsRenderingContext tmpCtx;
+  tmpCtx.Init(mTargetFrame->PresContext()->DeviceContext(), offscreen);
+
+  gfxRect r = aPrimitive->mImage.mFilterPrimitiveSubregion;
+  gfxMatrix m = GetUserSpaceToFilterSpaceTransform();
+  m.Invert();
+  r = m.TransformBounds(r);
+
+  gfxMatrix deviceToFilterSpace = GetFilterSpaceToDeviceSpaceTransform().Invert();
+  gfxContext *gfx = tmpCtx.ThebesContext();
+  gfx->Multiply(deviceToFilterSpace);
+
+  gfx->Save();
+
+  gfxMatrix matrix =
+    nsSVGUtils::GetCanvasTM(mTargetFrame, nsISVGChildFrame::FOR_PAINTING);
+  if (!matrix.IsSingular()) {
+    gfx->Multiply(matrix);
+    gfx->Rectangle(r);
+    if ((aPrimitive == &mFillPaint && 
+         nsSVGUtils::SetupCairoFill(gfx, mTargetFrame)) ||
+        (aPrimitive == &mStrokePaint &&
+         nsSVGUtils::SetupCairoStroke(gfx, mTargetFrame))) {
+      gfx->Fill();
+    }
+  }
+  gfx->Restore();
+
+  gfxContext copyContext(image);
+  copyContext.SetSource(offscreen);
+  copyContext.Paint();
+
+  aPrimitive->mImage.mImage = image;
+  // color model is PREMULTIPLIED SRGB by default.
+
+  return NS_OK;
+}
+
+nsresult
+nsSVGFilterInstance::BuildSourcePaints()
+{
+  nsresult rv = NS_OK;
+
+  if (!mFillPaint.mResultNeededBox.IsEmpty()) {
+    rv = BuildSourcePaint(&mFillPaint);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  if (!mStrokePaint.mResultNeededBox.IsEmpty()) {
+    rv = BuildSourcePaint(&mStrokePaint);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  return  rv;
+}
+
 nsresult
 nsSVGFilterInstance::BuildSourceImages()
 {
@@ -338,10 +419,9 @@ nsSVGFilterInstance::BuildSourceImages()
 
     nsRenderingContext tmpCtx;
     tmpCtx.Init(mTargetFrame->PresContext()->DeviceContext(), offscreen);
-    gfxMatrix userSpaceToFilterSpace = GetUserSpaceToFilterSpaceTransform();
 
     gfxRect r(neededRect.x, neededRect.y, neededRect.width, neededRect.height);
-    gfxMatrix m = userSpaceToFilterSpace;
+    gfxMatrix m = GetUserSpaceToFilterSpaceTransform();
     m.Invert();
     r = m.TransformBounds(r);
     r.RoundOut();
@@ -452,6 +532,9 @@ nsSVGFilterInstance::Render(gfxASurface** aOutput)
   mSurfaceRect = ComputeUnionOfAllNeededBoxes();
 
   rv = BuildSourceImages();
+  if (NS_FAILED(rv))
+    return rv;
+  rv = BuildSourcePaints();
   if (NS_FAILED(rv))
     return rv;
 
diff --git a/layout/svg/base/src/nsSVGFilterInstance.h b/layout/svg/base/src/nsSVGFilterInstance.h
index c22a6da9d6d0..025e30e69b3f 100644
--- a/layout/svg/base/src/nsSVGFilterInstance.h
+++ b/layout/svg/base/src/nsSVGFilterInstance.h
@@ -278,12 +278,25 @@ private:
   };
 
   /**
-   * Initializes the SourceGraphic and SourceAlpha graph nodes (i.e. sets
+   * Initializes the keyword nodes e.g. SourceGraphic (i.e. sets
    * .mImage.mFilterPrimitiveSubregion and .mResultBoundingBox on
    * mSourceColorAlpha and mSourceAlpha).
    */
   nsresult BuildSources();
 
+  /**
+   * Creates a gfxImageSurface for either the FillPaint or StrokePaint graph
+   * nodes
+   */
+  nsresult BuildSourcePaint(PrimitiveInfo *aPrimitive);
+
+  /**
+   * Creates a gfxImageSurface for either the FillPaint and StrokePaint graph
+   * nodes, fills its contents and assigns it to mFillPaint.mImage.mImage and
+   * mStrokePaint.mImage.mImage respectively.
+   */
+  nsresult BuildSourcePaints();
+
   /**
    * Creates the gfxImageSurfaces for the SourceGraphic and SourceAlpha graph
    * nodes, paints their contents, and assigns them to
@@ -414,6 +427,8 @@ private:
 
   PrimitiveInfo           mSourceColorAlpha;
   PrimitiveInfo           mSourceAlpha;
+  PrimitiveInfo           mFillPaint;
+  PrimitiveInfo           mStrokePaint;
   nsTArray<PrimitiveInfo> mPrimitives;
 };
 
diff --git a/layout/svg/base/src/nsSVGGeometryFrame.cpp b/layout/svg/base/src/nsSVGGeometryFrame.cpp
index 56914aaa51ba..565d4fdf11c0 100644
--- a/layout/svg/base/src/nsSVGGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGGeometryFrame.cpp
@@ -32,32 +32,6 @@ nsSVGGeometryFrame::Init(nsIContent* aContent,
 
 //----------------------------------------------------------------------
 
-nsSVGPaintServerFrame *
-nsSVGGeometryFrame::GetPaintServer(const nsStyleSVGPaint *aPaint,
-                                   const FramePropertyDescriptor *aType)
-{
-  if (aPaint->mType != eStyleSVGPaintType_Server)
-    return nullptr;
-
-  nsIFrame *frame = mContent->IsNodeOfType(nsINode::eTEXT) ?
-                      GetParent() : this;
-  nsSVGPaintingProperty *property =
-    nsSVGEffects::GetPaintingProperty(aPaint->mPaint.mPaintServer, frame, aType);
-  if (!property)
-    return nullptr;
-  nsIFrame *result = property->GetReferencedFrame();
-  if (!result)
-    return nullptr;
-
-  nsIAtom *type = result->GetType();
-  if (type != nsGkAtoms::svgLinearGradientFrame &&
-      type != nsGkAtoms::svgRadialGradientFrame &&
-      type != nsGkAtoms::svgPatternFrame)
-    return nullptr;
-
-  return static_cast<nsSVGPaintServerFrame*>(result);
-}
-
 float
 nsSVGGeometryFrame::GetStrokeWidth()
 {
@@ -122,27 +96,6 @@ nsSVGGeometryFrame::GetClipRule()
   return GetStyleSVG()->mClipRule;
 }
 
-static void
-SetupCairoColor(gfxContext *aContext, nscolor aRGB, float aOpacity)
-{
-  aContext->SetColor(gfxRGBA(NS_GET_R(aRGB)/255.0,
-                             NS_GET_G(aRGB)/255.0,
-                             NS_GET_B(aRGB)/255.0,
-                             NS_GET_A(aRGB)/255.0 * aOpacity));
-}
-
-static void
-SetupFallbackOrPaintColor(gfxContext *aContext, nsStyleContext *aStyleContext,
-                          nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
-                          float aOpacity)
-{
-  nscolor color;
-  nsSVGUtils::GetFallbackOrPaintColor(aContext, aStyleContext, aFillOrStroke,
-                                      &aOpacity, &color);
-
-  SetupCairoColor(aContext, color, aOpacity);
-}
-
 float
 nsSVGGeometryFrame::MaybeOptimizeOpacity(float aFillOrStrokeOpacity)
 {
@@ -153,34 +106,6 @@ nsSVGGeometryFrame::MaybeOptimizeOpacity(float aFillOrStrokeOpacity)
   return aFillOrStrokeOpacity;
 }
 
-bool
-nsSVGGeometryFrame::SetupCairoFill(gfxContext *aContext)
-{
-  const nsStyleSVG* style = GetStyleSVG();
-  if (style->mFill.mType == eStyleSVGPaintType_None)
-    return false;
-
-  if (style->mFillRule == NS_STYLE_FILL_RULE_EVENODD)
-    aContext->SetFillRule(gfxContext::FILL_RULE_EVEN_ODD);
-  else
-    aContext->SetFillRule(gfxContext::FILL_RULE_WINDING);
-
-  float opacity = MaybeOptimizeOpacity(style->mFillOpacity);
-
-  nsSVGPaintServerFrame *ps =
-    GetPaintServer(&style->mFill, nsSVGEffects::FillProperty());
-  if (ps && ps->SetupPaintServer(aContext, this, &nsStyleSVG::mFill, opacity))
-    return true;
-
-  // On failure, use the fallback colour in case we have an
-  // objectBoundingBox where the width or height of the object is zero.
-  // See http://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBox
-  SetupFallbackOrPaintColor(aContext, GetStyleContext(),
-                            &nsStyleSVG::mFill, opacity);
-
-  return true;
-}
-
 bool
 nsSVGGeometryFrame::HasStroke()
 {
@@ -242,6 +167,12 @@ nsSVGGeometryFrame::SetupCairoStrokeHitGeometry(gfxContext *aContext)
   }
 }
 
+bool
+nsSVGGeometryFrame::SetupCairoFill(gfxContext *aContext)
+{
+  return nsSVGUtils::SetupCairoFill(aContext, this);
+}
+
 bool
 nsSVGGeometryFrame::SetupCairoStroke(gfxContext *aContext)
 {
@@ -250,21 +181,7 @@ nsSVGGeometryFrame::SetupCairoStroke(gfxContext *aContext)
   }
   SetupCairoStrokeHitGeometry(aContext);
 
-  const nsStyleSVG* style = GetStyleSVG();
-  float opacity = MaybeOptimizeOpacity(style->mStrokeOpacity);
-
-  nsSVGPaintServerFrame *ps =
-    GetPaintServer(&style->mStroke, nsSVGEffects::StrokeProperty());
-  if (ps && ps->SetupPaintServer(aContext, this, &nsStyleSVG::mStroke, opacity))
-    return true;
-
-  // On failure, use the fallback colour in case we have an
-  // objectBoundingBox where the width or height of the object is zero.
-  // See http://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBox
-  SetupFallbackOrPaintColor(aContext, GetStyleContext(),
-                            &nsStyleSVG::mStroke, opacity);
-
-  return true;
+  return nsSVGUtils::SetupCairoStroke(aContext, this);
 }
 
 PRUint16
diff --git a/layout/svg/base/src/nsSVGGeometryFrame.h b/layout/svg/base/src/nsSVGGeometryFrame.h
index 6eca89275f43..4f0fada5e280 100644
--- a/layout/svg/base/src/nsSVGGeometryFrame.h
+++ b/layout/svg/base/src/nsSVGGeometryFrame.h
@@ -85,9 +85,6 @@ public:
   bool SetupCairoStroke(gfxContext *aContext);
 
 protected:
-  nsSVGPaintServerFrame *GetPaintServer(const nsStyleSVGPaint *aPaint,
-                                        const FramePropertyDescriptor *aProperty);
-
   /**
    * This function returns a set of bit flags indicating which parts of the
    * element (fill, stroke, bounds) should intercept pointer events. It takes
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index 85f0012fe97b..5cb48adf4706 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -957,8 +957,9 @@ nsSVGGlyphFrame::SetupCairoState(gfxContext *aContext, gfxPattern **aStrokePatte
 
     SetupCairoStrokeHitGeometry(aContext);
     float opacity = style->mStrokeOpacity;
-    nsSVGPaintServerFrame *ps = GetPaintServer(&style->mStroke,
-                                               nsSVGEffects::StrokeProperty());
+    nsSVGPaintServerFrame *ps =
+      nsSVGEffects::GetPaintServer(this, &style->mStroke,
+                                   nsSVGEffects::StrokeProperty());
 
     nsRefPtr<gfxPattern> strokePattern;
 
@@ -970,10 +971,8 @@ nsSVGGlyphFrame::SetupCairoState(gfxContext *aContext, gfxPattern **aStrokePatte
     }
 
     if (!strokePattern) {
-      nscolor color;
-      nsSVGUtils::GetFallbackOrPaintColor(aContext, GetStyleContext(),
-                                          &nsStyleSVG::mStroke, &opacity,
-                                          &color);
+      nscolor color = nsSVGUtils::GetFallbackOrPaintColor(
+                        aContext, GetStyleContext(), &nsStyleSVG::mStroke);
       strokePattern = new gfxPattern(gfxRGBA(NS_GET_R(color) / 255.0,
                                              NS_GET_G(color) / 255.0,
                                              NS_GET_B(color) / 255.0,
diff --git a/layout/svg/base/src/nsSVGPaintServerFrame.cpp b/layout/svg/base/src/nsSVGPaintServerFrame.cpp
index 5fe2721d7a62..cfffcbf66f16 100644
--- a/layout/svg/base/src/nsSVGPaintServerFrame.cpp
+++ b/layout/svg/base/src/nsSVGPaintServerFrame.cpp
@@ -14,7 +14,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsSVGPaintServerFrame)
 
 bool
 nsSVGPaintServerFrame::SetupPaintServer(gfxContext *aContext,
-                                        nsSVGGeometryFrame *aSource,
+                                        nsIFrame *aSource,
                                         nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
                                         float aOpacity)
 {
diff --git a/layout/svg/base/src/nsSVGPaintServerFrame.h b/layout/svg/base/src/nsSVGPaintServerFrame.h
index 3bd6f749c167..d0056b916e15 100644
--- a/layout/svg/base/src/nsSVGPaintServerFrame.h
+++ b/layout/svg/base/src/nsSVGPaintServerFrame.h
@@ -54,7 +54,7 @@ public:
    * @return false to skip rendering
    */
   virtual bool SetupPaintServer(gfxContext *aContext,
-                                nsSVGGeometryFrame *aSource,
+                                nsIFrame *aSource,
                                 nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
                                 float aOpacity);
 
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index b074ce639605..81605c72d89a 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -50,6 +50,7 @@
 #include "nsSVGOuterSVGFrame.h"
 #include "nsSVGPathGeometryElement.h"
 #include "nsSVGPathGeometryFrame.h"
+#include "nsSVGPaintServerFrame.h"
 #include "nsSVGSVGElement.h"
 #include "nsSVGTextContainerFrame.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
@@ -1801,15 +1802,14 @@ nsSVGUtils::PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
 
 // ----------------------------------------------------------------------
 
-/* static */ void
+/* static */ nscolor
 nsSVGUtils::GetFallbackOrPaintColor(gfxContext *aContext, nsStyleContext *aStyleContext,
-                                    nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
-                                    float *aOpacity, nscolor *color)
+                                    nsStyleSVGPaint nsStyleSVG::*aFillOrStroke)
 {
   const nsStyleSVGPaint &paint = aStyleContext->GetStyleSVG()->*aFillOrStroke;
   nsStyleContext *styleIfVisited = aStyleContext->GetStyleIfVisited();
   bool isServer = paint.mType == eStyleSVGPaintType_Server;
-  *color = isServer ? paint.mFallbackColor : paint.mPaint.mColor;
+  nscolor color = isServer ? paint.mFallbackColor : paint.mPaint.mColor;
   if (styleIfVisited) {
     const nsStyleSVGPaint &paintIfVisited =
       styleIfVisited->GetStyleSVG()->*aFillOrStroke;
@@ -1822,10 +1822,78 @@ nsSVGUtils::GetFallbackOrPaintColor(gfxContext *aContext, nsStyleContext *aStyle
     // another simple color.
     if (paintIfVisited.mType == eStyleSVGPaintType_Color &&
         paint.mType == eStyleSVGPaintType_Color) {
-      nscolor colorIfVisited = paintIfVisited.mPaint.mColor;
-      nscolor colors[2] = { *color, colorIfVisited };
-      *color = nsStyleContext::CombineVisitedColors(colors,
-                                         aStyleContext->RelevantLinkVisited());
+      nscolor colors[2] = { color, paintIfVisited.mPaint.mColor };
+      return nsStyleContext::CombineVisitedColors(
+               colors, aStyleContext->RelevantLinkVisited());
     }
   }
+  return color;
+}
+
+static void
+SetupFallbackOrPaintColor(gfxContext *aContext, nsStyleContext *aStyleContext,
+                          nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
+                          float aOpacity)
+{
+  nscolor color = nsSVGUtils::GetFallbackOrPaintColor(
+    aContext, aStyleContext, aFillOrStroke);
+
+  aContext->SetColor(gfxRGBA(NS_GET_R(color)/255.0,
+                             NS_GET_G(color)/255.0,
+                             NS_GET_B(color)/255.0,
+                             NS_GET_A(color)/255.0 * aOpacity));
+}
+
+static float
+MaybeOptimizeOpacity(nsIFrame *aFrame, float aFillOrStrokeOpacity)
+{
+  float opacity = aFrame->GetStyleDisplay()->mOpacity;
+  if (opacity < 1 && nsSVGUtils::CanOptimizeOpacity(aFrame)) {
+    return aFillOrStrokeOpacity * opacity;
+  }
+  return aFillOrStrokeOpacity;
+}
+
+bool
+nsSVGUtils::SetupCairoFill(gfxContext *aContext, nsIFrame *aFrame)
+{
+  const nsStyleSVG* style = aFrame->GetStyleSVG();
+  if (style->mFill.mType == eStyleSVGPaintType_None)
+    return false;
+  float opacity = MaybeOptimizeOpacity(aFrame, style->mFillOpacity);
+  nsSVGPaintServerFrame *ps =
+    nsSVGEffects::GetPaintServer(aFrame, &style->mFill, nsSVGEffects::FillProperty());
+  if (ps && ps->SetupPaintServer(aContext, aFrame, &nsStyleSVG::mFill, opacity))
+    return true;
+
+  // On failure, use the fallback colour in case we have an
+  // objectBoundingBox where the width or height of the object is zero.
+  // See http://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBox
+  SetupFallbackOrPaintColor(aContext, aFrame->GetStyleContext(),
+                            &nsStyleSVG::mFill, opacity);
+
+  return true;
+}
+
+bool
+nsSVGUtils::SetupCairoStroke(gfxContext *aContext, nsIFrame *aFrame)
+{
+  const nsStyleSVG* style = aFrame->GetStyleSVG();
+  if (style->mStroke.mType == eStyleSVGPaintType_None)
+    return false;
+
+  float opacity = MaybeOptimizeOpacity(aFrame, style->mStrokeOpacity);
+
+  nsSVGPaintServerFrame *ps =
+    nsSVGEffects::GetPaintServer(aFrame, &style->mStroke, nsSVGEffects::StrokeProperty());
+  if (ps && ps->SetupPaintServer(aContext, aFrame, &nsStyleSVG::mStroke, opacity))
+    return true;
+
+  // On failure, use the fallback colour in case we have an
+  // objectBoundingBox where the width or height of the object is zero.
+  // See http://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBox
+  SetupFallbackOrPaintColor(aContext, aFrame->GetStyleContext(),
+                            &nsStyleSVG::mStroke, opacity);
+
+  return true;
 }
diff --git a/layout/svg/base/src/nsSVGUtils.h b/layout/svg/base/src/nsSVGUtils.h
index 6174d460de1e..c94aaa949d10 100644
--- a/layout/svg/base/src/nsSVGUtils.h
+++ b/layout/svg/base/src/nsSVGUtils.h
@@ -668,10 +668,18 @@ public:
                             NS_MIN(double(PR_INT32_MAX), aVal)));
   }
 
-  static void GetFallbackOrPaintColor(gfxContext *aContext,
-                                      nsStyleContext *aStyleContext,
-                                      nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
-                                      float *aOpacity, nscolor *color);
+  static nscolor GetFallbackOrPaintColor(gfxContext *aContext,
+                                         nsStyleContext *aStyleContext,
+                                         nsStyleSVGPaint nsStyleSVG::*aFillOrStroke);
+
+  /**
+   * Set the graphics context ready for filling.
+   */
+  static bool SetupCairoFill(gfxContext *aContext, nsIFrame *aFrame);
+  /**
+   * Set the graphics context ready for stroking.
+   */
+  static bool SetupCairoStroke(gfxContext *aContext, nsIFrame *aFrame);
 };
 
 #endif
diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp
index 6043194eff23..044005bf9339 100644
--- a/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/layout/tables/BasicTableLayoutStrategy.cpp
@@ -80,6 +80,10 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
              nsIFrame *aFrame, bool aIsCell)
 {
     nscoord minCoord, prefCoord;
+    const nsStylePosition *stylePos = aFrame->GetStylePosition();
+    bool isQuirks = aFrame->PresContext()->CompatibilityMode() ==
+                    eCompatibility_NavQuirks;
+    nscoord boxSizingToBorderEdge = 0;
     if (aIsCell) {
         // If aFrame is a container for font size inflation, then shrink
         // wrapping inside of it should not apply font size inflation.
@@ -87,6 +91,43 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
 
         minCoord = aFrame->GetMinWidth(aRenderingContext);
         prefCoord = aFrame->GetPrefWidth(aRenderingContext);
+        // Until almost the end of this function, minCoord and prefCoord
+        // represent the box-sizing based width values (which mean they
+        // should include horizontal padding and border width when
+        // box-sizing is set to border-box).
+        // Note that this function returns border-box width, we add the
+        // outer edges near the end of this function.
+
+        // XXX Should we ignore percentage padding?
+        nsIFrame::IntrinsicWidthOffsetData offsets = aFrame->IntrinsicWidthOffsets(aRenderingContext);
+
+        // In quirks mode, table cell width should be content-box,
+        // but height should be border box.
+        // Because of this historic anomaly, we do not use quirk.css.
+        // (We can't specify one value of box-sizing for width and another
+        // for height).
+        // For this reason, we also do not use box-sizing for just one of
+        // them, as this may be confusing.
+        if (isQuirks) {
+            boxSizingToBorderEdge = offsets.hPadding + offsets.hBorder;
+        }
+        else {
+            switch (stylePos->mBoxSizing) {
+                case NS_STYLE_BOX_SIZING_CONTENT:
+                    boxSizingToBorderEdge = offsets.hPadding + offsets.hBorder;
+                    break;
+                case NS_STYLE_BOX_SIZING_PADDING:
+                    minCoord += offsets.hPadding;
+                    prefCoord += offsets.hPadding;
+                    boxSizingToBorderEdge = offsets.hBorder;
+                    break;
+                default:
+                    // NS_STYLE_BOX_SIZING_BORDER
+                    minCoord += offsets.hPadding + offsets.hBorder;
+                    prefCoord += offsets.hPadding + offsets.hBorder;
+                    break;
+            }
+        }
     } else {
         minCoord = 0;
         prefCoord = 0;
@@ -94,7 +135,6 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
     float prefPercent = 0.0f;
     bool hasSpecifiedWidth = false;
 
-    const nsStylePosition *stylePos = aFrame->GetStylePosition();
     const nsStyleCoord &width = stylePos->mWidth;
     nsStyleUnit unit = width.GetUnit();
     // NOTE: We're ignoring calc() units here, for lack of a sensible
@@ -102,6 +142,10 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
     // handled like 'auto' for table cells and columns.
     if (unit == eStyleUnit_Coord) {
         hasSpecifiedWidth = true;
+        // Note: since ComputeWidthValue was designed to return content-box
+        // width, it will (in some cases) subtract the box-sizing edges.
+        // We prevent this unwanted behavior by calling it with
+        // aContentEdgeToBoxSizing and aBoxSizingToMarginEdge set to 0.
         nscoord w = nsLayoutUtils::ComputeWidthValue(aRenderingContext,
                                                      aFrame, 0, 0, 0, width);
         // Quirk: A cell with "nowrap" set and a coord value for the
@@ -109,9 +153,7 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
         // that coord value as the minimum width.
         // This is kept up-to-date with dynamic changes to nowrap by code in
         // nsTableCellFrame::AttributeChanged
-        if (aIsCell && w > minCoord &&
-            aFrame->PresContext()->CompatibilityMode() ==
-              eCompatibility_NavQuirks &&
+        if (aIsCell && w > minCoord && isQuirks &&
             aFrame->GetContent()->HasAttr(kNameSpaceID_None,
                                           nsGkAtoms::nowrap)) {
             minCoord = w;
@@ -193,37 +235,8 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
 
     // XXX Should col frame have border/padding considered?
     if (aIsCell) {
-        nsIFrame::IntrinsicWidthOffsetData offsets =
-            aFrame->IntrinsicWidthOffsets(aRenderingContext);
-        // XXX Should we ignore percentage padding?
-
-        // In quirks mode, table cell width should be content-box,
-        // but height should be border box.
-        // Because of this historic anomaly, we do not use quirk.css.
-        // (We can't specify one value of box-sizing for width and another
-        // for height).
-        // For this reason, we also do not use box-sizing for just one of
-        // them, as this may be confusing.
-        nscoord add = 0;
-        if (aFrame->PresContext()->CompatibilityMode() == eCompatibility_NavQuirks) {
-          add = offsets.hPadding + offsets.hBorder;
-        }
-        else
-        {
-          switch (stylePos->mBoxSizing) {
-            case NS_STYLE_BOX_SIZING_CONTENT:
-              add = offsets.hPadding + offsets.hBorder;
-              break;
-            case NS_STYLE_BOX_SIZING_PADDING:
-              add = offsets.hBorder;
-              break;
-            default:
-              // NS_STYLE_BOX_SIZING_BORDER
-              break;
-          }
-        }
-        minCoord += add;
-        prefCoord = NSCoordSaturatingAdd(prefCoord, add);
+        minCoord += boxSizingToBorderEdge;
+        prefCoord = NSCoordSaturatingAdd(prefCoord, boxSizingToBorderEdge);
     }
 
     return CellWidthInfo(minCoord, prefCoord, prefPercent, hasSpecifiedWidth);
diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in
index f5cdacf1518c..67c80bf38e54 100644
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/tables/nsTablePainter.h b/layout/tables/nsTablePainter.h
index ea6ef88d9322..e90d0b02752c 100644
--- a/layout/tables/nsTablePainter.h
+++ b/layout/tables/nsTablePainter.h
@@ -14,7 +14,7 @@
 //Cells should paint their backgrounds only, no children
 #define NS_PAINT_FLAG_TABLE_CELL_BG_PASS  0x00000002
 
-#include "nsIFrame.h"
+class nsIFrame;
 class nsTableFrame;
 class nsTableRowGroupFrame;
 class nsTableRowFrame;
diff --git a/layout/tables/test/Makefile.in b/layout/tables/test/Makefile.in
index 62df32d36481..f1c75c942ed3 100644
--- a/layout/tables/test/Makefile.in
+++ b/layout/tables/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/tables/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/tools/layout-debug/Makefile.in b/layout/tools/layout-debug/Makefile.in
index a2c379c15fbc..60d1fa338171 100644
--- a/layout/tools/layout-debug/Makefile.in
+++ b/layout/tools/layout-debug/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in
index 9dd4fc9e0afc..6f28c2f9a50a 100644
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/tools/layout-debug/tests/Makefile.in b/layout/tools/layout-debug/tests/Makefile.in
index b8e1e24d04ad..2a048800eff9 100644
--- a/layout/tools/layout-debug/tests/Makefile.in
+++ b/layout/tools/layout-debug/tests/Makefile.in
@@ -4,11 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/tools/layout-debug/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/tools/layout-debug/ui/Makefile.in b/layout/tools/layout-debug/ui/Makefile.in
index 3b98c61c2039..654736c57b5a 100644
--- a/layout/tools/layout-debug/ui/Makefile.in
+++ b/layout/tools/layout-debug/ui/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in
index df30510d51ca..5ebbe5a4ac61 100644
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/xul/base/public/Makefile.in b/layout/xul/base/public/Makefile.in
index 097f743760ec..9f034e906a24 100644
--- a/layout/xul/base/public/Makefile.in
+++ b/layout/xul/base/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in
index cb36f808ba6e..fd41bf4b807a 100644
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/xul/base/src/grid/Makefile.in b/layout/xul/base/src/grid/Makefile.in
index 28c78e82edd1..ab9b01e7a5c5 100644
--- a/layout/xul/base/src/grid/Makefile.in
+++ b/layout/xul/base/src/grid/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/xul/base/src/grid/nsGrid.cpp b/layout/xul/base/src/grid/nsGrid.cpp
index 795a34f8df67..8cbd09046dea 100644
--- a/layout/xul/base/src/grid/nsGrid.cpp
+++ b/layout/xul/base/src/grid/nsGrid.cpp
@@ -18,6 +18,7 @@
 #include "nsGridLayout2.h"
 #include "nsGridRow.h"
 #include "nsGridCell.h"
+#include "nsHTMLReflowState.h"
 
 /*
 The grid control expands the idea of boxes from 1 dimension to 2 dimensions. 
@@ -245,20 +246,20 @@ nsGrid::FreeMap()
  * finds the first <rows> and <columns> tags in the <grid> tag
  */
 void
-nsGrid::FindRowsAndColumns(nsIBox** aRows, nsIBox** aColumns)
+nsGrid::FindRowsAndColumns(nsIFrame** aRows, nsIFrame** aColumns)
 {
   *aRows = nullptr;
   *aColumns = nullptr;
 
   // find the boxes that contain our rows and columns
-  nsIBox* child = nullptr;
+  nsIFrame* child = nullptr;
   // if we have <grid></grid> then mBox will be null (bug 125689)
   if (mBox)
     child = mBox->GetChildBox();
 
   while(child)
   {
-    nsIBox* oldBox = child;
+    nsIFrame* oldBox = child;
     nsIScrollableFrame *scrollFrame = do_QueryFrame(child);
     if (scrollFrame) {
        nsIFrame* scrolledFrame = scrollFrame->GetScrolledFrame();
@@ -296,7 +297,7 @@ nsGrid::FindRowsAndColumns(nsIBox** aRows, nsIBox** aColumns)
  * of cells in each row.
  */
 void
-nsGrid::CountRowsColumns(nsIBox* aRowBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)
+nsGrid::CountRowsColumns(nsIFrame* aRowBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)
 {
   aRowCount = 0;
   aComputedColumnCount = 0;
@@ -313,7 +314,7 @@ nsGrid::CountRowsColumns(nsIBox* aRowBox, PRInt32& aRowCount, PRInt32& aComputed
  * Given the number of rows create nsGridRow objects for them and full them out.
  */
 void
-nsGrid::BuildRows(nsIBox* aBox, PRInt32 aRowCount, nsGridRow** aRows, bool aIsHorizontal)
+nsGrid::BuildRows(nsIFrame* aBox, PRInt32 aRowCount, nsGridRow** aRows, bool aIsHorizontal)
 {
   // if no rows then return null
   if (aRowCount == 0) {
@@ -409,7 +410,7 @@ nsGrid::PopulateCellMap(nsGridRow* aRows, nsGridRow* aColumns, PRInt32 aRowCount
 
   for(PRInt32 i=0; i < aRowCount; i++) 
   {
-     nsIBox* child = nullptr;
+     nsIFrame* child = nullptr;
      nsGridRow* row = &aRows[i];
 
      // skip bogus rows. They have no cells
@@ -450,7 +451,7 @@ nsGrid::PopulateCellMap(nsGridRow* aRows, nsGridRow* aColumns, PRInt32 aRowCount
  * will get recalculated and get a layout.
  */
 void 
-nsGrid::DirtyRows(nsIBox* aRowBox, nsBoxLayoutState& aState)
+nsGrid::DirtyRows(nsIFrame* aRowBox, nsBoxLayoutState& aState)
 {
   // make sure we prevent others from dirtying things.
   mMarkingDirty = true;
@@ -559,7 +560,7 @@ nsGrid::GetMaxRowSize(nsBoxLayoutState& aState, PRInt32 aRowIndex, bool aIsHoriz
 
 // static
 nsIGridPart*
-nsGrid::GetPartFromBox(nsIBox* aBox)
+nsGrid::GetPartFromBox(nsIFrame* aBox)
 {
   if (!aBox)
     return nullptr;
@@ -569,7 +570,7 @@ nsGrid::GetPartFromBox(nsIBox* aBox)
 }
 
 nsMargin
-nsGrid::GetBoxTotalMargin(nsIBox* aBox, bool aIsHorizontal)
+nsGrid::GetBoxTotalMargin(nsIFrame* aBox, bool aIsHorizontal)
 {
   nsMargin margin(0,0,0,0);
   // walk the boxes parent chain getting the border/padding/margin of our parent rows
@@ -661,7 +662,7 @@ nsGrid::GetRowOffsets(nsBoxLayoutState& aState, PRInt32 aIndex, nscoord& aTop, n
   }
 
   // first get the rows top and bottom border and padding
-  nsIBox* box = row->GetBox();
+  nsIFrame* box = row->GetBox();
 
   // add up all the padding
   nsMargin margin(0,0,0,0);
@@ -734,7 +735,7 @@ nsGrid::GetRowOffsets(nsBoxLayoutState& aState, PRInt32 aIndex, nscoord& aTop, n
       nsMargin totalChildBorderPadding(0,0,0,0);
 
       nsGridRow* column = GetColumnAt(i,aIsHorizontal);
-      nsIBox* box = column->GetBox();
+      nsIFrame* box = column->GetBox();
 
       if (box) 
       {
@@ -820,14 +821,14 @@ nsGrid::GetPrefRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHoriz
   if (row->IsPrefSet()) 
     return row->mPref;
 
-  nsIBox* box = row->mBox;
+  nsIFrame* box = row->mBox;
 
   // set in CSS?
   if (box) 
   {
     bool widthSet, heightSet;
     nsSize cssSize(-1, -1);
-    nsIBox::AddCSSPrefSize(box, cssSize, widthSet, heightSet);
+    nsIFrame::AddCSSPrefSize(box, cssSize, widthSet, heightSet);
 
     row->mPref = GET_HEIGHT(cssSize, aIsHorizontal);
 
@@ -897,13 +898,13 @@ nsGrid::GetMinRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizo
   if (row->IsMinSet()) 
     return row->mMin;
 
-  nsIBox* box = row->mBox;
+  nsIFrame* box = row->mBox;
 
   // set in CSS?
   if (box) {
     bool widthSet, heightSet;
     nsSize cssSize(-1, -1);
-    nsIBox::AddCSSMinSize(aState, box, cssSize, widthSet, heightSet);
+    nsIFrame::AddCSSMinSize(aState, box, cssSize, widthSet, heightSet);
 
     row->mMin = GET_HEIGHT(cssSize, aIsHorizontal);
 
@@ -972,13 +973,13 @@ nsGrid::GetMaxRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizo
   if (row->IsMaxSet()) 
     return row->mMax;
 
-  nsIBox* box = row->mBox;
+  nsIFrame* box = row->mBox;
 
   // set in CSS?
   if (box) {
     bool widthSet, heightSet;
     nsSize cssSize(-1, -1);
-    nsIBox::AddCSSMaxSize(box, cssSize, widthSet, heightSet);
+    nsIFrame::AddCSSMaxSize(box, cssSize, widthSet, heightSet);
 
     row->mMax = GET_HEIGHT(cssSize, aIsHorizontal);
 
@@ -1035,7 +1036,7 @@ nsGrid::GetMaxRowHeight(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizo
 }
 
 bool
-nsGrid::IsGrid(nsIBox* aBox)
+nsGrid::IsGrid(nsIFrame* aBox)
 {
   nsIGridPart* part = GetPartFromBox(aBox);
   if (!part)
@@ -1064,7 +1065,7 @@ nsGrid::GetRowFlex(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizontal)
   if (row->IsFlexSet()) 
     return row->mFlex;
 
-  nsIBox* box = row->mBox;
+  nsIFrame* box = row->mBox;
   row->mFlex = 0;
 
   if (box) {
@@ -1114,8 +1115,8 @@ nsGrid::GetRowFlex(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizontal)
     // the grid. 3) Then we are not flexible
 
     box = GetScrollBox(box);
-    nsIBox* parent = box->GetParentBox();
-    nsIBox* parentsParent=nullptr;
+    nsIFrame* parent = box->GetParentBox();
+    nsIFrame* parentsParent=nullptr;
 
     while(parent)
     {
@@ -1128,7 +1129,7 @@ nsGrid::GetRowFlex(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizontal)
       if (parentsParent) {
         if (!IsGrid(parentsParent)) {
           nscoord flex = parent->GetFlex(aState);
-          nsIBox::AddCSSFlex(aState, parent, flex);
+          nsIFrame::AddCSSFlex(aState, parent, flex);
           if (flex == 0) {
             row->mFlex = 0;
             return row->mFlex;
@@ -1142,7 +1143,7 @@ nsGrid::GetRowFlex(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHorizontal)
     
     // get the row flex.
     row->mFlex = box->GetFlex(aState);
-    nsIBox::AddCSSFlex(aState, box, row->mFlex);
+    nsIFrame::AddCSSFlex(aState, box, row->mFlex);
   }
 
   return row->mFlex;
@@ -1222,8 +1223,8 @@ nsGrid::RowAddedOrRemoved(nsBoxLayoutState& aState, PRInt32 aIndex, bool aIsHori
  * Scrollframes are tranparent. If this is given a scrollframe is will return the
  * frame inside. If there is no scrollframe it does nothing.
  */
-nsIBox*
-nsGrid::GetScrolledBox(nsIBox* aChild)
+nsIFrame*
+nsGrid::GetScrolledBox(nsIFrame* aChild)
 {
   // first see if it is a scrollframe. If so walk down into it and get the scrolled child
       nsIScrollableFrame *scrollFrame = do_QueryFrame(aChild);
@@ -1240,14 +1241,14 @@ nsGrid::GetScrolledBox(nsIBox* aChild)
  * Scrollframes are tranparent. If this is given a child in a scrollframe is will return the
  * scrollframe ourside it. If there is no scrollframe it does nothing.
  */
-nsIBox*
-nsGrid::GetScrollBox(nsIBox* aChild)
+nsIFrame*
+nsGrid::GetScrollBox(nsIFrame* aChild)
 {
   if (!aChild)
     return nullptr;
 
   // get parent
-  nsIBox* parent = aChild->GetParentBox();
+  nsIFrame* parent = aChild->GetParentBox();
 
   // walk up until we find a scrollframe or a part
   // if it's a scrollframe return it.
diff --git a/layout/xul/base/src/grid/nsGrid.h b/layout/xul/base/src/grid/nsGrid.h
index 29dc1f3ef224..fbe1b42155e1 100644
--- a/layout/xul/base/src/grid/nsGrid.h
+++ b/layout/xul/base/src/grid/nsGrid.h
@@ -10,7 +10,6 @@
 #include "nsStackLayout.h"
 #include "nsIGridPart.h"
 #include "nsCOMPtr.h"
-#include "nsIFrame.h"
 
 class nsGridRowGroupLayout;
 class nsGridRowLayout;
@@ -56,7 +55,7 @@ public:
 
   void RowAddedOrRemoved(nsBoxLayoutState& aBoxLayoutState, PRInt32 aIndex, bool aIsHorizontal = true);
   void CellAddedOrRemoved(nsBoxLayoutState& aBoxLayoutState, PRInt32 aIndex, bool aIsHorizontal = true);
-  void DirtyRows(nsIBox* aRowBox, nsBoxLayoutState& aState);
+  void DirtyRows(nsIFrame* aRowBox, nsBoxLayoutState& aState);
 #ifdef DEBUG_grid
   void PrintCellMap();
 #endif
@@ -64,16 +63,16 @@ public:
   PRInt32 GetExtraRowCount(bool aIsHorizontal = true);
 
 // accessors
-  void SetBox(nsIBox* aBox) { mBox = aBox; }
-  nsIBox* GetBox() { return mBox; }
-  nsIBox* GetRowsBox() { return mRowsBox; }
-  nsIBox* GetColumnsBox() { return mColumnsBox; }
+  void SetBox(nsIFrame* aBox) { mBox = aBox; }
+  nsIFrame* GetBox() { return mBox; }
+  nsIFrame* GetRowsBox() { return mRowsBox; }
+  nsIFrame* GetColumnsBox() { return mColumnsBox; }
   PRInt32 GetRowCount(PRInt32 aIsHorizontal = true);
   PRInt32 GetColumnCount(PRInt32 aIsHorizontal = true);
 
-  static nsIBox* GetScrolledBox(nsIBox* aChild);
-  static nsIBox* GetScrollBox(nsIBox* aChild);
-  static nsIGridPart* GetPartFromBox(nsIBox* aBox);
+  static nsIFrame* GetScrolledBox(nsIFrame* aChild);
+  static nsIFrame* GetScrollBox(nsIFrame* aChild);
+  static nsIGridPart* GetPartFromBox(nsIFrame* aBox);
   void GetFirstAndLastRow(nsBoxLayoutState& aState, 
                           PRInt32& aFirstIndex, 
                           PRInt32& aLastIndex, 
@@ -83,20 +82,20 @@ public:
 
 private:
 
-  nsMargin GetBoxTotalMargin(nsIBox* aBox, bool aIsHorizontal = true);
+  nsMargin GetBoxTotalMargin(nsIFrame* aBox, bool aIsHorizontal = true);
 
   void FreeMap();
-  void FindRowsAndColumns(nsIBox** aRows, nsIBox** aColumns);
-  void BuildRows(nsIBox* aBox, PRInt32 aSize, nsGridRow** aColumnsRows, bool aIsHorizontal = true);
+  void FindRowsAndColumns(nsIFrame** aRows, nsIFrame** aColumns);
+  void BuildRows(nsIFrame* aBox, PRInt32 aSize, nsGridRow** aColumnsRows, bool aIsHorizontal = true);
   nsGridCell* BuildCellMap(PRInt32 aRows, PRInt32 aColumns);
   void PopulateCellMap(nsGridRow* aRows, nsGridRow* aColumns, PRInt32 aRowCount, PRInt32 aColumnCount, bool aIsHorizontal = true);
-  void CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
+  void CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
   void SetLargestSize(nsSize& aSize, nscoord aHeight, bool aIsHorizontal = true);
   void SetSmallestSize(nsSize& aSize, nscoord aHeight, bool aIsHorizontal = true);
-  bool IsGrid(nsIBox* aBox);
+  bool IsGrid(nsIFrame* aBox);
 
   // the box that implement the <grid> tag
-  nsIBox* mBox;
+  nsIFrame* mBox;
 
   // an array of row object
   nsGridRow* mRows;
@@ -105,10 +104,10 @@ private:
   nsGridRow* mColumns;
 
   // the first in the <grid> that implements the <rows> tag.
-  nsIBox* mRowsBox;
+  nsIFrame* mRowsBox;
 
   // the first in the <grid> that implements the <columns> tag.
-  nsIBox* mColumnsBox;
+  nsIFrame* mColumnsBox;
 
   // a flag that is false tells us to rebuild the who grid
   bool mNeedsRebuild;
diff --git a/layout/xul/base/src/grid/nsGridCell.h b/layout/xul/base/src/grid/nsGridCell.h
index a68b9df89644..74769beddb75 100644
--- a/layout/xul/base/src/grid/nsGridCell.h
+++ b/layout/xul/base/src/grid/nsGridCell.h
@@ -13,10 +13,9 @@
 #ifndef nsGridCell_h___
 #define nsGridCell_h___
 
-#include "nsIFrame.h"
-
 class nsBoxLayoutState;
 struct nsSize;
+class nsIFrame;
 
 /*
  * Grid cell is what makes up the cellmap in the grid. Each GridCell contains
@@ -38,14 +37,14 @@ public:
     bool        IsCollapsed();
 
 // accessors
-    nsIBox*     GetBoxInColumn()             { return mBoxInColumn; }
-    nsIBox*     GetBoxInRow()                { return mBoxInRow; }
-    void        SetBoxInRow(nsIBox* aBox)    { mBoxInRow = aBox; }
-    void        SetBoxInColumn(nsIBox* aBox) { mBoxInColumn = aBox; }
+    nsIFrame*   GetBoxInColumn()               { return mBoxInColumn; }
+    nsIFrame*   GetBoxInRow()                  { return mBoxInRow; }
+    void        SetBoxInRow(nsIFrame* aBox)    { mBoxInRow = aBox; }
+    void        SetBoxInColumn(nsIFrame* aBox) { mBoxInColumn = aBox; }
 
 private:
-    nsIBox* mBoxInColumn;
-    nsIBox* mBoxInRow;
+    nsIFrame* mBoxInColumn;
+    nsIFrame* mBoxInRow;
 };
 
 #endif
diff --git a/layout/xul/base/src/grid/nsGridLayout2.cpp b/layout/xul/base/src/grid/nsGridLayout2.cpp
index a437b002728e..7b6a77c99d6a 100644
--- a/layout/xul/base/src/grid/nsGridLayout2.cpp
+++ b/layout/xul/base/src/grid/nsGridLayout2.cpp
@@ -16,6 +16,7 @@
 #include "nsBox.h"
 #include "nsIScrollableFrame.h"
 #include "nsSprocketLayout.h"
+#include "nsHTMLReflowState.h"
 
 nsresult
 NS_NewGridLayout2( nsIPresShell* aPresShell, nsBoxLayout** aNewLayout)
@@ -33,7 +34,7 @@ nsGridLayout2::nsGridLayout2(nsIPresShell* aPresShell):nsStackLayout()
 
 // static
 void
-nsGridLayout2::AddOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsSize& aSize)
+nsGridLayout2::AddOffset(nsBoxLayoutState& aState, nsIFrame* aChild, nsSize& aSize)
 {
   nsMargin offset;
   GetOffset(aState, aChild, offset);
@@ -42,7 +43,7 @@ nsGridLayout2::AddOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsSize& aSize
 }
 
 NS_IMETHODIMP
-nsGridLayout2::Layout(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsGridLayout2::Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   // XXX This should be set a better way!
   mGrid.SetBox(aBox);
@@ -56,7 +57,7 @@ nsGridLayout2::Layout(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 }
 
 void
-nsGridLayout2::IntrinsicWidthsDirty(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsGridLayout2::IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   nsStackLayout::IntrinsicWidthsDirty(aBox, aBoxLayoutState);
   // XXXldb We really don't need to do all the work that NeedsRebuild
@@ -66,7 +67,7 @@ nsGridLayout2::IntrinsicWidthsDirty(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutSt
 }
 
 nsGrid*
-nsGridLayout2::GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor)
+nsGridLayout2::GetGrid(nsIFrame* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor)
 {
   // XXX This should be set a better way!
   mGrid.SetBox(aBox);
@@ -88,15 +89,15 @@ nsGridLayout2::AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal)
 }
 
 nsSize
-nsGridLayout2::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridLayout2::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize minSize = nsStackLayout::GetMinSize(aBox, aState); 
 
   // if there are no <rows> tags that will sum up our columns,
   // sum up our columns here.
   nsSize total(0,0);
-  nsIBox* rowsBox = mGrid.GetRowsBox();
-  nsIBox* columnsBox = mGrid.GetColumnsBox();
+  nsIFrame* rowsBox = mGrid.GetRowsBox();
+  nsIFrame* columnsBox = mGrid.GetColumnsBox();
   if (!rowsBox || !columnsBox) {
     if (!rowsBox) {
       // max height is the sum of our rows
@@ -127,15 +128,15 @@ nsGridLayout2::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsGridLayout2::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridLayout2::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize pref = nsStackLayout::GetPrefSize(aBox, aState); 
 
   // if there are no <rows> tags that will sum up our columns,
   // sum up our columns here.
   nsSize total(0,0);
-  nsIBox* rowsBox = mGrid.GetRowsBox();
-  nsIBox* columnsBox = mGrid.GetColumnsBox();
+  nsIFrame* rowsBox = mGrid.GetRowsBox();
+  nsIFrame* columnsBox = mGrid.GetColumnsBox();
   if (!rowsBox || !columnsBox) {
     if (!rowsBox) {
       // max height is the sum of our rows
@@ -166,15 +167,15 @@ nsGridLayout2::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsGridLayout2::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridLayout2::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize maxSize = nsStackLayout::GetMaxSize(aBox, aState); 
 
   // if there are no <rows> tags that will sum up our columns,
   // sum up our columns here.
   nsSize total(NS_INTRINSICSIZE, NS_INTRINSICSIZE);
-  nsIBox* rowsBox = mGrid.GetRowsBox();
-  nsIBox* columnsBox = mGrid.GetColumnsBox();
+  nsIFrame* rowsBox = mGrid.GetRowsBox();
+  nsIFrame* columnsBox = mGrid.GetColumnsBox();
   if (!rowsBox || !columnsBox) {
     if (!rowsBox) {
       total.height = 0;
@@ -207,7 +208,7 @@ nsGridLayout2::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 PRInt32
-nsGridLayout2::BuildRows(nsIBox* aBox, nsGridRow* aRows)
+nsGridLayout2::BuildRows(nsIFrame* aBox, nsGridRow* aRows)
 {
   if (aBox) {
     aRows[0].Init(aBox, true);
@@ -217,37 +218,37 @@ nsGridLayout2::BuildRows(nsIBox* aBox, nsGridRow* aRows)
 }
 
 nsMargin
-nsGridLayout2::GetTotalMargin(nsIBox* aBox, bool aIsHorizontal)
+nsGridLayout2::GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal)
 {
   nsMargin margin(0,0,0,0);
   return margin;
 }
 
 void
-nsGridLayout2::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                                nsIBox* aPrevBox,
+nsGridLayout2::ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
+                                nsIFrame* aPrevBox,
                                 const nsFrameList::Slice& aNewChildren)
 {
   mGrid.NeedsRebuild(aState);
 }
 
 void
-nsGridLayout2::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+nsGridLayout2::ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
                                 const nsFrameList::Slice& aNewChildren)
 {
   mGrid.NeedsRebuild(aState);
 }
 
 void
-nsGridLayout2::ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState,
-                               nsIBox* aChildList)
+nsGridLayout2::ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
+                               nsIFrame* aChildList)
 {
   mGrid.NeedsRebuild(aState);
 }
 
 void
-nsGridLayout2::ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState,
-                           nsIBox* aChildList)
+nsGridLayout2::ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
+                           nsIFrame* aChildList)
 {
   mGrid.NeedsRebuild(aState);
 }
diff --git a/layout/xul/base/src/grid/nsGridLayout2.h b/layout/xul/base/src/grid/nsGridLayout2.h
index 7906ade3e05f..070196b3a6e3 100644
--- a/layout/xul/base/src/grid/nsGridLayout2.h
+++ b/layout/xul/base/src/grid/nsGridLayout2.h
@@ -9,10 +9,10 @@
 
 #include "nsStackLayout.h"
 #include "nsIGridPart.h"
-#include "nsCOMPtr.h"
-#include "nsIFrame.h"
+#include "nsCoord.h"
 #include "nsGrid.h"
 
+class nsIPresContext;
 class nsGridRowGroupLayout;
 class nsGridRowLayout;
 class nsGridRow;
@@ -31,36 +31,36 @@ public:
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  NS_IMETHOD Layout(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void IntrinsicWidthsDirty(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
+  NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
 
   virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return nullptr; }
   virtual nsGridLayout2* CastToGridLayout() { return this; }
-  virtual nsGrid* GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nullptr);
-  virtual nsIGridPart* GetParentGridPart(nsIBox* aBox, nsIBox** aParentBox) {
+  virtual nsGrid* GetGrid(nsIFrame* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nullptr);
+  virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox) {
     NS_NOTREACHED("Should not be called"); return nullptr;
   }
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount) { aRowCount++; }
-  virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState) { }
-  virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows);
-  virtual nsMargin GetTotalMargin(nsIBox* aBox, bool aIsHorizontal);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual void CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount) { aRowCount++; }
+  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) { }
+  virtual PRInt32 BuildRows(nsIFrame* aBox, nsGridRow* aRows);
+  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal);
   virtual Type GetType() { return eGrid; }
-  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                                nsIBox* aPrevBox,
+  virtual void ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
+                                nsIFrame* aPrevBox,
                                 const nsFrameList::Slice& aNewChildren);
-  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+  virtual void ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
                                 const nsFrameList::Slice& aNewChildren);
-  virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState,
-                             nsIBox* aChildList);
-  virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState,
-                         nsIBox* aChildList);
+  virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
+                               nsIFrame* aChildList);
+  virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
+                           nsIFrame* aChildList);
 
   virtual nsIGridPart* AsGridPart() { return this; }
 
-  static void AddOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsSize& aSize);
+  static void AddOffset(nsBoxLayoutState& aState, nsIFrame* aChild, nsSize& aSize);
 
 protected:
 
diff --git a/layout/xul/base/src/grid/nsGridRow.cpp b/layout/xul/base/src/grid/nsGridRow.cpp
index 44c0df746b76..3e6c18edc238 100644
--- a/layout/xul/base/src/grid/nsGridRow.cpp
+++ b/layout/xul/base/src/grid/nsGridRow.cpp
@@ -11,8 +11,8 @@
 //
 
 #include "nsGridRow.h"
-#include "nsIFrame.h"
 #include "nsBoxLayoutState.h"
+#include "nsIFrame.h"
 
 nsGridRow::nsGridRow():mIsBogus(false),
                        mBox(nullptr), 
@@ -30,7 +30,7 @@ nsGridRow::nsGridRow():mIsBogus(false),
 }
 
 void
-nsGridRow::Init(nsIBox* aBox, bool aIsBogus)
+nsGridRow::Init(nsIFrame* aBox, bool aIsBogus)
 {
   mBox = aBox;
   mIsBogus = aIsBogus;
diff --git a/layout/xul/base/src/grid/nsGridRow.h b/layout/xul/base/src/grid/nsGridRow.h
index f56927dd37e2..86b983ba5016 100644
--- a/layout/xul/base/src/grid/nsGridRow.h
+++ b/layout/xul/base/src/grid/nsGridRow.h
@@ -13,10 +13,11 @@
 #ifndef nsGridRow_h___
 #define nsGridRow_h___
 
-#include "nsIFrame.h"
+#include "nsCoord.h"
 
 class nsGridLayout2;
 class nsBoxLayoutState;
+class nsIFrame;
 
 /**
  * The row (or column) data structure in the grid cellmap.
@@ -26,11 +27,11 @@ class nsGridRow
 public:
    nsGridRow();
    ~nsGridRow();
-   
-   void Init(nsIBox* aBox, bool aIsBogus);
+
+   void Init(nsIFrame* aBox, bool aIsBogus);
 
 // accessors
-   nsIBox* GetBox()   { return mBox;          }
+   nsIFrame* GetBox()   { return mBox;          }
    bool IsPrefSet() { return (mPref != -1); }
    bool IsMinSet()  { return (mMin  != -1); }
    bool IsMaxSet()  { return (mMax  != -1); } 
@@ -41,7 +42,7 @@ public:
 public:
 
    bool    mIsBogus;
-   nsIBox* mBox;
+   nsIFrame* mBox;
    nscoord mFlex;
    nscoord mPref;
    nscoord mMin;
diff --git a/layout/xul/base/src/grid/nsGridRowGroupFrame.cpp b/layout/xul/base/src/grid/nsGridRowGroupFrame.cpp
index 49a943662f17..9faf35e87cad 100644
--- a/layout/xul/base/src/grid/nsGridRowGroupFrame.cpp
+++ b/layout/xul/base/src/grid/nsGridRowGroupFrame.cpp
@@ -52,7 +52,7 @@ nsGridRowGroupFrame::GetFlex(nsBoxLayoutState& aState)
 
   // ok we are flexible add up our children
   nscoord totalFlex = 0;
-  nsIBox* child = GetChildBox();
+  nsIFrame* child = GetChildBox();
   while (child)
   {
     totalFlex += child->GetFlex(aState);
diff --git a/layout/xul/base/src/grid/nsGridRowGroupLayout.cpp b/layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
index 21fe9ee67b7e..cd0474ece4e3 100644
--- a/layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
+++ b/layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
@@ -21,6 +21,7 @@
 #include "nsBoxLayoutState.h"
 #include "nsGridLayout2.h"
 #include "nsGridRow.h"
+#include "nsHTMLReflowState.h"
 
 already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout()
 {
@@ -38,7 +39,7 @@ nsGridRowGroupLayout::~nsGridRowGroupLayout()
 }
 
 void
-nsGridRowGroupLayout::ChildAddedOrRemoved(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowGroupLayout::ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   PRInt32 index = 0;
   nsGrid* grid = GetGrid(aBox, &index);
@@ -60,7 +61,7 @@ nsGridRowGroupLayout::AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal
 }
 
 nsSize
-nsGridRowGroupLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowGroupLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 { 
   nsSize vpref = nsGridRowLayout::GetPrefSize(aBox, aState); 
 
@@ -94,7 +95,7 @@ nsGridRowGroupLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsGridRowGroupLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowGroupLayout::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
  nsSize maxSize = nsGridRowLayout::GetMaxSize(aBox, aState); 
 
@@ -120,7 +121,7 @@ nsGridRowGroupLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsGridRowGroupLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowGroupLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize minSize = nsGridRowLayout::GetMinSize(aBox, aState); 
 
@@ -148,7 +149,7 @@ nsGridRowGroupLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
  * Run down through our children dirtying them recursively.
  */
 void
-nsGridRowGroupLayout::DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowGroupLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   if (aBox) {
     // mark us dirty
@@ -156,12 +157,12 @@ nsGridRowGroupLayout::DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)
     // calling MarkIntrinsicWidthsDirty for every row group.
     aState.PresShell()->FrameNeedsReflow(aBox, nsIPresShell::eTreeChange,
                                          NS_FRAME_IS_DIRTY);
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     while(child) {
 
       // walk into scrollframes
-      nsIBox* deepChild = nsGrid::GetScrolledBox(child);
+      nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
 
       // walk into other monuments
       nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
@@ -175,17 +176,17 @@ nsGridRowGroupLayout::DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)
 
 
 void
-nsGridRowGroupLayout::CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)
+nsGridRowGroupLayout::CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)
 {
   if (aBox) {
     PRInt32 startCount = aRowCount;
 
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     while(child) {
       
       // first see if it is a scrollframe. If so walk down into it and get the scrolled child
-      nsIBox* deepChild = nsGrid::GetScrolledBox(child);
+      nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
 
       nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
       if (monument) {
@@ -210,17 +211,17 @@ nsGridRowGroupLayout::CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32
  * Fill out the given row structure recursively
  */
 PRInt32 
-nsGridRowGroupLayout::BuildRows(nsIBox* aBox, nsGridRow* aRows)
+nsGridRowGroupLayout::BuildRows(nsIFrame* aBox, nsGridRow* aRows)
 { 
   PRInt32 rowCount = 0;
 
   if (aBox) {
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     while(child) {
       
       // first see if it is a scrollframe. If so walk down into it and get the scrolled child
-      nsIBox* deepChild = nsGrid::GetScrolledBox(child);
+      nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
 
       nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
       if (monument) {
@@ -243,7 +244,7 @@ nsGridRowGroupLayout::BuildRows(nsIBox* aBox, nsGridRow* aRows)
 }
 
 nsMargin
-nsGridRowGroupLayout::GetTotalMargin(nsIBox* aBox, bool aIsHorizontal)
+nsGridRowGroupLayout::GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal)
 {
   // group have border and padding added to the total margin
 
diff --git a/layout/xul/base/src/grid/nsGridRowGroupLayout.h b/layout/xul/base/src/grid/nsGridRowGroupLayout.h
index c821b4246dcf..82912ae8b1f7 100644
--- a/layout/xul/base/src/grid/nsGridRowGroupLayout.h
+++ b/layout/xul/base/src/grid/nsGridRowGroupLayout.h
@@ -25,13 +25,13 @@ public:
   friend already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout();
 
   virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return this; }
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
-  virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState);
-  virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows);
-  virtual nsMargin GetTotalMargin(nsIBox* aBox, bool aIsHorizontal);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual void CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
+  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState);
+  virtual PRInt32 BuildRows(nsIFrame* aBox, nsGridRow* aRows);
+  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal);
   virtual PRInt32 GetRowCount() { return mRowCount; }
   virtual Type GetType() { return eRowGroup; }
 
@@ -39,7 +39,7 @@ protected:
   nsGridRowGroupLayout();
   virtual ~nsGridRowGroupLayout();
 
-  virtual void ChildAddedOrRemoved(nsIBox* aBox, nsBoxLayoutState& aState);
+  virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState);
   static void AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal);
 
 private:
diff --git a/layout/xul/base/src/grid/nsGridRowLayout.cpp b/layout/xul/base/src/grid/nsGridRowLayout.cpp
index 063f2e77664b..a9c468e68164 100644
--- a/layout/xul/base/src/grid/nsGridRowLayout.cpp
+++ b/layout/xul/base/src/grid/nsGridRowLayout.cpp
@@ -22,34 +22,34 @@ nsGridRowLayout::nsGridRowLayout():nsSprocketLayout()
 }
 
 void
-nsGridRowLayout::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                                  nsIBox* aPrevBox,
+nsGridRowLayout::ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
+                                  nsIFrame* aPrevBox,
                                   const nsFrameList::Slice& aNewChildren)
 {
   ChildAddedOrRemoved(aBox, aState);
 }
 
 void
-nsGridRowLayout::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+nsGridRowLayout::ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
                                   const nsFrameList::Slice& aNewChildren)
 {
   ChildAddedOrRemoved(aBox, aState);
 }
 
 void
-nsGridRowLayout::ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)
+nsGridRowLayout::ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList)
 {
   ChildAddedOrRemoved(aBox, aState);
 }
 
 void
-nsGridRowLayout::ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)
+nsGridRowLayout::ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList)
 {
   ChildAddedOrRemoved(aBox, aState);
 }
 
 nsIGridPart*
-nsGridRowLayout::GetParentGridPart(nsIBox* aBox, nsIBox** aParentBox)
+nsGridRowLayout::GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox)
 {
   // go up and find our parent gridRow. Skip and non gridRow
   // parents.
@@ -76,12 +76,12 @@ nsGridRowLayout::GetParentGridPart(nsIBox* aBox, nsIBox** aParentBox)
 
 
 nsGrid*
-nsGridRowLayout::GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor)
+nsGridRowLayout::GetGrid(nsIFrame* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor)
 {
 
    if (aRequestor == nullptr)
    {
-      nsIBox* parentBox; // nsIBox is implemented by nsIFrame and is not refcounted.
+      nsIFrame* parentBox; // nsIFrame is implemented by nsIFrame and is not refcounted.
       nsIGridPart* parent = GetParentGridPart(aBox, &parentBox);
       if (parent)
          return parent->GetGrid(parentBox, aIndex, this);
@@ -89,12 +89,12 @@ nsGridRowLayout::GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aReques
    }
 
    PRInt32 index = -1;
-   nsIBox* child = aBox->GetChildBox();
+   nsIFrame* child = aBox->GetChildBox();
    PRInt32 count = 0;
    while(child)
    {
      // if there is a scrollframe walk inside it to its child
-     nsIBox* childBox = nsGrid::GetScrolledBox(child);
+     nsIFrame* childBox = nsGrid::GetScrolledBox(child);
 
      nsBoxLayout* layout = childBox->GetLayoutManager();
      nsIGridPart* gridRow = nsGrid::GetPartFromBox(childBox);
@@ -121,7 +121,7 @@ nsGridRowLayout::GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aReques
 
    (*aIndex) += index;
 
-   nsIBox* parentBox; // nsIBox is implemented by nsIFrame and is not refcounted.
+   nsIFrame* parentBox; // nsIFrame is implemented by nsIFrame and is not refcounted.
    nsIGridPart* parent = GetParentGridPart(aBox, &parentBox);
    if (parent)
      return parent->GetGrid(parentBox, aIndex, this);
@@ -130,11 +130,11 @@ nsGridRowLayout::GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aReques
 }
 
 nsMargin
-nsGridRowLayout::GetTotalMargin(nsIBox* aBox, bool aIsHorizontal)
+nsGridRowLayout::GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal)
 {
   // get our parents margin
   nsMargin margin(0,0,0,0);
-  nsIBox* parent = nullptr;
+  nsIFrame* parent = nullptr;
   nsIGridPart* part = GetParentGridPart(aBox, &parent);
   if (part && parent) {
     // if we are the first or last child walk upward and add margins.
@@ -143,10 +143,10 @@ nsGridRowLayout::GetTotalMargin(nsIBox* aBox, bool aIsHorizontal)
     aBox = nsGrid::GetScrollBox(aBox);
 
     // see if we have a next to see if we are last
-    nsIBox* next = aBox->GetNextBox();
+    nsIFrame* next = aBox->GetNextBox();
 
     // get the parent first child to see if we are first
-    nsIBox* child = parent->GetChildBox();
+    nsIFrame* child = parent->GetChildBox();
 
     margin = part->GetTotalMargin(parent, aIsHorizontal);
 
diff --git a/layout/xul/base/src/grid/nsGridRowLayout.h b/layout/xul/base/src/grid/nsGridRowLayout.h
index 735198ab6cc2..c5221efd4f79 100644
--- a/layout/xul/base/src/grid/nsGridRowLayout.h
+++ b/layout/xul/base/src/grid/nsGridRowLayout.h
@@ -35,21 +35,21 @@ public:
 
   virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return nullptr; }
   virtual nsGridLayout2* CastToGridLayout() { return nullptr; }
-  virtual nsGrid* GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nullptr);
-  virtual nsIGridPart* GetParentGridPart(nsIBox* aBox, nsIBox** aParentBox);
-  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                                nsIBox* aPrevBox,
+  virtual nsGrid* GetGrid(nsIFrame* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nullptr);
+  virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox);
+  virtual void ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
+                                nsIFrame* aPrevBox,
                                 const nsFrameList::Slice& aNewChildren);
-  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+  virtual void ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
                                 const nsFrameList::Slice& aNewChildren);
-  virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
-  virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
-  virtual nsMargin GetTotalMargin(nsIBox* aBox, bool aIsHorizontal);
+  virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList);
+  virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList);
+  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal);
 
   virtual nsIGridPart* AsGridPart() { return this; }
 
 protected:
-  virtual void ChildAddedOrRemoved(nsIBox* aBox, nsBoxLayoutState& aState)=0;
+  virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState)=0;
 
   nsGridRowLayout();
 };
diff --git a/layout/xul/base/src/grid/nsGridRowLeafLayout.cpp b/layout/xul/base/src/grid/nsGridRowLeafLayout.cpp
index 900e54ede9d2..1d4d9c598235 100644
--- a/layout/xul/base/src/grid/nsGridRowLeafLayout.cpp
+++ b/layout/xul/base/src/grid/nsGridRowLeafLayout.cpp
@@ -35,7 +35,7 @@ nsGridRowLeafLayout::~nsGridRowLeafLayout()
 }
 
 nsSize
-nsGridRowLeafLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowLeafLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   PRInt32 index = 0;
   nsGrid* grid = GetGrid(aBox, &index);
@@ -53,7 +53,7 @@ nsGridRowLeafLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsGridRowLeafLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowLeafLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   PRInt32 index = 0;
   nsGrid* grid = GetGrid(aBox, &index);
@@ -69,7 +69,7 @@ nsGridRowLeafLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsGridRowLeafLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowLeafLayout::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   PRInt32 index = 0;
   nsGrid* grid = GetGrid(aBox, &index);
@@ -88,7 +88,7 @@ nsGridRowLeafLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
 /** If a child is added or removed or changes size
   */
 void
-nsGridRowLeafLayout::ChildAddedOrRemoved(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowLeafLayout::ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   PRInt32 index = 0;
   nsGrid* grid = GetGrid(aBox, &index);
@@ -99,7 +99,7 @@ nsGridRowLeafLayout::ChildAddedOrRemoved(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 void
-nsGridRowLeafLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, nsBoxSize*& aBoxSizes, nscoord& aMinSize, nscoord& aMaxSize, PRInt32& aFlexes)
+nsGridRowLeafLayout::PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aState, nsBoxSize*& aBoxSizes, nscoord& aMinSize, nscoord& aMaxSize, PRInt32& aFlexes)
 {
   PRInt32 index = 0;
   nsGrid* grid = GetGrid(aBox, &index);
@@ -114,7 +114,7 @@ nsGridRowLeafLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, ns
     nsBoxSize* start = nullptr;
     nsBoxSize* last = nullptr;
     nsBoxSize* current = nullptr;
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
     for (int i=0; i < count; i++)
     {
       column = grid->GetColumnAt(i,isHorizontal); 
@@ -132,7 +132,7 @@ nsGridRowLeafLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, ns
       nscoord left  = 0;
       nscoord right  = 0;
       grid->GetRowOffsets(aState, i, left, right, !isHorizontal); // GetColumnOffsets
-      nsIBox* box = column->GetBox();
+      nsIFrame* box = column->GetBox();
       bool collapsed = false;
       nscoord topMargin = column->mTopMargin;
       nscoord bottomMargin = column->mBottomMargin;
@@ -216,7 +216,7 @@ nsGridRowLeafLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, ns
 }
 
 void
-nsGridRowLeafLayout::ComputeChildSizes(nsIBox* aBox,
+nsGridRowLeafLayout::ComputeChildSizes(nsIFrame* aBox,
                            nsBoxLayoutState& aState, 
                            nscoord& aGivenSize, 
                            nsBoxSize* aBoxSizes, 
@@ -229,10 +229,10 @@ nsGridRowLeafLayout::ComputeChildSizes(nsIBox* aBox,
 
     // go up the parent chain looking for scrollframes
     nscoord diff = 0;
-    nsIBox* parentBox;
+    nsIFrame* parentBox;
     (void)GetParentGridPart(aBox, &parentBox);
     while (parentBox) {
-      nsIBox* scrollbox = nsGrid::GetScrollBox(parentBox);
+      nsIFrame* scrollbox = nsGrid::GetScrollBox(parentBox);
       nsIScrollableFrame *scrollable = do_QueryFrame(scrollbox);
       if (scrollable) {
         // Don't call GetActualScrollbarSizes here because it's not safe
@@ -278,13 +278,13 @@ nsGridRowLeafLayout::ComputeChildSizes(nsIBox* aBox,
 }
 
 NS_IMETHODIMP
-nsGridRowLeafLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsGridRowLeafLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   return nsGridRowLayout::Layout(aBox, aBoxLayoutState);
 }
 
 void
-nsGridRowLeafLayout::DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)
+nsGridRowLeafLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   if (aBox) {
     // mark us dirty
@@ -296,10 +296,10 @@ nsGridRowLeafLayout::DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 void
-nsGridRowLeafLayout::CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)
+nsGridRowLeafLayout::CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)
 {
   if (aBox) {
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     // count the children
     PRInt32 columnCount = 0;
@@ -317,8 +317,8 @@ nsGridRowLeafLayout::CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32&
 }
 
 PRInt32
-nsGridRowLeafLayout::BuildRows(nsIBox* aBox, nsGridRow* aRows)
-{ 
+nsGridRowLeafLayout::BuildRows(nsIFrame* aBox, nsGridRow* aRows)
+{
   if (aBox) {
       aRows[0].Init(aBox, false);
       return 1;
diff --git a/layout/xul/base/src/grid/nsGridRowLeafLayout.h b/layout/xul/base/src/grid/nsGridRowLeafLayout.h
index 865556e5a706..d19056900ee9 100644
--- a/layout/xul/base/src/grid/nsGridRowLeafLayout.h
+++ b/layout/xul/base/src/grid/nsGridRowLeafLayout.h
@@ -27,29 +27,31 @@ public:
 
   friend already_AddRefed<nsBoxLayout> NS_NewGridRowLeafLayout();
 
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void ChildAddedOrRemoved(nsIBox* aBox, nsBoxLayoutState& aState);
-  NS_IMETHOD Layout(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
-  virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState);
-  virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows);
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState);
+  NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual void CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
+  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState);
+  virtual PRInt32 BuildRows(nsIFrame* aBox, nsGridRow* aRows);
   virtual Type GetType() { return eRowLeaf; }
 
 protected:
 
-  virtual void PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsBoxSize*& aBoxSizes, nscoord& aMinSize, nscoord& aMaxSize, PRInt32& aFlexes);
-  virtual void ComputeChildSizes(nsIBox* aBox, 
-                         nsBoxLayoutState& aState, 
-                         nscoord& aGivenSize, 
-                         nsBoxSize* aBoxSizes, 
-                         nsComputedBoxSize*& aComputedBoxSizes);
+  virtual void PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState,
+                                nsBoxSize*& aBoxSizes, nscoord& aMinSize,
+                                nscoord& aMaxSize, PRInt32& aFlexes);
+  virtual void ComputeChildSizes(nsIFrame* aBox,
+                                 nsBoxLayoutState& aState,
+                                 nscoord& aGivenSize,
+                                 nsBoxSize* aBoxSizes,
+                                 nsComputedBoxSize*& aComputedBoxSizes);
 
 
   nsGridRowLeafLayout();
   virtual ~nsGridRowLeafLayout();
-  //virtual void AddBorderAndPadding(nsIBox* aBox, nsSize& aSize);
+  //virtual void AddBorderAndPadding(nsIFrame* aBox, nsSize& aSize);
 
 private:
 
diff --git a/layout/xul/base/src/grid/nsIGridPart.h b/layout/xul/base/src/grid/nsIGridPart.h
index fded84a47c7e..cf80799137bb 100644
--- a/layout/xul/base/src/grid/nsIGridPart.h
+++ b/layout/xul/base/src/grid/nsIGridPart.h
@@ -7,7 +7,6 @@
 #define nsIGridPart_h___
 
 #include "nsISupports.h"
-#include "nsFrame.h"
 
 class nsGridRowGroupLayout;
 class nsGrid;
@@ -50,7 +49,7 @@ public:
    *                   grids.)
    * @return The grid of which aBox (a row, row group, or grid) is a part.
    */
-  virtual nsGrid* GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nullptr)=0;
+  virtual nsGrid* GetGrid(nsIFrame* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nullptr)=0;
 
   /**
    * @param aBox [IN] The other half of the |this| parameter, i.e., the box
@@ -60,7 +59,7 @@ public:
    *                   row group).
    * @returns The layout manager for aParentBox.
    */
-  virtual nsIGridPart* GetParentGridPart(nsIBox* aBox, nsIBox** aParentBox) = 0;
+  virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox) = 0;
 
   /**
    * @param aBox [IN] The other half of the |this| parameter, i.e., the box
@@ -68,10 +67,10 @@ public:
    * @param aRowCount [INOUT] Row count
    * @param aComputedColumnCount [INOUT] Column count
    */
-  virtual void CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)=0;
-  virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)=0;
-  virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows)=0;
-  virtual nsMargin GetTotalMargin(nsIBox* aBox, bool aIsHorizontal)=0;
+  virtual void CountRowsColumns(nsIFrame* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount)=0;
+  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState)=0;
+  virtual PRInt32 BuildRows(nsIFrame* aBox, nsGridRow* aRows)=0;
+  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal)=0;
   virtual PRInt32 GetRowCount() { return 1; }
   
   /**
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index b5256cfe8a4a..47bd92fae65f 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -203,7 +203,7 @@ nsBox::Shutdown()
 }
 
 NS_IMETHODIMP
-nsBox::RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild)
+nsBox::RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild)
 {
   return NS_OK;
 }
@@ -405,7 +405,7 @@ nsBox::GetPrefSize(nsBoxLayoutState& aState)
 
   AddBorderAndPadding(pref);
   bool widthSet, heightSet;
-  nsIBox::AddCSSPrefSize(this, pref, widthSet, heightSet);
+  nsIFrame::AddCSSPrefSize(this, pref, widthSet, heightSet);
 
   nsSize minSize = GetMinSize(aState);
   nsSize maxSize = GetMaxSize(aState);
@@ -425,7 +425,7 @@ nsBox::GetMinSize(nsBoxLayoutState& aState)
 
   AddBorderAndPadding(min);
   bool widthSet, heightSet;
-  nsIBox::AddCSSMinSize(aState, this, min, widthSet, heightSet);
+  nsIFrame::AddCSSMinSize(aState, this, min, widthSet, heightSet);
   return min;
 }
 
@@ -448,7 +448,7 @@ nsBox::GetMaxSize(nsBoxLayoutState& aState)
 
   AddBorderAndPadding(maxSize);
   bool widthSet, heightSet;
-  nsIBox::AddCSSMaxSize(this, maxSize, widthSet, heightSet);
+  nsIFrame::AddCSSMaxSize(this, maxSize, widthSet, heightSet);
   return maxSize;
 }
 
@@ -457,7 +457,7 @@ nsBox::GetFlex(nsBoxLayoutState& aState)
 {
   nscoord flex = 0;
 
-  nsIBox::AddCSSFlex(aState, this, flex);
+  nsIFrame::AddCSSFlex(aState, this, flex);
 
   return flex;
 }
@@ -604,7 +604,7 @@ nsIFrame::Redraw(nsBoxLayoutState& aState,
 }
 
 bool
-nsIBox::AddCSSPrefSize(nsIBox* aBox, nsSize& aSize, bool &aWidthSet, bool &aHeightSet)
+nsIFrame::AddCSSPrefSize(nsIFrame* aBox, nsSize& aSize, bool &aWidthSet, bool &aHeightSet)
 {
     aWidthSet = false;
     aHeightSet = false;
@@ -677,7 +677,7 @@ nsIBox::AddCSSPrefSize(nsIBox* aBox, nsSize& aSize, bool &aWidthSet, bool &aHeig
 
 
 bool
-nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize,
+nsIFrame::AddCSSMinSize(nsBoxLayoutState& aState, nsIFrame* aBox, nsSize& aSize,
                       bool &aWidthSet, bool &aHeightSet)
 {
     aWidthSet = false;
@@ -787,7 +787,7 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize,
 }
 
 bool
-nsIBox::AddCSSMaxSize(nsIBox* aBox, nsSize& aSize, bool &aWidthSet, bool &aHeightSet)
+nsIFrame::AddCSSMaxSize(nsIFrame* aBox, nsSize& aSize, bool &aWidthSet, bool &aHeightSet)
 {
     aWidthSet = false;
     aHeightSet = false;
@@ -846,7 +846,7 @@ nsIBox::AddCSSMaxSize(nsIBox* aBox, nsSize& aSize, bool &aWidthSet, bool &aHeigh
 }
 
 bool
-nsIBox::AddCSSFlex(nsBoxLayoutState& aState, nsIBox* aBox, nscoord& aFlex)
+nsIFrame::AddCSSFlex(nsBoxLayoutState& aState, nsIFrame* aBox, nscoord& aFlex)
 {
     bool flexSet = false;
 
@@ -882,7 +882,7 @@ nsBox::AddBorderAndPadding(nsSize& aSize)
 }
 
 void
-nsBox::AddBorderAndPadding(nsIBox* aBox, nsSize& aSize)
+nsBox::AddBorderAndPadding(nsIFrame* aBox, nsSize& aSize)
 {
   nsMargin borderPadding(0,0,0,0);
   aBox->GetBorderAndPadding(borderPadding);
@@ -890,7 +890,7 @@ nsBox::AddBorderAndPadding(nsIBox* aBox, nsSize& aSize)
 }
 
 void
-nsBox::AddMargin(nsIBox* aChild, nsSize& aSize)
+nsBox::AddMargin(nsIFrame* aChild, nsSize& aSize)
 {
   nsMargin margin(0,0,0,0);
   aChild->GetMargin(margin);
@@ -942,14 +942,14 @@ nsBox::SetDebug(nsBoxLayoutState& aState, bool aDebug)
 
 NS_IMETHODIMP
 nsBox::GetDebugBoxAt( const nsPoint& aPoint,
-                      nsIBox**     aBox)
+                      nsIFrame**     aBox)
 {
   nsRect thisRect(nsPoint(0,0), GetSize());
   if (!thisRect.Contains(aPoint))
     return NS_ERROR_FAILURE;
 
-  nsIBox* child = GetChildBox();
-  nsIBox* hit = nullptr;
+  nsIFrame* child = GetChildBox();
+  nsIFrame* hit = nullptr;
 
   *aBox = nullptr;
   while (nullptr != child) {
diff --git a/layout/xul/base/src/nsBox.h b/layout/xul/base/src/nsBox.h
index d18f79aea4d6..9673463e9c14 100644
--- a/layout/xul/base/src/nsBox.h
+++ b/layout/xul/base/src/nsBox.h
@@ -42,10 +42,10 @@ public:
   virtual Valignment GetVAlign() const { return vAlign_Top; }
   virtual Halignment GetHAlign() const { return hAlign_Left; }
 
-  NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild);
+  NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild);
 
 #ifdef DEBUG_LAYOUT
-  NS_IMETHOD GetDebugBoxAt(const nsPoint& aPoint, nsIBox** aBox);
+  NS_IMETHOD GetDebugBoxAt(const nsPoint& aPoint, nsIFrame** aBox);
   NS_IMETHOD GetDebug(bool& aDebug);
   NS_IMETHOD SetDebug(nsBoxLayoutState& aState, bool aDebug);
 
@@ -72,8 +72,8 @@ rollbox.
 
   void AddBorderAndPadding(nsSize& aSize);
 
-  static void AddBorderAndPadding(nsIBox* aBox, nsSize& aSize);
-  static void AddMargin(nsIBox* aChild, nsSize& aSize);
+  static void AddBorderAndPadding(nsIFrame* aBox, nsSize& aSize);
+  static void AddMargin(nsIFrame* aChild, nsSize& aSize);
   static void AddMargin(nsSize& aSize, const nsMargin& aMargin);
 
   static nsSize BoundsCheckMinMax(const nsSize& aMinSize, const nsSize& aMaxSize);
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 2f9dcc846607..cc2af1425886 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -80,7 +80,7 @@ using namespace mozilla;
 
 #ifdef DEBUG_LAYOUT
 bool nsBoxFrame::gDebug = false;
-nsIBox* nsBoxFrame::mDebugChild = nullptr;
+nsIFrame* nsBoxFrame::mDebugChild = nullptr;
 #endif
 
 nsIFrame*
@@ -759,7 +759,7 @@ nsBoxFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState)
 
   // if the size was not completely redefined in CSS then ask our children
   bool widthSet, heightSet;
-  if (!nsIBox::AddCSSPrefSize(this, size, widthSet, heightSet))
+  if (!nsIFrame::AddCSSPrefSize(this, size, widthSet, heightSet))
   {
     if (mLayoutManager) {
       nsSize layoutSize = mLayoutManager->GetPrefSize(this, aBoxLayoutState);
@@ -822,7 +822,7 @@ nsBoxFrame::GetMinSize(nsBoxLayoutState& aBoxLayoutState)
 
   // if the size was not completely redefined in CSS then ask our children
   bool widthSet, heightSet;
-  if (!nsIBox::AddCSSMinSize(aBoxLayoutState, this, size, widthSet, heightSet))
+  if (!nsIFrame::AddCSSMinSize(aBoxLayoutState, this, size, widthSet, heightSet))
   {
     if (mLayoutManager) {
       nsSize layoutSize = mLayoutManager->GetMinSize(this, aBoxLayoutState);
@@ -862,7 +862,7 @@ nsBoxFrame::GetMaxSize(nsBoxLayoutState& aBoxLayoutState)
 
   // if the size was not completely redefined in CSS then ask our children
   bool widthSet, heightSet;
-  if (!nsIBox::AddCSSMaxSize(this, size, widthSet, heightSet))
+  if (!nsIFrame::AddCSSMaxSize(this, size, widthSet, heightSet))
   {
     if (mLayoutManager) {
       nsSize layoutSize = mLayoutManager->GetMaxSize(this, aBoxLayoutState);
@@ -1226,7 +1226,7 @@ nsBoxFrame::AttributeChanged(PRInt32 aNameSpaceID,
   }
   else if (aAttribute == nsGkAtoms::ordinal) {
     nsBoxLayoutState state(PresContext());
-    nsIBox* parent = GetParentBox();
+    nsIFrame* parent = GetParentBox();
     // If our parent is not a box, there's not much we can do... but in that
     // case our ordinal doesn't matter anyway, so that's ok.
     // Also don't bother with popup frames since they are kept on the 
@@ -1713,7 +1713,7 @@ nsBoxFrame::GetValue(nsPresContext* aPresContext, PRInt32 a, PRInt32 b, char* ch
 }
 
 nsresult
-nsBoxFrame::DisplayDebugInfoFor(nsIBox*  aBox,
+nsBoxFrame::DisplayDebugInfoFor(nsIFrame*  aBox,
                                 nsPoint& aPoint)
 {
     nsBoxLayoutState state(GetPresContext());
@@ -1736,7 +1736,7 @@ nsBoxFrame::DisplayDebugInfoFor(nsIBox*  aBox,
     //printf("%%%%%% inside box %%%%%%%\n");
 
     int count = 0;
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     nsMargin m;
     nsMargin m2;
@@ -1783,10 +1783,10 @@ nsBoxFrame::DisplayDebugInfoFor(nsIBox*  aBox,
                     nscoord flexCSS = NS_INTRINSICSIZE;
 
                     bool widthSet, heightSet;
-                    nsIBox::AddCSSPrefSize(child, prefSizeCSS, widthSet, heightSet);
-                    nsIBox::AddCSSMinSize (state, child, minSizeCSS, widthSet, heightSet);
-                    nsIBox::AddCSSMaxSize (child, maxSizeCSS, widthSet, heightSet);
-                    nsIBox::AddCSSFlex    (state, child, flexCSS);
+                    nsIFrame::AddCSSPrefSize(child, prefSizeCSS, widthSet, heightSet);
+                    nsIFrame::AddCSSMinSize (state, child, minSizeCSS, widthSet, heightSet);
+                    nsIFrame::AddCSSMaxSize (child, maxSizeCSS, widthSet, heightSet);
+                    nsIFrame::AddCSSFlex    (state, child, flexCSS);
 
                     nsSize prefSize = child->GetPrefSize(state);
                     nsSize minSize = child->GetMinSize(state);
@@ -1837,9 +1837,9 @@ nsBoxFrame::DisplayDebugInfoFor(nsIBox*  aBox,
 }
 
 void
-nsBoxFrame::SetDebugOnChildList(nsBoxLayoutState& aState, nsIBox* aChild, bool aDebug)
+nsBoxFrame::SetDebugOnChildList(nsBoxLayoutState& aState, nsIFrame* aChild, bool aDebug)
 {
-    nsIBox* child = GetChildBox();
+    nsIFrame* child = GetChildBox();
      while (child)
      {
         child->SetDebug(aState, aDebug);
@@ -1848,7 +1848,7 @@ nsBoxFrame::SetDebugOnChildList(nsBoxLayoutState& aState, nsIBox* aChild, bool a
 }
 
 nsresult
-nsBoxFrame::GetFrameSizeWithMargin(nsIBox* aBox, nsSize& aSize)
+nsBoxFrame::GetFrameSizeWithMargin(nsIFrame* aBox, nsSize& aSize)
 {
   nsRect rect(aBox->GetRect());
   nsMargin margin(0,0,0,0);
@@ -2024,7 +2024,7 @@ nsBoxFrame::CheckBoxOrder(nsBoxLayoutState& aState)
 }
 
 nsresult
-nsBoxFrame::LayoutChildAt(nsBoxLayoutState& aState, nsIBox* aBox, const nsRect& aRect)
+nsBoxFrame::LayoutChildAt(nsBoxLayoutState& aState, nsIFrame* aBox, const nsRect& aRect)
 {
   // get the current rect
   nsRect oldRect(aBox->GetRect());
@@ -2040,7 +2040,7 @@ nsBoxFrame::LayoutChildAt(nsBoxLayoutState& aState, nsIBox* aBox, const nsRect&
 }
 
 NS_IMETHODIMP
-nsBoxFrame::RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild)
+nsBoxFrame::RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild)
 {
   if (!SupportsOrdinalsInChildren())
     return NS_OK;
diff --git a/layout/xul/base/src/nsBoxFrame.h b/layout/xul/base/src/nsBoxFrame.h
index 125bc268f360..3fbdb644a351 100644
--- a/layout/xul/base/src/nsBoxFrame.h
+++ b/layout/xul/base/src/nsBoxFrame.h
@@ -58,11 +58,10 @@ public:
   // gets the rect inside our border and debug border. If you wish to paint inside a box
   // call this method to get the rect so you don't draw on the debug border or outer border.
 
-  // ------ nsIBox -------------
   virtual void SetLayoutManager(nsBoxLayout* aLayout) { mLayoutManager = aLayout; }
   virtual nsBoxLayout* GetLayoutManager() { return mLayoutManager; }
 
-  NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild);
+  NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild);
 
   virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
@@ -162,12 +161,12 @@ public:
                               const nsDisplayListSet& aLists);
   
 #ifdef DEBUG_LAYOUT
-    virtual void SetDebugOnChildList(nsBoxLayoutState& aState, nsIBox* aChild, bool aDebug);
-    nsresult DisplayDebugInfoFor(nsIBox*  aBox, 
+    virtual void SetDebugOnChildList(nsBoxLayoutState& aState, nsIFrame* aChild, bool aDebug);
+    nsresult DisplayDebugInfoFor(nsIFrame*  aBox, 
                                  nsPoint& aPoint);
 #endif
 
-  static nsresult LayoutChildAt(nsBoxLayoutState& aState, nsIBox* aBox, const nsRect& aRect);
+  static nsresult LayoutChildAt(nsBoxLayoutState& aState, nsIFrame* aBox, const nsRect& aRect);
 
   /**
    * Utility method to redirect events on descendants to this frame.
@@ -233,7 +232,7 @@ private:
     void GetDebugPadding(nsMargin& aInset);
     void GetDebugMargin(nsMargin& aInset);
 
-    nsresult GetFrameSizeWithMargin(nsIBox* aBox, nsSize& aSize);
+    nsresult GetFrameSizeWithMargin(nsIFrame* aBox, nsSize& aSize);
 
     void PixelMarginToTwips(nsPresContext* aPresContext, nsMargin& aMarginPixels);
 
@@ -253,7 +252,7 @@ private:
 
 #ifdef DEBUG_LAYOUT
     static bool gDebug;
-    static nsIBox* mDebugChild;
+    static nsIFrame* mDebugChild;
 #endif
 
 }; // class nsBoxFrame
diff --git a/layout/xul/base/src/nsBoxLayout.cpp b/layout/xul/base/src/nsBoxLayout.cpp
index d11de4e06f9d..223cef7f5f46 100644
--- a/layout/xul/base/src/nsBoxLayout.cpp
+++ b/layout/xul/base/src/nsBoxLayout.cpp
@@ -16,13 +16,13 @@
 #include "nsBoxLayout.h"
 
 void
-nsBoxLayout::AddBorderAndPadding(nsIBox* aBox, nsSize& aSize)
+nsBoxLayout::AddBorderAndPadding(nsIFrame* aBox, nsSize& aSize)
 {
   nsBox::AddBorderAndPadding(aBox, aSize);
 }
 
 void
-nsBoxLayout::AddMargin(nsIBox* aBox, nsSize& aSize)
+nsBoxLayout::AddMargin(nsIFrame* aBox, nsSize& aSize)
 {
   nsBox::AddMargin(aBox, aSize);
 }
@@ -34,7 +34,7 @@ nsBoxLayout::AddMargin(nsSize& aSize, const nsMargin& aMargin)
 }
 
 nsSize
-nsBoxLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsBoxLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   nsSize pref (0, 0);
   AddBorderAndPadding(aBox, pref);
@@ -43,7 +43,7 @@ nsBoxLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 }
 
 nsSize
-nsBoxLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsBoxLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   nsSize minSize (0,0);
   AddBorderAndPadding(aBox, minSize);
@@ -51,7 +51,7 @@ nsBoxLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 }
 
 nsSize
-nsBoxLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsBoxLayout::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   //AddBorderAndPadding () never changes maxSize (NS_INTRINSICSIZE)
   //AddBorderAndPadding(aBox, maxSize);
@@ -60,13 +60,13 @@ nsBoxLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 
 
 nscoord
-nsBoxLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsBoxLayout::GetAscent(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   return 0;
 }
 
 NS_IMETHODIMP
-nsBoxLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsBoxLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   return NS_OK;
 }
diff --git a/layout/xul/base/src/nsBoxLayout.h b/layout/xul/base/src/nsBoxLayout.h
index 55bee69f9921..201ee61feceb 100644
--- a/layout/xul/base/src/nsBoxLayout.h
+++ b/layout/xul/base/src/nsBoxLayout.h
@@ -7,7 +7,13 @@
 #define nsBoxLayout_h___
 
 #include "nsISupports.h"
-#include "nsIFrame.h"
+#include "nsCoord.h"
+#include "nsFrameList.h"
+
+class nsIFrame;
+class nsBoxLayoutState;
+struct nsSize;
+struct nsMargin;
 
 #define NS_BOX_LAYOUT_IID \
 { 0x09d522a7, 0x304c, 0x4137, \
@@ -26,23 +32,23 @@ public:
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_BOX_LAYOUT_IID)
 
-  NS_IMETHOD Layout(nsIBox* aBox, nsBoxLayoutState& aState);
+  NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
 
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nscoord GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                                nsIBox* aPrevBox,
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nscoord GetAscent(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual void ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
+                                nsIFrame* aPrevBox,
                                 const nsFrameList::Slice& aNewChildren) {}
-  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+  virtual void ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
                                 const nsFrameList::Slice& aNewChildren) {}
-  virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList) {}
-  virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList) {}
-  virtual void IntrinsicWidthsDirty(nsIBox* aBox, nsBoxLayoutState& aState) {}
+  virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList) {}
+  virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList) {}
+  virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aState) {}
 
-  virtual void AddBorderAndPadding(nsIBox* aBox, nsSize& aSize);
-  virtual void AddMargin(nsIBox* aChild, nsSize& aSize);
+  virtual void AddBorderAndPadding(nsIFrame* aBox, nsSize& aSize);
+  virtual void AddMargin(nsIFrame* aChild, nsSize& aSize);
   virtual void AddMargin(nsSize& aSize, const nsMargin& aMargin);
 
   virtual nsIGridPart* AsGridPart() { return nullptr; }
diff --git a/layout/xul/base/src/nsBoxLayoutState.h b/layout/xul/base/src/nsBoxLayoutState.h
index ecfa2922631e..8c7f9df75b04 100644
--- a/layout/xul/base/src/nsBoxLayoutState.h
+++ b/layout/xul/base/src/nsBoxLayoutState.h
@@ -13,7 +13,6 @@
 #ifndef nsBoxLayoutState_h___
 #define nsBoxLayoutState_h___
 
-#include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
@@ -21,6 +20,7 @@
 class nsRenderingContext;
 class nsCalculatedBoxInfo;
 struct nsHTMLReflowMetrics;
+struct nsHTMLReflowState;
 class nsString;
 class nsHTMLReflowCommand;
 
diff --git a/layout/xul/base/src/nsDeckFrame.cpp b/layout/xul/base/src/nsDeckFrame.cpp
index 8a25fce487b5..e70d81745243 100644
--- a/layout/xul/base/src/nsDeckFrame.cpp
+++ b/layout/xul/base/src/nsDeckFrame.cpp
@@ -83,7 +83,7 @@ nsDeckFrame::Init(nsIContent*     aContent,
 }
 
 void
-nsDeckFrame::HideBox(nsIBox* aBox)
+nsDeckFrame::HideBox(nsIFrame* aBox)
 {
   nsIPresShell::ClearMouseCapture(aBox);
 }
@@ -100,7 +100,7 @@ nsDeckFrame::IndexChanged()
   InvalidateOverflowRect();
 
   // hide the currently showing box
-  nsIBox* currentBox = GetSelectedBox();
+  nsIFrame* currentBox = GetSelectedBox();
   if (currentBox) // only hide if it exists
     HideBox(currentBox);
 
@@ -152,7 +152,7 @@ nsDeckFrame::BuildDisplayListForChildren(nsDisplayListBuilder*   aBuilder,
                                          const nsDisplayListSet& aLists)
 {
   // only paint the selected box
-  nsIBox* box = GetSelectedBox();
+  nsIFrame* box = GetSelectedBox();
   if (!box)
     return NS_OK;
 
@@ -174,7 +174,7 @@ nsDeckFrame::DoLayout(nsBoxLayoutState& aState)
   nsresult rv = nsBoxFrame::DoLayout(aState);
 
   // run though each child. Hide all but the selected one
-  nsIBox* box = GetChildBox();
+  nsIFrame* box = GetChildBox();
 
   nscoord count = 0;
   while (box) 
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h
index daa439f85478..c68e4fa2857a 100644
--- a/layout/xul/base/src/nsDeckFrame.h
+++ b/layout/xul/base/src/nsDeckFrame.h
@@ -61,7 +61,7 @@ protected:
 
   void IndexChanged();
   PRInt32 GetSelectedIndex();
-  void HideBox(nsIBox* aBox);
+  void HideBox(nsIFrame* aBox);
 
 private:
 
diff --git a/layout/xul/base/src/nsGroupBoxFrame.cpp b/layout/xul/base/src/nsGroupBoxFrame.cpp
index c054d657c5c2..00f76b149797 100644
--- a/layout/xul/base/src/nsGroupBoxFrame.cpp
+++ b/layout/xul/base/src/nsGroupBoxFrame.cpp
@@ -43,7 +43,7 @@ public:
   virtual bool GetInitialVAlignment(Valignment& aValign)  { aValign = vAlign_Top; return true; } 
   virtual bool GetInitialAutoStretch(bool& aStretch)    { aStretch = true; return true; } 
 
-  nsIBox* GetCaptionBox(nsPresContext* aPresContext, nsRect& aCaptionRect);
+  nsIFrame* GetCaptionBox(nsPresContext* aPresContext, nsRect& aCaptionRect);
 };
 
 /*
@@ -133,7 +133,7 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
   nsPresContext* presContext = PresContext();
 
   nsRect groupRect;
-  nsIBox* groupBox = GetCaptionBox(presContext, groupRect);
+  nsIFrame* groupBox = GetCaptionBox(presContext, groupRect);
 
   if (groupBox) {        
     // if the border is smaller than the legend. Move the border down
@@ -207,11 +207,11 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
   }
 }
 
-nsIBox*
+nsIFrame*
 nsGroupBoxFrame::GetCaptionBox(nsPresContext* aPresContext, nsRect& aCaptionRect)
 {
     // first child is our grouped area
-    nsIBox* box = GetChildBox();
+    nsIFrame* box = GetChildBox();
 
     // no area fail.
     if (!box)
@@ -225,7 +225,7 @@ nsGroupBoxFrame::GetCaptionBox(nsPresContext* aPresContext, nsRect& aCaptionRect
       return nullptr;
 
     // now get the caption itself. It is in the caption frame.
-    nsIBox* child = box->GetChildBox();
+    nsIFrame* child = box->GetChildBox();
 
     if (child) {
        // convert to our coordinates.
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index 4c193e601a01..7ee1e8240d22 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -439,7 +439,7 @@ nsImageBoxFrame::GetPrefSize(nsBoxLayoutState& aState)
   size.height += borderPadding.TopBottom();
 
   bool widthSet, heightSet;
-  nsIBox::AddCSSPrefSize(this, size, widthSet, heightSet);
+  nsIFrame::AddCSSPrefSize(this, size, widthSet, heightSet);
   NS_ASSERTION(size.width != NS_INTRINSICSIZE && size.height != NS_INTRINSICSIZE,
                "non-intrinsic size expected");
 
@@ -504,7 +504,7 @@ nsImageBoxFrame::GetMinSize(nsBoxLayoutState& aState)
   DISPLAY_MIN_SIZE(this, size);
   AddBorderAndPadding(size);
   bool widthSet, heightSet;
-  nsIBox::AddCSSMinSize(aState, this, size, widthSet, heightSet);
+  nsIFrame::AddCSSMinSize(aState, this, size, widthSet, heightSet);
   return size;
 }
 
diff --git a/layout/xul/base/src/nsImageBoxFrame.h b/layout/xul/base/src/nsImageBoxFrame.h
index 69c08f278c67..411b9cf9880c 100644
--- a/layout/xul/base/src/nsImageBoxFrame.h
+++ b/layout/xul/base/src/nsImageBoxFrame.h
@@ -44,7 +44,6 @@ class nsImageBoxFrame : public nsLeafBoxFrame
 public:
   NS_DECL_FRAMEARENA_HELPERS
 
-  // nsIBox
   virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
@@ -52,8 +51,6 @@ public:
 
   friend nsIFrame* NS_NewImageBoxFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
-  // nsIBox frame interface
-
   NS_IMETHOD  Init(nsIContent*      aContent,
                    nsIFrame*        aParent,
                    nsIFrame*        asPrevInFlow);
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index 2adfcfc0df7b..b9b9d5452851 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -184,7 +184,7 @@ nsListBoxBodyFrame::Init(nsIContent*     aContent,
   NS_ENSURE_SUCCESS(rv, rv);
   nsIScrollableFrame* scrollFrame = nsLayoutUtils::GetScrollableFrameFor(this);
   if (scrollFrame) {
-    nsIBox* verticalScrollbar = scrollFrame->GetScrollbarBox(true);
+    nsIFrame* verticalScrollbar = scrollFrame->GetScrollbarBox(true);
     nsScrollbarFrame* scrollbarFrame = do_QueryFrame(verticalScrollbar);
     if (scrollbarFrame) {
       scrollbarFrame->SetScrollbarMediatorContent(GetContent());
@@ -235,8 +235,6 @@ nsListBoxBodyFrame::AttributeChanged(PRInt32 aNameSpaceID,
  
 }
 
-/////////// nsIBox ///////////////
-
 /* virtual */ void
 nsListBoxBodyFrame::MarkIntrinsicWidthsDirty()
 {
@@ -995,7 +993,7 @@ nsListBoxBodyFrame::CreateRows()
   
   // get the first tree box. If there isn't one create one.
   bool created = false;
-  nsIBox* box = GetFirstItemBox(0, &created);
+  nsIFrame* box = GetFirstItemBox(0, &created);
   nscoord rowHeight = GetRowHeightAppUnits();
   while (box) {  
     if (created && mRowsToPrepend > 0)
@@ -1088,10 +1086,10 @@ IsListItemChild(nsListBoxBodyFrame* aParent, nsIContent* aChild,
 }
 
 //
-// Get the nsIBox for the first visible listitem, and if none exists,
+// Get the nsIFrame for the first visible listitem, and if none exists,
 // create one.
 //
-nsIBox* 
+nsIFrame*
 nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, bool* aCreated)
 {
   if (aCreated)
@@ -1101,7 +1099,7 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, bool* aCreated)
   mBottomFrame = mTopFrame;
 
   if (mTopFrame) {
-    return mTopFrame->IsBoxFrame() ? static_cast<nsIBox*>(mTopFrame) : nullptr;
+    return mTopFrame->IsBoxFrame() ? mTopFrame : nullptr;
   }
 
   // top frame was cleared out
@@ -1109,7 +1107,7 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, bool* aCreated)
   mBottomFrame = mTopFrame;
 
   if (mTopFrame && mRowsToPrepend <= 0) {
-    return mTopFrame->IsBoxFrame() ? static_cast<nsIBox*>(mTopFrame) : nullptr;
+    return mTopFrame->IsBoxFrame() ? mTopFrame : nullptr;
   }
 
   // At this point, we either have no frames at all, 
@@ -1159,7 +1157,7 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, bool* aCreated)
 
       mBottomFrame = mTopFrame;
 
-      return mTopFrame->IsBoxFrame() ? static_cast<nsIBox*>(mTopFrame) : nullptr;
+      return mTopFrame->IsBoxFrame() ? mTopFrame : nullptr;
     } else
       return GetFirstItemBox(++aOffset, 0);
   }
@@ -1168,11 +1166,11 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, bool* aCreated)
 }
 
 //
-// Get the nsIBox for the next visible listitem after aBox, and if none
+// Get the nsIFrame for the next visible listitem after aBox, and if none
 // exists, create one.
 //
-nsIBox* 
-nsListBoxBodyFrame::GetNextItemBox(nsIBox* aBox, PRInt32 aOffset,
+nsIFrame*
+nsListBoxBodyFrame::GetNextItemBox(nsIFrame* aBox, PRInt32 aOffset,
                                    bool* aCreated)
 {
   if (aCreated)
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.h b/layout/xul/base/src/nsListBoxBodyFrame.h
index 34c9a42c4f10..0e133d6061c2 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.h
+++ b/layout/xul/base/src/nsListBoxBodyFrame.h
@@ -63,7 +63,6 @@ public:
   virtual bool ReflowFinished();
   virtual void ReflowCallbackCanceled();
 
-  // nsIBox
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
   virtual void MarkIntrinsicWidthsDirty();
 
@@ -98,8 +97,8 @@ public:
   void CreateRows();
   void DestroyRows(PRInt32& aRowsToLose);
   void ReverseDestroyRows(PRInt32& aRowsToLose);
-  nsIBox* GetFirstItemBox(PRInt32 aOffset, bool* aCreated);
-  nsIBox* GetNextItemBox(nsIBox* aBox, PRInt32 aOffset, bool* aCreated);
+  nsIFrame* GetFirstItemBox(PRInt32 aOffset, bool* aCreated);
+  nsIFrame* GetNextItemBox(nsIFrame* aBox, PRInt32 aOffset, bool* aCreated);
   bool ContinueReflow(nscoord height);
   NS_IMETHOD ListBoxAppendFrames(nsFrameList& aFrameList);
   NS_IMETHOD ListBoxInsertFrames(nsIFrame* aPrevFrame, nsFrameList& aFrameList);
diff --git a/layout/xul/base/src/nsListBoxLayout.cpp b/layout/xul/base/src/nsListBoxLayout.cpp
index 0883163639c9..b039e49b1dbd 100644
--- a/layout/xul/base/src/nsListBoxLayout.cpp
+++ b/layout/xul/base/src/nsListBoxLayout.cpp
@@ -6,7 +6,6 @@
 #include "nsListBoxLayout.h"
 
 #include "nsListBoxBodyFrame.h"
-#include "nsIFrame.h"
 #include "nsBox.h"
 #include "nsBoxLayoutState.h"
 #include "nsIScrollableFrame.h"
@@ -22,7 +21,7 @@ nsListBoxLayout::nsListBoxLayout() : nsGridRowGroupLayout()
 ////////// nsBoxLayout //////////////
 
 nsSize
-nsListBoxLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsListBoxLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   nsSize pref = nsGridRowGroupLayout::GetPrefSize(aBox, aBoxLayoutState);
 
@@ -48,7 +47,7 @@ nsListBoxLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 }
 
 nsSize
-nsListBoxLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsListBoxLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   nsSize minSize = nsGridRowGroupLayout::GetMinSize(aBox, aBoxLayoutState);
 
@@ -74,7 +73,7 @@ nsListBoxLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 }
 
 nsSize
-nsListBoxLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
+nsListBoxLayout::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
 {
   nsSize maxSize = nsGridRowGroupLayout::GetMaxSize(aBox, aBoxLayoutState);
 
@@ -94,7 +93,7 @@ nsListBoxLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)
 }
 
 NS_IMETHODIMP
-nsListBoxLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
+nsListBoxLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   return LayoutInternal(aBox, aState);
 }
@@ -106,7 +105,7 @@ nsListBoxLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
  * Called to layout our our children. Does no frame construction
  */
 NS_IMETHODIMP
-nsListBoxLayout::LayoutInternal(nsIBox* aBox, nsBoxLayoutState& aState)
+nsListBoxLayout::LayoutInternal(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   PRInt32 redrawStart = -1;
 
@@ -137,7 +136,7 @@ nsListBoxLayout::LayoutInternal(nsIBox* aBox, nsBoxLayoutState& aState)
   }
 
   // run through all our currently created children
-  nsIBox* box = body->GetChildBox();
+  nsIFrame* box = body->GetChildBox();
 
   // if the reason is resize or initial we must relayout.
   nscoord rowHeight = body->GetRowHeightAppUnits();
diff --git a/layout/xul/base/src/nsListBoxLayout.h b/layout/xul/base/src/nsListBoxLayout.h
index 2d1ed7937da0..dcef3d958638 100644
--- a/layout/xul/base/src/nsListBoxLayout.h
+++ b/layout/xul/base/src/nsListBoxLayout.h
@@ -7,8 +7,9 @@
 #define nsListBoxLayout_h___
 
 #include "nsGridRowGroupLayout.h"
-#include "nsIFrame.h"
 
+class nsIFrame;
+typedef class nsIFrame nsIFrame;
 class nsBoxLayoutState;
 
 class nsListBoxLayout : public nsGridRowGroupLayout
@@ -17,13 +18,13 @@ public:
   nsListBoxLayout();
 
   // nsBoxLayout
-  NS_IMETHOD Layout(nsIBox* aBox, nsBoxLayoutState& aState);
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
+  NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
 
 protected:
-  NS_IMETHOD LayoutInternal(nsIBox* aBox, nsBoxLayoutState& aState);
+  NS_IMETHOD LayoutInternal(nsIFrame* aBox, nsBoxLayoutState& aState);
 };
 
 #endif
diff --git a/layout/xul/base/src/nsListItemFrame.h b/layout/xul/base/src/nsListItemFrame.h
index abe82c2c892f..8fce5756f06c 100644
--- a/layout/xul/base/src/nsListItemFrame.h
+++ b/layout/xul/base/src/nsListItemFrame.h
@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsBoxFrame.h"
 #include "nsGridRowLeafFrame.h"
 
 nsIFrame* NS_NewListItemFrame(nsIPresShell* aPresShell,
@@ -23,9 +22,8 @@ public:
                                          const nsRect&           aDirtyRect,
                                          const nsDisplayListSet& aLists);
 
-  // nsIBox
   virtual nsSize GetPrefSize(nsBoxLayoutState& aState);
-  
+
 protected:
   nsListItemFrame(nsIPresShell* aPresShell,
                   nsStyleContext *aContext,
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp
index 7f123a2ba3d8..a8d1343657a5 100644
--- a/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/layout/xul/base/src/nsMenuBarListener.cpp
@@ -6,7 +6,7 @@
 #include "nsMenuBarListener.h"
 #include "nsMenuBarFrame.h"
 #include "nsMenuPopupFrame.h"
-#include "nsIDOMNSEvent.h"
+#include "nsIDOMEvent.h"
 #include "nsGUIEvent.h"
 
 // Drag & Drop, Clipboard
@@ -117,15 +117,12 @@ nsMenuBarListener::KeyUp(nsIDOMEvent* aKeyEvent)
   InitAccessKey();
 
   //handlers shouldn't be triggered by non-trusted events.
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
   bool trustedEvent = false;
+  aKeyEvent->GetIsTrusted(&trustedEvent);
 
-  if (domNSEvent) {
-    domNSEvent->GetIsTrusted(&trustedEvent);
-  }
-
-  if (!trustedEvent)
+  if (!trustedEvent) {
     return NS_OK;
+  }
 
   if (mAccessKey && mAccessKeyFocuses)
   {
@@ -167,10 +164,9 @@ nsresult
 nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
 {
   // if event has already been handled, bail
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
-  if (domNSEvent) {
+  if (aKeyEvent) {
     bool eventHandled = false;
-    domNSEvent->GetPreventDefault(&eventHandled);
+    aKeyEvent->GetPreventDefault(&eventHandled);
     if (eventHandled) {
       return NS_OK;       // don't consume event
     }
@@ -178,8 +174,8 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
 
   //handlers shouldn't be triggered by non-trusted events.
   bool trustedEvent = false;
-  if (domNSEvent) {
-    domNSEvent->GetIsTrusted(&trustedEvent);
+  if (aKeyEvent) {
+    aKeyEvent->GetIsTrusted(&trustedEvent);
   }
 
   if (!trustedEvent)
@@ -192,7 +188,7 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
   if (mAccessKey)
   {
     bool preventDefault;
-    domNSEvent->GetPreventDefault(&preventDefault);
+    aKeyEvent->GetPreventDefault(&preventDefault);
     if (!preventDefault) {
       nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aKeyEvent);
       PRUint32 keyCode, charCode;
@@ -307,11 +303,9 @@ nsMenuBarListener::KeyDown(nsIDOMEvent* aKeyEvent)
   InitAccessKey();
 
   //handlers shouldn't be triggered by non-trusted events.
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
   bool trustedEvent = false;
-
-  if (domNSEvent) {
-    domNSEvent->GetIsTrusted(&trustedEvent);
+  if (aKeyEvent) {
+    aKeyEvent->GetIsTrusted(&trustedEvent);
   }
 
   if (!trustedEvent)
diff --git a/layout/xul/base/src/nsMenuBoxObject.cpp b/layout/xul/base/src/nsMenuBoxObject.cpp
index 48e7aab2d97c..5e3ea623999b 100644
--- a/layout/xul/base/src/nsMenuBoxObject.cpp
+++ b/layout/xul/base/src/nsMenuBoxObject.cpp
@@ -7,7 +7,6 @@
 #include "nsBoxObject.h"
 #include "nsIFrame.h"
 #include "nsGUIEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsMenuBarFrame.h"
 #include "nsMenuBarListener.h"
 #include "nsMenuFrame.h"
@@ -87,12 +86,8 @@ NS_IMETHODIMP nsMenuBoxObject::HandleKeyPress(nsIDOMKeyEvent* aKeyEvent, bool* a
     return NS_OK;
 
   // if event has already been handled, bail
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
-  if (!domNSEvent)
-    return NS_OK;
-
   bool eventHandled = false;
-  domNSEvent->GetPreventDefault(&eventHandled);
+  aKeyEvent->GetPreventDefault(&eventHandled);
   if (eventHandled)
     return NS_OK;
 
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp
index fd64bbe43f93..e66aeb3d2ff1 100644
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -1338,7 +1338,7 @@ nsMenuFrame::SizeToPopup(nsBoxLayoutState& aState, nsSize& aSize)
   if (!IsCollapsed()) {
     bool widthSet, heightSet;
     nsSize tmpSize(-1, 0);
-    nsIBox::AddCSSPrefSize(this, tmpSize, widthSet, heightSet);
+    nsIFrame::AddCSSPrefSize(this, tmpSize, widthSet, heightSet);
     if (!widthSet && GetFlex(aState) == 0) {
       nsMenuPopupFrame* popupFrame = GetPopup();
       if (!popupFrame)
diff --git a/layout/xul/base/src/nsMenuFrame.h b/layout/xul/base/src/nsMenuFrame.h
index d03c03a7b304..4e786c49a969 100644
--- a/layout/xul/base/src/nsMenuFrame.h
+++ b/layout/xul/base/src/nsMenuFrame.h
@@ -82,7 +82,6 @@ public:
   NS_DECL_QUERYFRAME
   NS_DECL_FRAMEARENA_HELPERS
 
-  // nsIBox
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
diff --git a/layout/xul/base/src/nsPopupBoxObject.cpp b/layout/xul/base/src/nsPopupBoxObject.cpp
index c253d62ec4e6..89e2e5909ab9 100644
--- a/layout/xul/base/src/nsPopupBoxObject.cpp
+++ b/layout/xul/base/src/nsPopupBoxObject.cpp
@@ -10,7 +10,6 @@
 #include "nsFrameManager.h"
 #include "nsIContent.h"
 #include "nsIDOMElement.h"
-#include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsGkAtoms.h"
 #include "nsMenuPopupFrame.h"
diff --git a/layout/xul/base/src/nsPopupSetFrame.h b/layout/xul/base/src/nsPopupSetFrame.h
index 02c3e7c2b2c8..f469a4874b9c 100644
--- a/layout/xul/base/src/nsPopupSetFrame.h
+++ b/layout/xul/base/src/nsPopupSetFrame.h
@@ -35,7 +35,6 @@ public:
   NS_IMETHOD  SetInitialChildList(ChildListID     aListID,
                                   nsFrameList&    aChildList);
 
-  // nsIBox
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
 
   // Used to destroy our popup frames.
diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp
index 56a0f2ee9caa..5e3b0ecfa578 100644
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -48,7 +48,7 @@ PRInt32 nsSliderFrame::gSnapMultiplier;
 #undef DEBUG_SLIDER
 
 static already_AddRefed<nsIContent>
-GetContentOfBox(nsIBox *aBox)
+GetContentOfBox(nsIFrame *aBox)
 {
   nsIContent* content = aBox->GetContent();
   NS_IF_ADDREF(content);
@@ -238,7 +238,7 @@ nsSliderFrame::AttributeChanged(PRInt32 aNameSpaceID,
              aAttribute == nsGkAtoms::maxpos) {
       // bounds check it.
 
-      nsIBox* scrollbarBox = GetScrollbar();
+      nsIFrame* scrollbarBox = GetScrollbar();
       nsCOMPtr<nsIContent> scrollbar;
       scrollbar = GetContentOfBox(scrollbarBox);
       PRInt32 current = GetCurrentPosition(scrollbar);
@@ -310,7 +310,7 @@ nsSliderFrame::BuildDisplayListForChildren(nsDisplayListBuilder*   aBuilder,
                                            const nsDisplayListSet& aLists)
 {
   // if we are too small to have a thumb don't paint it.
-  nsIBox* thumb = GetChildBox();
+  nsIFrame* thumb = GetChildBox();
 
   if (thumb) {
     nsRect thumbRect(thumb->GetRect());
@@ -332,7 +332,7 @@ NS_IMETHODIMP
 nsSliderFrame::DoLayout(nsBoxLayoutState& aState)
 {
   // get the thumb should be our only child
-  nsIBox* thumbBox = GetChildBox();
+  nsIFrame* thumbBox = GetChildBox();
 
   if (!thumbBox) {
     SyncLayout(aState);
@@ -355,7 +355,7 @@ nsSliderFrame::DoLayout(nsBoxLayoutState& aState)
   GetClientRect(clientRect);
 
   // get the scrollbar
-  nsIBox* scrollbarBox = GetScrollbar();
+  nsIFrame* scrollbarBox = GetScrollbar();
   nsCOMPtr<nsIContent> scrollbar;
   scrollbar = GetContentOfBox(scrollbarBox);
 
@@ -430,7 +430,7 @@ nsSliderFrame::HandleEvent(nsPresContext* aPresContext,
     return NS_OK;
   }
 
-  nsIBox* scrollbarBox = GetScrollbar();
+  nsIFrame* scrollbarBox = GetScrollbar();
   nsCOMPtr<nsIContent> scrollbar;
   scrollbar = GetContentOfBox(scrollbarBox);
   bool isHorizontal = IsHorizontal();
@@ -604,7 +604,7 @@ nsSliderFrame::GetScrollToClick()
 #endif
 }
 
-nsIBox*
+nsIFrame*
 nsSliderFrame::GetScrollbar()
 {
   // if we are in a scrollbar then return the scrollbar's content node
@@ -624,7 +624,7 @@ nsSliderFrame::PageUpDown(nscoord change)
   // on a page up or down get our page increment. We get this by getting the scrollbar we are in and
   // asking it for the current position and the page increment. If we are not in a scrollbar we will
   // get the values from our own node.
-  nsIBox* scrollbarBox = GetScrollbar();
+  nsIFrame* scrollbarBox = GetScrollbar();
   nsCOMPtr<nsIContent> scrollbar;
   scrollbar = GetContentOfBox(scrollbarBox);
 
@@ -652,7 +652,7 @@ nsresult
 nsSliderFrame::CurrentPositionChanged(nsPresContext* aPresContext,
                                       bool aImmediateRedraw)
 {
-  nsIBox* scrollbarBox = GetScrollbar();
+  nsIFrame* scrollbarBox = GetScrollbar();
   nsCOMPtr<nsIContent> scrollbar;
   scrollbar = GetContentOfBox(scrollbarBox);
 
@@ -784,7 +784,7 @@ nsSliderFrame::SetCurrentPositionInternal(nsIContent* aScrollbar, PRInt32 aNewPo
                                           bool aImmediateRedraw)
 {
   nsCOMPtr<nsIContent> scrollbar = aScrollbar;
-  nsIBox* scrollbarBox = GetScrollbar();
+  nsIFrame* scrollbarBox = GetScrollbar();
 
   mUserChanged = true;
 
@@ -897,7 +897,7 @@ nsSliderFrame::StartDrag(nsIDOMEvent* aEvent)
 
     newpos -= (thumbLength/2);
 
-    nsIBox* scrollbarBox = GetScrollbar();
+    nsIFrame* scrollbarBox = GetScrollbar();
     scrollbar = GetContentOfBox(scrollbarBox);
   }
 
@@ -1080,7 +1080,7 @@ nsSliderFrame::GetMaxSize(nsBoxLayoutState& aState)
 void
 nsSliderFrame::EnsureOrient()
 {
-  nsIBox* scrollbarBox = GetScrollbar();
+  nsIFrame* scrollbarBox = GetScrollbar();
 
   bool isHorizontal = (scrollbarBox->GetStateBits() & NS_STATE_IS_HORIZONTAL) != 0;
   if (isHorizontal)
diff --git a/layout/xul/base/src/nsSliderFrame.h b/layout/xul/base/src/nsSliderFrame.h
index a79b2142c770..8ae123fbae63 100644
--- a/layout/xul/base/src/nsSliderFrame.h
+++ b/layout/xul/base/src/nsSliderFrame.h
@@ -52,7 +52,6 @@ public:
   }
 #endif
 
-  // nsIBox
   virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
@@ -127,7 +126,7 @@ public:
 private:
 
   bool GetScrollToClick();
-  nsIBox* GetScrollbar();
+  nsIFrame* GetScrollbar();
 
   void PageUpDown(nscoord change);
   void SetCurrentThumbPosition(nsIContent* aScrollbar, nscoord aNewPos, bool aIsSmooth,
diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp
index 0decb1eee417..ee504c972962 100644
--- a/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/layout/xul/base/src/nsSplitterFrame.cpp
@@ -105,13 +105,13 @@ public:
   bool SupportsCollapseDirection(CollapseDirection aDirection);
 
   void EnsureOrient();
-  void SetPreferredSize(nsBoxLayoutState& aState, nsIBox* aChildBox, nscoord aOnePixel, bool aIsHorizontal, nscoord* aSize);
+  void SetPreferredSize(nsBoxLayoutState& aState, nsIFrame* aChildBox, nscoord aOnePixel, bool aIsHorizontal, nscoord* aSize);
 
   nsSplitterFrame* mOuter;
   bool mDidDrag;
   nscoord mDragStart;
   nscoord mCurrentPos;
-  nsIBox* mParentBox;
+  nsIFrame* mParentBox;
   bool mPressed;
   nsSplitterInfo* mChildInfosBefore;
   nsSplitterInfo* mChildInfosAfter;
@@ -319,7 +319,7 @@ nsSplitterFrame::DoLayout(nsBoxLayoutState& aState)
 void
 nsSplitterFrame::GetInitialOrientation(bool& aIsHorizontal)
 {
-  nsIBox* box = GetParentBox();
+  nsIFrame* box = GetParentBox();
   if (box) {
     aIsHorizontal = !box->IsHorizontal();
   }
@@ -662,7 +662,7 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent)
   mChildInfosBeforeCount = 0;
   mChildInfosAfterCount = 0;
 
-  nsIBox* childBox = mParentBox->GetChildBox();
+  nsIFrame* childBox = mParentBox->GetChildBox();
 
   while (nullptr != childBox) 
   { 
@@ -907,9 +907,9 @@ nsSplitterFrameInner::AdjustChildren(nsPresContext* aPresContext)
   aPresContext->PresShell()->FlushPendingNotifications(Flush_Display);
 }
 
-static nsIBox* GetChildBoxForContent(nsIBox* aParentBox, nsIContent* aContent)
+static nsIFrame* GetChildBoxForContent(nsIFrame* aParentBox, nsIContent* aContent)
 {
-  nsIBox* childBox = aParentBox->GetChildBox();
+  nsIFrame* childBox = aParentBox->GetChildBox();
 
   while (nullptr != childBox) {
     if (childBox->GetContent() == aContent) {
@@ -930,7 +930,7 @@ nsSplitterFrameInner::AdjustChildren(nsPresContext* aPresContext, nsSplitterInfo
   nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
 
   // first set all the widths.
-  nsIBox* child =  mOuter->GetChildBox();
+  nsIFrame* child =  mOuter->GetChildBox();
   while(child)
   {
     SetPreferredSize(state, child, onePixel, aIsHorizontal, nullptr);
@@ -941,7 +941,7 @@ nsSplitterFrameInner::AdjustChildren(nsPresContext* aPresContext, nsSplitterInfo
   for (int i=0; i < aCount; i++) 
   {
     nscoord   pref       = aChildInfos[i].changed;
-    nsIBox* childBox     = GetChildBoxForContent(mParentBox, aChildInfos[i].childElem);
+    nsIFrame* childBox     = GetChildBoxForContent(mParentBox, aChildInfos[i].childElem);
 
     if (childBox) {
       SetPreferredSize(state, childBox, onePixel, aIsHorizontal, &pref);
@@ -950,7 +950,7 @@ nsSplitterFrameInner::AdjustChildren(nsPresContext* aPresContext, nsSplitterInfo
 }
 
 void
-nsSplitterFrameInner::SetPreferredSize(nsBoxLayoutState& aState, nsIBox* aChildBox, nscoord aOnePixel, bool aIsHorizontal, nscoord* aSize)
+nsSplitterFrameInner::SetPreferredSize(nsBoxLayoutState& aState, nsIFrame* aChildBox, nscoord aOnePixel, bool aIsHorizontal, nscoord* aSize)
 {
   nsRect rect(aChildBox->GetRect());
   nscoord pref = 0;
diff --git a/layout/xul/base/src/nsSprocketLayout.cpp b/layout/xul/base/src/nsSprocketLayout.cpp
index fddc55723c88..4cf261517c5f 100644
--- a/layout/xul/base/src/nsSprocketLayout.cpp
+++ b/layout/xul/base/src/nsSprocketLayout.cpp
@@ -52,25 +52,25 @@ nsSprocketLayout::nsSprocketLayout()
 }
 
 bool 
-nsSprocketLayout::IsHorizontal(nsIBox* aBox)
+nsSprocketLayout::IsHorizontal(nsIFrame* aBox)
 {
    return (aBox->GetStateBits() & NS_STATE_IS_HORIZONTAL) != 0;
 }
 
 void
-nsSprocketLayout::GetFrameState(nsIBox* aBox, nsFrameState& aState)
+nsSprocketLayout::GetFrameState(nsIFrame* aBox, nsFrameState& aState)
 {
    aState = aBox->GetStateBits();
 }
 
 static PRUint8
-GetFrameDirection(nsIBox* aBox)
+GetFrameDirection(nsIFrame* aBox)
 {
    return aBox->GetStyleVisibility()->mDirection;
 }
 
 static void
-HandleBoxPack(nsIBox* aBox, const nsFrameState& aFrameState, nscoord& aX, nscoord& aY, 
+HandleBoxPack(nsIFrame* aBox, const nsFrameState& aFrameState, nscoord& aX, nscoord& aY, 
               const nsRect& aOriginalRect, const nsRect& aClientRect)
 {
   // In the normal direction we lay out our kids in the positive direction (e.g., |x| will get
@@ -112,8 +112,8 @@ HandleBoxPack(nsIBox* aBox, const nsFrameState& aFrameState, nscoord& aX, nscoor
   }
 
   // Get our pack/alignment information.
-  nsIBox::Halignment halign = aBox->GetHAlign();
-  nsIBox::Valignment valign = aBox->GetVAlign();
+  nsIFrame::Halignment halign = aBox->GetHAlign();
+  nsIFrame::Valignment valign = aBox->GetVAlign();
 
   // The following code handles box PACKING.  Packing comes into play in the case where the computed size for 
   // all of our children (now stored in our client rect) is smaller than the size available for
@@ -166,12 +166,12 @@ HandleBoxPack(nsIBox* aBox, const nsFrameState& aFrameState, nscoord& aX, nscoor
 }
 
 NS_IMETHODIMP
-nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
+nsSprocketLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   // See if we are collapsed. If we are, then simply iterate over all our
   // children and give them a rect of 0 width and height.
   if (aBox->IsCollapsed()) {
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
     while(child) 
     {
       nsBoxFrame::LayoutChildAt(aState, child, nsRect(0,0,0,0));  
@@ -301,7 +301,7 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
     nsComputedBoxSize* childComputedBoxSize = computedBoxSizes;
     nsBoxSize* childBoxSize                 = boxSizes;
 
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     PRInt32 count = 0;
     while (child || (childBoxSize && childBoxSize->bogus))
@@ -617,7 +617,7 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
   // we really did have to change the positions because of packing (typically for 'center'
   // or 'end' pack values).
   if (x != origX || y != origY) {
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
 
     // reposition all our children
     while (child) 
@@ -645,7 +645,7 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 void
-nsSprocketLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, nsBoxSize*& aBoxSizes, nscoord& aMinSize, nscoord& aMaxSize, PRInt32& aFlexes)
+nsSprocketLayout::PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aState, nsBoxSize*& aBoxSizes, nscoord& aMinSize, nscoord& aMaxSize, PRInt32& aFlexes)
 {
   // used for the equal size flag
   nscoord biggestPrefWidth = 0;
@@ -678,7 +678,7 @@ nsSprocketLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, nsBox
   // so we can just optimize it out this way.
 
   // set flexes
-  nsIBox* child = aBox->GetChildBox();
+  nsIFrame* child = aBox->GetChildBox();
 
   aFlexes = 0;
   nsBoxSize* currentBox = nullptr;
@@ -889,7 +889,7 @@ nsSprocketLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, nsBox
 }
 
 void
-nsSprocketLayout::ComputeChildsNextPosition(nsIBox* aBox, 
+nsSprocketLayout::ComputeChildsNextPosition(nsIFrame* aBox, 
                                       const nscoord& aCurX, 
                                       const nscoord& aCurY, 
                                       nscoord& aNextX, 
@@ -918,7 +918,7 @@ nsSprocketLayout::ComputeChildsNextPosition(nsIBox* aBox,
 }
 
 void
-nsSprocketLayout::AlignChildren(nsIBox* aBox,
+nsSprocketLayout::AlignChildren(nsIFrame* aBox,
                                 nsBoxLayoutState& aState,
                                 bool* aNeedsRedraw)
 {
@@ -932,8 +932,8 @@ nsSprocketLayout::AlignChildren(nsIBox* aBox,
                   "Only AlignChildren() with non-stretch alignment");
 
   // These are only calculated if needed
-  nsIBox::Halignment halign;
-  nsIBox::Valignment valign;
+  nsIFrame::Halignment halign;
+  nsIFrame::Valignment valign;
   nscoord maxAscent;
   bool isLTR;
 
@@ -947,7 +947,7 @@ nsSprocketLayout::AlignChildren(nsIBox* aBox,
     halign = aBox->GetHAlign();
   }
 
-  nsIBox* child = aBox->GetChildBox();
+  nsIFrame* child = aBox->GetChildBox();
   while (child) {
 
     nsMargin margin;
@@ -1014,9 +1014,9 @@ nsSprocketLayout::AlignChildren(nsIBox* aBox,
 }
 
 void
-nsSprocketLayout::ChildResized(nsIBox* aBox,
+nsSprocketLayout::ChildResized(nsIFrame* aBox,
                          nsBoxLayoutState& aState, 
-                         nsIBox* aChild,
+                         nsIFrame* aChild,
                          nsBoxSize* aChildBoxSize,
                          nsComputedBoxSize* aChildComputedSize,
                          nsBoxSize* aBoxSizes, 
@@ -1154,7 +1154,7 @@ nsSprocketLayout::InvalidateComputedSizes(nsComputedBoxSize* aComputedBoxSizes)
 }
 
 void
-nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
+nsSprocketLayout::ComputeChildSizes(nsIFrame* aBox,
                            nsBoxLayoutState& aState, 
                            nscoord& aGivenSize, 
                            nsBoxSize* aBoxSizes, 
@@ -1307,7 +1307,7 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
 
 
 nsSize
-nsSprocketLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsSprocketLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
    nsSize vpref (0, 0); 
    bool isHorizontal = IsHorizontal(aBox);
@@ -1317,7 +1317,7 @@ nsSprocketLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
    // run through all the children and get their min, max, and preferred sizes
    // return us the size of the box
 
-   nsIBox* child = aBox->GetChildBox();
+   nsIFrame* child = aBox->GetChildBox();
    nsFrameState frameState = 0;
    GetFrameState(aBox, frameState);
    bool isEqual = !!(frameState & NS_STATE_EQUAL_SIZE);
@@ -1363,7 +1363,7 @@ nsSprocketLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsSprocketLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsSprocketLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
    nsSize minSize (0, 0);
    bool isHorizontal = IsHorizontal(aBox);
@@ -1374,7 +1374,7 @@ nsSprocketLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
    // run through all the children and get their min, max, and preferred sizes
    // return us the size of the box
 
-   nsIBox* child = aBox->GetChildBox();
+   nsIFrame* child = aBox->GetChildBox();
    nsFrameState frameState = 0;
    GetFrameState(aBox, frameState);
    bool isEqual = !!(frameState & NS_STATE_EQUAL_SIZE);
@@ -1432,7 +1432,7 @@ nsSprocketLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsSprocketLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsSprocketLayout::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
 
   bool isHorizontal = IsHorizontal(aBox);
@@ -1443,7 +1443,7 @@ nsSprocketLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
    // run through all the children and get their min, max, and preferred sizes
    // return us the size of the box
 
-   nsIBox* child = aBox->GetChildBox();
+   nsIFrame* child = aBox->GetChildBox();
    nsFrameState frameState = 0;
    GetFrameState(aBox, frameState);
    bool isEqual = !!(frameState & NS_STATE_EQUAL_SIZE);
@@ -1499,7 +1499,7 @@ nsSprocketLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
 
 
 nscoord
-nsSprocketLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aState)
+nsSprocketLayout::GetAscent(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
    nscoord vAscent = 0;
 
@@ -1508,7 +1508,7 @@ nsSprocketLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aState)
    // run through all the children and get their min, max, and preferred sizes
    // return us the size of the box
    
-   nsIBox* child = aBox->GetChildBox();
+   nsIFrame* child = aBox->GetChildBox();
    
    while (child) 
    {  
diff --git a/layout/xul/base/src/nsSprocketLayout.h b/layout/xul/base/src/nsSprocketLayout.h
index 4917f014122d..e73d6d0aeeca 100644
--- a/layout/xul/base/src/nsSprocketLayout.h
+++ b/layout/xul/base/src/nsSprocketLayout.h
@@ -8,6 +8,7 @@
 
 #include "nsBoxLayout.h"
 #include "nsCOMPtr.h"
+#include "nsIFrame.h"
 
 class nsBoxSize
 {
@@ -66,16 +67,16 @@ public:
   friend nsresult NS_NewSprocketLayout(nsIPresShell* aPresShell, nsCOMPtr<nsBoxLayout>& aNewLayout);
   static void Shutdown();
 
-  NS_IMETHOD Layout(nsIBox* aBox, nsBoxLayoutState& aState);
+  NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
 
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nscoord GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nscoord GetAscent(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
 
   nsSprocketLayout();
 
-  static bool IsHorizontal(nsIBox* aBox);
+  static bool IsHorizontal(nsIFrame* aBox);
 
   static void SetLargestSize(nsSize& aSize1, const nsSize& aSize2, bool aIsHorizontal);
   static void SetSmallestSize(nsSize& aSize1, const nsSize& aSize2, bool aIsHorizontal);
@@ -87,16 +88,16 @@ public:
 protected:
 
 
-  void ComputeChildsNextPosition(nsIBox* aBox,
+  void ComputeChildsNextPosition(nsIFrame* aBox,
                                  const nscoord& aCurX, 
                                  const nscoord& aCurY, 
                                  nscoord& aNextX, 
                                  nscoord& aNextY, 
                                  const nsRect& aChildSize);
 
-  void ChildResized(nsIBox* aBox,
+  void ChildResized(nsIFrame* aBox,
                     nsBoxLayoutState& aState, 
-                    nsIBox* aChild,
+                    nsIFrame* aChild,
                     nsBoxSize* aChildBoxSize, 
                     nsComputedBoxSize* aChildComputedBoxSize, 
                     nsBoxSize* aBoxSizes, 
@@ -107,24 +108,26 @@ protected:
                     PRInt32 aFlexes, 
                     bool& aFinished);
 
-  void AlignChildren(nsIBox* aBox,
+  void AlignChildren(nsIFrame* aBox,
                      nsBoxLayoutState& aState,
                      bool* aNeedsRedraw);
 
-  virtual void ComputeChildSizes(nsIBox* aBox, 
+  virtual void ComputeChildSizes(nsIFrame* aBox, 
                          nsBoxLayoutState& aState, 
                          nscoord& aGivenSize, 
                          nsBoxSize* aBoxSizes, 
                          nsComputedBoxSize*& aComputedBoxSizes);
 
 
-  virtual void PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsBoxSize*& aBoxSizes, nscoord& aMinSize, nscoord& aMaxSize, PRInt32& aFlexes);
+  virtual void PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState,
+                                nsBoxSize*& aBoxSizes, nscoord& aMinSize,
+                                nscoord& aMaxSize, PRInt32& aFlexes);
 
   virtual void InvalidateComputedSizes(nsComputedBoxSize* aComputedBoxSizes);
 
   virtual bool GetDefaultFlex(PRInt32& aFlex);
 
-  virtual void GetFrameState(nsIBox* aBox, nsFrameState& aState);
+  virtual void GetFrameState(nsIFrame* aBox, nsFrameState& aState);
 
 private:
 
diff --git a/layout/xul/base/src/nsStackLayout.cpp b/layout/xul/base/src/nsStackLayout.cpp
index 12e4e9d8188f..3626c4bf4502 100644
--- a/layout/xul/base/src/nsStackLayout.cpp
+++ b/layout/xul/base/src/nsStackLayout.cpp
@@ -59,11 +59,11 @@ nsStackLayout::nsStackLayout()
  */
 
 nsSize
-nsStackLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsStackLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize prefSize (0, 0);
 
-  nsIBox* child = aBox->GetChildBox();
+  nsIFrame* child = aBox->GetChildBox();
   while (child) {
     if (child->GetStyleXUL()->mStretchStack) {
       nsSize pref = child->GetPrefSize(aState);
@@ -85,11 +85,11 @@ nsStackLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsStackLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsStackLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize minSize (0, 0);
 
-  nsIBox* child = aBox->GetChildBox();
+  nsIFrame* child = aBox->GetChildBox();
   while (child) {
     if (child->GetStyleXUL()->mStretchStack) {
       nsSize min = child->GetMinSize(aState);
@@ -111,11 +111,11 @@ nsStackLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 nsSize
-nsStackLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
+nsStackLayout::GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsSize maxSize (NS_INTRINSICSIZE, NS_INTRINSICSIZE);
 
-  nsIBox* child = aBox->GetChildBox();
+  nsIFrame* child = aBox->GetChildBox();
   while (child) {
     if (child->GetStyleXUL()->mStretchStack) {
       nsSize min = child->GetMinSize(aState);
@@ -141,11 +141,11 @@ nsStackLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
 
 
 nscoord
-nsStackLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aState)
+nsStackLayout::GetAscent(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nscoord vAscent = 0;
 
-  nsIBox* child = aBox->GetChildBox();
+  nsIFrame* child = aBox->GetChildBox();
   while (child) {  
     nscoord ascent = child->GetBoxAscent(aState);
     nsMargin margin;
@@ -161,7 +161,7 @@ nsStackLayout::GetAscent(nsIBox* aBox, nsBoxLayoutState& aState)
 }
 
 PRUint8
-nsStackLayout::GetOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsMargin& aOffset)
+nsStackLayout::GetOffset(nsBoxLayoutState& aState, nsIFrame* aChild, nsMargin& aOffset)
 {
   aOffset = nsMargin(0, 0, 0, 0);
 
@@ -252,7 +252,7 @@ nsStackLayout::GetOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsMargin& aOf
 
 
 NS_IMETHODIMP
-nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
+nsStackLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aState)
 {
   nsRect clientRect;
   aBox->GetClientRect(clientRect);
@@ -260,7 +260,7 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
   bool grow;
 
   do {
-    nsIBox* child = aBox->GetChildBox();
+    nsIFrame* child = aBox->GetChildBox();
     grow = false;
 
     while (child) 
diff --git a/layout/xul/base/src/nsStackLayout.h b/layout/xul/base/src/nsStackLayout.h
index 44ff90cabb5e..3de56d93c8c3 100644
--- a/layout/xul/base/src/nsStackLayout.h
+++ b/layout/xul/base/src/nsStackLayout.h
@@ -16,6 +16,9 @@
 
 #include "nsBoxLayout.h"
 #include "nsCOMPtr.h"
+#include "nsCoord.h"
+
+class nsIPresShell;
 
 nsresult NS_NewStackLayout(nsIPresShell* aPresShell, nsCOMPtr<nsBoxLayout>& aNewLayout);
 
@@ -28,18 +31,18 @@ public:
 
   nsStackLayout();
 
-  NS_IMETHOD Layout(nsIBox* aBox, nsBoxLayoutState& aState);
+  NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
 
-  virtual nsSize GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual nscoord GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
+  virtual nscoord GetAscent(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
 
   // get the child offsets for aChild and set them in aMargin. Returns a
   // bitfield mask of the SPECIFIED_LEFT, SPECIFIED_RIGHT, SPECIFIED_TOP and
   // SPECIFIED_BOTTOM offsets indicating which sides have been specified by
-  // attributes. 
-  static PRUint8 GetOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsMargin& aMargin);
+  // attributes.
+  static PRUint8 GetOffset(nsBoxLayoutState& aState, nsIFrame* aChild, nsMargin& aMargin);
 
 private:
   static nsBoxLayout* gInstance;
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index a384ef752628..477256a04dd5 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -1031,7 +1031,7 @@ nsTextBoxFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState)
 
     AddBorderAndPadding(size);
     bool widthSet, heightSet;
-    nsIBox::AddCSSPrefSize(this, size, widthSet, heightSet);
+    nsIFrame::AddCSSPrefSize(this, size, widthSet, heightSet);
 
     return size;
 }
@@ -1053,7 +1053,7 @@ nsTextBoxFrame::GetMinSize(nsBoxLayoutState& aBoxLayoutState)
 
     AddBorderAndPadding(size);
     bool widthSet, heightSet;
-    nsIBox::AddCSSMinSize(aBoxLayoutState, this, size, widthSet, heightSet);
+    nsIFrame::AddCSSMinSize(aBoxLayoutState, this, size, widthSet, heightSet);
 
     return size;
 }
diff --git a/layout/xul/base/src/nsTextBoxFrame.h b/layout/xul/base/src/nsTextBoxFrame.h
index 610b2fb75b78..e67001ed5ace 100644
--- a/layout/xul/base/src/nsTextBoxFrame.h
+++ b/layout/xul/base/src/nsTextBoxFrame.h
@@ -16,7 +16,6 @@ class nsTextBoxFrame : public nsTextBoxFrameSuper
 public:
   NS_DECL_FRAMEARENA_HELPERS
 
-  // nsIBox
   virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index 3f2a540dd5e5..b408a499fc6f 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -12,7 +12,7 @@
 #include "nsMenuBarListener.h"
 #include "nsContentUtils.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSEvent.h"
+#include "nsIDOMEvent.h"
 #include "nsIDOMXULElement.h"
 #include "nsIXULDocument.h"
 #include "nsIXULTemplateBuilder.h"
@@ -2110,11 +2110,9 @@ nsXULPopupManager::KeyPress(nsIDOMKeyEvent* aKeyEvent)
     return NS_OK;
 
   //handlers shouldn't be triggered by non-trusted events.
-  nsCOMPtr<nsIDOMNSEvent> domNSEvent = do_QueryInterface(aKeyEvent);
   bool trustedEvent = false;
-
-  if (domNSEvent) {
-    domNSEvent->GetIsTrusted(&trustedEvent);
+  if (aKeyEvent) {
+    aKeyEvent->GetIsTrusted(&trustedEvent);
   }
 
   if (!trustedEvent)
diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/base/src/nsXULTooltipListener.cpp
index efce2d9c3b77..517de5c4d71a 100644
--- a/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/layout/xul/base/src/nsXULTooltipListener.cpp
@@ -11,7 +11,6 @@
 #include "nsIDOMXULElement.h"
 #include "nsIDocument.h"
 #include "nsGkAtoms.h"
-#include "nsIFrame.h"
 #include "nsIPopupBoxObject.h"
 #include "nsMenuPopupFrame.h"
 #include "nsIServiceManager.h"
diff --git a/layout/xul/base/src/tree/public/Makefile.in b/layout/xul/base/src/tree/public/Makefile.in
index 925c713c384b..d85eb76160f4 100644
--- a/layout/xul/base/src/tree/public/Makefile.in
+++ b/layout/xul/base/src/tree/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/xul/base/src/tree/src/Makefile.in b/layout/xul/base/src/tree/src/Makefile.in
index f5d47f8ce5b1..4a97e7451585 100644
--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/base/src/tree/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 4940fa5faa10..cf049f4bf891 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -217,7 +217,7 @@ nsTreeBodyFrame::GetMinSize(nsBoxLayoutState& aBoxLayoutState)
 
   AddBorderAndPadding(min);
   bool widthSet, heightSet;
-  nsIBox::AddCSSMinSize(aBoxLayoutState, this, min, widthSet, heightSet);
+  nsIFrame::AddCSSMinSize(aBoxLayoutState, this, min, widthSet, heightSet);
 
   return min;
 }
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
index 8c6da36148d0..cf0a46365ff8 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
@@ -101,7 +101,6 @@ public:
   nsresult EndUpdateBatch();
   nsresult ClearStyleAndImageCaches();
 
-  // nsIBox
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
   virtual void SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRect,
                          bool aRemoveOverflowArea = false);
diff --git a/layout/xul/base/src/tree/src/nsTreeColumns.h b/layout/xul/base/src/tree/src/nsTreeColumns.h
index f7bd836edc43..ee891cc3a116 100644
--- a/layout/xul/base/src/tree/src/nsTreeColumns.h
+++ b/layout/xul/base/src/tree/src/nsTreeColumns.h
@@ -8,12 +8,16 @@
 
 #include "nsITreeColumns.h"
 #include "nsITreeBoxObject.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
 #include "mozilla/Attributes.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsAutoPtr.h"
 
 class nsTreeBodyFrame;
 class nsTreeColumns;
+class nsIFrame;
+class nsIContent;
+struct nsRect;
 
 #define NS_TREECOLUMN_IMPL_CID                       \
 { /* 02cd1963-4b5d-4a6c-9223-814d3ade93a3 */         \
diff --git a/layout/xul/base/test/Makefile.in b/layout/xul/base/test/Makefile.in
index ded19ecee21f..c2a782af69b2 100644
--- a/layout/xul/base/test/Makefile.in
+++ b/layout/xul/base/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/xul/base/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/layout/xul/test/Makefile.in b/layout/xul/test/Makefile.in
index 8a088d41e745..68e556349e79 100644
--- a/layout/xul/test/Makefile.in
+++ b/layout/xul/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = layout/xul/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/media/libcubeb/Makefile.in b/media/libcubeb/Makefile.in
index b60faaeb6646..2b5ab88cc5bb 100644
--- a/media/libcubeb/Makefile.in
+++ b/media/libcubeb/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA
index 38e4f7c15f36..7ba101a44bd1 100644
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
-The git commit ID used was f3116936eba69aced240df7db77264269f3f95ae.
+The git commit ID used was 697b5c1279bf723d93b9d5f08e1fec6a6382bb77.
diff --git a/media/libcubeb/include/Makefile.in b/media/libcubeb/include/Makefile.in
index 8db665ea02c3..2b1d051ead81 100644
--- a/media/libcubeb/include/Makefile.in
+++ b/media/libcubeb/include/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/media/libcubeb/include/cubeb.h b/media/libcubeb/include/cubeb.h
index 32e0b4d6c2f2..e50e9e558da7 100644
--- a/media/libcubeb/include/cubeb.h
+++ b/media/libcubeb/include/cubeb.h
@@ -88,7 +88,7 @@ typedef enum {
   CUBEB_SAMPLE_FLOAT32LE,
   /**< Big endian 32-bit IEEE floating point PCM. */
   CUBEB_SAMPLE_FLOAT32BE,
-#ifdef WORDS_BIGENDIAN
+#if defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__)
   /**< Native endian 16-bit signed PCM. */
   CUBEB_SAMPLE_S16NE = CUBEB_SAMPLE_S16BE,
   /**< Native endian 32-bit IEEE floating point PCM. */
diff --git a/media/libcubeb/src/Makefile.in b/media/libcubeb/src/Makefile.in
index 5ab4dd841374..9afca97489c2 100644
--- a/media/libcubeb/src/Makefile.in
+++ b/media/libcubeb/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/media/libjpeg/Makefile.in b/media/libjpeg/Makefile.in
index bb07295d5b4c..2f076f4c51d8 100644
--- a/media/libjpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libjpeg/simd/Makefile.in b/media/libjpeg/simd/Makefile.in
index 27c1353a1fef..e748cee1ca01 100644
--- a/media/libjpeg/simd/Makefile.in
+++ b/media/libjpeg/simd/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libnestegg/Makefile.in b/media/libnestegg/Makefile.in
index 5d6e826bd038..1dc29a5f9ece 100644
--- a/media/libnestegg/Makefile.in
+++ b/media/libnestegg/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libnestegg/include/Makefile.in b/media/libnestegg/include/Makefile.in
index cf79a0f098ea..fd5ad8ae7368 100644
--- a/media/libnestegg/include/Makefile.in
+++ b/media/libnestegg/include/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libnestegg/src/Makefile.in b/media/libnestegg/src/Makefile.in
index e3f0f1ff29b1..8e84c034e45a 100644
--- a/media/libnestegg/src/Makefile.in
+++ b/media/libnestegg/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libogg/Makefile.in b/media/libogg/Makefile.in
index f71de3f8ad3a..fce99ae927a6 100644
--- a/media/libogg/Makefile.in
+++ b/media/libogg/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/media/libogg/include/Makefile.in b/media/libogg/include/Makefile.in
index 1c15897c4abb..4adab1437baa 100644
--- a/media/libogg/include/Makefile.in
+++ b/media/libogg/include/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libogg/include/ogg/Makefile.in b/media/libogg/include/ogg/Makefile.in
index ce121ffa206e..a624b70d05bb 100644
--- a/media/libogg/include/ogg/Makefile.in
+++ b/media/libogg/include/ogg/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libogg/src/Makefile.in b/media/libogg/src/Makefile.in
index b34992bff61c..5d5e39958eea 100644
--- a/media/libogg/src/Makefile.in
+++ b/media/libogg/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libopus/Makefile.in b/media/libopus/Makefile.in
index afe15c5536c5..c27ee7aad4db 100644
--- a/media/libopus/Makefile.in
+++ b/media/libopus/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in
index 680fd98e1315..c412f1c02f59 100644
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libspeex_resampler/Makefile.in b/media/libspeex_resampler/Makefile.in
index 15460b3dcf5e..80d8aa31289d 100644
--- a/media/libspeex_resampler/Makefile.in
+++ b/media/libspeex_resampler/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/media/libspeex_resampler/src/Makefile.in b/media/libspeex_resampler/src/Makefile.in
index 3abd2bd763be..fe6046b4426f 100644
--- a/media/libspeex_resampler/src/Makefile.in
+++ b/media/libspeex_resampler/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/media/libsydneyaudio/Makefile.in b/media/libsydneyaudio/Makefile.in
index 2e7059c8bc80..90d55e371ad0 100644
--- a/media/libsydneyaudio/Makefile.in
+++ b/media/libsydneyaudio/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libsydneyaudio/include/Makefile.in b/media/libsydneyaudio/include/Makefile.in
index bc35fe46dfbe..73a77cf0ef93 100644
--- a/media/libsydneyaudio/include/Makefile.in
+++ b/media/libsydneyaudio/include/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libsydneyaudio/src/Makefile.in b/media/libsydneyaudio/src/Makefile.in
index 8dda8ceb08db..0302f16648f6 100644
--- a/media/libsydneyaudio/src/Makefile.in
+++ b/media/libsydneyaudio/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libtheora/Makefile.in b/media/libtheora/Makefile.in
index f85fb6850581..a8519b4d4b9b 100644
--- a/media/libtheora/Makefile.in
+++ b/media/libtheora/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libtheora/include/Makefile.in b/media/libtheora/include/Makefile.in
index 95894196b3f4..952d385bc1db 100644
--- a/media/libtheora/include/Makefile.in
+++ b/media/libtheora/include/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libtheora/include/theora/Makefile.in b/media/libtheora/include/theora/Makefile.in
index c038a877f01b..9936ce92ed72 100644
--- a/media/libtheora/include/theora/Makefile.in
+++ b/media/libtheora/include/theora/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libtheora/lib/Makefile.in b/media/libtheora/lib/Makefile.in
index def93415f6ae..5c278ee20bfc 100644
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 
diff --git a/media/libtremor/Makefile.in b/media/libtremor/Makefile.in
index 639bc7e99fca..0d9d74f9ebd8 100644
--- a/media/libtremor/Makefile.in
+++ b/media/libtremor/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH  = ../..
+DEPTH  = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir  = @srcdir@
 VPATH  = @srcdir@
diff --git a/media/libtremor/include/tremor/Makefile.in b/media/libtremor/include/tremor/Makefile.in
index 0c42d9a5f1d1..5f689fd730b8 100644
--- a/media/libtremor/include/tremor/Makefile.in
+++ b/media/libtremor/include/tremor/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH  = ../../../..
+DEPTH  = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir  = @srcdir@
 VPATH  = @srcdir@
diff --git a/media/libtremor/lib/Makefile.in b/media/libtremor/lib/Makefile.in
index 42e4c0e9e7d8..f740aafdb19d 100644
--- a/media/libtremor/lib/Makefile.in
+++ b/media/libtremor/lib/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH  = ../../..
+DEPTH  = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir  = @srcdir@
 VPATH  = @srcdir@
diff --git a/media/libvorbis/Makefile.in b/media/libvorbis/Makefile.in
index 01ff82e66b8e..e9b8403566a8 100644
--- a/media/libvorbis/Makefile.in
+++ b/media/libvorbis/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libvorbis/include/Makefile.in b/media/libvorbis/include/Makefile.in
index 9fbf89e02518..6c92f8bb473a 100644
--- a/media/libvorbis/include/Makefile.in
+++ b/media/libvorbis/include/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libvorbis/include/vorbis/Makefile.in b/media/libvorbis/include/vorbis/Makefile.in
index a801f27909e1..2f0751107056 100644
--- a/media/libvorbis/include/vorbis/Makefile.in
+++ b/media/libvorbis/include/vorbis/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libvorbis/lib/Makefile.in b/media/libvorbis/lib/Makefile.in
index c1405a418100..fa514c65ee88 100644
--- a/media/libvorbis/lib/Makefile.in
+++ b/media/libvorbis/lib/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
index bc11fd831e2d..6b7c726a501a 100644
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in
index 9fa226da3d61..bec793735462 100644
--- a/media/omx-plugin/Makefile.in
+++ b/media/omx-plugin/Makefile.in
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/media/webrtc/Makefile.in b/media/webrtc/Makefile.in
index 4cd6c1b45dc7..a4e348af95d4 100644
--- a/media/webrtc/Makefile.in
+++ b/media/webrtc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/memory/build/Makefile.in b/memory/build/Makefile.in
index a11f3c2bc749..dca0f4883434 100644
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/memory/jemalloc/Makefile.in b/memory/jemalloc/Makefile.in
index 8393f6d7d419..76c37f82c43e 100644
--- a/memory/jemalloc/Makefile.in
+++ b/memory/jemalloc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 
diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in
index 4aeee1042573..c29e6a513524 100644
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/memory/mozjemalloc/Makefile.in b/memory/mozjemalloc/Makefile.in
index 76e278a8e6ab..285255fa4444 100644
--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mfbt/Makefile.in b/mfbt/Makefile.in
index 0e52fa73923a..63f638035141 100644
--- a/mfbt/Makefile.in
+++ b/mfbt/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mfbt/tests/Makefile.in b/mfbt/tests/Makefile.in
index eb6221925909..43e4e99f5127 100644
--- a/mfbt/tests/Makefile.in
+++ b/mfbt/tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/Makefile.in b/mobile/android/Makefile.in
index 0f4475b1731a..0e1f00b32a0c 100644
--- a/mobile/android/Makefile.in
+++ b/mobile/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in
index f91bb7ac7f52..d2be0c8ef0da 100644
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/android/app/profile/extensions/Makefile.in b/mobile/android/app/profile/extensions/Makefile.in
index d4aeaa913a23..03518fbafcef 100644
--- a/mobile/android/app/profile/extensions/Makefile.in
+++ b/mobile/android/app/profile/extensions/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index e2422df62318..de4717212ac9 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -50,6 +50,7 @@
     <application android:label="@MOZ_APP_DISPLAYNAME@"
 		 android:icon="@drawable/icon"
                  android:name="org.mozilla.gecko.GeckoApplication"
+		 android:hardwareAccelerated="true"
 #if MOZILLA_OFFICIAL
 		 android:debuggable="false">
 #else
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 3210e0855552..e301934ffba1 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -212,9 +212,9 @@ abstract public class BrowserApp extends GeckoApp
         super.finishProfileMigration();
     }
 
+    // We don't want to call super.initializeChrome in here because we don't
+    // want to create two DoorHangerPopup instances.
     @Override void initializeChrome(String uri, Boolean isExternalURL) {
-        super.initializeChrome(uri, isExternalURL);
-
         mBrowserToolbar.updateBackButton(false);
         mBrowserToolbar.updateForwardButton(false);
 
@@ -244,6 +244,8 @@ abstract public class BrowserApp extends GeckoApp
         }
 
         mBrowserToolbar.setProgressVisibility(isExternalURL || (mRestoreMode != GeckoAppShell.RESTORE_NONE));
+
+        mDoorHangerPopup = new DoorHangerPopup(this, mBrowserToolbar.mFavicon);
     }
 
     void toggleChrome(final boolean aShow) {
@@ -436,17 +438,6 @@ abstract public class BrowserApp extends GeckoApp
         });
     }
 
-    /* Doorhanger notification methods */
-    @Override
-    void updatePopups(final Tab tab) {
-        mDoorHangerPopup.updatePopup(mBrowserToolbar.mFavicon);
-    }
-
-    @Override
-    void addDoorHanger(String message, String value, JSONArray buttons, Tab tab, JSONObject options) {
-        mDoorHangerPopup.addDoorHanger(message, value, buttons, tab, options, mBrowserToolbar.mFavicon);
-    }
-
     /* Favicon methods */
     private void loadFavicon(final Tab tab) {
         maybeCancelFaviconLoad(tab);
diff --git a/mobile/android/base/DoorHanger.java b/mobile/android/base/DoorHanger.java
index 6779b9844872..da7cf5725aec 100644
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -5,6 +5,7 @@
 
 package org.mozilla.gecko;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -22,51 +23,79 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class DoorHanger extends LinearLayout implements Button.OnClickListener {
-    private static final String LOGTAG = "DoorHanger";
+    private static final String LOGTAG = "GeckoDoorHanger";
 
-    private Context mContext;
+    private GeckoApp mActivity;
+    // The popup that holds this doorhanger
+    private DoorHangerPopup mPopup;
     private LinearLayout mChoicesLayout;
     private TextView mTextView;
+
+    // LayoutParams used for adding button layouts
     static private LayoutParams mLayoutParams;
-    public Tab mTab;
-    // value used to identify the notification
-    private String mValue;
+    private final int mTabId;
+    // Value used to identify the notification
+    private final String mValue;
 
     // Optional checkbox added underneath message text
     private CheckBox mCheckBox;
 
-    static private LayoutInflater mInflater;
-
     private int mPersistence = 0;
     private boolean mPersistWhileVisible = false;
     private long mTimeout = 0;
 
-    public DoorHanger(Context aContext, String aValue) {
-        super(aContext);
+    DoorHanger(GeckoApp aActivity, DoorHangerPopup aPopup, int aTabId, String aValue) {
+        super(aActivity);
 
-        mContext = aContext;
+        mActivity = aActivity;
+        mPopup = aPopup;
+        mTabId = aTabId;
         mValue = aValue;
+    }
+ 
+    int getTabId() {
+        return mTabId;
+    }
 
+    String getValue() {
+        return mValue;
+    }
+
+    // Postpone stuff that needs to be done on the main thread
+    void init(String message, JSONArray buttons, JSONObject options) {
         setOrientation(VERTICAL);
         setBackgroundResource(R.drawable.doorhanger_shadow_bg);
 
-        if (mInflater == null)
-            mInflater = LayoutInflater.from(mContext);
-
-        mInflater.inflate(R.layout.doorhanger, this);
-        hide();
+        LayoutInflater.from(mActivity).inflate(R.layout.doorhanger, this);
+        setVisibility(View.GONE);
 
         mTextView = (TextView) findViewById(R.id.doorhanger_title);
+        mTextView.setText(message);
+
         mChoicesLayout = (LinearLayout) findViewById(R.id.doorhanger_choices);
 
+        // Set the doorhanger text and buttons
+        for (int i = 0; i < buttons.length(); i++) {
+            try {
+                JSONObject buttonObject = buttons.getJSONObject(i);
+                String label = buttonObject.getString("label");
+                int callBackId = buttonObject.getInt("callback");
+                addButton(label, callBackId);
+            } catch (JSONException e) {
+                Log.e(LOGTAG, "Error creating doorhanger button", e);
+            }
+         }
+
+        setOptions(options);
+    }
+
+    private void addButton(String aText, int aCallback) {
         if (mLayoutParams == null)
             mLayoutParams = new LayoutParams(LayoutParams.FILL_PARENT,
                                              LayoutParams.FILL_PARENT,
                                              1.0f);
-    }
 
-    public void addButton(String aText, int aCallback) {
-        Button mButton = new Button(mContext);
+        Button mButton = new Button(mActivity);
         mButton.setText(aText);
         mButton.setTag(Integer.toString(aCallback));
         mButton.setOnClickListener(this);
@@ -81,48 +110,20 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
             // If the checkbox is being used, pass its value
             if (mCheckBox != null)
                 response.put("checked", mCheckBox.isChecked());
-        } catch (JSONException ex) {
-            Log.e(LOGTAG, "Error creating onClick response: " + ex);
+        } catch (JSONException e) {
+            Log.e(LOGTAG, "Error creating onClick response", e);
         }
 
         GeckoEvent e = GeckoEvent.createBroadcastEvent("Doorhanger:Reply", response.toString());
         GeckoAppShell.sendEventToGecko(e);
-        mTab.removeDoorHanger(mValue);
+        mPopup.removeDoorHanger(this);
 
         // This will hide the doorhanger (and hide the popup if there are no
         // more doorhangers to show)
-        ((GeckoApp)mContext).updatePopups(mTab);
+        mPopup.updatePopup();
     }
 
-    public void show() {
-        setVisibility(View.VISIBLE);
-    }
-
-    public void hide() {
-        setVisibility(View.GONE);
-    }
-
-    public boolean isVisible() {
-        return getVisibility() == View.VISIBLE;
-    }
-
-    public String getValue() {
-        return mValue;
-    }
-
-    public void setText(String aText) {
-        mTextView.setText(aText);
-    }
-
-    public Tab getTab() {
-        return mTab;
-    }
-
-    public void setTab(Tab tab) {
-        mTab = tab;
-    }
-
-    public void setOptions(JSONObject options) {
+    private void setOptions(JSONObject options) {
         try {
             mPersistence = options.getInt("persistence");
         } catch (JSONException e) { }
@@ -144,7 +145,7 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
             URLSpan linkSpan = new URLSpan(linkUrl) {
                 @Override
                 public void onClick(View view) {
-                    GeckoApp.mAppContext.loadUrlInTab(this.getURL());
+                    mActivity.loadUrlInTab(this.getURL());
                 }
             };
 
@@ -167,8 +168,8 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
 
     // This method checks with persistence and timeout options to see if
     // it's okay to remove a doorhanger.
-    public boolean shouldRemove() {
-        if (mPersistWhileVisible && GeckoApp.mAppContext.mDoorHangerPopup.isShowing()) {
+    boolean shouldRemove() {
+        if (mPersistWhileVisible && mPopup.isShowing()) {
             // We still want to decrement mPersistence, even if the popup is showing
             if (mPersistence != 0)
                 mPersistence--;
diff --git a/mobile/android/base/DoorHangerPopup.java b/mobile/android/base/DoorHangerPopup.java
index 3f3e86021b2f..662f82942364 100644
--- a/mobile/android/base/DoorHangerPopup.java
+++ b/mobile/android/base/DoorHangerPopup.java
@@ -21,34 +21,109 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 
-import java.util.HashMap;
+import java.util.HashSet;
 
-public class DoorHangerPopup extends PopupWindow {
+public class DoorHangerPopup extends PopupWindow
+                             implements GeckoEventListener, Tabs.OnTabsChangedListener {
     private static final String LOGTAG = "GeckoDoorHangerPopup";
 
-    private Context mContext;
+    private GeckoApp mActivity;
+    private View mAnchor;
     private LinearLayout mContent;
 
     private boolean mInflated; 
     private ImageView mArrow;
     private int mArrowWidth;
 
-    public DoorHangerPopup(Context aContext) {
-        super(aContext);
-        mContext = aContext;
+    // Stores a set of all active DoorHanger notifications. A DoorHanger is
+    // uniquely identified by its tabId and value.
+    private HashSet<DoorHanger> mDoorHangers;
+
+    DoorHangerPopup(GeckoApp aActivity, View aAnchor) {
+        super(aActivity);
+        mActivity = aActivity;
+        mAnchor = aAnchor;
 
         mInflated = false;
-        mArrowWidth = aContext.getResources().getDimensionPixelSize(R.dimen.doorhanger_arrow_width);
-   }
+        mArrowWidth = aActivity.getResources().getDimensionPixelSize(R.dimen.doorhanger_arrow_width);
+        mDoorHangers = new HashSet<DoorHanger>();
+
+        GeckoAppShell.registerGeckoEventListener("Doorhanger:Add", this);
+        GeckoAppShell.registerGeckoEventListener("Doorhanger:Remove", this);
+        Tabs.registerOnTabsChangedListener(this);
+    }
+
+    void destroy() {
+        GeckoAppShell.unregisterGeckoEventListener("Doorhanger:Add", this);
+        GeckoAppShell.unregisterGeckoEventListener("Doorhanger:Remove", this);
+        Tabs.unregisterOnTabsChangedListener(this);
+    }
+
+    public void handleMessage(String event, JSONObject geckoObject) {
+        try {
+            if (event.equals("Doorhanger:Add")) {
+                int tabId = geckoObject.getInt("tabID");
+                String value = geckoObject.getString("value");
+                String message = geckoObject.getString("message");
+                JSONArray buttons = geckoObject.getJSONArray("buttons");
+                JSONObject options = geckoObject.getJSONObject("options");
+
+                addDoorHanger(tabId, value, message, buttons, options);
+            } else if (event.equals("Doorhanger:Remove")) {
+                int tabId = geckoObject.getInt("tabID");
+                String value = geckoObject.getString("value");
+                DoorHanger doorHanger = getDoorHanger(tabId, value);
+                if (doorHanger == null)
+                    return;
+
+                removeDoorHanger(doorHanger);
+                mActivity.runOnUiThread(new Runnable() {
+                    public void run() {
+                        updatePopup();
+                    }
+                });
+            }
+        } catch (Exception e) {
+            Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
+        }
+    }
+
+    public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+        switch(msg) {
+            case CLOSED:
+                // Remove any doorhangers for a tab when it's closed
+                for (DoorHanger dh : mDoorHangers) {
+                    if (dh.getTabId() == tab.getId())
+                        removeDoorHanger(dh);
+                }
+                break;
+
+            case LOCATION_CHANGE:
+                // Only remove doorhangers if the popup is hidden or if we're navigating to a new URL
+                if (!isShowing() || !data.equals(tab.getURL()))
+                    removeTransientDoorHangers(tab.getId());
+
+                // Update the popup if the location change was on the current tab
+                if (Tabs.getInstance().isSelectedTab(tab))
+                    updatePopup();
+                break;
+
+            case SELECTED:
+                // Always update the popup when a new tab is selected. This will cover cases
+                // where a different tab was closed, since we always need to select a new tab.
+                updatePopup();
+                break;
+        }
+    }
 
     private void init() {
         setBackgroundDrawable(new BitmapDrawable());
         setOutsideTouchable(true);
         setFocusable(true);
-        setWindowLayoutMode(GeckoApp.mAppContext.isTablet() ? ViewGroup.LayoutParams.WRAP_CONTENT : ViewGroup.LayoutParams.FILL_PARENT,
+        setWindowLayoutMode(mActivity.isTablet() ? ViewGroup.LayoutParams.WRAP_CONTENT : ViewGroup.LayoutParams.FILL_PARENT,
             ViewGroup.LayoutParams.WRAP_CONTENT);
 
-        LayoutInflater inflater = LayoutInflater.from(mContext);
+        LayoutInflater inflater = LayoutInflater.from(mActivity);
         RelativeLayout layout = (RelativeLayout) inflater.inflate(R.layout.doorhangerpopup, null);
         mArrow = (ImageView) layout.findViewById(R.id.doorhanger_arrow);
         mContent = (LinearLayout) layout.findViewById(R.id.doorhanger_container);
@@ -57,111 +132,123 @@ public class DoorHangerPopup extends PopupWindow {
         mInflated = true;
     }
 
-    public void addDoorHanger(String message, String value, JSONArray buttons,
-                              Tab tab, JSONObject options, View v) {
-        Log.i(LOGTAG, "Adding a DoorHanger to Tab: " + tab.getId());
-
-        if (!mInflated)
-            init();
+    void addDoorHanger(final int tabId, final String value, final String message,
+                       final JSONArray buttons, final JSONObject options) {
+        // Don't add a doorhanger for a tab that doesn't exist
+        if (Tabs.getInstance().getTab(tabId) == null)
+            return;
 
         // Replace the doorhanger if it already exists
-        DoorHanger dh = tab.getDoorHanger(value);
-        if (dh != null) {
-            tab.removeDoorHanger(value);
-        }
-        dh = new DoorHanger(mContent.getContext(), value);
- 
-        // Set the doorhanger text and buttons
-        dh.setText(message);
-        for (int i = 0; i < buttons.length(); i++) {
-            try {
-                JSONObject buttonObject = buttons.getJSONObject(i);
-                String label = buttonObject.getString("label");
-                int callBackId = buttonObject.getInt("callback");
-                dh.addButton(label, callBackId);
-            } catch (JSONException e) {
-                Log.i(LOGTAG, "JSON throws", e);
+        DoorHanger oldDoorHanger = getDoorHanger(tabId, value);
+        if (oldDoorHanger != null)
+            removeDoorHanger(oldDoorHanger);
+
+        final DoorHanger newDoorHanger = new DoorHanger(mActivity, this, tabId, value);
+        mDoorHangers.add(newDoorHanger);
+
+        // Update the UI bits on the main thread
+        mActivity.runOnUiThread(new Runnable() {
+            public void run() {
+                if (!mInflated)
+                    init();
+
+                newDoorHanger.init(message, buttons, options);
+                mContent.addView(newDoorHanger);
+
+                // Only update the popup if we're adding a notifcation to the selected tab
+                if (tabId == Tabs.getInstance().getSelectedTab().getId())
+                    updatePopup();
             }
-         }
-        dh.setOptions(options);
-
-        dh.setTab(tab);
-        tab.addDoorHanger(value, dh);
-        mContent.addView(dh);
-
-        // Only update the popup if we're adding a notifcation to the selected tab
-        if (tab.equals(Tabs.getInstance().getSelectedTab()))
-            updatePopup(v);
+        });
     }
 
-    // Updates popup contents to show doorhangers for the selected tab
-    public void updatePopup() {
-      updatePopup(null);
+    DoorHanger getDoorHanger(int tabId, String value) {
+        for (DoorHanger dh : mDoorHangers) {
+            if (dh.getTabId() == tabId && dh.getValue().equals(value))
+                return dh;
+        }
+
+        // If there's no doorhanger for the given tabId and value, return null
+        return null;
     }
 
-    public void updatePopup(View v) {
+    void removeDoorHanger(final DoorHanger doorHanger) {
+        mDoorHangers.remove(doorHanger);
+
+        // Update the UI on the main thread
+        mActivity.runOnUiThread(new Runnable() {
+            public void run() {
+                mContent.removeView(doorHanger);
+            }
+        });        
+    }
+
+    void removeTransientDoorHangers(int tabId) {
+        // Make a temporary set to avoid a ConcurrentModificationException
+        HashSet<DoorHanger> doorHangersToRemove = new HashSet<DoorHanger>();
+        for (DoorHanger dh : mDoorHangers) {
+            // Only remove transient doorhangers for the given tab
+            if (dh.getTabId() == tabId && dh.shouldRemove())
+                doorHangersToRemove.add(dh);
+        }
+
+        for (DoorHanger dh : doorHangersToRemove) {
+            removeDoorHanger(dh);
+        }
+    }
+
+    void updatePopup() {
+        // Bail if the selected tab is null, if there are no active doorhangers,
+        // or if we haven't inflated the layout yet (this can happen if updatePopup()
+        // is called before the runnable from addDoorHanger() runs). 
         Tab tab = Tabs.getInstance().getSelectedTab();
-        if (tab == null) {
-            hidePopup();
-            return;
-        }
-        
-        Log.i(LOGTAG, "Showing all doorhangers for tab: " + tab.getId());
- 
-        HashMap<String, DoorHanger> doorHangers = tab.getDoorHangers();
-        // Hide the popup if there aren't any doorhangers to show
-        if (doorHangers == null || doorHangers.size() == 0) {
-            hidePopup();
-            return;
-        }
-
-        if (!mInflated)
-            init();
-
-        // Hide old doorhangers
-        for (int i = 0; i < mContent.getChildCount(); i++) {
-            DoorHanger dh = (DoorHanger) mContent.getChildAt(i);
-            dh.hide();
-        }
-
-        // Show the doorhangers for the tab
-        for (DoorHanger dh : doorHangers.values()) {
-            dh.show();
-        }
-
-        if (v == null)
-            showAtLocation(((GeckoApp)mContext).getView(), Gravity.TOP, 0, 0);
-        else
-            showPopup(v);
-    }
-
-    public void hidePopup() {
-        if (isShowing()) {
+        if (tab == null || mDoorHangers.size() == 0 || !mInflated) {
             dismiss();
+            return;
+        }
+
+        // Show doorhangers for the selected tab
+        int tabId = tab.getId();
+        boolean shouldShowPopup = false;
+        for (DoorHanger dh : mDoorHangers) {
+            if (dh.getTabId() == tabId) {
+                dh.setVisibility(View.VISIBLE);
+                shouldShowPopup = true;
+            } else {
+                dh.setVisibility(View.GONE);
+            }
+        }
+ 
+        // Dismiss the popup if there are no doorhangers to show for this tab
+        if (!shouldShowPopup) {
+            dismiss();
+            return;
         }
-    }
 
-    public void showPopup(View v) {
         fixBackgroundForFirst();
-
         if (isShowing()) {
             update();
             return;
         }
 
+        // If there's no anchor, just show the popup at the top of the gecko app view.
+        if (mAnchor == null) {
+            showAtLocation(mActivity.getView(), Gravity.TOP, 0, 0);
+            return;
+        }
+
         // On tablets, we need to position the popup so that the center of the arrow points to the
         // center of the anchor view. On phones the popup stretches across the entire screen, so the
         // arrow position is determined by its left margin.
-        int offset = GeckoApp.mAppContext.isTablet() ? v.getWidth()/2 - mArrowWidth/2 -
+        int offset = mActivity.isTablet() ? mAnchor.getWidth()/2 - mArrowWidth/2 -
                      ((RelativeLayout.LayoutParams) mArrow.getLayoutParams()).leftMargin : 0;
-
-        showAsDropDown(v, offset, 0);
+        showAsDropDown(mAnchor, offset, 0);
     }
 
     private void fixBackgroundForFirst() {
-        for (int i=0; i < mContent.getChildCount(); i++) {
+        for (int i = 0; i < mContent.getChildCount(); i++) {
             DoorHanger dh = (DoorHanger) mContent.getChildAt(i);
-            if (dh.isVisible()) {
+            if (dh.getVisibility() == View.VISIBLE) {
                 dh.setBackgroundResource(R.drawable.doorhanger_bg);
                 break;
             }
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index dea4d4132923..1ae7ef52e195 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -213,7 +213,6 @@ abstract public class GeckoApp
                     break;
                 // Fall through...
             case SELECTED:
-                updatePopups(tab);
                 invalidateOptionsMenu();
                 break;
         }
@@ -663,14 +662,6 @@ abstract public class GeckoApp
     public void hideFormAssistPopup() {
         if (mFormAssistPopup != null)
             mFormAssistPopup.hide();
-    } 
-
-    void updatePopups(final Tab tab) {
-        mDoorHangerPopup.updatePopup();
-    }
-
-    void addDoorHanger(String message, String value, JSONArray buttons, Tab tab, JSONObject options) {
-        mDoorHangerPopup.addDoorHanger(message, value, buttons, tab, options, null);
     }
 
     void handleLocationChange(final int tabId, final String uri,
@@ -680,10 +671,6 @@ abstract public class GeckoApp
         if (tab == null)
             return;
 
-        // Only remove doorhangers if the popup is hidden or if we're navigating to a new URL
-        if (!mDoorHangerPopup.isShowing() || !uri.equals(tab.getURL()))
-            tab.removeTransientDoorHangers();
-
         tab.updateURL(uri);
         tab.setDocumentURI(documentURI);
 
@@ -705,7 +692,7 @@ abstract public class GeckoApp
 
         mMainHandler.post(new Runnable() {
             public void run() {
-                Tabs.getInstance().notifyListeners(tab, Tabs.TabEvents.LOCATION_CHANGE);
+                Tabs.getInstance().notifyListeners(tab, Tabs.TabEvents.LOCATION_CHANGE, uri);
             }
         });
     }
@@ -937,10 +924,6 @@ abstract public class GeckoApp
             } else if (event.equals("Content:PageShow")) {
                 final int tabId = message.getInt("tabID");
                 handlePageShow(tabId);
-            } else if (event.equals("Doorhanger:Add")) {
-                handleDoorHanger(message);
-            } else if (event.equals("Doorhanger:Remove")) {
-                handleDoorHangerRemove(message);
             } else if (event.equals("Gecko:Ready")) {
                 sIsGeckoReady = true;
                 final Menu menu = mMenu;
@@ -1218,41 +1201,6 @@ abstract public class GeckoApp
         });
     }
 
-    void handleDoorHanger(JSONObject geckoObject) throws JSONException {
-        final String message = geckoObject.getString("message");
-        final String value = geckoObject.getString("value");
-        final JSONArray buttons = geckoObject.getJSONArray("buttons");
-        final int tabId = geckoObject.getInt("tabID");
-        final JSONObject options = geckoObject.getJSONObject("options");
-
-        Log.i(LOGTAG, "DoorHanger received for tab " + tabId + ", msg:" + message);
-
-        mMainHandler.post(new Runnable() {
-            public void run() {
-                Tab tab = Tabs.getInstance().getTab(tabId);
-                if (tab != null)
-                    addDoorHanger(message, value, buttons, tab, options);
-            }
-        });
-    }
-
-    void handleDoorHangerRemove(JSONObject geckoObject) throws JSONException {
-        final String value = geckoObject.getString("value");
-        final int tabId = geckoObject.getInt("tabID");
-
-        Log.i(LOGTAG, "Doorhanger:Remove received for tab " + tabId);
-
-        mMainHandler.post(new Runnable() {
-            public void run() {
-                Tab tab = Tabs.getInstance().getTab(tabId);
-                if (tab == null)
-                    return;
-                tab.removeDoorHanger(value);
-                updatePopups(tab);
-            }
-        });
-    }
-
     void handleDocumentStart(int tabId, final boolean showProgress, String uri) {
         final Tab tab = Tabs.getInstance().getTab(tabId);
         if (tab == null)
@@ -1610,7 +1558,9 @@ abstract public class GeckoApp
         ((GeckoApplication) getApplication()).addApplicationLifecycleCallbacks(this);
     }
 
-    void initializeChrome(String uri, Boolean isExternalURL) { }
+    void initializeChrome(String uri, Boolean isExternalURL) {
+        mDoorHangerPopup = new DoorHangerPopup(this, null);
+    }
 
     private void initialize() {
         mInitialized = true;
@@ -1729,8 +1679,6 @@ abstract public class GeckoApp
         }
 
         mPluginContainer = (AbsoluteLayout) findViewById(R.id.plugin_container);
-
-        mDoorHangerPopup = new DoorHangerPopup(this);
         mFormAssistPopup = (FormAssistPopup) findViewById(R.id.form_assist_popup);
 
         Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - UI almost up");
@@ -1749,8 +1697,6 @@ abstract public class GeckoApp
         GeckoAppShell.registerGeckoEventListener("Content:PageShow", this);
         GeckoAppShell.registerGeckoEventListener("Reader:FaviconRequest", this);
         GeckoAppShell.registerGeckoEventListener("onCameraCapture", this);
-        GeckoAppShell.registerGeckoEventListener("Doorhanger:Add", this);
-        GeckoAppShell.registerGeckoEventListener("Doorhanger:Remove", this);
         GeckoAppShell.registerGeckoEventListener("Menu:Add", this);
         GeckoAppShell.registerGeckoEventListener("Menu:Remove", this);
         GeckoAppShell.registerGeckoEventListener("Gecko:Ready", this);
@@ -2114,8 +2060,6 @@ abstract public class GeckoApp
         GeckoAppShell.unregisterGeckoEventListener("Content:PageShow", this);
         GeckoAppShell.unregisterGeckoEventListener("Reader:FaviconRequest", this);
         GeckoAppShell.unregisterGeckoEventListener("onCameraCapture", this);
-        GeckoAppShell.unregisterGeckoEventListener("Doorhanger:Add", this);
-        GeckoAppShell.unregisterGeckoEventListener("Doorhanger:Remove", this);
         GeckoAppShell.unregisterGeckoEventListener("Menu:Add", this);
         GeckoAppShell.unregisterGeckoEventListener("Menu:Remove", this);
         GeckoAppShell.unregisterGeckoEventListener("Gecko:Ready", this);
@@ -2150,6 +2094,8 @@ abstract public class GeckoApp
             mLayerController.destroy();
         if (mLayerClient != null)
             mLayerClient.destroy();
+        if (mDoorHangerPopup != null)
+            mDoorHangerPopup.destroy();
         if (mFormAssistPopup != null)
             mFormAssistPopup.destroy();
         if (mPromptService != null)
diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java
index 50911e855ed6..ee31569a5a6c 100644
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -523,7 +523,13 @@ public class GeckoInputConnection
 
         if (imm != null && imm.isFullscreenMode()) {
             View v = getView();
-            imm.updateSelection(v, start, end, -1, -1);
+            if (hasCompositionString()) {
+                Span span = getComposingSpan();
+                imm.updateSelection(v, start, end, span.start, span.end);
+            } else {
+                imm.updateSelection(v, start, end, -1, -1);
+            }
+
         }
     }
 
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index e4fe760663dc..440e92264fec 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -812,14 +812,20 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
   res/drawable-large-mdpi-v11/remote_tabs_off.png \
   res/drawable-large-mdpi-v11/remote_tabs_on.png \
   res/drawable-large-mdpi-v11/tab_new.png \
+  res/drawable-large-mdpi-v11/tab_new_normal.png \
+  res/drawable-large-mdpi-v11/tab_new_pressed.png \
   res/drawable-large-mdpi-v11/urlbar_stop.png \
   res/drawable-large-mdpi-v11/reader.png \
   res/drawable-large-mdpi-v11/site_security_identified.png \
   res/drawable-large-mdpi-v11/site_security_verified.png \
   res/drawable-large-mdpi-v11/menu.png \
+  res/drawable-large-mdpi-v11/menu_normal.png \
+  res/drawable-large-mdpi-v11/menu_pressed.png \
   res/drawable-large-mdpi-v11/tabs_carat.png \
   res/drawable-large-mdpi-v11/tabs_crop_normal.png \
   res/drawable-large-mdpi-v11/tabs_crop_pressed.png \
+  res/drawable-large-mdpi-v11/tabs_full_normal.png \
+  res/drawable-large-mdpi-v11/tabs_full_pressed.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_HDPI_V11 = \
@@ -838,14 +844,20 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
   res/drawable-large-hdpi-v11/remote_tabs_off.png \
   res/drawable-large-hdpi-v11/remote_tabs_on.png \
   res/drawable-large-hdpi-v11/tab_new.png \
+  res/drawable-large-hdpi-v11/tab_new_normal.png \
+  res/drawable-large-hdpi-v11/tab_new_pressed.png \
   res/drawable-large-hdpi-v11/urlbar_stop.png \
   res/drawable-large-hdpi-v11/reader.png \
   res/drawable-large-hdpi-v11/site_security_identified.png \
   res/drawable-large-hdpi-v11/site_security_verified.png \
   res/drawable-large-hdpi-v11/menu.png \
+  res/drawable-large-hdpi-v11/menu_normal.png \
+  res/drawable-large-hdpi-v11/menu_pressed.png \
   res/drawable-large-hdpi-v11/tabs_carat.png \
   res/drawable-large-hdpi-v11/tabs_crop_normal.png \
   res/drawable-large-hdpi-v11/tabs_crop_pressed.png \
+  res/drawable-large-hdpi-v11/tabs_full_normal.png \
+  res/drawable-large-hdpi-v11/tabs_full_pressed.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_XHDPI_V11 = \
@@ -864,14 +876,20 @@ RES_DRAWABLE_LARGE_XHDPI_V11 = \
   res/drawable-large-xhdpi-v11/remote_tabs_on.png \
   res/drawable-large-xhdpi-v11/remote_tabs_off.png \
   res/drawable-large-xhdpi-v11/tab_new.png \
+  res/drawable-large-xhdpi-v11/tab_new_normal.png \
+  res/drawable-large-xhdpi-v11/tab_new_pressed.png \
   res/drawable-large-xhdpi-v11/urlbar_stop.png \
   res/drawable-large-xhdpi-v11/reader.png \
   res/drawable-large-xhdpi-v11/site_security_identified.png \
   res/drawable-large-xhdpi-v11/site_security_verified.png \
   res/drawable-large-xhdpi-v11/menu.png \
+  res/drawable-large-xhdpi-v11/menu_normal.png \
+  res/drawable-large-xhdpi-v11/menu_pressed.png \
   res/drawable-large-xhdpi-v11/tabs_carat.png \
   res/drawable-large-xhdpi-v11/tabs_crop_normal.png \
   res/drawable-large-xhdpi-v11/tabs_crop_pressed.png \
+  res/drawable-large-xhdpi-v11/tabs_full_normal.png \
+  res/drawable-large-xhdpi-v11/tabs_full_pressed.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_MDPI_V11 = \
diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index c388e03cf184..0080f7351462 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -49,7 +49,6 @@ public final class Tab {
     private boolean mExternal;
     private boolean mBookmark;
     private boolean mReadingListItem;
-    private HashMap<String, DoorHanger> mDoorHangers;
     private long mFaviconLoadId;
     private String mDocumentURI;
     private String mContentType;
@@ -89,7 +88,6 @@ public final class Tab {
         mHistorySize = 0;
         mBookmark = false;
         mReadingListItem = false;
-        mDoorHangers = new HashMap<String, DoorHanger>();
         mFaviconLoadId = 0;
         mDocumentURI = "";
         mContentType = "";
@@ -106,7 +104,6 @@ public final class Tab {
     }
 
     public void onDestroy() {
-        mDoorHangers = new HashMap<String, DoorHanger>();
         BrowserDB.unregisterContentObserver(mContentResolver, mContentObserver);
     }
 
@@ -492,43 +489,6 @@ public final class Tab {
         return true;
     }
 
-    public void addDoorHanger(String value, DoorHanger dh) {
-        mDoorHangers.put(value, dh);
-    }
-
-    public void removeDoorHanger(String value) {
-        mDoorHangers.remove(value);
-    }
-
-    public void removeTransientDoorHangers() {
-        // Make a temporary set to avoid a ConcurrentModificationException
-        final HashSet<String> valuesToRemove = new HashSet<String>(); 
-
-        for (String value : mDoorHangers.keySet()) {
-            DoorHanger dh = mDoorHangers.get(value);
-            if (dh.shouldRemove())
-                valuesToRemove.add(value);
-        }
-
-        for (String value : valuesToRemove) {
-            mDoorHangers.remove(value);
-        }
-    }
-
-    public DoorHanger getDoorHanger(String value) {
-        if (mDoorHangers == null)
-            return null;
-
-        if (mDoorHangers.containsKey(value))
-            return mDoorHangers.get(value);
-
-        return null;
-    }
-
-    public HashMap<String, DoorHanger> getDoorHangers() {
-        return mDoorHangers;
-    }
-
     void handleSessionHistoryMessage(String event, JSONObject message) throws JSONException {
         if (event.equals("New")) {
             final String url = message.getString("url");
diff --git a/mobile/android/base/TabsPanel.java b/mobile/android/base/TabsPanel.java
index 6e862d6fa616..87365ef4b207 100644
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -109,7 +109,7 @@ public class TabsPanel extends LinearLayout {
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             if (!GeckoApp.mAppContext.hasTabsSideBar()) {
-                int heightSpec = MeasureSpec.makeMeasureSpec(mContext.getResources().getDisplayMetrics().heightPixels, MeasureSpec.EXACTLY);
+                int heightSpec = MeasureSpec.makeMeasureSpec((int) (0.5 * mContext.getResources().getDisplayMetrics().heightPixels), MeasureSpec.EXACTLY);
                 super.onMeasure(widthMeasureSpec, heightSpec);
             } else {
                 super.onMeasure(widthMeasureSpec, heightMeasureSpec);
diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java
index 6be7fa71d3f6..866a714bd8df 100644
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -19,6 +19,7 @@ import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.TextureView;
+import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
@@ -26,6 +27,8 @@ import android.widget.FrameLayout;
 
 import java.nio.IntBuffer;
 
+import java.lang.reflect.Method;
+
 /**
  * A view rendered by the layer compositor.
  *
@@ -56,21 +59,38 @@ public class LayerView extends FrameLayout {
     public static final int PAINT_BEFORE_FIRST = 1;
     public static final int PAINT_AFTER_FIRST = 2;
 
+    boolean shouldUseTextureView() {
+        // we can only use TextureView on ICS or higher
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            Log.i(LOGTAG, "Not using TextureView: not on ICS+");
+            return false;
+        }
+
+        try {
+            // and then we can only use it if we have a hardware accelerated window
+            Method m = View.class.getMethod("isHardwareAccelerated", new Class[0]);
+            return (Boolean) m.invoke(this);
+        } catch (Exception e) {
+            Log.i(LOGTAG, "Not using TextureView: caught exception checking for hw accel: " + e.toString());
+            return false;
+        }
+    }
+
     public LayerView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+        if (shouldUseTextureView()) {
+            mTextureView = new TextureView(context);
+            mTextureView.setSurfaceTextureListener(new SurfaceTextureListener());
+
+            addView(mTextureView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+        } else {
             mSurfaceView = new SurfaceView(context);
             addView(mSurfaceView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
             SurfaceHolder holder = mSurfaceView.getHolder();
             holder.addCallback(new SurfaceListener());
             holder.setFormat(PixelFormat.RGB_565);
-        } else {
-            mTextureView = new TextureView(context);
-            mTextureView.setSurfaceTextureListener(new SurfaceTextureListener());
-
-            addView(mTextureView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         }
 
         mGLController = new GLController(this);
@@ -237,7 +257,7 @@ public class LayerView extends FrameLayout {
     }
 
     public Object getNativeWindow() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+        if (mSurfaceView != null)
             return mSurfaceView.getHolder();
 
         return mTextureView.getSurfaceTexture();
diff --git a/mobile/android/base/gfx/TextureReaper.java b/mobile/android/base/gfx/TextureReaper.java
index 9e01eb371c15..71b4690eb9f1 100644
--- a/mobile/android/base/gfx/TextureReaper.java
+++ b/mobile/android/base/gfx/TextureReaper.java
@@ -32,9 +32,16 @@ public class TextureReaper {
     }
 
     public void reap() {
-        int[] deadTextureIDs = new int[mDeadTextureIDs.size()];
-        for (int i = 0; i < deadTextureIDs.length; i++)
+        int numTextures = mDeadTextureIDs.size();
+        // Adreno 200 will generate INVALID_VALUE if len == 0 is passed to glDeleteTextures,
+        // even though it's not supposed to.
+        if (numTextures == 0)
+            return;
+
+        int[] deadTextureIDs = new int[numTextures];
+        for (int i = 0; i < numTextures; i++) {
             deadTextureIDs[i] = mDeadTextureIDs.get(i);
+        }
         mDeadTextureIDs.clear();
 
         GLES20.glDeleteTextures(deadTextureIDs.length, deadTextureIDs, 0);
diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in
index 6e99db8fe5c1..d2049f0cb544 100644
--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = mobile/android/base/locales
+relativesrcdir = @relativesrcdir@
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tab_new_normal.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tab_new_normal.png
index 100fc6f6ab2d..d0498d79ee8a 100644
Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/tab_new_normal.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/tab_new_normal.png differ
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/tab_new_normal.png b/mobile/android/base/resources/drawable-large-mdpi-v11/tab_new_normal.png
index 42156c59f646..4df597fbf2f6 100644
Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/tab_new_normal.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/tab_new_normal.png differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new_normal.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new_normal.png
index 0bef937146eb..2e0d4015d24f 100644
Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new_normal.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new_normal.png differ
diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
index ef54e15190ec..85d905f535bf 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
@@ -13,7 +13,7 @@
         <View android:id="@+id/curve"
               android:layout_width="84dip"
               android:layout_height="fill_parent"
-              android:layout_marginRight="50dip"
+              android:layout_marginRight="56dip"
               android:layout_alignParentRight="true"
               android:background="@drawable/address_bar_bg_curve"/>
 
@@ -39,7 +39,7 @@
         <ImageButton android:id="@+id/tabs"
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="112dip"
-                     android:layout_marginRight="22dip"
+                     android:layout_marginRight="28dip"
                      android:layout_alignParentRight="true"
                      android:background="@drawable/tabs_full_button"
                      android:gravity="center_vertical"
diff --git a/mobile/android/base/resources/layout-large-v11/tabs_panel_toolbar_menu.xml b/mobile/android/base/resources/layout-large-v11/tabs_panel_toolbar_menu.xml
index c21dac746ecb..c6f31c70e310 100644
--- a/mobile/android/base/resources/layout-large-v11/tabs_panel_toolbar_menu.xml
+++ b/mobile/android/base/resources/layout-large-v11/tabs_panel_toolbar_menu.xml
@@ -27,7 +27,7 @@
 
         <LinearLayout android:layout_width="fill_parent"
                       android:layout_height="fill_parent"
-                      android:layout_marginRight="12dip">
+                      android:layout_marginRight="15dip">
 
             <TextView android:id="@+id/title"
                       android:layout_width="wrap_content"
diff --git a/mobile/android/branding/aurora/Makefile.in b/mobile/android/branding/aurora/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/android/branding/aurora/Makefile.in
+++ b/mobile/android/branding/aurora/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/aurora/content/Makefile.in b/mobile/android/branding/aurora/content/Makefile.in
index 7a0d01b11052..e9280157ddf1 100644
--- a/mobile/android/branding/aurora/content/Makefile.in
+++ b/mobile/android/branding/aurora/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/aurora/locales/Makefile.in b/mobile/android/branding/aurora/locales/Makefile.in
index 68f32527977e..815fb4c1bbfb 100644
--- a/mobile/android/branding/aurora/locales/Makefile.in
+++ b/mobile/android/branding/aurora/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/android/branding/beta/Makefile.in b/mobile/android/branding/beta/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/android/branding/beta/Makefile.in
+++ b/mobile/android/branding/beta/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/beta/content/Makefile.in b/mobile/android/branding/beta/content/Makefile.in
index 7a0d01b11052..e9280157ddf1 100644
--- a/mobile/android/branding/beta/content/Makefile.in
+++ b/mobile/android/branding/beta/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/beta/locales/Makefile.in b/mobile/android/branding/beta/locales/Makefile.in
index acaafcc276ec..a6dce0a67f81 100644
--- a/mobile/android/branding/beta/locales/Makefile.in
+++ b/mobile/android/branding/beta/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/android/branding/nightly/Makefile.in b/mobile/android/branding/nightly/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/android/branding/nightly/Makefile.in
+++ b/mobile/android/branding/nightly/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/nightly/content/Makefile.in b/mobile/android/branding/nightly/content/Makefile.in
index 7a0d01b11052..e9280157ddf1 100644
--- a/mobile/android/branding/nightly/content/Makefile.in
+++ b/mobile/android/branding/nightly/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/nightly/locales/Makefile.in b/mobile/android/branding/nightly/locales/Makefile.in
index 68f32527977e..815fb4c1bbfb 100644
--- a/mobile/android/branding/nightly/locales/Makefile.in
+++ b/mobile/android/branding/nightly/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/android/branding/official/Makefile.in b/mobile/android/branding/official/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/android/branding/official/Makefile.in
+++ b/mobile/android/branding/official/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/official/content/Makefile.in b/mobile/android/branding/official/content/Makefile.in
index 7a0d01b11052..e9280157ddf1 100644
--- a/mobile/android/branding/official/content/Makefile.in
+++ b/mobile/android/branding/official/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/official/locales/Makefile.in b/mobile/android/branding/official/locales/Makefile.in
index acaafcc276ec..a6dce0a67f81 100644
--- a/mobile/android/branding/official/locales/Makefile.in
+++ b/mobile/android/branding/official/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/android/branding/unofficial/Makefile.in b/mobile/android/branding/unofficial/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/android/branding/unofficial/Makefile.in
+++ b/mobile/android/branding/unofficial/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/unofficial/content/Makefile.in b/mobile/android/branding/unofficial/content/Makefile.in
index 7a0d01b11052..e9280157ddf1 100644
--- a/mobile/android/branding/unofficial/content/Makefile.in
+++ b/mobile/android/branding/unofficial/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/android/branding/unofficial/locales/Makefile.in b/mobile/android/branding/unofficial/locales/Makefile.in
index 913b0f904b9f..2839d474fe52 100644
--- a/mobile/android/branding/unofficial/locales/Makefile.in
+++ b/mobile/android/branding/unofficial/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = mobile/android/branding/unofficial/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mobile/android/chrome/Makefile.in b/mobile/android/chrome/Makefile.in
index 1c910f613018..d816fe52e224 100644
--- a/mobile/android/chrome/Makefile.in
+++ b/mobile/android/chrome/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 7d385bd4e912..12b2b6ddd86a 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1379,7 +1379,7 @@ var NativeWindow = {
       }
 
       // only send the contextmenu event to content if we are planning to show a context menu (i.e. not on every long tap)
-      if (this.menuitems) {
+      if (!this.textContext.matches(element) && this.menuitems) {
         let event = rootElement.ownerDocument.createEvent("MouseEvent");
         event.initMouseEvent("contextmenu", true, true, content,
                              0, aX, aY, aX, aY, false, false, false, false,
@@ -1522,6 +1522,17 @@ var SelectionHandler = {
     this._viewRef = Cu.getWeakReference(aView);
   },
 
+  // The target can be a window or an input element
+  get _target() {
+    if (this._targetRef)
+      return this._targetRef.get();
+    return null;
+  },
+
+  set _target(aTarget) {
+    this._targetRef = Cu.getWeakReference(aTarget);
+  },
+
   get _cwu() {
     return BrowserApp.selectedBrowser.contentWindow.QueryInterface(Ci.nsIInterfaceRequestor).
                                                     getInterface(Ci.nsIDOMWindowUtils);
@@ -1645,23 +1656,25 @@ var SelectionHandler = {
 
     // Get the element's view
     this._view = aElement.ownerDocument.defaultView;
+
+    if (aElement instanceof Ci.nsIDOMNSEditableElement)
+      this._target = aElement;
+    else
+      this._target = this._view;
+
     this._view.addEventListener("pagehide", this, false);
     this._isRTL = (this._view.getComputedStyle(aElement, "").direction == "rtl");
 
     // Remove any previous selected or created ranges. Tapping anywhere on a
     // page will create an empty range.
-    let selection = this._view.getSelection();
+    let selection = this.getSelection();
     selection.removeAllRanges();
 
     // Position the caret using a fake mouse click sent to the top-level window
     this._sendMouseEvents(aX, aY, false);
 
     try {
-      let selectionController = this._view.QueryInterface(Ci.nsIInterfaceRequestor).
-                                           getInterface(Ci.nsIWebNavigation).
-                                           QueryInterface(Ci.nsIInterfaceRequestor).
-                                           getInterface(Ci.nsISelectionDisplay).
-                                           QueryInterface(Ci.nsISelectionController);
+      let selectionController = this.getSelectionController();
 
       // Select the word nearest the caret
       selectionController.wordMove(false, false);
@@ -1691,6 +1704,24 @@ var SelectionHandler = {
     this._active = true;
   },
 
+  getSelection: function sh_getSelection() {
+    if (this._target instanceof Ci.nsIDOMNSEditableElement)
+      return this._target.QueryInterface(Ci.nsIDOMNSEditableElement).editor.selection;
+    else
+      return this._target.getSelection();
+  },
+
+  getSelectionController: function sh_getSelectionController() {
+    if (this._target instanceof Ci.nsIDOMNSEditableElement)
+      return this._target.QueryInterface(Ci.nsIDOMNSEditableElement).editor.selectionController;
+    else
+      return this._target.QueryInterface(Ci.nsIInterfaceRequestor).
+                          getInterface(Ci.nsIWebNavigation).
+                          QueryInterface(Ci.nsIInterfaceRequestor).
+                          getInterface(Ci.nsISelectionDisplay).
+                          QueryInterface(Ci.nsISelectionController);
+  },
+
   showContextMenu: function sh_showContextMenu(aX, aY) {
     let [SELECT_ALL, COPY, SHARE] = [0, 1, 2];
     let listitems = [
@@ -1710,11 +1741,7 @@ var SelectionHandler = {
 
     switch (id) {
       case SELECT_ALL: {
-        let selectionController = this._view.QueryInterface(Ci.nsIInterfaceRequestor).
-                                             getInterface(Ci.nsIWebNavigation).
-                                             QueryInterface(Ci.nsIInterfaceRequestor).
-                                             getInterface(Ci.nsISelectionDisplay).
-                                             QueryInterface(Ci.nsISelectionController);
+        let selectionController = this.getSelectionController();
         selectionController.selectAll();
         this.updateCacheForSelection();
         this.positionHandles();
@@ -1786,7 +1813,7 @@ var SelectionHandler = {
     let selectedText = "";
     let pointInSelection = false;
     if (this._view) {
-      let selection = this._view.getSelection();
+      let selection = this.getSelection();
       if (selection) {
         // Get the text before we clear the selection!
         selectedText = selection.toString().trim();
@@ -1813,6 +1840,7 @@ var SelectionHandler = {
 
     this._view.removeEventListener("pagehide", this, false);
     this._view = null;
+    this._target = null;
     this._isRTL = false;
     this.cache = null;
 
@@ -1837,7 +1865,7 @@ var SelectionHandler = {
 
   _pointInSelection: function sh_pointInSelection(aX, aY) {
     let offset = this._getViewOffset();
-    let rangeRect = this._view.getSelection().getRangeAt(0).getBoundingClientRect();
+    let rangeRect = this.getSelection().getRangeAt(0).getBoundingClientRect();
     let radius = ElementTouchHelper.getTouchRadius();
     return (aX - offset.x > rangeRect.left - radius.left &&
             aX - offset.x < rangeRect.right + radius.right &&
@@ -1848,7 +1876,8 @@ var SelectionHandler = {
   // Returns true if the selection has been reversed. Takes optional aIsStartHandle
   // param to decide whether the selection has been reversed.
   updateCacheForSelection: function sh_updateCacheForSelection(aIsStartHandle) {
-    let rects = this._view.getSelection().getRangeAt(0).getClientRects();
+    let selection = this.getSelection();
+    let rects = selection.getRangeAt(0).getClientRects();
     let start = { x: rects[0].left, y: rects[0].bottom };
     let end = { x: rects[rects.length - 1].right, y: rects[rects.length - 1].bottom };
 
@@ -1871,6 +1900,7 @@ var SelectionHandler = {
     let offset = this._getViewOffset();
     let scrollX = {}, scrollY = {};
     this._view.top.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).getScrollXY(false, scrollX, scrollY);
+
     sendMessageToJava({
       gecko: {
         type: "TextSelection:PositionHandles",
diff --git a/mobile/android/components/Makefile.in b/mobile/android/components/Makefile.in
index d0cf97a30cac..dcb91864c175 100644
--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in
index f9de5fd970f7..6d83a8a0cd08 100644
--- a/mobile/android/components/build/Makefile.in
+++ b/mobile/android/components/build/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in
index 7084d7dd672d..ff4d3e56e7e4 100644
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/android/locales/Makefile.in b/mobile/android/locales/Makefile.in
index 991bccc735c3..5ec03d275860 100644
--- a/mobile/android/locales/Makefile.in
+++ b/mobile/android/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = mobile/android/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
diff --git a/mobile/android/modules/Makefile.in b/mobile/android/modules/Makefile.in
index 7bca73b386c4..b72e93343650 100644
--- a/mobile/android/modules/Makefile.in
+++ b/mobile/android/modules/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/mobile/android/themes/core/Makefile.in b/mobile/android/themes/core/Makefile.in
index 0052e9c3858a..4016357d650a 100644
--- a/mobile/android/themes/core/Makefile.in
+++ b/mobile/android/themes/core/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	    = ../../../..
+DEPTH	    = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mobile/android/themes/core/content.css b/mobile/android/themes/core/content.css
index b3ab9c559523..d5fa8a4157f5 100644
--- a/mobile/android/themes/core/content.css
+++ b/mobile/android/themes/core/content.css
@@ -22,7 +22,7 @@ xul|window xul|scrollbar {
   display: block;
 }
 
-xul|scrollbar[orient="vertical"] {
+xul|window xul|scrollbar[orient="vertical"] {
   -moz-appearance: none !important;
   opacity: 0;
   position: relative;
@@ -33,17 +33,17 @@ xul|scrollbar[orient="vertical"] {
   border: 0px solid transparent !important;
 }
 
-xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
+xul|window xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
   margin-left: 2px;
   margin-right: -10px;
 }
 
-xul|scrollbar[orient="vertical"] xul|thumb {
+xul|window xul|scrollbar[orient="vertical"] xul|thumb {
   max-width: 6px !important;
   min-width: 6px !important;
 }
 
-xul|scrollbar[orient="horizontal"] {
+xul|window xul|scrollbar[orient="horizontal"] {
   -moz-appearance: none !important;
   opacity: 0;
   position: relative;
@@ -54,7 +54,7 @@ xul|scrollbar[orient="horizontal"] {
   border: 0px solid transparent !important;
 }
 
-xul|scrollbar[orient="horizontal"] xul|thumb {
+xul|window xul|scrollbar[orient="horizontal"] xul|thumb {
   max-height: 6px !important;
   min-height: 6px !important;
 }
@@ -63,24 +63,24 @@ xul|*[panning="true"] xul|scrollbar {
   opacity: 1;
 }
 
-xul|scrollbox {
+xul|window xul|scrollbox {
   overflow-y: scroll;
   overflow-x: scroll;
 }
 
-xul|scrollbarbutton {
+xul|window xul|scrollbarbutton {
   min-height: 8px !important;
   min-width: 8px !important;
   -moz-appearance: none !important;
   visibility: hidden;
 }
 
-xul|scrollbarbutton[sbattr="scrollbar-up-top"],
-xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
+xul|window xul|scrollbarbutton[sbattr="scrollbar-up-top"],
+xul|window xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
   display: none;
 }
 
-xul|scrollbar xul|thumb {
+xul|window xul|scrollbar xul|thumb {
   background-color: @color_background_scroller@ !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
index 24ba54015965..25f403c00aaa 100644
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -12,11 +12,11 @@
 #     based on current locale.
 #####################################################################################
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = mobile/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
diff --git a/mobile/xul/Makefile.in b/mobile/xul/Makefile.in
index 84686af3e928..cec39110992e 100644
--- a/mobile/xul/Makefile.in
+++ b/mobile/xul/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/mobile/xul/app/Makefile.in b/mobile/xul/app/Makefile.in
index 55834fccdd29..27255f7be5f8 100644
--- a/mobile/xul/app/Makefile.in
+++ b/mobile/xul/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/xul/app/profile/extensions/Makefile.in b/mobile/xul/app/profile/extensions/Makefile.in
index 2cc01d3ee4ed..d7f48f48eecf 100644
--- a/mobile/xul/app/profile/extensions/Makefile.in
+++ b/mobile/xul/app/profile/extensions/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mobile/xul/branding/aurora/Makefile.in b/mobile/xul/branding/aurora/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/xul/branding/aurora/Makefile.in
+++ b/mobile/xul/branding/aurora/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/aurora/content/Makefile.in b/mobile/xul/branding/aurora/content/Makefile.in
index 05a63052fc08..84f35dac220c 100644
--- a/mobile/xul/branding/aurora/content/Makefile.in
+++ b/mobile/xul/branding/aurora/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/aurora/locales/Makefile.in b/mobile/xul/branding/aurora/locales/Makefile.in
index 68f32527977e..815fb4c1bbfb 100644
--- a/mobile/xul/branding/aurora/locales/Makefile.in
+++ b/mobile/xul/branding/aurora/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/xul/branding/beta/Makefile.in b/mobile/xul/branding/beta/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/xul/branding/beta/Makefile.in
+++ b/mobile/xul/branding/beta/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/beta/content/Makefile.in b/mobile/xul/branding/beta/content/Makefile.in
index 05a63052fc08..84f35dac220c 100644
--- a/mobile/xul/branding/beta/content/Makefile.in
+++ b/mobile/xul/branding/beta/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/beta/locales/Makefile.in b/mobile/xul/branding/beta/locales/Makefile.in
index acaafcc276ec..a6dce0a67f81 100644
--- a/mobile/xul/branding/beta/locales/Makefile.in
+++ b/mobile/xul/branding/beta/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/xul/branding/nightly/Makefile.in b/mobile/xul/branding/nightly/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/xul/branding/nightly/Makefile.in
+++ b/mobile/xul/branding/nightly/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/nightly/content/Makefile.in b/mobile/xul/branding/nightly/content/Makefile.in
index 05a63052fc08..84f35dac220c 100644
--- a/mobile/xul/branding/nightly/content/Makefile.in
+++ b/mobile/xul/branding/nightly/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/nightly/locales/Makefile.in b/mobile/xul/branding/nightly/locales/Makefile.in
index 68f32527977e..815fb4c1bbfb 100644
--- a/mobile/xul/branding/nightly/locales/Makefile.in
+++ b/mobile/xul/branding/nightly/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/xul/branding/official/Makefile.in b/mobile/xul/branding/official/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/xul/branding/official/Makefile.in
+++ b/mobile/xul/branding/official/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/official/content/Makefile.in b/mobile/xul/branding/official/content/Makefile.in
index 05a63052fc08..84f35dac220c 100644
--- a/mobile/xul/branding/official/content/Makefile.in
+++ b/mobile/xul/branding/official/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/official/locales/Makefile.in b/mobile/xul/branding/official/locales/Makefile.in
index acaafcc276ec..a6dce0a67f81 100644
--- a/mobile/xul/branding/official/locales/Makefile.in
+++ b/mobile/xul/branding/official/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/xul/branding/unofficial/Makefile.in b/mobile/xul/branding/unofficial/Makefile.in
index 9e1c0e16dc6d..35ffc39b103d 100644
--- a/mobile/xul/branding/unofficial/Makefile.in
+++ b/mobile/xul/branding/unofficial/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/unofficial/content/Makefile.in b/mobile/xul/branding/unofficial/content/Makefile.in
index 05a63052fc08..84f35dac220c 100644
--- a/mobile/xul/branding/unofficial/content/Makefile.in
+++ b/mobile/xul/branding/unofficial/content/Makefile.in
@@ -5,7 +5,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/mobile/xul/branding/unofficial/locales/Makefile.in b/mobile/xul/branding/unofficial/locales/Makefile.in
index f711bdb9f309..edb084024726 100644
--- a/mobile/xul/branding/unofficial/locales/Makefile.in
+++ b/mobile/xul/branding/unofficial/locales/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
diff --git a/mobile/xul/chrome/Makefile.in b/mobile/xul/chrome/Makefile.in
index af37fad4f664..7b36044349e3 100644
--- a/mobile/xul/chrome/Makefile.in
+++ b/mobile/xul/chrome/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/xul/chrome/content/Util.js b/mobile/xul/chrome/content/Util.js
index bb0bcf38b269..cd804b51615a 100644
--- a/mobile/xul/chrome/content/Util.js
+++ b/mobile/xul/chrome/content/Util.js
@@ -179,10 +179,10 @@ let Util = {
   },
 
   modifierMaskFromEvent: function modifierMaskFromEvent(aEvent) {
-    return (aEvent.altKey   ? Ci.nsIDOMNSEvent.ALT_MASK     : 0) |
-           (aEvent.ctrlKey  ? Ci.nsIDOMNSEvent.CONTROL_MASK : 0) |
-           (aEvent.shiftKey ? Ci.nsIDOMNSEvent.SHIFT_MASK   : 0) |
-           (aEvent.metaKey  ? Ci.nsIDOMNSEvent.META_MASK    : 0);
+    return (aEvent.altKey   ? Ci.nsIDOMEvent.ALT_MASK     : 0) |
+           (aEvent.ctrlKey  ? Ci.nsIDOMEvent.CONTROL_MASK : 0) |
+           (aEvent.shiftKey ? Ci.nsIDOMEvent.SHIFT_MASK   : 0) |
+           (aEvent.metaKey  ? Ci.nsIDOMEvent.META_MASK    : 0);
   },
 
   get displayDPI() {
diff --git a/mobile/xul/chrome/content/content.js b/mobile/xul/chrome/content/content.js
index 60789592d2e5..0126afd17f73 100644
--- a/mobile/xul/chrome/content/content.js
+++ b/mobile/xul/chrome/content/content.js
@@ -494,7 +494,7 @@ let Content = {
       case "Browser:MouseClick": {
         this.formAssistant.focusSync = true;
         let element = elementFromPoint(x, y);
-        if (modifiers == Ci.nsIDOMNSEvent.CONTROL_MASK) {
+        if (modifiers == Ci.nsIDOMEvent.CONTROL_MASK) {
           let uri = Util.getHrefForElement(element);
           if (uri)
             sendAsyncMessage("Browser:OpenURI", { uri: uri,
@@ -1518,8 +1518,8 @@ var SelectionHandler = {
           // Keep the cache in "client" coordinates, but translate for the mouse event
           this.cache.end = { x: json.x, y: json.y };
           let end = { x: this.cache.end.x - scrollOffset.x, y: this.cache.end.y - scrollOffset.y };
-          utils.sendMouseEventToWindow("mousedown", end.x, end.y, 0, 1, Ci.nsIDOMNSEvent.SHIFT_MASK, true);
-          utils.sendMouseEventToWindow("mouseup", end.x, end.y, 0, 1, Ci.nsIDOMNSEvent.SHIFT_MASK, true);
+          utils.sendMouseEventToWindow("mousedown", end.x, end.y, 0, 1, Ci.nsIDOMEvent.SHIFT_MASK, true);
+          utils.sendMouseEventToWindow("mouseup", end.x, end.y, 0, 1, Ci.nsIDOMEvent.SHIFT_MASK, true);
         } else {
           // Keep the cache in "client" coordinates, but translate for the mouse event
           this.cache.start = { x: json.x, y: json.y };
@@ -1529,8 +1529,8 @@ var SelectionHandler = {
           utils.sendMouseEventToWindow("mousedown", start.x, start.y, 0, 0, 0, true);
           utils.sendMouseEventToWindow("mouseup", start.x, start.y, 0, 0, 0, true);
         
-          utils.sendMouseEventToWindow("mousedown", end.x, end.y, 0, 1, Ci.nsIDOMNSEvent.SHIFT_MASK, true);
-          utils.sendMouseEventToWindow("mouseup", end.x, end.y, 0, 1, Ci.nsIDOMNSEvent.SHIFT_MASK, true);
+          utils.sendMouseEventToWindow("mousedown", end.x, end.y, 0, 1, Ci.nsIDOMEvent.SHIFT_MASK, true);
+          utils.sendMouseEventToWindow("mouseup", end.x, end.y, 0, 1, Ci.nsIDOMEvent.SHIFT_MASK, true);
         }
 
         // Cache the selected text since the selection might be gone by the time we get the "end" message
diff --git a/mobile/xul/chrome/tests/Makefile.in b/mobile/xul/chrome/tests/Makefile.in
index df676c402b66..6f2a76e5b94f 100644
--- a/mobile/xul/chrome/tests/Makefile.in
+++ b/mobile/xul/chrome/tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/xul/components/Makefile.in b/mobile/xul/components/Makefile.in
index 04fda44360f2..8494201130d5 100644
--- a/mobile/xul/components/Makefile.in
+++ b/mobile/xul/components/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/mobile/xul/components/build/Makefile.in b/mobile/xul/components/build/Makefile.in
index 7e3c40e50306..1eef24e35588 100644
--- a/mobile/xul/components/build/Makefile.in
+++ b/mobile/xul/components/build/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mobile/xul/installer/Makefile.in b/mobile/xul/installer/Makefile.in
index cc05f337918e..befb461fe310 100644
--- a/mobile/xul/installer/Makefile.in
+++ b/mobile/xul/installer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/mobile/xul/locales/Makefile.in b/mobile/xul/locales/Makefile.in
index a65ce9ad8de6..c75ae066e15b 100644
--- a/mobile/xul/locales/Makefile.in
+++ b/mobile/xul/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = mobile/xul/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
diff --git a/mobile/xul/modules/Makefile.in b/mobile/xul/modules/Makefile.in
index 7bca73b386c4..b72e93343650 100644
--- a/mobile/xul/modules/Makefile.in
+++ b/mobile/xul/modules/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/mobile/xul/themes/core/Makefile.in b/mobile/xul/themes/core/Makefile.in
index 0052e9c3858a..4016357d650a 100644
--- a/mobile/xul/themes/core/Makefile.in
+++ b/mobile/xul/themes/core/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	    = ../../../..
+DEPTH	    = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mobile/xul/themes/core/content.css b/mobile/xul/themes/core/content.css
index 2d0cf4103926..0ee811ca4eb4 100644
--- a/mobile/xul/themes/core/content.css
+++ b/mobile/xul/themes/core/content.css
@@ -30,7 +30,7 @@ xul|window xul|scrollbar {
   display: block;
 }
 
-xul|scrollbar[orient="vertical"] {
+xul|window xul|scrollbar[orient="vertical"] {
   -moz-appearance: none !important;
   opacity: 0;
   position: relative;
@@ -41,17 +41,17 @@ xul|scrollbar[orient="vertical"] {
   border: 0px solid transparent !important;
 }
 
-xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
+xul|window xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
   margin-left: 2px;
   margin-right: -10px;
 }
 
-xul|scrollbar[orient="vertical"] xul|thumb {
+xul|window xul|scrollbar[orient="vertical"] xul|thumb {
   max-width: 6px !important;
   min-width: 6px !important;
 }
 
-xul|scrollbar[orient="horizontal"] {
+xul|window xul|scrollbar[orient="horizontal"] {
   -moz-appearance: none !important;
   opacity: 0;
   position: relative;
@@ -62,33 +62,33 @@ xul|scrollbar[orient="horizontal"] {
   border: 0px solid transparent !important;
 }
 
-xul|scrollbar[orient="horizontal"] xul|thumb {
+xul|window xul|scrollbar[orient="horizontal"] xul|thumb {
   max-height: 6px !important;
   min-height: 6px !important;
 }
 
-xul|*[panning="true"] xul|scrollbar {
+xul|window xul|*[panning="true"] xul|scrollbar {
   opacity: 1;
 }
 
-xul|scrollbox {
+xul|window xul|scrollbox {
   overflow-y: scroll;
   overflow-x: scroll;
 }
 
-xul|scrollbarbutton {
+xul|window xul|scrollbarbutton {
   min-height: 8px !important;
   min-width: 8px !important;
   -moz-appearance: none !important;
   visibility: hidden;
 }
 
-xul|scrollbarbutton[sbattr="scrollbar-up-top"],
-xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
+xul|window xul|scrollbarbutton[sbattr="scrollbar-up-top"],
+xul|window xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
   display: none;
 }
 
-xul|scrollbar xul|thumb {
+xul|window xul|scrollbar xul|thumb {
   background-color: rgba(0, 0, 0, 0.4) !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
diff --git a/modules/libbz2/Makefile.in b/modules/libbz2/Makefile.in
index 32175480d116..f8bb7daa6d19 100644
--- a/modules/libbz2/Makefile.in
+++ b/modules/libbz2/Makefile.in
@@ -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/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in
index 84696a8bf6fc..d25d32ba02d6 100644
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in
index 753a0bac0462..d8cfd7d67378 100644
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libjar/test/Makefile.in b/modules/libjar/test/Makefile.in
index 195dddd6e830..07ce128a9576 100644
--- a/modules/libjar/test/Makefile.in
+++ b/modules/libjar/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = modules/libjar/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/modules/libjar/test/chrome/Makefile.in b/modules/libjar/test/chrome/Makefile.in
index be4a0974ec4d..b8ab6369c163 100644
--- a/modules/libjar/test/chrome/Makefile.in
+++ b/modules/libjar/test/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = modules/libjar/test/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/modules/libjar/test/mochitest/Makefile.in b/modules/libjar/test/mochitest/Makefile.in
index 2026bf508e99..b967bf55039f 100644
--- a/modules/libjar/test/mochitest/Makefile.in
+++ b/modules/libjar/test/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = modules/libjar/test/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/modules/libjar/zipwriter/Makefile.in b/modules/libjar/zipwriter/Makefile.in
index f2572013d110..5311babefd41 100644
--- a/modules/libjar/zipwriter/Makefile.in
+++ b/modules/libjar/zipwriter/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH                 = ../../..
+DEPTH                 = @DEPTH@
 topsrcdir             = @top_srcdir@
 srcdir                = @srcdir@
 VPATH                 = @srcdir@
diff --git a/modules/libjar/zipwriter/public/Makefile.in b/modules/libjar/zipwriter/public/Makefile.in
index da853c537c5f..09e6e07a82d3 100644
--- a/modules/libjar/zipwriter/public/Makefile.in
+++ b/modules/libjar/zipwriter/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH                 = ../../../..
+DEPTH                 = @DEPTH@
 topsrcdir             = @top_srcdir@
 srcdir                = @srcdir@
 VPATH                 = @srcdir@
diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in
index ab1c072ca964..03437af35d05 100644
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH                 = ../../../..
+DEPTH                 = @DEPTH@
 topsrcdir             = @top_srcdir@
 srcdir                = @srcdir@
 VPATH                 = @srcdir@
diff --git a/modules/libjar/zipwriter/test/Makefile.in b/modules/libjar/zipwriter/test/Makefile.in
index 45c4a5d49723..110a84f902dd 100644
--- a/modules/libjar/zipwriter/test/Makefile.in
+++ b/modules/libjar/zipwriter/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = modules/libjar/zipwriter/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/modules/libmar/Makefile.in b/modules/libmar/Makefile.in
index e14f1df9c0ea..69720d132f20 100644
--- a/modules/libmar/Makefile.in
+++ b/modules/libmar/Makefile.in
@@ -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/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libmar/sign/Makefile.in b/modules/libmar/sign/Makefile.in
index 6bcd7c1f2d51..4713c8b42c7a 100644
--- a/modules/libmar/sign/Makefile.in
+++ b/modules/libmar/sign/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in
index 283b96bf5a10..57c02bd81a01 100644
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libmar/tests/Makefile.in b/modules/libmar/tests/Makefile.in
index ea2c1463f499..14c1544fb238 100644
--- a/modules/libmar/tests/Makefile.in
+++ b/modules/libmar/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = modules/libmar/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in
index 83822c163c30..503c12086e55 100644
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libmar/verify/Makefile.in b/modules/libmar/verify/Makefile.in
index 4d8dc21814c8..7133599caa59 100644
--- a/modules/libmar/verify/Makefile.in
+++ b/modules/libmar/verify/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libpref/Makefile.in b/modules/libpref/Makefile.in
index c37ba2e699a7..2897d9da19b3 100644
--- a/modules/libpref/Makefile.in
+++ b/modules/libpref/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libpref/public/Makefile.in b/modules/libpref/public/Makefile.in
index 0d305700748e..e1064ac322d0 100644
--- a/modules/libpref/public/Makefile.in
+++ b/modules/libpref/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
index 2d0243699c4d..00542ea20bdb 100644
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/libpref/test/Makefile.in b/modules/libpref/test/Makefile.in
index 9713ec2dca82..ddfb30050d1c 100644
--- a/modules/libpref/test/Makefile.in
+++ b/modules/libpref/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = modules/libpref/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/modules/zlib/Makefile.in b/modules/zlib/Makefile.in
index 58ef790a83ba..88cb451e4563 100644
--- a/modules/zlib/Makefile.in
+++ b/modules/zlib/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/modules/zlib/src/Makefile.in b/modules/zlib/src/Makefile.in
index e7186645d076..74a8e035b015 100644
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mozglue/Makefile.in b/mozglue/Makefile.in
index bf33fd3f8e2b..ceb5cb3a528f 100644
--- a/mozglue/Makefile.in
+++ b/mozglue/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mozglue/android/Makefile.in b/mozglue/android/Makefile.in
index a01867912140..11947ad68e6b 100644
--- a/mozglue/android/Makefile.in
+++ b/mozglue/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in
index 40beeb182419..c333647a1d72 100644
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mozglue/linker/Makefile.in b/mozglue/linker/Makefile.in
index d2a69f65e254..faee93904442 100644
--- a/mozglue/linker/Makefile.in
+++ b/mozglue/linker/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in
index 983be17e4d09..4379e0f5ee48 100644
--- a/mozglue/tests/Makefile.in
+++ b/mozglue/tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/mozilla-config.h.in b/mozilla-config.h.in
new file mode 100644
index 000000000000..b821728cc708
--- /dev/null
+++ b/mozilla-config.h.in
@@ -0,0 +1,27 @@
+/* List of defines generated by configure. Included with preprocessor flag,
+ * -include, to avoid long list of -D defines on the compile command-line.
+ * Do not edit.
+ */
+
+#ifndef _MOZILLA_CONFIG_H_
+#define _MOZILLA_CONFIG_H_
+
+@ALLDEFINES@
+
+/* The c99 defining the limit macros (UINT32_MAX for example), says:
+ * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+ * is defined before <stdint.h> is included. */
+#define __STDC_LIMIT_MACROS
+
+/* Force-include hunspell_alloc_hooks.h for hunspell, so that we don't need to
+ * modify it directly.
+ *
+ * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in,
+ * unless --enable-system-hunspell is defined.
+ */
+#if defined(HUNSPELL_STATIC)
+#include "hunspell_alloc_hooks.h"
+#endif
+
+#endif /* _MOZILLA_CONFIG_H_ */
+
diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in
index e9b2f2d680d0..90437890bb22 100644
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/base/Makefile.in b/netwerk/base/Makefile.in
index 14a7484fd24e..7b948be6cee9 100644
--- a/netwerk/base/Makefile.in
+++ b/netwerk/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in
index 497e496beca1..00961d8b54c7 100644
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index 505241cf625b..0bd106572054 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/base/src/nsFileStreams.cpp b/netwerk/base/src/nsFileStreams.cpp
index 7386bb32be60..b388c42ecd81 100644
--- a/netwerk/base/src/nsFileStreams.cpp
+++ b/netwerk/base/src/nsFileStreams.cpp
@@ -508,13 +508,28 @@ nsFileInputStream::Write(IPC::Message *aMsg)
 ////////////////////////////////////////////////////////////////////////////////
 // nsPartialFileInputStream
 
+NS_IMPL_ADDREF_INHERITED(nsPartialFileInputStream, nsFileStreamBase)
+NS_IMPL_RELEASE_INHERITED(nsPartialFileInputStream, nsFileStreamBase)
+
+NS_IMPL_CLASSINFO(nsPartialFileInputStream, NULL, nsIClassInfo::THREADSAFE,
+                  NS_PARTIALLOCALFILEINPUTSTREAM_CID)
+
 // Don't forward to nsFileInputStream as we don't want to QI to
 // nsIFileInputStream
-NS_IMPL_ISUPPORTS_INHERITED3(nsPartialFileInputStream,
-                             nsFileStreamBase,
+NS_INTERFACE_MAP_BEGIN(nsPartialFileInputStream)
+    NS_INTERFACE_MAP_ENTRY(nsIInputStream)
+    NS_INTERFACE_MAP_ENTRY(nsIPartialFileInputStream)
+    NS_INTERFACE_MAP_ENTRY(nsILineInputStream)
+    NS_INTERFACE_MAP_ENTRY(nsIIPCSerializable)
+    NS_IMPL_QUERY_CLASSINFO(nsPartialFileInputStream)
+NS_INTERFACE_MAP_END_INHERITING(nsFileStreamBase)
+
+NS_IMPL_CI_INTERFACE_GETTER5(nsPartialFileInputStream,
                              nsIInputStream,
                              nsIPartialFileInputStream,
-                             nsILineInputStream)
+                             nsISeekableStream,
+                             nsILineInputStream,
+                             nsIIPCSerializable)
 
 nsresult
 nsPartialFileInputStream::Create(nsISupports *aOuter, REFNSIID aIID,
@@ -614,6 +629,57 @@ nsPartialFileInputStream::Seek(PRInt32 aWhence, PRInt64 aOffset)
     return rv;
 }
 
+bool
+nsPartialFileInputStream::Read(const IPC::Message *aMsg, void **aIter)
+{
+    using IPC::ReadParam;
+
+    // Grab our members first.
+    PRUint64 start;
+    PRUint64 length;
+    if (!ReadParam(aMsg, aIter, &start) ||
+        !ReadParam(aMsg, aIter, &length))
+        return false;
+
+    // Then run base class deserialization.
+    if (!nsFileInputStream::Read(aMsg, aIter))
+        return false;
+
+    // Set members.
+    mStart = start;
+    mLength = length;
+
+    // XXX This isn't really correct, we should probably set this to whatever
+    //     the sender had. However, it doesn't look like nsFileInputStream deals
+    //     with sending a partially-consumed stream either, so...
+    mPosition = 0;
+
+    // Mirror nsPartialFileInputStream::Init here. We can't call it directly
+    // because nsFileInputStream::Read() already calls the base class Init
+    // method.
+    return NS_SUCCEEDED(nsFileInputStream::Seek(NS_SEEK_SET, start));
+}
+
+void
+nsPartialFileInputStream::Write(IPC::Message *aMsg)
+{
+    using IPC::WriteParam;
+
+    // Write our members first.
+    WriteParam(aMsg, mStart);
+    WriteParam(aMsg, mLength);
+
+    // XXX This isn't really correct, we should probably send this too. However,
+    //     it doesn't look like nsFileInputStream deals with sending a
+    //     partially-consumed stream either, so...
+    if (mPosition) {
+      NS_WARNING("No support for sending a partially-consumed input stream!");
+    }
+
+    // Now run base class serialization.
+    nsFileInputStream::Write(aMsg);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsFileOutputStream
 
diff --git a/netwerk/base/src/nsFileStreams.h b/netwerk/base/src/nsFileStreams.h
index 6e6a9e586c55..fa6fdb1292f3 100644
--- a/netwerk/base/src/nsFileStreams.h
+++ b/netwerk/base/src/nsFileStreams.h
@@ -178,6 +178,7 @@ class nsPartialFileInputStream : public nsFileInputStream,
 public:
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSIPARTIALFILEINPUTSTREAM
+    NS_DECL_NSIIPCSERIALIZABLE
 
     NS_IMETHOD Tell(PRInt64 *aResult);
     NS_IMETHOD Available(PRUint32 *aResult);
diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index c1e877407183..bf8104b6b454 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in
index 041dc85c7c22..f525a9a85be5 100644
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in
index d6c510f614b2..86a7c483c3f3 100644
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = netwerk/cookie
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in
index da23635cfafd..ea87fb99b7eb 100644
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in
index e63ada950ce8..6993f975ca54 100644
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
index dfb7917888ec..4cc47d271eea 100644
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -191,6 +191,8 @@ struct ParamTraits<InputStream>
     }
 
     nsCOMPtr<nsIClassInfo> classInfo = do_QueryInterface(aParam.mStream);
+    NS_ASSERTION(classInfo, "Must QI to nsIClassInfo for this to work!");
+
     char cidStr[NSID_LENGTH];
     nsCID cid;
     mozilla::DebugOnly<nsresult> rv = classInfo->GetClassIDNoAlloc(&cid);
diff --git a/netwerk/locales/Makefile.in b/netwerk/locales/Makefile.in
index d24f209b76b4..3e9aa00c44fa 100644
--- a/netwerk/locales/Makefile.in
+++ b/netwerk/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = netwerk/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in
index 4317341834be..d39abb8e4ed7 100644
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/Makefile.in b/netwerk/protocol/Makefile.in
index 764a7b71bffb..2e3d66bed007 100644
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in
index d5f27255aeba..1d31d42473e9 100644
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/app/Makefile.in b/netwerk/protocol/app/Makefile.in
index c4b392eaa97a..3a83ce06a528 100644
--- a/netwerk/protocol/app/Makefile.in
+++ b/netwerk/protocol/app/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in
index 40e5c5f3e73e..2e5c9249ba8d 100644
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in
index c540dee75f18..02cf2b33fbce 100644
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in
index 5630b4a3193b..cfa6db4e9ab0 100644
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in
index 9873ce75e3d0..046fd679a093 100644
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in
index 837131c15b9d..ab7adedebf40 100644
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in
index 27a8e32c28ce..19f9ff515b43 100644
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in
index f2906bd1f57b..a9215f347f5b 100644
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in
index ff669f62a714..974bbf975b2b 100644
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in
index 7253218eeb27..df92b3bff4ca 100644
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in
index 70f0d539b8a1..abf1b901c1bb 100644
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/netwerk/streamconv/Makefile.in b/netwerk/streamconv/Makefile.in
index 86dd9cc174fb..d5e3c4d09834 100644
--- a/netwerk/streamconv/Makefile.in
+++ b/netwerk/streamconv/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in
index da7a2cd69490..ae1eb830f839 100644
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/streamconv/public/Makefile.in b/netwerk/streamconv/public/Makefile.in
index b45669d35acc..de447e535650 100644
--- a/netwerk/streamconv/public/Makefile.in
+++ b/netwerk/streamconv/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in
index b2d26f0fbaba..ed35cbaafcb8 100644
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in
index 8799d98c3735..51b2357e1141 100644
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/system/Makefile.in b/netwerk/system/Makefile.in
index 821f6edf9a5a..1d4c2328ea6d 100644
--- a/netwerk/system/Makefile.in
+++ b/netwerk/system/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in
index e23113a2b27c..16d03a57146d 100644
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in
index 7bd0973828aa..9eae57cf6d2f 100644
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in
index 332d5a3d90da..9c13892b38e3 100644
--- a/netwerk/system/maemo/Makefile.in
+++ b/netwerk/system/maemo/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in
index bf333b0e68d9..f8e6ea02b23a 100644
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	 = @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in
index cd1f5ec8517d..ef53233d2f53 100644
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in
index 4b4cb7570948..615c8ff6f760 100644
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -4,11 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = netwerk/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/netwerk/test/browser/Makefile.in b/netwerk/test/browser/Makefile.in
index 954006c3d168..03b63904c868 100644
--- a/netwerk/test/browser/Makefile.in
+++ b/netwerk/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = netwerk/test/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/netwerk/test/httpserver/Makefile.in b/netwerk/test/httpserver/Makefile.in
index 2a25b67a805e..0ca60ce0c568 100644
--- a/netwerk/test/httpserver/Makefile.in
+++ b/netwerk/test/httpserver/Makefile.in
@@ -6,11 +6,11 @@
 
 $(warning httpserver XPI_NAME=$(XPI_NAME))
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = netwerk/test/httpserver
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in
index ddf67fbc733b..506698bbe45c 100644
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/other-licenses/android/Makefile.in b/other-licenses/android/Makefile.in
index bdc8d4b75c28..726381f78787 100644
--- a/other-licenses/android/Makefile.in
+++ b/other-licenses/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
index 7ef7c2a80891..1254b02967aa 100644
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -22,7 +22,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in
index 3bda9b73c673..b1e2e69a0b9d 100644
--- a/other-licenses/skia-npapi/Makefile.in
+++ b/other-licenses/skia-npapi/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in
index 2b77208139d8..fdf8a2c49f09 100644
--- a/other-licenses/snappy/Makefile.in
+++ b/other-licenses/snappy/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 
diff --git a/parser/Makefile.in b/parser/Makefile.in
index 7a5ebf6bd7a6..62cc0824cd95 100644
--- a/parser/Makefile.in
+++ b/parser/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/parser/expat/Makefile.in b/parser/expat/Makefile.in
index 6e2839c1ed4d..661931543c4f 100644
--- a/parser/expat/Makefile.in
+++ b/parser/expat/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in
index 73801b8ad9f4..38680149d6c3 100644
--- a/parser/expat/lib/Makefile.in
+++ b/parser/expat/lib/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in
index 8706550755dc..ad5800af3fa0 100644
--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/parser/htmlparser/Makefile.in b/parser/htmlparser/Makefile.in
index fa92022ad655..f46b7322dcca 100644
--- a/parser/htmlparser/Makefile.in
+++ b/parser/htmlparser/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/parser/htmlparser/public/Makefile.in b/parser/htmlparser/public/Makefile.in
index c7c13d8e8154..a16eb2248e17 100644
--- a/parser/htmlparser/public/Makefile.in
+++ b/parser/htmlparser/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in
index f427874c3eba..f0e43ae8fd64 100644
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/parser/htmlparser/tests/Makefile.in b/parser/htmlparser/tests/Makefile.in
index 190f70bbad58..b1c6db51e2e1 100644
--- a/parser/htmlparser/tests/Makefile.in
+++ b/parser/htmlparser/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in
index fa7f2500a1d0..aba4aa559e7f 100644
--- a/parser/htmlparser/tests/mochitest/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = parser/htmlparser/tests/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
index f965b0e60d2e..1cc24f94d37d 100644
--- a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = parser/htmlparser/tests/mochitest/dir_bug534293
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
index 951ec4d1e026..0b43bd53629b 100644
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = parser/htmlparser/tests/mochitest/html5lib_tree_construction
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
index adad21b9a0b7..dea1f9d57913 100644
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/parser/xml/Makefile.in b/parser/xml/Makefile.in
index 9c0e05815fd3..acd40b7c27bf 100644
--- a/parser/xml/Makefile.in
+++ b/parser/xml/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/parser/xml/public/Makefile.in b/parser/xml/public/Makefile.in
index 24c834e566f3..f23c64d143f7 100644
--- a/parser/xml/public/Makefile.in
+++ b/parser/xml/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in
index 94e39ebf901d..9efe1a58c17f 100644
--- a/parser/xml/src/Makefile.in
+++ b/parser/xml/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/parser/xml/test/Makefile.in b/parser/xml/test/Makefile.in
index ecff895b5a17..0b09eb3e689c 100644
--- a/parser/xml/test/Makefile.in
+++ b/parser/xml/test/Makefile.in
@@ -12,11 +12,11 @@
 #
 
 # Note: DEPTH should be set to the relative path to mozilla/
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = parser/xml/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/probes/Makefile.in b/probes/Makefile.in
index fbeb7aa0ff35..8a1e44b72830 100644
--- a/probes/Makefile.in
+++ b/probes/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/profile/Makefile.in b/profile/Makefile.in
index 033ddd4c22f2..b971d747bea8 100644
--- a/profile/Makefile.in
+++ b/profile/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/profile/dirserviceprovider/Makefile.in b/profile/dirserviceprovider/Makefile.in
index f08b8198f523..e2ecc60f0651 100644
--- a/profile/dirserviceprovider/Makefile.in
+++ b/profile/dirserviceprovider/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/profile/dirserviceprovider/public/Makefile.in b/profile/dirserviceprovider/public/Makefile.in
index 7d4675d7b7e0..9c4b76a7fc6a 100644
--- a/profile/dirserviceprovider/public/Makefile.in
+++ b/profile/dirserviceprovider/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		=../../..
+DEPTH		=@DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in
index 582af91203e5..a947e7618c3d 100644
--- a/profile/dirserviceprovider/src/Makefile.in
+++ b/profile/dirserviceprovider/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/profile/dirserviceprovider/standalone/Makefile.in b/profile/dirserviceprovider/standalone/Makefile.in
index 9088242955d7..920a0166d890 100644
--- a/profile/dirserviceprovider/standalone/Makefile.in
+++ b/profile/dirserviceprovider/standalone/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/profile/public/Makefile.in b/profile/public/Makefile.in
index d73e094d664a..859739eb56e0 100644
--- a/profile/public/Makefile.in
+++ b/profile/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/python/mozbuild/README.rst b/python/mozbuild/README.rst
new file mode 100644
index 000000000000..21a72417bebc
--- /dev/null
+++ b/python/mozbuild/README.rst
@@ -0,0 +1,101 @@
+========
+mozbuild
+========
+
+mozbuild is a Python package providing functionality used by Mozilla's
+build system.
+
+Modules Overview
+================
+
+* mozbuild.compilation -- Functionality related to compiling. This
+  includes managing compiler warnings.
+* mozbuild.logging -- Defines mozbuild's logging infrastructure.
+  mozbuild uses a structured logging backend.
+
+Structured Logging
+==================
+
+One of the features of mozbuild is structured logging. Instead of
+conventional logging where simple strings are logged, the internal
+logging mechanism logs all events with the following pieces of
+information:
+
+* A string *action*
+* A dict of log message fields
+* A formatting string
+
+Essentially, instead of assembling a human-readable string at
+logging-time, you create an object holding all the pieces of data that
+will constitute your logged event. For each unique type of logged event,
+you assign an *action* name.
+
+Depending on how logging is configured, your logged event could get
+written a couple of different ways.
+
+JSON Logging
+------------
+
+Where machines are the intended target of the logging data, a JSON
+logger is configured. The JSON logger assembles an array consisting of
+the following elements:
+
+* Decimal wall clock time in seconds since UNIX epoch
+* String *action* of message
+* Object with structured message data
+
+The JSON-serialized array is written to a configured file handle.
+Consumers of this logging stream can just perform a readline() then feed
+that into a JSON deserializer to reconstruct the original logged
+message. They can key off the *action* element to determine how to
+process individual events. There is no need to invent a parser.
+Convenient, isn't it?
+
+Logging for Humans
+------------------
+
+Where humans are the intended consumer of a log message, the structured
+log message are converted to more human-friendly form. This is done by
+utilizing the *formatting* string provided at log time. The logger
+simply calls the *format* method of the formatting string, passing the
+dict containing the message's fields.
+
+When *mach* is used in a terminal that supports it, the logging facility
+also supports terminal features such as colorization. This is done
+automatically in the logging layer - there is no need to control this at
+logging time.
+
+In addition, messages intended for humans typically prepends every line
+with the time passed since the application started.
+
+Logging HOWTO
+-------------
+
+Structured logging piggybacks on top of Python's built-in logging
+infrastructure provided by the *logging* package. We accomplish this by
+taking advantage of *logging.Logger.log()*'s *extra* argument. To this
+argument, we pass a dict with the fields *action* and *params*. These
+are the string *action* and dict of message fields, respectively. The
+formatting string is passed as the *msg* argument, like normal.
+
+If you were logging to a logger directly, you would do something like:
+
+    logger.log(logging.INFO, 'My name is {name}',
+        extra={'action': 'my_name', 'params': {'name': 'Gregory'}})
+
+The JSON logging would produce something like:
+
+    [1339985554.306338, "my_name", {"name": "Gregory"}]
+
+Human logging would produce something like:
+
+     0.52 My name is Gregory
+
+Since there is a lot of complexity using logger.log directly, it is
+recommended to go through a wrapping layer that hides part of the
+complexity for you. e.g.
+
+    def log(self, level, action, params, format_str):
+        self.logger.log(level, format_str,
+            extra={'action': action, 'params': params)
+
diff --git a/python/mozbuild/mozbuild/__init__.py b/python/mozbuild/mozbuild/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/compilation/__init__.py b/python/mozbuild/mozbuild/compilation/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/compilation/warnings.py b/python/mozbuild/mozbuild/compilation/warnings.py
new file mode 100644
index 000000000000..b5e0bd2f80e0
--- /dev/null
+++ b/python/mozbuild/mozbuild/compilation/warnings.py
@@ -0,0 +1,344 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 modules provides functionality for dealing with compiler warnings.
+
+import json
+import os
+import re
+
+from mozbuild.util import hash_file
+
+
+# Regular expression to strip ANSI color sequences from a string. This is
+# needed to properly analyze Clang compiler output, which may be colorized.
+# It assumes ANSI escape sequences.
+RE_STRIP_COLORS = re.compile(r'\x1b\[[\d;]+m')
+
+# This captures Clang diagnostics with the standard formatting.
+RE_CLANG_WARNING = re.compile(r"""
+    (?P<file>[^:]+)
+    :
+    (?P<line>\d+)
+    :
+    (?P<column>\d+)
+    :
+    \swarning:\s
+    (?P<message>[^\[]+)
+    \[(?P<flag>[^\]]+)
+    """, re.X)
+
+# This captures Visual Studio's warning format.
+RE_MSVC_WARNING = re.compile(r"""
+    (?P<file>.*)
+    \((?P<line>\d+)\)
+    \s:\swarning\s
+    (?P<flag>[^:]+)
+    :\s
+    (?P<message>.*)
+    """, re.X)
+
+IN_FILE_INCLUDED_FROM = 'In file included from '
+
+
+class CompilerWarning(dict):
+    """Represents an individual compiler warning."""
+
+    def __init__(self):
+        dict.__init__(self)
+
+        self['filename'] = None
+        self['line'] = None
+        self['column'] = None
+        self['message'] = None
+        self['flag'] = None
+
+    def __eq__(self, other):
+        if not isinstance(other, CompilerWarning):
+            return False
+
+        return self['filename'] == other['filename'] \
+            and self['line'] == other['line'] \
+            and self['column'] == other['column']
+
+    def __neq__(self, other):
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        """Define so this can exist inside a set, etc."""
+        return hash(tuple(sorted(self.items())))
+
+
+class WarningsDatabase(object):
+    """Holds a collection of warnings.
+
+    The warnings database is a semi-intelligent container that holds warnings
+    encountered during builds.
+
+    The warnings database is backed by a JSON file. But, that is transparent
+    to consumers.
+
+    Under most circumstances, the warnings database is insert only. When a
+    warning is encountered, the caller simply blindly inserts it into the
+    database. The database figures out whether it is a dupe, etc.
+
+    During the course of development, it is common for warnings to change
+    slightly as source code changes. For example, line numbers will disagree.
+    The WarningsDatabase handles this by storing the hash of a file a warning
+    occurred in. At warning insert time, if the hash of the file does not match
+    what is stored in the database, the existing warnings for that file are
+    purged from the database.
+
+    Callers should periodically prune old, invalid warnings from the database
+    by calling prune(). A good time to do this is at the end of a build.
+    """
+    def __init__(self):
+        """Create an empty database."""
+        self._files = {}
+
+    def __len__(self):
+        i = 0
+        for value in self._files.values():
+            i += len(value['warnings'])
+
+        return i
+
+    def __iter__(self):
+        for value in self._files.values():
+            for warning in value['warnings']:
+                yield warning
+
+    def __contains__(self, item):
+        for value in self._files.values():
+            for warning in value['warnings']:
+                if warning == item:
+                    return True
+
+        return False
+
+    @property
+    def warnings(self):
+        """All the CompilerWarning instances in this database."""
+        for value in self._files.values():
+            for w in value['warnings']:
+                yield w
+
+    @property
+    def type_counts(self):
+        """Returns a mapping of warning types to their counts."""
+
+        types = {}
+        for value in self._files.values():
+            for warning in value['warnings']:
+                count = types.get(warning['flag'], 0)
+                count += 1
+
+                types[warning['flag']] = count
+
+        return types
+
+    def has_file(self, filename):
+        """Whether we have any warnings for the specified file."""
+        return filename in self._files
+
+    def warnings_for_file(self, filename):
+        """Obtain the warnings for the specified file."""
+        f = self._files.get(filename, {'warnings': []})
+
+        for warning in f['warnings']:
+            yield warning
+
+    def insert(self, warning, compute_hash=True):
+        assert isinstance(warning, CompilerWarning)
+
+        filename = warning['filename']
+
+        new_hash = None
+
+        if compute_hash:
+            new_hash = hash_file(filename)
+
+        if filename in self._files:
+            if new_hash != self._files[filename]['hash']:
+                del self._files[filename]
+
+        value = self._files.get(filename, {
+            'hash': new_hash,
+            'warnings': set(),
+        })
+
+        value['warnings'].add(warning)
+
+        self._files[filename] = value
+
+    def prune(self):
+        """Prune the contents of the database.
+
+        This removes warnings that are no longer valid. A warning is no longer
+        valid if the file it was in no longer exists or if the content has
+        changed.
+
+        The check for changed content catches the case where a file previously
+        contained warnings but no longer does.
+        """
+
+        # Need to calculate up front since we are mutating original object.
+        filenames = self._files.keys()
+        for filename in filenames:
+            if not os.path.exists(filename):
+                del self._files[filename]
+                continue
+
+            if self._files[filename]['hash'] is None:
+                continue
+
+            current_hash = hash_file(filename)
+            if current_hash != self._files[filename]['hash']:
+                del self._files[filename]
+                continue
+
+    def serialize(self, fh):
+        """Serialize the database to an open file handle."""
+        obj = {'files': {}}
+
+        # All this hackery because JSON can't handle sets.
+        for k, v in self._files.iteritems():
+            obj['files'][k] = {}
+
+            for k2, v2 in v.iteritems():
+                normalized = v2
+
+                if k2 == 'warnings':
+                    normalized = [w for w in v2]
+
+                obj['files'][k][k2] = normalized
+
+        json.dump(obj, fh, indent=2)
+
+    def deserialize(self, fh):
+        """Load serialized content from a handle into the current instance."""
+        obj = json.load(fh)
+
+        self._files = obj['files']
+
+        # Normalize data types.
+        for filename, value in self._files.iteritems():
+            for k, v in value.iteritems():
+                if k != 'warnings':
+                    continue
+
+                normalized = set()
+                for d in v:
+                    w = CompilerWarning()
+                    w.update(d)
+                    normalized.add(w)
+
+                self._files[filename]['warnings'] = normalized
+
+    def load_from_file(self, filename):
+        """Load the database from a file."""
+        with open(filename, 'rb') as fh:
+            self.deserialize(fh)
+
+    def save_to_file(self, filename):
+        """Save the database to a file."""
+        with open(filename, 'wb') as fh:
+            self.serialize(fh)
+
+
+class WarningsCollector(object):
+    """Collects warnings from text data.
+
+    Instances of this class receive data (usually the output of compiler
+    invocations) and parse it into warnings and add these warnings to a
+    database.
+
+    The collector works by incrementally receiving data, usually line-by-line
+    output from the compiler. Therefore, it can maintain state to parse
+    multi-line warning messages.
+    """
+    def __init__(self, database=None, objdir=None, resolve_files=True):
+        self.database = database
+        self.objdir = objdir
+        self.resolve_files = resolve_files
+        self.included_from = []
+
+        if database is None:
+            self.database = WarningsDatabase()
+
+    def process_line(self, line):
+        """Take a line of text and process it for a warning."""
+
+        filtered = RE_STRIP_COLORS.sub('', line)
+
+        # Clang warnings in files included from the one(s) being compiled will
+        # start with "In file included from /path/to/file:line:". Here, we
+        # record those.
+        if filtered.startswith(IN_FILE_INCLUDED_FROM):
+            included_from = filtered[len(IN_FILE_INCLUDED_FROM):]
+
+            parts = included_from.split(':')
+
+            self.included_from.append(parts[0])
+
+            return
+
+        warning = CompilerWarning()
+        filename = None
+
+        # TODO make more efficient so we run minimal regexp matches.
+        match_clang = RE_CLANG_WARNING.match(filtered)
+        match_msvc = RE_MSVC_WARNING.match(filtered)
+        if match_clang:
+            d = match_clang.groupdict()
+
+            filename = d['file']
+            warning['line'] = int(d['line'])
+            warning['column'] = int(d['column'])
+            warning['flag'] = d['flag']
+            warning['message'] = d['message'].rstrip()
+
+        elif match_msvc:
+            d = match_msvc.groupdict()
+
+            filename = d['file']
+            warning['line'] = int(d['line'])
+            warning['flag'] = d['flag']
+            warning['message'] = d['message'].rstrip()
+        else:
+            self.included_from = []
+            return None
+
+        filename = os.path.normpath(filename)
+
+        # Sometimes we get relative includes. These typically point to files in
+        # the object directory. We try to resolve the relative path.
+        if not os.path.isabs(filename):
+            filename = self._normalize_relative_path(filename)
+
+        if not os.path.exists(filename) and self.resolve_files:
+            raise Exception('Could not find file containing warning: %s' %
+                    filename)
+
+        warning['filename'] = filename
+
+        self.database.insert(warning, compute_hash=self.resolve_files)
+
+        return warning
+
+    def _normalize_relative_path(self, filename):
+        # Special case files in dist/include.
+        idx = filename.find('/dist/include')
+        if idx != -1:
+            return self.objdir + filename[idx:]
+
+        for included_from in self.included_from:
+            source_dir = os.path.dirname(included_from)
+
+            candidate = os.path.normpath(os.path.join(source_dir, filename))
+
+            if os.path.exists(candidate):
+                return candidate
+
+        return filename
diff --git a/python/mozbuild/mozbuild/logger.py b/python/mozbuild/mozbuild/logger.py
new file mode 100644
index 000000000000..04b7046bb1c4
--- /dev/null
+++ b/python/mozbuild/mozbuild/logger.py
@@ -0,0 +1,202 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This file contains logging functionality for mozbuild. This functionality
+# could likely be split out of mozbuild. For now, mozbuild is the only
+# consumer and thus it lives here.
+
+try:
+    import blessings
+except ImportError:
+    blessings = None
+
+import json
+import logging
+import sys
+import time
+
+
+class ConvertToStructuredFilter(logging.Filter):
+    """Filter that converts unstructured records into structured ones."""
+    def filter(self, record):
+        if hasattr(record, 'action') and hasattr(record, 'params'):
+            return True
+
+        record.action = 'unstructured'
+        record.params = {'msg': record.msg}
+        record.msg = '{msg}'
+
+        return True
+
+
+class StructuredJSONFormatter(logging.Formatter):
+    """Log formatter that writes a structured JSON entry."""
+
+    def format(self, record):
+        action = getattr(record, 'action', 'UNKNOWN')
+        params = getattr(record, 'params', {})
+
+        return json.dumps([record.created, action, params])
+
+
+class StructuredHumanFormatter(logging.Formatter):
+    """Log formatter that writes structured messages for humans.
+
+    It is important that this formatter never be added to a logger that
+    produces unstructured/classic log messages. If it is, the call to format()
+    could fail because the string could contain things (like JSON) that look
+    like formatting character sequences.
+
+    Because of this limitation, format() will fail with a KeyError if an
+    unstructured record is passed or if the structured message is malformed.
+    """
+    def __init__(self, start_time, write_interval=False):
+        self.start_time = start_time
+        self.write_interval = write_interval
+        self.last_time = None
+
+    def format(self, record):
+        elapsed = self._time(record)
+
+        return u'%4.2f %s' % (elapsed, record.msg.format(**record.params))
+
+    def _time(self, record):
+        t = record.created - self.start_time
+
+        if self.write_interval and self.last_time is not None:
+            t = record.created - self.last_time
+
+        self.last_time = record.created
+
+        return t
+
+
+class StructuredTerminalFormatter(StructuredHumanFormatter):
+    """Log formatter for structured messages writing to a terminal."""
+
+    def set_terminal(self, terminal):
+        self.terminal = terminal
+
+    def format(self, record):
+        t = self.terminal.blue('%4.2f' % self._time(record))
+        f = record.msg.format(**record.params)
+
+        return u'%s %s' % (t, self._colorize(f))
+
+    def _colorize(self, s):
+        if not self.terminal:
+            return s
+
+        result = s
+
+        if s.startswith('TEST-PASS'):
+            result = self.terminal.green(s[0:9]) + s[9:]
+        elif s.startswith('TEST-UNEXPECTED'):
+            result = self.terminal.red(s[0:20]) + s[21:]
+
+        return result.decode('UTF-8', 'ignore')
+
+
+class LoggingManager(object):
+    """Holds and controls global logging state.
+
+    A mozbuild application should instantiate one of these and configure it
+    as needed.
+
+    This class provides a mechanism to configure the output of logging data
+    both from mozbuild and from the overall logging system (e.g. from other
+    modules).
+    """
+
+    def __init__(self):
+        self.start_time = time.time()
+
+        self.json_handlers = []
+        self.terminal_handler = None
+        self.terminal_formatter = None
+
+        self.root_logger = logging.getLogger()
+        self.root_logger.setLevel(logging.DEBUG)
+
+        self.mozbuild_logger = logging.getLogger('mozbuild')
+        self.mozbuild_logger.setLevel(logging.DEBUG)
+
+        self.structured_filter = ConvertToStructuredFilter()
+
+        self._terminal = None
+
+    @property
+    def terminal(self):
+        if not self._terminal and blessings:
+            terminal = blessings.Terminal(stream=sys.stdout)
+
+            if terminal.is_a_tty:
+                self._terminal = terminal
+
+        return self._terminal
+
+    def add_json_handler(self, fh):
+        """Enable JSON logging on the specified file object."""
+
+        # Configure the consumer of structured messages.
+        handler = logging.StreamHandler(stream=fh)
+        handler.setFormatter(StructuredJSONFormatter())
+        handler.setLevel(logging.DEBUG)
+
+        # And hook it up.
+        self.mozbuild_logger.addHandler(handler)
+
+        self.json_handlers.append(handler)
+
+    def add_terminal_logging(self, fh=sys.stdout, level=logging.INFO,
+            write_interval=False):
+        """Enable logging to the terminal."""
+
+        formatter = StructuredHumanFormatter(self.start_time,
+            write_interval=write_interval)
+
+        if self.terminal:
+            formatter = StructuredTerminalFormatter(self.start_time,
+                write_interval=write_interval)
+            formatter.set_terminal(self.terminal)
+
+        handler = logging.StreamHandler(stream=fh)
+        handler.setFormatter(formatter)
+        handler.setLevel(level)
+
+        self.mozbuild_logger.addHandler(handler)
+
+        self.terminal_handler = handler
+        self.terminal_formatter = formatter
+
+    def replace_terminal_handler(self, handler):
+        """Replace the installed terminal handler.
+
+        Returns the old handler or None if none was configured.
+        If the new handler is None, removes any existing handler and disables
+        logging to the terminal.
+        """
+        old = self.terminal_handler
+
+        if old:
+            self.mozbuild_logger.removeHandler(old)
+
+        if handler:
+            self.mozbuild_logger.addHandler(handler)
+
+        self.terminal_handler = handler
+
+        return old
+
+    def enable_unstructured(self):
+        """Enable logging of unstructured messages."""
+        if self.terminal_handler:
+            self.terminal_handler.addFilter(self.structured_filter)
+            self.root_logger.addHandler(self.terminal_handler)
+
+    def disable_unstructured(self):
+        """Disable logging of unstructured messages."""
+        if self.terminal_handler:
+            self.terminal_handler.removeFilter(self.structured_filter)
+            self.root_logger.removeHandler(self.terminal_handler)
diff --git a/python/mozbuild/mozbuild/test/__init__.py b/python/mozbuild/mozbuild/test/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/compilation/__init__.py b/python/mozbuild/mozbuild/test/compilation/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/compilation/test_warnings.py b/python/mozbuild/mozbuild/test/compilation/test_warnings.py
new file mode 100644
index 000000000000..d1051afdc59d
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/compilation/test_warnings.py
@@ -0,0 +1,191 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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.path
+import unittest
+
+from tempfile import NamedTemporaryFile
+
+from mozbuild.compilation.warnings import CompilerWarning
+from mozbuild.compilation.warnings import WarningsCollector
+from mozbuild.compilation.warnings import WarningsDatabase
+
+
+CLANG_TESTS = [
+    ('foobar.cpp:123:10: warning: you messed up [-Wfoo]',
+     'foobar.cpp', 123, 10, 'you messed up', '-Wfoo')
+]
+
+MSVC_TESTS = [
+    ("C:/mozilla-central/test/foo.cpp(793) : warning C4244: 'return' : "
+     "conversion from 'double' to 'PRUint32', possible loss of data",
+     'C:/mozilla-central/test/foo.cpp', 793, 'C4244',
+     "'return' : conversion from 'double' to 'PRUint32', possible loss of "
+         'data')
+]
+
+CURRENT_LINE = 1
+
+def get_warning():
+    global CURRENT_LINE
+
+    w = CompilerWarning()
+    w['filename'] = '/foo/bar/baz.cpp'
+    w['line'] = CURRENT_LINE
+    w['column'] = 12
+    w['message'] = 'This is irrelevant'
+
+    CURRENT_LINE += 1
+
+    return w
+
+class TestCompilerWarning(unittest.TestCase):
+    def test_equivalence(self):
+        w1 = CompilerWarning()
+        w2 = CompilerWarning()
+
+        s = set()
+
+        # Empty warnings should be equal.
+        self.assertEqual(w1, w2)
+
+        s.add(w1)
+        s.add(w2)
+
+        self.assertEqual(len(s), 1)
+
+        w1['filename'] = '/foo.c'
+        w2['filename'] = '/bar.c'
+
+        self.assertNotEqual(w1, w2)
+
+        s = set()
+        s.add(w1)
+        s.add(w2)
+
+        self.assertEqual(len(s), 2)
+
+        w1['filename'] = '/foo.c'
+        w1['line'] = 5
+        w2['line'] = 5
+
+        w2['filename'] = '/foo.c'
+        w1['column'] = 3
+        w2['column'] = 3
+
+        self.assertEqual(w1, w2)
+
+class TestWarningsParsing(unittest.TestCase):
+    def test_clang_parsing(self):
+        for source, filename, line, column, message, flag in CLANG_TESTS:
+            collector = WarningsCollector(resolve_files=False)
+            warning = collector.process_line(source)
+
+            self.assertIsNotNone(warning)
+
+            self.assertEqual(warning['filename'], filename)
+            self.assertEqual(warning['line'], line)
+            self.assertEqual(warning['column'], column)
+            self.assertEqual(warning['message'], message)
+            self.assertEqual(warning['flag'], flag)
+
+    def test_msvc_parsing(self):
+        for source, filename, line, flag, message in MSVC_TESTS:
+            collector = WarningsCollector(resolve_files=False)
+            warning = collector.process_line(source)
+
+            self.assertIsNotNone(warning)
+
+            self.assertEqual(warning['filename'], filename)
+            self.assertEqual(warning['line'], line)
+            self.assertEqual(warning['flag'], flag)
+            self.assertEqual(warning['message'], message)
+
+class TestWarningsDatabase(unittest.TestCase):
+    def test_basic(self):
+        db = WarningsDatabase()
+
+        self.assertEqual(len(db), 0)
+
+        for i in xrange(10):
+            db.insert(get_warning(), compute_hash=False)
+
+        self.assertEqual(len(db), 10)
+
+        warnings = list(db)
+        self.assertEqual(len(warnings), 10)
+
+    def test_hashing(self):
+        """Ensure that hashing files on insert works."""
+        db = WarningsDatabase()
+
+        temp = NamedTemporaryFile()
+        temp.write('x' * 100)
+        temp.flush()
+
+        w = CompilerWarning()
+        w['filename'] = temp.name
+        w['line'] = 1
+        w['column'] = 4
+        w['message'] = 'foo bar'
+
+        # Should not throw.
+        db.insert(w)
+
+        w['filename'] = 'DOES_NOT_EXIST'
+
+        with self.assertRaises(Exception):
+            db.insert(w)
+
+    def test_pruning(self):
+        """Ensure old warnings are removed from database appropriately."""
+        db = WarningsDatabase()
+
+        source_files = []
+        for i in xrange(1, 21):
+            temp = NamedTemporaryFile()
+            temp.write('x' * (100 * i))
+            temp.flush()
+
+            # Keep reference so it doesn't get GC'd and deleted.
+            source_files.append(temp)
+
+            w = CompilerWarning()
+            w['filename'] = temp.name
+            w['line'] = 1
+            w['column'] = i * 10
+            w['message'] = 'irrelevant'
+
+            db.insert(w)
+
+        self.assertEqual(len(db), 20)
+
+        # If we change a source file, inserting a new warning should nuke the
+        # old one.
+        source_files[0].write('extra')
+        source_files[0].flush()
+
+        w = CompilerWarning()
+        w['filename'] = source_files[0].name
+        w['line'] = 1
+        w['column'] = 50
+        w['message'] = 'replaced'
+
+        db.insert(w)
+
+        self.assertEqual(len(db), 20)
+
+        warnings = list(db.warnings_for_file(source_files[0].name))
+        self.assertEqual(len(warnings), 1)
+        self.assertEqual(warnings[0]['column'], w['column'])
+
+        # If we delete the source file, calling prune should call the warnings
+        # to go away.
+        old_filename = source_files[0].name
+        del source_files[0]
+
+        self.assertFalse(os.path.exists(old_filename))
+
+        db.prune()
+        self.assertEqual(len(db), 19)
diff --git a/python/mozbuild/mozbuild/test/test_util.py b/python/mozbuild/mozbuild/test/test_util.py
new file mode 100644
index 000000000000..fa6d582deaa4
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/test_util.py
@@ -0,0 +1,43 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import hashlib
+import unittest
+
+from StringIO import StringIO
+from tempfile import NamedTemporaryFile
+
+from mozbuild.util import hash_file
+
+
+class TestHashing(unittest.TestCase):
+    def test_hash_file_known_hash(self):
+        """Ensure a known hash value is recreated."""
+        data = 'The quick brown fox jumps over the lazy cog'
+        expected = 'de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3'
+
+        temp = NamedTemporaryFile()
+        temp.write(data)
+        temp.flush()
+
+        actual = hash_file(temp.name)
+
+        self.assertEqual(actual, expected)
+
+    def test_hash_file_large(self):
+        """Ensure that hash_file seems to work with a large file."""
+        data = 'x' * 1048576
+
+        hasher = hashlib.sha1()
+        hasher.update(data)
+        expected = hasher.hexdigest()
+
+        temp = NamedTemporaryFile()
+        temp.write(data)
+        temp.flush()
+
+        actual = hash_file(temp.name)
+
+        self.assertEqual(actual, expected)
+
diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
new file mode 100644
index 000000000000..42f534c7a0a4
--- /dev/null
+++ b/python/mozbuild/mozbuild/util.py
@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This file contains miscellaneous utility functions that don't belong anywhere
+# in particular.
+
+import hashlib
+
+
+def hash_file(path):
+    """Hashes a file specified by the path given and returns the hex digest."""
+
+    # If the hashing function changes, this may invalidate lots of cached data.
+    # Don't change it lightly.
+    h = hashlib.sha1()
+
+    with open(path, 'rb') as fh:
+        while True:
+            data = fh.read(8192)
+
+            if not len(data):
+                break
+
+            h.update(data)
+
+    return h.hexdigest()
diff --git a/python/mozbuild/setup.py b/python/mozbuild/setup.py
new file mode 100644
index 000000000000..fe267abee613
--- /dev/null
+++ b/python/mozbuild/setup.py
@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from setuptools import setup
+
+VERSION = '0.1'
+
+setup(
+    name='mozbuild',
+    description='Mozilla build system functionality.',
+    license='MPL 2.0',
+    packages=['mozbuild'],
+    version=VERSION
+)
diff --git a/rdf/Makefile.in b/rdf/Makefile.in
index 9eb821a984aa..dd100711684e 100644
--- a/rdf/Makefile.in
+++ b/rdf/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/base/Makefile.in b/rdf/base/Makefile.in
index 2d5edeeb4933..017e8cc207fb 100644
--- a/rdf/base/Makefile.in
+++ b/rdf/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/base/idl/Makefile.in b/rdf/base/idl/Makefile.in
index 3d0b158f040a..7cd34caae632 100644
--- a/rdf/base/idl/Makefile.in
+++ b/rdf/base/idl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/base/public/Makefile.in b/rdf/base/public/Makefile.in
index 5f74d4516975..259086cd09d0 100644
--- a/rdf/base/public/Makefile.in
+++ b/rdf/base/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/base/src/Makefile.in b/rdf/base/src/Makefile.in
index 72adb4504b9e..b721a24f5cf8 100644
--- a/rdf/base/src/Makefile.in
+++ b/rdf/base/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in
index 9dba986f964d..250febf54871 100644
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/datasource/Makefile.in b/rdf/datasource/Makefile.in
index 2fa8872edfb5..a40a06552d75 100644
--- a/rdf/datasource/Makefile.in
+++ b/rdf/datasource/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/datasource/public/Makefile.in b/rdf/datasource/public/Makefile.in
index 5c84da7246cb..1a3e6bf97d85 100644
--- a/rdf/datasource/public/Makefile.in
+++ b/rdf/datasource/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in
index 232ba0a04975..79cecd08a1ed 100644
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/tests/Makefile.in b/rdf/tests/Makefile.in
index 9578a5aceb23..2ac852d52d6f 100644
--- a/rdf/tests/Makefile.in
+++ b/rdf/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = rdf/tests
+relativesrcdir = @relativesrcdir@
 
 MODULE = test_rdf
 
diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in
index fe73fcfce3d5..85fe2595f948 100644
--- a/rdf/tests/dsds/Makefile.in
+++ b/rdf/tests/dsds/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in
index 8eb4c176cefb..df0d1c2d3670 100644
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in
index d96104de19fe..a6265d84e8cd 100644
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in
index 3c17f1e8af19..196e1fe97678 100644
--- a/rdf/tests/triplescat/Makefile.in
+++ b/rdf/tests/triplescat/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/util/Makefile.in b/rdf/util/Makefile.in
index 3d47e4b1c509..66b4d025163f 100644
--- a/rdf/util/Makefile.in
+++ b/rdf/util/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/util/public/Makefile.in b/rdf/util/public/Makefile.in
index 8bfc4e206b44..74efb6184b54 100644
--- a/rdf/util/public/Makefile.in
+++ b/rdf/util/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/util/src/Makefile.in b/rdf/util/src/Makefile.in
index 346b4423fda2..c31e1d8ca64d 100644
--- a/rdf/util/src/Makefile.in
+++ b/rdf/util/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/rdf/util/src/internal/Makefile.in b/rdf/util/src/internal/Makefile.in
index 202c9a38d535..0f4c3ec0cc0c 100644
--- a/rdf/util/src/internal/Makefile.in
+++ b/rdf/util/src/internal/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index f2fe951e69fa..c3ceb187926c 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/boot/Makefile.in b/security/manager/boot/Makefile.in
index e0c6f5d1964d..4c7b2fc1c276 100644
--- a/security/manager/boot/Makefile.in
+++ b/security/manager/boot/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/boot/public/Makefile.in b/security/manager/boot/public/Makefile.in
index 7875f33ed123..8b38d5e7cec0 100644
--- a/security/manager/boot/public/Makefile.in
+++ b/security/manager/boot/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in
index 29afc0f1dda0..d56344e5cd2d 100644
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/locales/Makefile.in b/security/manager/locales/Makefile.in
index 83748e0572d4..3e9aa00c44fa 100644
--- a/security/manager/locales/Makefile.in
+++ b/security/manager/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = security/manager/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/security/manager/pki/Makefile.in b/security/manager/pki/Makefile.in
index da36dd75037a..913d266e47f8 100644
--- a/security/manager/pki/Makefile.in
+++ b/security/manager/pki/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/pki/public/Makefile.in b/security/manager/pki/public/Makefile.in
index a036bfe7e93b..8aa68dadd7d4 100644
--- a/security/manager/pki/public/Makefile.in
+++ b/security/manager/pki/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/security/manager/pki/resources/Makefile.in b/security/manager/pki/resources/Makefile.in
index 21c5f1d923f9..1dd4bbb28132 100644
--- a/security/manager/pki/resources/Makefile.in
+++ b/security/manager/pki/resources/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in
index ff45efe34039..a8315926604c 100644
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -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/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/ssl/Makefile.in b/security/manager/ssl/Makefile.in
index a55dc3e87c7a..a4d8bb5fc0ce 100644
--- a/security/manager/ssl/Makefile.in
+++ b/security/manager/ssl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/ssl/public/Makefile.in b/security/manager/ssl/public/Makefile.in
index da30ad8f4d22..36b561111d42 100644
--- a/security/manager/ssl/public/Makefile.in
+++ b/security/manager/ssl/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 242a9e19d07f..2100f083b330 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -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/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/ssl/src/nsSmartCardEvent.cpp b/security/manager/ssl/src/nsSmartCardEvent.cpp
index ea69ffa1c06f..2fcf46b43a97 100644
--- a/security/manager/ssl/src/nsSmartCardEvent.cpp
+++ b/security/manager/ssl/src/nsSmartCardEvent.cpp
@@ -5,7 +5,6 @@
 #include "nsSmartCardEvent.h"
 #include "nsIDOMSmartCardEvent.h"
 #include "nsIDOMClassInfo.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMEvent.h"
 #include "nsXPCOM.h"
 
@@ -23,7 +22,6 @@ nsSmartCardEvent::~nsSmartCardEvent()
 NS_INTERFACE_MAP_BEGIN(nsSmartCardEvent)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMSmartCardEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMSmartCardEvent)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMNSEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMEvent)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SmartCardEvent)
 NS_INTERFACE_MAP_END
@@ -36,14 +34,8 @@ NS_IMPL_RELEASE(nsSmartCardEvent)
 //
 NS_IMETHODIMP nsSmartCardEvent::Init(nsIDOMEvent * aInner)
 {
-  nsresult rv;
-
   NS_ASSERTION(aInner, "SmartCardEvent initialized with a null Event");
   mInner = aInner;
-  mNSEvent = do_QueryInterface(mInner, &rv);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
   return mInner->SetTrusted(true);
 }
 
@@ -54,6 +46,7 @@ NS_IMETHODIMP nsSmartCardEvent::GetTokenName(nsAString &aTokenName)
   return NS_OK;
 }
 
+// nsIDOMEvent maps
 NS_IMETHODIMP nsSmartCardEvent::DuplicatePrivateData(void)
 {
   NS_ASSERTION(mInner, "SmartCardEvent called without Init");
@@ -99,45 +92,43 @@ nsSmartCardEvent::Deserialize(const IPC::Message* aMsg, void** aIter)
   return mInner->Deserialize(aMsg, aIter);
 }
 
-// IDOMNSEvent maps
 NS_IMETHODIMP nsSmartCardEvent::GetOriginalTarget(nsIDOMEventTarget * *aOriginalTarget)
 {
-  NS_ASSERTION(mNSEvent, "SmartCardEvent called without Init");
-  return mNSEvent->GetOriginalTarget(aOriginalTarget);
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->GetOriginalTarget(aOriginalTarget);
 }
 
 NS_IMETHODIMP nsSmartCardEvent::GetExplicitOriginalTarget(nsIDOMEventTarget * *aTarget)
 {
-  NS_ASSERTION(mNSEvent, "SmartCardEvent called without Init");
-  return mNSEvent->GetExplicitOriginalTarget(aTarget);
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->GetExplicitOriginalTarget(aTarget);
 }
 
 NS_IMETHODIMP nsSmartCardEvent::PreventBubble(void)
 {
-  NS_ASSERTION(mNSEvent, "SmartCardEvent called without Init");
-  return mNSEvent->PreventBubble();
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->PreventBubble();
 }
 
 NS_IMETHODIMP nsSmartCardEvent::PreventCapture(void)
 {
-  NS_ASSERTION(mNSEvent, "SmartCardEvent called without Init");
-  return mNSEvent->PreventCapture();
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->PreventCapture();
 }
 
 NS_IMETHODIMP nsSmartCardEvent::GetIsTrusted(bool *aIsTrusted)
 {
-  NS_ASSERTION(mNSEvent, "SmartCardEvent called without Init");
-  return mNSEvent->GetIsTrusted(aIsTrusted);
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->GetIsTrusted(aIsTrusted);
 }
 
 NS_IMETHODIMP
 nsSmartCardEvent::GetPreventDefault(bool* aReturn)
 {
-  NS_ASSERTION(mNSEvent, "SmartCardEvent called without Init");
-  return mNSEvent->GetPreventDefault(aReturn);
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->GetPreventDefault(aReturn);
 }
 
-// IDOMEvent maps
 NS_IMETHODIMP nsSmartCardEvent::GetType(nsAString & aType)
 {
   NS_ASSERTION(mInner, "SmartCardEvent called without Init");
diff --git a/security/manager/ssl/src/nsSmartCardEvent.h b/security/manager/ssl/src/nsSmartCardEvent.h
index 99f55f75486c..42add1d50e1f 100644
--- a/security/manager/ssl/src/nsSmartCardEvent.h
+++ b/security/manager/ssl/src/nsSmartCardEvent.h
@@ -7,14 +7,12 @@
 
 #include "nsIDOMSmartCardEvent.h"
 #include "nsIDOMEvent.h"
-#include "nsIDOMNSEvent.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsXPCOM.h"
 
 // Expose SmartCard Specific paramenters to smart card events.
-class nsSmartCardEvent : public nsIDOMSmartCardEvent,
-                         public nsIDOMNSEvent
+class nsSmartCardEvent : public nsIDOMSmartCardEvent
 {
 public:
   nsSmartCardEvent(const nsAString &aTokenName);
@@ -22,13 +20,11 @@ public:
 
 
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIDOMSMARTCARDEVENT
-  NS_DECL_NSIDOMNSEVENT
   NS_DECL_NSIDOMEVENT
+  NS_DECL_NSIDOMSMARTCARDEVENT
 
 protected:
   nsCOMPtr<nsIDOMEvent> mInner;
-  nsCOMPtr<nsIDOMNSEvent> mNSEvent;
   nsString mTokenName;
 };
 
diff --git a/security/manager/ssl/tests/Makefile.in b/security/manager/ssl/tests/Makefile.in
index ff41372567c3..234b0557c685 100644
--- a/security/manager/ssl/tests/Makefile.in
+++ b/security/manager/ssl/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = security/manager/ssl/tests
+relativesrcdir = @relativesrcdir@
 
 MODULE		= pipnss
 DIRS		= mochitest
diff --git a/security/manager/ssl/tests/mochitest/Makefile.in b/security/manager/ssl/tests/mochitest/Makefile.in
index 42c6ae822bdd..84fe723932da 100644
--- a/security/manager/ssl/tests/mochitest/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 40622c3e2b03..91d1d995a134 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
index 8f74ed8d0fd8..6c89bba737a6 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
index fc0eac4a002b..3deaa96e3454 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/services/Makefile.in b/services/Makefile.in
index ccf7bdbe4d3d..dac68cf67085 100644
--- a/services/Makefile.in
+++ b/services/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/services/aitc/Makefile.in b/services/aitc/Makefile.in
index e336b2fc0478..0a0f0969ed90 100644
--- a/services/aitc/Makefile.in
+++ b/services/aitc/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/services/aitc/tests/Makefile.in b/services/aitc/tests/Makefile.in
index bd1390d13ab5..623202a04a94 100644
--- a/services/aitc/tests/Makefile.in
+++ b/services/aitc/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = services/aitc/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/services/common/Makefile.in b/services/common/Makefile.in
index fb0b0648cc06..2a14deca6350 100644
--- a/services/common/Makefile.in
+++ b/services/common/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/services/common/tests/Makefile.in b/services/common/tests/Makefile.in
index 2639e774adb6..17c1d25290a3 100644
--- a/services/common/tests/Makefile.in
+++ b/services/common/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = services/common/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/services/crypto/Makefile.in b/services/crypto/Makefile.in
index 415b7b77162e..788eda63ac3e 100644
--- a/services/crypto/Makefile.in
+++ b/services/crypto/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in
index c8ef490ea30f..a688272d1e2a 100644
--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/services/crypto/component/tests/Makefile.in b/services/crypto/component/tests/Makefile.in
index b69371f43f61..8666cf890917 100644
--- a/services/crypto/component/tests/Makefile.in
+++ b/services/crypto/component/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = services/crypto/component/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/services/crypto/tests/Makefile.in b/services/crypto/tests/Makefile.in
index a1aa9e725d61..8666cf890917 100644
--- a/services/crypto/tests/Makefile.in
+++ b/services/crypto/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = services/crypto/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/services/notifications/Makefile.in b/services/notifications/Makefile.in
index 60ad5fd48cf3..7840165e0cda 100644
--- a/services/notifications/Makefile.in
+++ b/services/notifications/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/services/notifications/tests/Makefile.in b/services/notifications/tests/Makefile.in
index fca75593674e..4dda825d5b4d 100644
--- a/services/notifications/tests/Makefile.in
+++ b/services/notifications/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = services/notifications/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in
index af2e5d99efe8..a8904a7ba1aa 100644
--- a/services/sync/Makefile.in
+++ b/services/sync/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     := ../..
+DEPTH     := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir    := @srcdir@
 VPATH     := @srcdir@
diff --git a/services/sync/locales/Makefile.in b/services/sync/locales/Makefile.in
index e81ed0e06a66..0a0160779ea3 100644
--- a/services/sync/locales/Makefile.in
+++ b/services/sync/locales/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = services/sync/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/services/sync/tests/Makefile.in b/services/sync/tests/Makefile.in
index b1d65767e996..74d446e60952 100644
--- a/services/sync/tests/Makefile.in
+++ b/services/sync/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = services/sync/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in
index a46414673983..ff290ad592ae 100644
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = ..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/startupcache/test/Makefile.in b/startupcache/test/Makefile.in
index becc6511dde7..cf9e80d367d0 100644
--- a/startupcache/test/Makefile.in
+++ b/startupcache/test/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/storage/Makefile.in b/storage/Makefile.in
index f252a852c20d..6c21df9427f2 100644
--- a/storage/Makefile.in
+++ b/storage/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in
index 739ed39797f9..c48b3e493e18 100644
--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH=../..
+DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
diff --git a/storage/public/Makefile.in b/storage/public/Makefile.in
index c9327b563da6..23ced3aaa217 100644
--- a/storage/public/Makefile.in
+++ b/storage/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in
index 67b003b109bc..50dd3c782854 100644
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
index a84982a23b92..633dd00cf755 100644
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = storage/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/firebug/Makefile.in b/testing/firebug/Makefile.in
index ac288cf35b37..18eaeee579df 100644
--- a/testing/firebug/Makefile.in
+++ b/testing/firebug/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/testing/marionette/Makefile.in b/testing/marionette/Makefile.in
index 3133f75cf6c1..8ccf5dbcdca3 100644
--- a/testing/marionette/Makefile.in
+++ b/testing/marionette/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/testing/marionette/atoms/Makefile.in b/testing/marionette/atoms/Makefile.in
index 1d93a0af7ada..1e897836deba 100644
--- a/testing/marionette/atoms/Makefile.in
+++ b/testing/marionette/atoms/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/testing/marionette/components/Makefile.in b/testing/marionette/components/Makefile.in
index 80beda579db9..49b089b656dd 100644
--- a/testing/marionette/components/Makefile.in
+++ b/testing/marionette/components/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 9a102df40cf0..263bf7dae622 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/mochitest/MochiKit/Makefile.in b/testing/mochitest/MochiKit/Makefile.in
index 293638674025..2b9bb0e0ae8c 100644
--- a/testing/mochitest/MochiKit/Makefile.in
+++ b/testing/mochitest/MochiKit/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/MochiKit
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
index ced51fccf5ce..5af97f394050 100644
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -1,6 +1,7 @@
 {
 "runtests": {},
 "excludetests": {
+ "content/base/test/test_bug590812.html": "bug 687032",
  "content/base/test/test_CSP.html": "TIMED_OUT",
  "content/base/test/test_CSP_frameancestors.html": "",
  "content/base/test/test_CSP_inlinescript.html": "",
@@ -34,7 +35,6 @@
  "content/base/test/websocket_hybi/test_receive-blob.html": "",
  "content/base/test/websocket_hybi/test_send-arraybuffer.html": "",
  "content/base/test/websocket_hybi/test_send-blob.html": "",
- "content/canvas/test/webgl/test_webgl_conformance_test_suite.html": "bug 775227",
  "content/events/test/test_bug409604.html": "TIMED_OUT",
  "content/events/test/test_bug426082.html": "",
  "content/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
@@ -125,7 +125,6 @@
  "docshell/test/test_bug637644.html": "",
  "docshell/test/test_bug668513.html": "RANDOM",
  "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
- "dom/browser-element/mochitest/test_browserElement_inproc_Iconchange.html": "bug 775227",
  "dom/browser-element/mochitest/test_browserElement_inproc_SecurityChange.html": "TIMED_OUT, bug 766586",
  "dom/imptests/editing/conformancetest/test_event.html": "",
  "dom/imptests/editing/conformancetest/test_runtest.html": "",
@@ -141,7 +140,7 @@
  "dom/imptests/webapps/DOMCore/tests/approved/test_Range-mutations.html": "bug 775227",
  "dom/imptests/webapps/DOMCore/tests/approved/test_Range-set.html": "bug 775227",
  "dom/imptests/webapps/DOMCore/tests/approved/test_Range-surroundContents.html": "bug 775227",
- "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_key.html": "bug 775227",
+ "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
  "dom/indexedDB/test/test_third_party.html": "TIMED_OUT",
  "dom/network/tests/test_network_basics.html": "",
  "dom/settings/tests/test_settings_events.html": "",
diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in
index 828d8daffc20..96a0c160e6b3 100644
--- a/testing/mochitest/chrome/Makefile.in
+++ b/testing/mochitest/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/dynamic/Makefile.in b/testing/mochitest/dynamic/Makefile.in
index 7a02994c874c..a1925e352487 100644
--- a/testing/mochitest/dynamic/Makefile.in
+++ b/testing/mochitest/dynamic/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/dynamic
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/roboextender/Makefile.in b/testing/mochitest/roboextender/Makefile.in
index e4bbc0508511..48fb5b4e1794 100644
--- a/testing/mochitest/roboextender/Makefile.in
+++ b/testing/mochitest/roboextender/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir  = testing/mochitest/roboextender
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/mochitest/specialpowers/Makefile.in b/testing/mochitest/specialpowers/Makefile.in
index 00fec14ad93d..fa11c095276e 100644
--- a/testing/mochitest/specialpowers/Makefile.in
+++ b/testing/mochitest/specialpowers/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir  = testing/mochitest/specialpowers
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in
index 2b20692b21bb..0542451a4e18 100644
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/testing/mochitest/static/Makefile.in b/testing/mochitest/static/Makefile.in
index ebf85d998f9a..7c36843bfed5 100644
--- a/testing/mochitest/static/Makefile.in
+++ b/testing/mochitest/static/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/static
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/tests/Makefile.in b/testing/mochitest/tests/Makefile.in
index 670868062451..043f732cbfa2 100644
--- a/testing/mochitest/tests/Makefile.in
+++ b/testing/mochitest/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in
index ac43ae75e8f1..94121e5e20b0 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
index 98e8ae1a3e83..ad52619f4ba8 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
@@ -4,11 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests/MochiKit-1.4.2/MochiKit
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
index 923f6b716671..39b7019b09ff 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
@@ -4,11 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests/MochiKit-1.4.2/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
index 882ffc82b7a4..e3de691f61c8 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
@@ -8,11 +8,11 @@
 # We want to run the tests in our own (modified) harness.
 #
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in
index aff360d26358..ec78d32af4f7 100644
--- a/testing/mochitest/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/SimpleTest/Makefile.in
@@ -2,11 +2,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests/SimpleTest
+relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/tests/browser/Makefile.in b/testing/mochitest/tests/browser/Makefile.in
index da25b1a17f22..1376948e72f0 100644
--- a/testing/mochitest/tests/browser/Makefile.in
+++ b/testing/mochitest/tests/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/testing/mozbase/Makefile.in b/testing/mozbase/Makefile.in
index a435fd2a83b2..aa447eaf6829 100644
--- a/testing/mozbase/Makefile.in
+++ b/testing/mozbase/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/testing/mozbase/manifestdestiny/manifestparser/manifestparser.py b/testing/mozbase/manifestdestiny/manifestparser/manifestparser.py
index 69f97b210f0d..d60c0030f8fa 100755
--- a/testing/mozbase/manifestdestiny/manifestparser/manifestparser.py
+++ b/testing/mozbase/manifestdestiny/manifestparser/manifestparser.py
@@ -50,7 +50,7 @@ except AttributeError:
 
         rel_list = [os.path.pardir] * (len(start_list)-i) + path_list[i:]
         if not rel_list:
-            return start
+            return os.curdir
         return os.path.join(*rel_list)
 
 # expr.py
diff --git a/testing/peptest/Makefile.in b/testing/peptest/Makefile.in
index b8c3092ca3a5..768c96d8380a 100644
--- a/testing/peptest/Makefile.in
+++ b/testing/peptest/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/testing/tools/screenshot/Makefile.in b/testing/tools/screenshot/Makefile.in
index eb0d2bd764cf..d5e0846cd429 100644
--- a/testing/tools/screenshot/Makefile.in
+++ b/testing/tools/screenshot/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in
index 06412dbed2e5..f4daa44e5c2e 100644
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/testing/xpcshell/example/Makefile.in b/testing/xpcshell/example/Makefile.in
index c6ac6d77888d..c80045d03ff1 100644
--- a/testing/xpcshell/example/Makefile.in
+++ b/testing/xpcshell/example/Makefile.in
@@ -12,11 +12,11 @@
 #
 
 # Note: DEPTH should be set to the relative path to mozilla/
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = testing/xpcshell/example
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in
index 29748c67d78c..40bbd27a796c 100644
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
index b88c5bf27f30..3e823257ee3c 100644
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -88,7 +88,9 @@ DIRS += \
   build \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = nsDefaultCLH.js
-EXTRA_COMPONENTS = nsDefaultCLH.manifest
+EXTRA_COMPONENTS = \
+  nsDefaultCLH.manifest \
+  nsDefaultCLH.js \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/aboutmemory/Makefile.in b/toolkit/components/aboutmemory/Makefile.in
index d3d9a62341e9..bd90c1680bc0 100644
--- a/toolkit/components/aboutmemory/Makefile.in
+++ b/toolkit/components/aboutmemory/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/aboutmemory/tests/Makefile.in b/toolkit/components/aboutmemory/tests/Makefile.in
index d99f21f0a20a..21199ba54167 100644
--- a/toolkit/components/aboutmemory/tests/Makefile.in
+++ b/toolkit/components/aboutmemory/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/aboutmemory/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in
index 71c0e16c6ad2..e467102d3505 100644
--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/alerts/mac/Makefile.in b/toolkit/components/alerts/mac/Makefile.in
index aa7f2782ff02..74e519917a68 100644
--- a/toolkit/components/alerts/mac/Makefile.in
+++ b/toolkit/components/alerts/mac/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/alerts/mac/growl/Makefile.in b/toolkit/components/alerts/mac/growl/Makefile.in
index de188305d965..aaf9beeff67c 100644
--- a/toolkit/components/alerts/mac/growl/Makefile.in
+++ b/toolkit/components/alerts/mac/growl/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/alerts/test/Makefile.in b/toolkit/components/alerts/test/Makefile.in
index 43a7f6b19a26..5c0c9428b8d5 100644
--- a/toolkit/components/alerts/test/Makefile.in
+++ b/toolkit/components/alerts/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
-relativesrcdir  = toolkit/components/alerts/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/apppicker/Makefile.in b/toolkit/components/apppicker/Makefile.in
index e9ea0055afca..360a6fdbb5eb 100644
--- a/toolkit/components/apppicker/Makefile.in
+++ b/toolkit/components/apppicker/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in
index 94eaf0b88fbc..298129096447 100644
--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/autocomplete/tests/Makefile.in b/toolkit/components/autocomplete/tests/Makefile.in
index fade56650320..be2a87873c9b 100644
--- a/toolkit/components/autocomplete/tests/Makefile.in
+++ b/toolkit/components/autocomplete/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/autocomplete/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
index 42cf3061c63f..8443fc481cfc 100644
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH=../../..
+DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in
index de4e2210add8..69456bfc79bf 100644
--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/commandlines/test/Makefile.in b/toolkit/components/commandlines/test/Makefile.in
index 8d93b9444ace..81cfcdaeb623 100644
--- a/toolkit/components/commandlines/test/Makefile.in
+++ b/toolkit/components/commandlines/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/commandlines/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/console/Makefile.in b/toolkit/components/console/Makefile.in
index f18b4bc5b960..2f861059faef 100644
--- a/toolkit/components/console/Makefile.in
+++ b/toolkit/components/console/Makefile.in
@@ -1,17 +1,18 @@
-#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_COMPONENTS = jsconsole-clhandler.js jsconsole-clhandler.manifest
+EXTRA_COMPONENTS = \
+  jsconsole-clhandler.js \
+  jsconsole-clhandler.manifest \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/components/console/jsconsole-clhandler.js b/toolkit/components/console/jsconsole-clhandler.js
index c8e4b47de655..990a0e476b64 100644
--- a/toolkit/components/console/jsconsole-clhandler.js
+++ b/toolkit/components/console/jsconsole-clhandler.js
@@ -1,8 +1,10 @@
-# -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# vim:sw=4:sr:sta:et:sts:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:sw=4:sr:sta:et:sts: */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/toolkit/components/contentprefs/Makefile.in b/toolkit/components/contentprefs/Makefile.in
index 088e889fb566..aa548316d11c 100644
--- a/toolkit/components/contentprefs/Makefile.in
+++ b/toolkit/components/contentprefs/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js
index 10536fd69077..8b03f8b788e4 100644
--- a/toolkit/components/contentprefs/nsContentPrefService.js
+++ b/toolkit/components/contentprefs/nsContentPrefService.js
@@ -118,8 +118,8 @@ var inMemoryPrefsProto = {
   getPref: function(aName, aGroup) {
     aGroup = aGroup || "__GlobalPrefs__";
 
-    if (this._prefCache[aGroup] && this._prefCache[aGroup].hasOwnProperty(aName)) {
-      let value = this._prefCache[aGroup][aName];
+    if (this._prefCache[aGroup] && this._prefCache[aGroup].has(aName)) {
+      let value = this._prefCache[aGroup].get(aName);
       return [true, value];
     }
     return [false, undefined];
@@ -137,9 +137,9 @@ var inMemoryPrefsProto = {
   removePref: function(aName, aGroup) {
     aGroup = aGroup || "__GlobalPrefs__";
 
-    if (this._prefCache[aGroup].hasOwnProperty(aName)) {
-      delete this._prefCache[aGroup][aName];
-      if (Object.keys(this._prefCache[aGroup]).length == 0) {
+    if (this._prefCache[aGroup].has(aName)) {
+      this._prefCache[aGroup].delete(aName);
+      if (this._prefCache[aGroup].size() == 0) {
         // remove empty group
         delete this._prefCache[aGroup];
       }
@@ -310,7 +310,6 @@ ContentPrefService.prototype = {
 
   //**************************************************************************//
   // Prefs cache
-
   _cache: Object.create(inMemoryPrefsProto, {
     _prefCache: { 
       value: {}, configurable: true, writable: true, enumerable: true
@@ -322,11 +321,11 @@ ContentPrefService.prototype = {
 
         if (!this._prefCache[aGroup]) {
           this._possiblyCleanCache();
-          this._prefCache[aGroup] = {};
+          this._prefCache[aGroup] = new Map();
         }
 
-        this._prefCache[aGroup][aName] = aValue;
-      },
+        this._prefCache[aGroup].set(aName, aValue);
+      }
     },
 
     _possiblyCleanCache: { value:
@@ -359,10 +358,10 @@ ContentPrefService.prototype = {
         aGroup = aGroup || "__GlobalPrefs__";
 
         if (!this._prefCache[aGroup]) {
-          this._prefCache[aGroup] = {};
+          this._prefCache[aGroup] = new Map();
         }
 
-        this._prefCache[aGroup][aName] = aValue;
+        this._prefCache[aGroup].set(aName, aValue);
       }
     },
 
@@ -595,10 +594,8 @@ ContentPrefService.prototype = {
         let prefs = Cc["@mozilla.org/hash-property-bag;1"].
                     createInstance(Ci.nsIWritablePropertyBag);
         let [hasbranch,properties] = this._privModeStorage.getPrefs(group);
-        for (let entry in properties) {
-          if (properties.hasOwnProperty(entry)) {
-            prefs.setProperty(entry, properties[entry]);
-          }
+        for (let [entry, value] of properties) {
+          prefs.setProperty(entry, value);
         }
         return prefs;
     }
diff --git a/toolkit/components/contentprefs/tests/Makefile.in b/toolkit/components/contentprefs/tests/Makefile.in
index 6a930e228c05..35e8ef0e02db 100644
--- a/toolkit/components/contentprefs/tests/Makefile.in
+++ b/toolkit/components/contentprefs/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/contentprefs/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/cookie/Makefile.in b/toolkit/components/cookie/Makefile.in
index e9ea0055afca..360a6fdbb5eb 100644
--- a/toolkit/components/cookie/Makefile.in
+++ b/toolkit/components/cookie/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in
index 40371e52772c..ec81037f19de 100644
--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in
index feb28a657bde..b04e0cb3fbf9 100644
--- a/toolkit/components/ctypes/tests/Makefile.in
+++ b/toolkit/components/ctypes/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = toolkit/components/ctypes/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
index 719515a95e88..a9f2f3e6127e 100644
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/downloads/test/Makefile.in b/toolkit/components/downloads/test/Makefile.in
index d85047f3a23d..1a733ff76b91 100644
--- a/toolkit/components/downloads/test/Makefile.in
+++ b/toolkit/components/downloads/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
-relativesrcdir = toolkit/components/downloads/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/downloads/test/browser/Makefile.in b/toolkit/components/downloads/test/browser/Makefile.in
index 316efea4f6fd..d4762c7c2a4b 100644
--- a/toolkit/components/downloads/test/browser/Makefile.in
+++ b/toolkit/components/downloads/test/browser/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/components/downloads/test/browser
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/exthelper/Makefile.in b/toolkit/components/exthelper/Makefile.in
index df908d5b04e3..7eae3549090b 100644
--- a/toolkit/components/exthelper/Makefile.in
+++ b/toolkit/components/exthelper/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in
index 70c8e21a4145..2c7557ceb476 100644
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/feeds/test/Makefile.in b/toolkit/components/feeds/test/Makefile.in
index 65be04abc1de..702fc71980bf 100644
--- a/toolkit/components/feeds/test/Makefile.in
+++ b/toolkit/components/feeds/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/feeds/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in
index 6432a5222272..2b36461f696b 100644
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/find/Makefile.in b/toolkit/components/find/Makefile.in
index 3523646cfe56..0143af466b1f 100644
--- a/toolkit/components/find/Makefile.in
+++ b/toolkit/components/find/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/help/Makefile.in b/toolkit/components/help/Makefile.in
index 1a8721221519..d2044d8ab77b 100644
--- a/toolkit/components/help/Makefile.in
+++ b/toolkit/components/help/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/intl/Makefile.in b/toolkit/components/intl/Makefile.in
index b775f36e38ca..7cc22a220f74 100644
--- a/toolkit/components/intl/Makefile.in
+++ b/toolkit/components/intl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in
index c67cc2f3f5a2..45ad492bb6e8 100644
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/microformats/Makefile.in b/toolkit/components/microformats/Makefile.in
index bda4bbb3155b..638217ee47b0 100644
--- a/toolkit/components/microformats/Makefile.in
+++ b/toolkit/components/microformats/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/microformats/tests/Makefile.in b/toolkit/components/microformats/tests/Makefile.in
index 7312ca0c7b22..3e2c0ca67fb4 100644
--- a/toolkit/components/microformats/tests/Makefile.in
+++ b/toolkit/components/microformats/tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/nsDefaultCLH.js b/toolkit/components/nsDefaultCLH.js
index b83589322398..b81eed725eed 100644
--- a/toolkit/components/nsDefaultCLH.js
+++ b/toolkit/components/nsDefaultCLH.js
@@ -1,6 +1,6 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
diff --git a/toolkit/components/osfile/Makefile.in b/toolkit/components/osfile/Makefile.in
index 16ac2eaa2626..0a82197dbb42 100644
--- a/toolkit/components/osfile/Makefile.in
+++ b/toolkit/components/osfile/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/osfile/tests/Makefile.in b/toolkit/components/osfile/tests/Makefile.in
index d30d4628d6f8..58398dfcbf3d 100644
--- a/toolkit/components/osfile/tests/Makefile.in
+++ b/toolkit/components/osfile/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            = ../../../..
+DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
-relativesrcdir   = toolkit/components/osfile/tests
+relativesrcdir   = @relativesrcdir@
 
 MODULE           = test_osfile
 DIRS = mochi
diff --git a/toolkit/components/osfile/tests/mochi/Makefile.in b/toolkit/components/osfile/tests/mochi/Makefile.in
index dac90e224160..c489417352c3 100644
--- a/toolkit/components/osfile/tests/mochi/Makefile.in
+++ b/toolkit/components/osfile/tests/mochi/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir  = toolkit/components/osfile/tests/mochi
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/parentalcontrols/Makefile.in b/toolkit/components/parentalcontrols/Makefile.in
index 89fdd6d34893..eb8d07f7b5f8 100644
--- a/toolkit/components/parentalcontrols/Makefile.in
+++ b/toolkit/components/parentalcontrols/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in
index 218887062dc0..008a3be0f0b8 100644
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index 89bf351e161e..21e3759f98cc 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/components/passwordmgr/test
+relativesrcdir = @relativesrcdir@
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/toolkit/components/passwordmgr/test/browser/Makefile.in b/toolkit/components/passwordmgr/test/browser/Makefile.in
index c836a5251393..2d15248d6bd7 100644
--- a/toolkit/components/passwordmgr/test/browser/Makefile.in
+++ b/toolkit/components/passwordmgr/test/browser/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/passwordmgr/test/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
index c145641cd7e9..9f5be8597ef5 100644
--- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
@@ -84,7 +84,7 @@ commonInit();
 
 var uname = $_(1, "uname");
 var pword = $_(1, "pword");
-const shiftModifier = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
 
 // Get the pwmgr service
 var pwmgr = SpecialPowers.wrap(Components)
diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in
index f3a4e3090d2c..5e48ff40d78c 100644
--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
index fda97b797ca4..14d1295a38eb 100644
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in
index 7e0e2bff09ac..542783da64f1 100644
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= toolkit/components/places/tests
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index 9304e46e1336..816e76ef00e7 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/places/tests/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/chrome/Makefile.in b/toolkit/components/places/tests/chrome/Makefile.in
index 641b82d1ce44..7b54f1723f2b 100644
--- a/toolkit/components/places/tests/chrome/Makefile.in
+++ b/toolkit/components/places/tests/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/places/tests/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in
index 60871a2f0d41..c8ef7958a625 100644
--- a/toolkit/components/places/tests/cpp/Makefile.in
+++ b/toolkit/components/places/tests/cpp/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-relativesrcdir = toolkit/components/places/tests/cpp
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
index 06e6ac3dd779..8d4991e3e04f 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
index 99b5ca60e22f..777db7efa75d 100644
--- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/printing/Makefile.in b/toolkit/components/printing/Makefile.in
index fb7aab776251..85ab40579f56 100644
--- a/toolkit/components/printing/Makefile.in
+++ b/toolkit/components/printing/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/prompts/Makefile.in b/toolkit/components/prompts/Makefile.in
index 77c7cc38577b..a46146ecc034 100644
--- a/toolkit/components/prompts/Makefile.in
+++ b/toolkit/components/prompts/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/prompts/src/Makefile.in b/toolkit/components/prompts/src/Makefile.in
index ea59ac13b50a..edd6af7cf4e3 100644
--- a/toolkit/components/prompts/src/Makefile.in
+++ b/toolkit/components/prompts/src/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/prompts/test/Makefile.in b/toolkit/components/prompts/test/Makefile.in
index 3349d8be06d5..f6443802906d 100644
--- a/toolkit/components/prompts/test/Makefile.in
+++ b/toolkit/components/prompts/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/components/prompts/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in
index 40fbf116b83b..7fd3769206b1 100644
--- a/toolkit/components/reflect/Makefile.in
+++ b/toolkit/components/reflect/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in
index b1b62b33d6ce..82dbe670dc32 100644
--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in
index de261f03db27..9df813c7b53b 100644
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp
index 5bf4237244f4..7327659cb9e6 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -25,7 +25,6 @@
 #include "nsIDocument.h"
 #include "nsIContent.h"
 #include "nsIPresShell.h"
-#include "nsIFrame.h"
 #include "nsRect.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsILoginManager.h"
@@ -34,7 +33,6 @@
 #include "nsToolkitCompsCID.h"
 #include "nsEmbedCID.h"
 #include "nsIDOMNSEditableElement.h"
-#include "nsIDOMNSEvent.h"
 #include "mozilla/dom/Element.h"
 #include "nsContentUtils.h"
 
diff --git a/toolkit/components/satchel/test/Makefile.in b/toolkit/components/satchel/test/Makefile.in
index df4b8897c207..a1b3b96f67b0 100644
--- a/toolkit/components/satchel/test/Makefile.in
+++ b/toolkit/components/satchel/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH   = ../../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
-relativesrcdir  = toolkit/components/satchel/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/satchel/test/test_form_autocomplete.html b/toolkit/components/satchel/test/test_form_autocomplete.html
index cea5efc7dee2..e44f8f179665 100644
--- a/toolkit/components/satchel/test/test_form_autocomplete.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete.html
@@ -102,7 +102,7 @@ Form History test: form field autocomplete
 netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
 var input = $_(1, "field1");
-const shiftModifier = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
 
 // Get the form history service
 var fh = Components.classes["@mozilla.org/satchel/form-history;1"].
diff --git a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
index 2a0b4a40b8b4..00400af0dde5 100644
--- a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
@@ -47,7 +47,7 @@ Form History test: form field autocomplete
 netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
 var input = $_(1, "field1");
-const shiftModifier = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
+const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
 
 // Get the form history service
 var fh = Components.classes["@mozilla.org/satchel/form-history;1"].
diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in
index 876d0c480353..7d553fd403ee 100644
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -2,16 +2,21 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_COMPONENTS = toolkitsearch.manifest
-EXTRA_PP_COMPONENTS = nsSearchService.js \
-	nsSearchSuggestions.js
+EXTRA_COMPONENTS = \
+  toolkitsearch.manifest \
+  nsSearchSuggestions.js \
+  $(NULL)
+
+EXTRA_PP_COMPONENTS = \
+  nsSearchService.js \
+  $(NULL)
 
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 
diff --git a/toolkit/components/search/tests/Makefile.in b/toolkit/components/search/tests/Makefile.in
index c86a39d3b027..b6a7acc36338 100644
--- a/toolkit/components/search/tests/Makefile.in
+++ b/toolkit/components/search/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/search/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/social/Makefile.in b/toolkit/components/social/Makefile.in
index 757eff190318..9dccd09dfd51 100644
--- a/toolkit/components/social/Makefile.in
+++ b/toolkit/components/social/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/social/test/Makefile.in b/toolkit/components/social/test/Makefile.in
index c4e3b3abb6ea..35c2336943e5 100644
--- a/toolkit/components/social/test/Makefile.in
+++ b/toolkit/components/social/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/components/social/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/social/test/browser/Makefile.in b/toolkit/components/social/test/browser/Makefile.in
index ea4ae941e5bc..19fd9d2c9ada 100644
--- a/toolkit/components/social/test/browser/Makefile.in
+++ b/toolkit/components/social/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/social/test/browser
+relativesrcdir  = @relativesrcdir@
 
 MODULE = test_socialapi
 
diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in
index aa7e2e06b1dc..05a9fb5aadcd 100644
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
-relativesrcdir = toolkit/components/startup
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/startup/public/Makefile.in b/toolkit/components/startup/public/Makefile.in
index ed581ec343a6..0bfe751ea495 100644
--- a/toolkit/components/startup/public/Makefile.in
+++ b/toolkit/components/startup/public/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/toolkit/components/startup/tests/browser/Makefile.in b/toolkit/components/startup/tests/browser/Makefile.in
index 62daa7e299d0..d493dd085b29 100644
--- a/toolkit/components/startup/tests/browser/Makefile.in
+++ b/toolkit/components/startup/tests/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/startup/tests/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/statusfilter/Makefile.in b/toolkit/components/statusfilter/Makefile.in
index 1a9c55403109..76ab4ccc4b6f 100644
--- a/toolkit/components/statusfilter/Makefile.in
+++ b/toolkit/components/statusfilter/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index 021804aad8ac..0179c2e1fe88 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/telemetry/tests/Makefile.in b/toolkit/components/telemetry/tests/Makefile.in
index a04d77cb924f..375a973794b5 100644
--- a/toolkit/components/telemetry/tests/Makefile.in
+++ b/toolkit/components/telemetry/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/telemetry/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/typeaheadfind/Makefile.in b/toolkit/components/typeaheadfind/Makefile.in
index 08f210842865..7c881c174684 100644
--- a/toolkit/components/typeaheadfind/Makefile.in
+++ b/toolkit/components/typeaheadfind/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
index 7435451d99ad..88177df87333 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
@@ -17,7 +17,6 @@
 #include "nsIEditorDocShell.h"
 #include "nsISimpleEnumerator.h"
 #include "nsPIDOMWindow.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsString.h"
@@ -26,7 +25,7 @@
 #include "nsIDOMNode.h"
 #include "mozilla/dom/Element.h"
 #include "nsIFrame.h"
-#include "nsFrameTraversal.h"
+#include "nsFrameIterator.h"
 #include "nsIImageDocument.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
@@ -64,8 +63,6 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF(nsTypeAheadFind)
 NS_IMPL_RELEASE(nsTypeAheadFind)
 
-static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
-
 #define NS_FIND_CONTRACTID "@mozilla.org/embedcomp/rangefind;1"
 
 nsTypeAheadFind::nsTypeAheadFind():
@@ -1117,23 +1114,12 @@ nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
   // We know that the target range isn't usable because it's not in the
   // view port. Move range forward to first visible point,
   // this speeds us up a lot in long documents
-  nsCOMPtr<nsIFrameEnumerator> frameTraversal;
-  nsCOMPtr<nsIFrameTraversal> trav(do_CreateInstance(kFrameTraversalCID));
-  if (trav)
-    trav->NewFrameTraversal(getter_AddRefs(frameTraversal),
-                            aPresContext, frame,
-                            eLeaf,
-                            false, // aVisual
-                            false, // aLockInScrollView
-                            false     // aFollowOOFs
-                            );
-
-  if (!frameTraversal)
-    return false;
+  nsFrameIterator frameTraversal(aPresContext, frame,
+                                 eLeaf, FrameIteratorFlags::FLAG_NONE);
 
   while (rectVisibility == nsRectVisibility_kAboveViewport) {
-    frameTraversal->Next();
-    frame = frameTraversal->CurrentItem();
+    frameTraversal.Next();
+    frame = frameTraversal.CurrentItem();
     if (!frame)
       return false;
 
diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in
index 1136fa7612e9..794e8cd2f875 100644
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in
index d1f0e693e672..a115c54d47a2 100644
--- a/toolkit/components/url-classifier/tests/Makefile.in
+++ b/toolkit/components/url-classifier/tests/Makefile.in
@@ -4,11 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = toolkit/components/url-classifier/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/url-classifier/tests/mochitest/Makefile.in b/toolkit/components/url-classifier/tests/mochitest/Makefile.in
index 1f7044ea5664..34be1e9d8179 100644
--- a/toolkit/components/url-classifier/tests/mochitest/Makefile.in
+++ b/toolkit/components/url-classifier/tests/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/url-classifier/tests/mochitest
+relativesrcdir  = @relativesrcdir@
 
 MODULE = test_url-classifier
 
diff --git a/toolkit/components/urlformatter/Makefile.in b/toolkit/components/urlformatter/Makefile.in
index 2781627c27fc..6f869c4dbc69 100644
--- a/toolkit/components/urlformatter/Makefile.in
+++ b/toolkit/components/urlformatter/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -18,9 +18,6 @@ XPIDLSRCS = \
 
 EXTRA_COMPONENTS = \
   nsURLFormatter.manifest \
-  $(NULL)
-
-EXTRA_PP_COMPONENTS = \
   nsURLFormatter.js \
   $(NULL)
 
diff --git a/toolkit/components/urlformatter/nsURLFormatter.js b/toolkit/components/urlformatter/nsURLFormatter.js
index 686833aa5e6a..c0f7ce7846c1 100644
--- a/toolkit/components/urlformatter/nsURLFormatter.js
+++ b/toolkit/components/urlformatter/nsURLFormatter.js
@@ -1,7 +1,8 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-/**
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ /**
  * @class nsURLFormatterService
  *
  * nsURLFormatterService exposes methods to substitute variables in URL formats.
diff --git a/toolkit/components/urlformatter/tests/Makefile.in b/toolkit/components/urlformatter/tests/Makefile.in
index b2f6bca8a515..c98efc3626ab 100644
--- a/toolkit/components/urlformatter/tests/Makefile.in
+++ b/toolkit/components/urlformatter/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/components/urlformatter/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/viewconfig/Makefile.in b/toolkit/components/viewconfig/Makefile.in
index fb7aab776251..85ab40579f56 100644
--- a/toolkit/components/viewconfig/Makefile.in
+++ b/toolkit/components/viewconfig/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/viewsource/Makefile.in b/toolkit/components/viewsource/Makefile.in
index f35ebe56fe5c..5cf9d09f4cc3 100644
--- a/toolkit/components/viewsource/Makefile.in
+++ b/toolkit/components/viewsource/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/components/viewsource/test/Makefile.in b/toolkit/components/viewsource/test/Makefile.in
index e703c87280c3..7de6b9472b2d 100644
--- a/toolkit/components/viewsource/test/Makefile.in
+++ b/toolkit/components/viewsource/test/Makefile.in
@@ -4,11 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = toolkit/components/viewsource/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/components/viewsource/test/browser/Makefile.in b/toolkit/components/viewsource/test/browser/Makefile.in
index 4237165ded3e..2df7cf9d81b5 100644
--- a/toolkit/components/viewsource/test/browser/Makefile.in
+++ b/toolkit/components/viewsource/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = toolkit/components/viewsource/test/browser
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
index b4e9949e884c..a61663092f3d 100644
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -57,20 +57,20 @@ endif
 TEST_DIRS += tests
 
 EXTRA_JS_MODULES = \
+  debug.js \
   Geometry.jsm \
   InlineSpellChecker.jsm \
   PopupNotifications.jsm \
   Dict.jsm \
+  PageMenu.jsm \
   PropertyListUtils.jsm \
   PrivateBrowsingUtils.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
-  debug.js \
   LightweightThemeConsumer.jsm \
   Services.jsm \
   WindowDraggingUtils.jsm \
-  PageMenu.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/PageMenu.jsm b/toolkit/content/PageMenu.jsm
index 9a5b494e085c..febe94a981b3 100644
--- a/toolkit/content/PageMenu.jsm
+++ b/toolkit/content/PageMenu.jsm
@@ -1,6 +1,6 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 EXPORTED_SYMBOLS = ["PageMenu"];
 
diff --git a/toolkit/content/debug.js b/toolkit/content/debug.js
index 37c4c2c0edeb..ba647dedd142 100644
--- a/toolkit/content/debug.js
+++ b/toolkit/content/debug.js
@@ -1,12 +1,12 @@
-# vim:set ts=2 sw=2 sts=2 ci et:
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file contains functions that are useful for debugging purposes from
-# within JavaScript code.
+/* vim:set ts=2 sw=2 sts=2 ci et: */
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// This file contains functions that are useful for debugging purposes from
+// within JavaScript code.
 
 var EXPORTED_SYMBOLS = ["NS_ASSERT"];
 
diff --git a/toolkit/content/tests/Makefile.in b/toolkit/content/tests/Makefile.in
index 7da59a2569b1..b59fb9e071f0 100644
--- a/toolkit/content/tests/Makefile.in
+++ b/toolkit/content/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/content/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in
index b5bbe68a6acb..99b9d975e453 100644
--- a/toolkit/content/tests/browser/Makefile.in
+++ b/toolkit/content/tests/browser/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/content/tests/browser
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/content/tests/browser/common/Makefile.in b/toolkit/content/tests/browser/common/Makefile.in
index e6c053803012..3e6bac2c7cf1 100644
--- a/toolkit/content/tests/browser/common/Makefile.in
+++ b/toolkit/content/tests/browser/common/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/content/tests/browser/common
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/content/tests/browser/data/Makefile.in b/toolkit/content/tests/browser/data/Makefile.in
index 3b4f638674d4..17e9e9f590b3 100644
--- a/toolkit/content/tests/browser/data/Makefile.in
+++ b/toolkit/content/tests/browser/data/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/content/tests/browser/data
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in
index 70c1d0834812..9dcf76a64fd3 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/content/tests/chrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/content/tests/chrome/rtlchrome/Makefile.in b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
index e140bd1e6ad6..b484ffe0925d 100644
--- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in
+++ b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/content/tests/chrome/rtlchrome
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in
index 508b2ad3b89b..c42c98ed1b6f 100644
--- a/toolkit/content/tests/chrome/rtltest/Makefile.in
+++ b/toolkit/content/tests/chrome/rtltest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/content/tests/chrome/rtltest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in
index a10fa6f70d32..db86219a05e7 100644
--- a/toolkit/content/tests/widgets/Makefile.in
+++ b/toolkit/content/tests/widgets/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/content/tests/widgets
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index e028dbd11b1d..ecd16382cf6e 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
index 46811b6e1fec..60d850321c4a 100644
--- a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
+++ b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
index f17b759591fc..8224fc62abc2 100644
--- a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
+++ b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in
index b2fad88ca855..c6ba680fc283 100644
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/crashreporter/client
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/crashreporter/fileid/Makefile.in b/toolkit/crashreporter/fileid/Makefile.in
index 1936005fd0c7..b7945ff48bdb 100644
--- a/toolkit/crashreporter/fileid/Makefile.in
+++ b/toolkit/crashreporter/fileid/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
index 4d6bd6b46a05..c8b2cf82d392 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
index e7e2415b8a4f..77ed12aaf8eb 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
index ebfca55e0b4e..eb557d5372d5 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
index 853ccc9442a6..011dfde72ded 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
index 00cd7fb70080..72419331a0bb 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
index cb292f4184a6..cd3c6803bbcd 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
index 2af78a451ee2..9fe669d44479 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
index 020284baf02f..8d1636158da0 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
index 5dc01eff61f3..9fc663815150 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
index b0ddc756aecf..13750ef075b5 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
index 40d5c6be9958..ecb85ad40f87 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
index cf5c2bdcf6a3..2c1a7181223e 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
index 84383e34dd5e..07036fee6709 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
index 199db066e9cc..33d31c38f9a8 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
index a036f855e157..7d7a9cac4afe 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in
index ceef33e6ce54..de5a7daab070 100644
--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 8e8dcf673d18..d482014e9a6b 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/crashreporter/test
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/devtools/Makefile.in b/toolkit/devtools/Makefile.in
index 7404b79eb336..e9de48419bcf 100644
--- a/toolkit/devtools/Makefile.in
+++ b/toolkit/devtools/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/devtools/debugger/Makefile.in b/toolkit/devtools/debugger/Makefile.in
index ab0f4a2f8d08..3828f736b780 100644
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/debugger/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/devtools/debugger/tests/Makefile.in b/toolkit/devtools/debugger/tests/Makefile.in
index fe598f5cfc52..1debc1c4753d 100644
--- a/toolkit/devtools/debugger/tests/Makefile.in
+++ b/toolkit/devtools/debugger/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir = toolkit/devtools/debugger/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/devtools/sourcemap/Makefile.in b/toolkit/devtools/sourcemap/Makefile.in
index 245843b0527d..b1987c00443f 100644
--- a/toolkit/devtools/sourcemap/Makefile.in
+++ b/toolkit/devtools/sourcemap/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/devtools/sourcemap/tests/Makefile.in b/toolkit/devtools/sourcemap/tests/Makefile.in
index 226dba53c4ef..9779f4169d52 100644
--- a/toolkit/devtools/sourcemap/tests/Makefile.in
+++ b/toolkit/devtools/sourcemap/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir  = toolkit/devtools/sourcemap/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in
index 1fb5e47a095b..b15badfd5305 100644
--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/identity/tests/Makefile.in b/toolkit/identity/tests/Makefile.in
index f463e8a5fc0a..85daa60f7400 100644
--- a/toolkit/identity/tests/Makefile.in
+++ b/toolkit/identity/tests/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/identity/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/identity/tests/chrome/Makefile.in b/toolkit/identity/tests/chrome/Makefile.in
index 9ed29f1535ae..0d8c172e5f0d 100644
--- a/toolkit/identity/tests/chrome/Makefile.in
+++ b/toolkit/identity/tests/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/identity/tests/chrome
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/identity/tests/chrome/sandbox_content.html b/toolkit/identity/tests/chrome/sandbox_content.html
index bc41e2f3c812..9a9b63ac2426 100644
--- a/toolkit/identity/tests/chrome/sandbox_content.html
+++ b/toolkit/identity/tests/chrome/sandbox_content.html
@@ -21,8 +21,8 @@
 <audio src="sandbox_content.sjs?audio/ogg" autoplay="true"></audio>
 
 <!-- plugins -->
-<embed src="sandbox_content.sjs?test/embed"/>
-<object data="sandbox_content.sjs?test/object"></object>
+<embed src="sandbox_content.sjs?application/x-test"/>
+<object data="sandbox_content.sjs?application/x-test"></object>
 <applet code="sandbox_content.sjs?application/x-java-applet"></applet>
 
 <iframe src="sandbox_content.sjs?text/html"></iframe>
diff --git a/toolkit/identity/tests/chrome/test_sandbox.xul b/toolkit/identity/tests/chrome/test_sandbox.xul
index 6b47db77ef92..94211bba0853 100644
--- a/toolkit/identity/tests/chrome/test_sandbox.xul
+++ b/toolkit/identity/tests/chrome/test_sandbox.xul
@@ -119,26 +119,43 @@ function test_url_normalization() {
 /**
  * Check with the server's state to see what content was loaded then reset it.
  */
-function check_loaded_content(aNothingShouldLoad, aCallback) {
+function check_loaded_content(aSandbox, aNothingShouldLoad, aCallback) {
 
   let xhr = new XMLHttpRequest();
   xhr.open("GET", STATE_URL + "?get_loaded", true);
   xhr.onload = function() {
+    let res = xhr.responseText;
     is(xhr.status, 200, "Check successful response");
 
     if (aNothingShouldLoad) {
-      is(xhr.responseText, "NOTHING", "Check that nothing was loaded on the server");
+      is(res, "NOTHING", "Check that nothing was loaded on the server");
     } else if (!OSX_10_5) {
-      let loadedTypes = xhr.responseText == "NOTHING" ? [] : xhr.responseText.split(",");
+      let allowedTypes = [ "application/javascript", "text/html", "video/webm",
+                           "audio/ogg", "application/x-test" ];
+      let loadedTypes = res == "NOTHING" ? [] : res.split(",");
+
+      for (let loadedType of loadedTypes) {
+        isnot(allowedTypes.indexOf(loadedType), -1, "Check that " + loadedType + " was expected to load");
+      }
 
       // TODO: Media should be disabled after bug 759964.
-      is(loadedTypes.length, 4, "Check number of loaded content types: " + xhr.responseText)
-      todo_is(loadedTypes.length, 2, "Check number of loaded content types: " + xhr.responseText)
-
       isnot(loadedTypes.indexOf("application/javascript"), -1, "Check JS was loaded");
       isnot(loadedTypes.indexOf("text/html"), -1, "Check iframe was loaded");
       todo_is(loadedTypes.indexOf("video/webm"), -1, "Check webm was not loaded");
       todo_is(loadedTypes.indexOf("audio/ogg"), -1, "Check ogg was not loaded");
+
+      // Check that no plugin tags have a type other than TYPE_NULL (failed load)
+      // --
+      // Checking if a channel was opened is not sufficient for plugin tags --
+      // An object tag may still be allowed to load a sub-document, but not a
+      // plugin, so it will open a channel but then abort when it gets a
+      // plugin-type.
+      let doc = aSandbox._frame.contentDocument;
+      let nullType = Components.interfaces.nsIObjectLoadingContent.TYPE_NULL;
+      for (let tag of doc.querySelectorAll("embed, object, applet")) {
+        tag instanceof Components.interfaces.nsIObjectLoadingContent;
+        is(tag.displayedType, nullType, "Check that plugin did not load content");
+      }
     }
 
     reset_server_state();
@@ -157,7 +174,7 @@ function check_disabled_content(aSandboxURL, aNothingShouldLoad = false) {
     let originalId = aSandbox.id;
 
     setTimeout(function() {
-      check_loaded_content(aNothingShouldLoad, function checkFinished() {
+      check_loaded_content(aSandbox, aNothingShouldLoad, function checkFinished() {
 
         info("reload the sandbox content");
         aSandbox.reload(function sandboxReloadCB(aSandbox) {
@@ -165,7 +182,7 @@ function check_disabled_content(aSandboxURL, aNothingShouldLoad = false) {
           is(aSandbox.id, originalId, "Sandbox ID should be the same after reload");
 
           setTimeout(function() {
-            check_loaded_content(aNothingShouldLoad, function reloadCheckFinished() {
+            check_loaded_content(aSandbox, aNothingShouldLoad, function reloadCheckFinished() {
               free_and_check_sandbox(aSandbox);
             });
           }, 5000);
diff --git a/toolkit/identity/tests/mochitest/Makefile.in b/toolkit/identity/tests/mochitest/Makefile.in
index 6530d40a1a1b..fcd4e851af9e 100644
--- a/toolkit/identity/tests/mochitest/Makefile.in
+++ b/toolkit/identity/tests/mochitest/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/identity/tests/mochitest
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index e06b415749bb..ba545a820cdb 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/library/winvccorlib/Makefile.in b/toolkit/library/winvccorlib/Makefile.in
index 02b4fb2a3c10..ff2bd1e0746c 100644
--- a/toolkit/library/winvccorlib/Makefile.in
+++ b/toolkit/library/winvccorlib/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in
index 40413e922e5d..bb88f1577263 100644
--- a/toolkit/locales/Makefile.in
+++ b/toolkit/locales/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/downloads/Makefile.in b/toolkit/mozapps/downloads/Makefile.in
index 301139607d7f..6115557efe65 100644
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/mozapps/downloads/tests/Makefile.in b/toolkit/mozapps/downloads/tests/Makefile.in
index 9ef3bd901338..039e24058803 100644
--- a/toolkit/mozapps/downloads/tests/Makefile.in
+++ b/toolkit/mozapps/downloads/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/mozapps/downloads/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/downloads/tests/chrome/Makefile.in b/toolkit/mozapps/downloads/tests/chrome/Makefile.in
index ae2f3735029c..eac1bbbe2f18 100644
--- a/toolkit/mozapps/downloads/tests/chrome/Makefile.in
+++ b/toolkit/mozapps/downloads/tests/chrome/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = toolkit/mozapps/downloads/tests/chrome
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
index 21ead098f494..ed1df0f19093 100644
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -26,26 +26,29 @@ XPIDLSRCS = \
   $(NULL)
 
 EXTRA_PP_COMPONENTS = \
-  extensions.manifest \
   nsBlocklistService.js \
+  $(NULL)
+
+EXTRA_COMPONENTS = \
+  extensions.manifest \
   addonManager.js \
   amContentHandler.js \
   amWebInstallListener.js \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
-  AddonLogging.jsm \
   AddonManager.jsm \
-  AddonRepository.jsm \
-  AddonUpdateChecker.jsm \
-  PluginProvider.jsm \
   XPIProvider.jsm \
   XPIProviderUtils.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
+  AddonLogging.jsm \
+  AddonRepository.jsm \
+  AddonUpdateChecker.jsm \
   ChromeManifestParser.jsm \
   LightweightThemeManager.jsm \
+  PluginProvider.jsm \
   SpellCheckDictionaryBootstrap.js \
   $(NULL)
 
diff --git a/toolkit/mozapps/extensions/addonManager.js b/toolkit/mozapps/extensions/addonManager.js
index 887f24e717b3..6a5a3b9f61ab 100644
--- a/toolkit/mozapps/extensions/addonManager.js
+++ b/toolkit/mozapps/extensions/addonManager.js
@@ -1,8 +1,6 @@
-/*
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 component serves as integration between the platform and AddonManager.
diff --git a/toolkit/mozapps/extensions/amContentHandler.js b/toolkit/mozapps/extensions/amContentHandler.js
index 86350475e95f..3acefe1fafab 100644
--- a/toolkit/mozapps/extensions/amContentHandler.js
+++ b/toolkit/mozapps/extensions/amContentHandler.js
@@ -1,8 +1,6 @@
-/*
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
diff --git a/toolkit/mozapps/extensions/amWebInstallListener.js b/toolkit/mozapps/extensions/amWebInstallListener.js
index e101b7cf34ba..3b49d0896c0c 100644
--- a/toolkit/mozapps/extensions/amWebInstallListener.js
+++ b/toolkit/mozapps/extensions/amWebInstallListener.js
@@ -1,8 +1,6 @@
-/*
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
  * This is a default implementation of amIWebInstallListener that should work
diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/extensions/nsBlocklistService.js
index bce50f5a19d9..01c03545e4d9 100644
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in
index ee19407d4ca3..94e86c62012e 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 ADDONSRC = $(srcdir)/addons
-relativesrcdir = toolkit/mozapps/extensions/test
+relativesrcdir = @relativesrcdir@
 
 TESTROOT = $(CURDIR)/$(DEPTH)/_tests/xpcshell/$(relativesrcdir)
 TESTXPI = $(TESTROOT)/xpcshell/addons
diff --git a/toolkit/mozapps/extensions/test/browser/Makefile.in b/toolkit/mozapps/extensions/test/browser/Makefile.in
index 5f193b9029e8..658f0b49469b 100644
--- a/toolkit/mozapps/extensions/test/browser/Makefile.in
+++ b/toolkit/mozapps/extensions/test/browser/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir  = toolkit/mozapps/extensions/test/browser
+relativesrcdir  = @relativesrcdir@
 ADDONSRC = $(srcdir)/addons
 TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
 
diff --git a/toolkit/mozapps/extensions/test/mochitest/Makefile.in b/toolkit/mozapps/extensions/test/mochitest/Makefile.in
index dbce25ca8f39..fc8266cbad4f 100644
--- a/toolkit/mozapps/extensions/test/mochitest/Makefile.in
+++ b/toolkit/mozapps/extensions/test/mochitest/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/mozapps/extensions/test/mochitest
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in
index e9a304490716..20742d1fa1ae 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in
+++ b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/mozapps/extensions/test/xpinstall
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/handling/Makefile.in b/toolkit/mozapps/handling/Makefile.in
index 13067db19d77..9730f2e7549f 100644
--- a/toolkit/mozapps/handling/Makefile.in
+++ b/toolkit/mozapps/handling/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/mozapps/plugins/Makefile.in b/toolkit/mozapps/plugins/Makefile.in
index c87ce42ad8fb..9012f1e16671 100644
--- a/toolkit/mozapps/plugins/Makefile.in
+++ b/toolkit/mozapps/plugins/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH   = ../../..
+DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in
index 5aa2bf7b6ba1..39585581ac3a 100644
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -10,7 +10,7 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_plugins
-relativesrcdir  = toolkit/mozapps/plugins/tests
+relativesrcdir  = @relativesrcdir@
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
diff --git a/toolkit/mozapps/preferences/Makefile.in b/toolkit/mozapps/preferences/Makefile.in
index d28b21cb8edd..a9a90427c060 100644
--- a/toolkit/mozapps/preferences/Makefile.in
+++ b/toolkit/mozapps/preferences/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/mozapps/shared/Makefile.in b/toolkit/mozapps/shared/Makefile.in
index ae1a80fcc742..cef5d2eac55c 100644
--- a/toolkit/mozapps/shared/Makefile.in
+++ b/toolkit/mozapps/shared/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = toolkit/mozapps/shared
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -14,6 +14,9 @@ MODULE = toolkitShared
 
 EXTRA_PP_JS_MODULES = \
   CertUtils.jsm \
+  $(NULL)
+
+EXTRA_JS_MODULES = \
   FileUtils.jsm \
   $(NULL)
 
diff --git a/toolkit/mozapps/shared/test/chrome/Makefile.in b/toolkit/mozapps/shared/test/chrome/Makefile.in
index 59f171082fa6..9c3ed48eb652 100644
--- a/toolkit/mozapps/shared/test/chrome/Makefile.in
+++ b/toolkit/mozapps/shared/test/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = toolkit/mozapps/shared/test/chrome
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in
index d762d4bd86f9..3221b358c2ab 100644
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -13,7 +13,10 @@ MODULE = update
 
 XPIDLSRCS = nsIUpdateTimerManager.idl
 
-EXTRA_PP_COMPONENTS = nsUpdateTimerManager.js nsUpdateTimerManager.manifest
+EXTRA_COMPONENTS = \
+  nsUpdateTimerManager.js \
+  nsUpdateTimerManager.manifest \
+  $(NULL)
 
 ifdef MOZ_UPDATER
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
@@ -26,8 +29,12 @@ XPIDLSRCS += nsIUpdateService.idl
 EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
   nsUpdateServiceStub.js \
+  $(NULL)
+
+EXTRA_COMPONENTS += \
   nsUpdateService.manifest \
   $(NULL)
+
 else
 
 # If only the maintenance service is installed and not
diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in
index f5fae631c3a0..766435f381ff 100644
--- a/toolkit/mozapps/update/common/Makefile.in
+++ b/toolkit/mozapps/update/common/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/mozapps/update/nsUpdateTimerManager.js b/toolkit/mozapps/update/nsUpdateTimerManager.js
index bb7ea4be6e2a..8bfe54ffef4d 100644
--- a/toolkit/mozapps/update/nsUpdateTimerManager.js
+++ b/toolkit/mozapps/update/nsUpdateTimerManager.js
@@ -1,8 +1,7 @@
-/*
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
@@ -21,16 +20,16 @@ XPCOMUtils.defineLazyGetter(this, "gLogEnabled", function tm_gLogEnabled() {
 });
 
 /**
-#  Gets a preference value, handling the case where there is no default.
-#  @param   func
-#           The name of the preference function to call, on nsIPrefBranch
-#  @param   preference
-#           The name of the preference
-#  @param   defaultValue
-#           The default value to return in the event the preference has
-#           no setting
-#  @returns The value of the preference, or undefined if there was no
-#           user or default value.
+ *  Gets a preference value, handling the case where there is no default.
+ *  @param   func
+ *           The name of the preference function to call, on nsIPrefBranch
+ *  @param   preference
+ *           The name of the preference
+ *  @param   defaultValue
+ *           The default value to return in the event the preference has
+ *           no setting
+ *  @returns The value of the preference, or undefined if there was no
+ *           user or default value.
  */
 function getPref(func, preference, defaultValue) {
   try {
@@ -42,9 +41,9 @@ function getPref(func, preference, defaultValue) {
 }
 
 /**
-#  Logs a string to the error console.
-#  @param   string
-#           The string to write to the error console.
+ *  Logs a string to the error console.
+ *  @param   string
+ *           The string to write to the error console.
  */
 function LOG(string) {
   if (gLogEnabled) {
@@ -54,9 +53,9 @@ function LOG(string) {
 }
 
 /**
-#  A manager for timers. Manages timers that fire over long periods of time
-#  (e.g. days, weeks, months).
-#  @constructor
+ *  A manager for timers. Manages timers that fire over long periods of time
+ *  (e.g. days, weeks, months).
+ *  @constructor
  */
 function TimerManager() {
   Services.obs.addObserver(this, "xpcom-shutdown", false);
@@ -68,9 +67,9 @@ TimerManager.prototype = {
   _timer: null,
 
   /**
-#    The Checker Timer minimum delay interval as specified by the
-#    app.update.timerMinimumDelay pref. If the app.update.timerMinimumDelay
-#    pref doesn't exist this will default to 120000.
+ *    The Checker Timer minimum delay interval as specified by the
+ *    app.update.timerMinimumDelay pref. If the app.update.timerMinimumDelay
+ *    pref doesn't exist this will default to 120000.
    */
    _timerMinimumDelay: null,
 
@@ -117,14 +116,14 @@ TimerManager.prototype = {
   },
 
   /**
-#    Called when the checking timer fires.
-#
-#    We only fire one notification each time, so that the operations are
-#    staggered. We don't want too many to happen at once, which could
-#    negatively impact responsiveness.
-#
-#    @param   timer
-#             The checking timer that fired.
+   * Called when the checking timer fires.
+   *
+   * We only fire one notification each time, so that the operations are
+   * staggered. We don't want too many to happen at once, which could
+   * negatively impact responsiveness.
+   *
+   * @param   timer
+   *          The checking timer that fired.
    */
   notify: function TM_notify(timer) {
     var nextDelay = null;
diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in
index 6c160e30ee6b..af9a8c6758a0 100644
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = toolkit/mozapps/update/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/update/test/chrome/Makefile.in b/toolkit/mozapps/update/test/chrome/Makefile.in
index 7f79e850a4a6..22f80552880d 100644
--- a/toolkit/mozapps/update/test/chrome/Makefile.in
+++ b/toolkit/mozapps/update/test/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = toolkit/mozapps/update/test/chrome
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/update/test_svc/Makefile.in b/toolkit/mozapps/update/test_svc/Makefile.in
index ee528c80e879..b024e361d1e8 100644
--- a/toolkit/mozapps/update/test_svc/Makefile.in
+++ b/toolkit/mozapps/update/test_svc/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = toolkit/mozapps/update/test_svc
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/update/test_timermanager/Makefile.in b/toolkit/mozapps/update/test_timermanager/Makefile.in
index 1983da049a44..30046e4b84b1 100644
--- a/toolkit/mozapps/update/test_timermanager/Makefile.in
+++ b/toolkit/mozapps/update/test_timermanager/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = toolkit/mozapps/update/test_timermanager
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in
index 035e99f4fb3c..b20da96554d9 100644
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/obsolete/Makefile.in b/toolkit/obsolete/Makefile.in
index edb922858b30..360a6fdbb5eb 100644
--- a/toolkit/obsolete/Makefile.in
+++ b/toolkit/obsolete/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in
index 9f61e5d8927a..bb4f6178c328 100644
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/profile/test/Makefile.in b/toolkit/profile/test/Makefile.in
index 58c9f0c92ce4..cfaa2896570c 100644
--- a/toolkit/profile/test/Makefile.in
+++ b/toolkit/profile/test/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/profile/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in
index 4b7db2664d86..20f156cfd82d 100644
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
index 042901d3b6ad..cd2712c22caa 100644
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir	  = @srcdir@
 VPATH	  = @srcdir@
diff --git a/toolkit/system/osxproxy/Makefile.in b/toolkit/system/osxproxy/Makefile.in
index fd81ea927029..bf2c8cbb4385 100644
--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in
index 764616ea47a2..79f9cf81e908 100644
--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/system/windowsproxy/Makefile.in b/toolkit/system/windowsproxy/Makefile.in
index 5a022ef1a76b..9f68b46c7d7c 100644
--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/Makefile.in b/toolkit/themes/Makefile.in
index 1757eeb22cc4..46bf3958665a 100644
--- a/toolkit/themes/Makefile.in
+++ b/toolkit/themes/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/faststripe/global/Makefile.in b/toolkit/themes/faststripe/global/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/faststripe/global/Makefile.in
+++ b/toolkit/themes/faststripe/global/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/gnomestripe/Makefile.in b/toolkit/themes/gnomestripe/Makefile.in
index f5980cecf337..02289c730f5c 100644
--- a/toolkit/themes/gnomestripe/Makefile.in
+++ b/toolkit/themes/gnomestripe/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/gnomestripe/global/Makefile.in b/toolkit/themes/gnomestripe/global/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/gnomestripe/global/Makefile.in
+++ b/toolkit/themes/gnomestripe/global/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/gnomestripe/help/Makefile.in b/toolkit/themes/gnomestripe/help/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/gnomestripe/help/Makefile.in
+++ b/toolkit/themes/gnomestripe/help/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/gnomestripe/mozapps/Makefile.in b/toolkit/themes/gnomestripe/mozapps/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/gnomestripe/mozapps/Makefile.in
+++ b/toolkit/themes/gnomestripe/mozapps/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/pinstripe/Makefile.in b/toolkit/themes/pinstripe/Makefile.in
index 9153bfeb0c60..6f5ac3cd64bf 100644
--- a/toolkit/themes/pinstripe/Makefile.in
+++ b/toolkit/themes/pinstripe/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/pinstripe/global/Makefile.in b/toolkit/themes/pinstripe/global/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/pinstripe/global/Makefile.in
+++ b/toolkit/themes/pinstripe/global/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/pinstripe/global/popup.css b/toolkit/themes/pinstripe/global/popup.css
index 36febae1c280..5164a9b33bca 100644
--- a/toolkit/themes/pinstripe/global/popup.css
+++ b/toolkit/themes/pinstripe/global/popup.css
@@ -29,7 +29,7 @@ panel[type="arrow"] {
 }
 
 .panel-arrowcontainer[panelopen] {
-  transition-duration: 250ms;
+  transition-duration: 200ms, 150ms;
   transition-property: opacity, transform;
   transition-timing-function: ease-out;
 }
diff --git a/toolkit/themes/pinstripe/help/Makefile.in b/toolkit/themes/pinstripe/help/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/pinstripe/help/Makefile.in
+++ b/toolkit/themes/pinstripe/help/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/pinstripe/mochitests/Makefile.in b/toolkit/themes/pinstripe/mochitests/Makefile.in
index d617618207e9..64638d8ee499 100644
--- a/toolkit/themes/pinstripe/mochitests/Makefile.in
+++ b/toolkit/themes/pinstripe/mochitests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/themes/pinstripe/mochitests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/themes/pinstripe/mozapps/Makefile.in b/toolkit/themes/pinstripe/mozapps/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/pinstripe/mozapps/Makefile.in
+++ b/toolkit/themes/pinstripe/mozapps/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/pmstripe/global/Makefile.in b/toolkit/themes/pmstripe/global/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/pmstripe/global/Makefile.in
+++ b/toolkit/themes/pmstripe/global/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/winstripe/Makefile.in b/toolkit/themes/winstripe/Makefile.in
index f5980cecf337..02289c730f5c 100644
--- a/toolkit/themes/winstripe/Makefile.in
+++ b/toolkit/themes/winstripe/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/winstripe/global/Makefile.in b/toolkit/themes/winstripe/global/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/winstripe/global/Makefile.in
+++ b/toolkit/themes/winstripe/global/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/winstripe/global/popup.css b/toolkit/themes/winstripe/global/popup.css
index cc46d4f6c218..a3dc700124c1 100644
--- a/toolkit/themes/winstripe/global/popup.css
+++ b/toolkit/themes/winstripe/global/popup.css
@@ -37,7 +37,7 @@ panel[type="arrow"] {
 }
 
 .panel-arrowcontainer[panelopen] {
-  transition-duration: 250ms;
+  transition-duration: 200ms, 150ms;
   transition-property: opacity, transform;
   transition-timing-function: ease-out;
 }
diff --git a/toolkit/themes/winstripe/help/Makefile.in b/toolkit/themes/winstripe/help/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/winstripe/help/Makefile.in
+++ b/toolkit/themes/winstripe/help/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/themes/winstripe/mozapps/Makefile.in b/toolkit/themes/winstripe/mozapps/Makefile.in
index 0e2136b10795..51341c30aea1 100644
--- a/toolkit/themes/winstripe/mozapps/Makefile.in
+++ b/toolkit/themes/winstripe/mozapps/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/webapps/Makefile.in b/toolkit/webapps/Makefile.in
index 8ea5cafd989d..b2d22140f083 100644
--- a/toolkit/webapps/Makefile.in
+++ b/toolkit/webapps/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
@@ -13,6 +13,7 @@ include $(topsrcdir)/config/config.mk
 
 EXTRA_PP_JS_MODULES = \
 	WebappOSUtils.jsm \
+	WebappsInstaller.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/modules/WebappsIconHelpers.js b/toolkit/webapps/WebappsIconHelpers.js
similarity index 100%
rename from browser/modules/WebappsIconHelpers.js
rename to toolkit/webapps/WebappsIconHelpers.js
diff --git a/browser/modules/WebappsInstaller.jsm b/toolkit/webapps/WebappsInstaller.jsm
similarity index 100%
rename from browser/modules/WebappsInstaller.jsm
rename to toolkit/webapps/WebappsInstaller.jsm
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 91a8012319dd..ae28d7234759 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/toolkit/xre/test/Makefile.in b/toolkit/xre/test/Makefile.in
index b41699ad157d..c9b15ade0196 100644
--- a/toolkit/xre/test/Makefile.in
+++ b/toolkit/xre/test/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = toolkit/xre/test
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in
index eb131c911115..1caab860a81e 100644
--- a/toolkit/xre/test/win/Makefile.in
+++ b/toolkit/xre/test/win/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/codesighs/Makefile.in b/tools/codesighs/Makefile.in
index da06bb61943c..66dd3bfe7fd3 100644
--- a/tools/codesighs/Makefile.in
+++ b/tools/codesighs/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/jprof/Makefile.in b/tools/jprof/Makefile.in
index 2a7c42765929..2dcd81a7a5c8 100644
--- a/tools/jprof/Makefile.in
+++ b/tools/jprof/Makefile.in
@@ -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/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/jprof/stub/Makefile.in b/tools/jprof/stub/Makefile.in
index a01314c6ed45..e519bbc48828 100644
--- a/tools/jprof/stub/Makefile.in
+++ b/tools/jprof/stub/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index e14c5d9f422a..b5e62d8a7ecf 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -4,11 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir	  = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = $(srcdir)
-relativesrcdir = tools/profiler
+relativesrcdir = @relativesrcdir@
 
 XPCSHELL_TESTS = tests
 
diff --git a/tools/testy/Makefile.in b/tools/testy/Makefile.in
index 6b9483655b36..e12161e5961c 100644
--- a/tools/testy/Makefile.in
+++ b/tools/testy/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/testy/sample/Makefile.in b/tools/testy/sample/Makefile.in
index ba20153f1da8..55c6b0752830 100644
--- a/tools/testy/sample/Makefile.in
+++ b/tools/testy/sample/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in
index 82f3ae801fa7..e1e7b4003206 100644
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in
index 874f0f7f6e98..05488f45eec6 100644
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in
index 939b3488c69c..9d35dafe3d35 100644
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -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/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/uriloader/Makefile.in b/uriloader/Makefile.in
index ecd916c43e76..5d00417c2eef 100644
--- a/uriloader/Makefile.in
+++ b/uriloader/Makefile.in
@@ -9,7 +9,7 @@
 # Build in docshell/build to relink.
 #
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in
index a399b7902131..8803a51d00f5 100644
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index a168449eb772..393ba9495531 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 
diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in
index 17c4d96c1bc9..9ac5e9a014ed 100644
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
-relativesrcdir = uriloader/exthandler/tests
+relativesrcdir = @relativesrcdir@
 
 DIRS += mochitest \
         $(NULL)
diff --git a/uriloader/exthandler/tests/mochitest/Makefile.in b/uriloader/exthandler/tests/mochitest/Makefile.in
index c0c42becffbe..a96c2668ff27 100644
--- a/uriloader/exthandler/tests/mochitest/Makefile.in
+++ b/uriloader/exthandler/tests/mochitest/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= uriloader/exthandler/tests/mochitest 
+relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in
index 7674c4d0a9de..e6aea8f08e70 100644
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/view/Makefile.in b/view/Makefile.in
index 694b3ed92922..58d5fd550174 100644
--- a/view/Makefile.in
+++ b/view/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/view/public/Makefile.in b/view/public/Makefile.in
index 392c819d86fa..39a2baca3b13 100644
--- a/view/public/Makefile.in
+++ b/view/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/view/public/nsIView.h b/view/public/nsIView.h
index 7d243a0fc127..ae4faee97553 100644
--- a/view/public/nsIView.h
+++ b/view/public/nsIView.h
@@ -13,13 +13,13 @@
 #include "nsNativeWidget.h"
 #include "nsIWidget.h"
 #include "nsWidgetInitData.h"
-#include "nsIFrame.h"
 
 class nsIViewManager;
 class nsViewManager;
 class nsView;
 class nsWeakView;
 class nsIWidget;
+class nsIFrame;
 
 // Enumerated type to indicate the visibility of a layer.
 // hide - the layer is not shown.
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 0821fba36912..9ebbf1e23ba4 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -14,6 +14,7 @@ class nsIWidget;
 struct nsRect;
 class nsRegion;
 class nsDeviceContext;
+class nsIPresShell;
 
 #define NS_IVIEWMANAGER_IID \
 { 0x540610a6, 0x4fdd, 0x4ae3, \
diff --git a/view/src/Makefile.in b/view/src/Makefile.in
index f50d80b67e12..98bc3e87d164 100644
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/webapprt/Makefile.in b/webapprt/Makefile.in
index bae6bce6af8f..aad4a2556b35 100644
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in
index 14c59e6646e3..44df8e683ecb 100644
--- a/webapprt/gtk2/Makefile.in
+++ b/webapprt/gtk2/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in
index 7737c37bb7d1..d6cf65743267 100644
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/webapprt/test/Makefile.in b/webapprt/test/Makefile.in
index b304870c76c0..087c744b24a4 100644
--- a/webapprt/test/Makefile.in
+++ b/webapprt/test/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/webapprt/test/chrome/Makefile.in b/webapprt/test/chrome/Makefile.in
index cae357731a6c..dd3551ca5ee2 100644
--- a/webapprt/test/chrome/Makefile.in
+++ b/webapprt/test/chrome/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = webapprt/test/chrome
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/webapprt/test/content/Makefile.in b/webapprt/test/content/Makefile.in
index 713e9486aafa..92eedf404182 100644
--- a/webapprt/test/content/Makefile.in
+++ b/webapprt/test/content/Makefile.in
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH          = ../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = webapprt/test/content
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in
index 07192b63418c..e5a3014c6103 100644
--- a/webapprt/win/Makefile.in
+++ b/webapprt/win/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
index 5668d9cde130..71af05dea55e 100644
--- a/widget/LookAndFeel.h
+++ b/widget/LookAndFeel.h
@@ -186,6 +186,8 @@ public:
     eIntID_SubmenuDelay,
     // can popups overlap menu/task bar?
     eIntID_MenusCanOverlapOSBar,
+    // show/hide scrollbars based on activity
+    eIntID_ShowHideScrollbars,
     // skip navigating to disabled menu item?
     eIntID_SkipNavigatingDisabledMenuItem,
     // begin a drag if the mouse is moved further than the threshold while the
diff --git a/widget/Makefile.in b/widget/Makefile.in
index f74062b2633d..b1dc87a059a6 100644
--- a/widget/Makefile.in
+++ b/widget/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in
index ede308b63a79..bea57069acd1 100644
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH           = ../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in
index 2785d0f333f9..6dbb0e08ed33 100644
--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm
index dd4fb076c257..5ed846f869d9 100644
--- a/widget/cocoa/nsDragService.mm
+++ b/widget/cocoa/nsDragService.mm
@@ -27,7 +27,6 @@
 #include "nsNetUtil.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
-#include "nsIFrame.h"
 #include "nsIView.h"
 #include "gfxASurface.h"
 #include "gfxContext.h"
diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in
index c45c7b5c45ac..30e12bd87e9d 100644
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH           = ../..
+DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = \
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
index fef8e93a1b5c..4723e23edc3e 100644
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in
index 56afc2097529..95baa1dbc837 100644
--- a/widget/gtkxtbin/Makefile.in
+++ b/widget/gtkxtbin/Makefile.in
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in
index 017fd20d4511..da53a8cd1cbc 100644
--- a/widget/os2/Makefile.in
+++ b/widget/os2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in
index 620bfd4838ab..7e767553a63c 100644
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/qt/faststartupqt/Makefile.in b/widget/qt/faststartupqt/Makefile.in
index 026d828ac310..5427c46613f9 100644
--- a/widget/qt/faststartupqt/Makefile.in
+++ b/widget/qt/faststartupqt/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in
index 246bec13b37c..70c82b295727 100644
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in
index d545f459ae9c..5a9bbb27d070 100644
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH      = ../../..
+DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
index 35a8d7f2c7da..0507b8a0a7f1 100644
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = widget/tests
+relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in
index 160c941850e8..ec383bd0b0f4 100644
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/windows/tests/Makefile.in b/widget/windows/tests/Makefile.in
index 76ad6f958bb3..a48471b5828d 100644
--- a/widget/windows/tests/Makefile.in
+++ b/widget/windows/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in
index 9e2e69ee2e32..6d37147c50a6 100644
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/widget/xpwidgets/nsXPLookAndFeel.cpp b/widget/xpwidgets/nsXPLookAndFeel.cpp
index 46c8782dc5fb..3abb1f958635 100644
--- a/widget/xpwidgets/nsXPLookAndFeel.cpp
+++ b/widget/xpwidgets/nsXPLookAndFeel.cpp
@@ -48,6 +48,9 @@ nsLookAndFeelIntPref nsXPLookAndFeel::sIntPrefs[] =
   { "ui.menusCanOverlapOSBar",
     eIntID_MenusCanOverlapOSBar,
     false, 0 },
+  { "ui.showHideScrollbars",
+    eIntID_ShowHideScrollbars,
+    false, 0 },
   { "ui.skipNavigatingDisabledMenuItem",
     eIntID_SkipNavigatingDisabledMenuItem,
     false, 0 },
diff --git a/widget/xremoteclient/Makefile.in b/widget/xremoteclient/Makefile.in
index acdaea6d51b1..7455efcc39be 100644
--- a/widget/xremoteclient/Makefile.in
+++ b/widget/xremoteclient/Makefile.in
@@ -7,7 +7,7 @@
 # the application binaries. The fact that it's under mozilla/widget is a fluke
 # of tree history.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in
index 71232ec1e242..66fa77a66925 100644
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/analysis/Makefile.in b/xpcom/analysis/Makefile.in
index 9e805cb3f364..784424dd826c 100644
--- a/xpcom/analysis/Makefile.in
+++ b/xpcom/analysis/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index a6bd9e7569da..1250c141e548 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index 62862ce024e1..f2db2f7b2db2 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -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/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
index ddfd57cd6e86..0678242529d1 100644
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index a76d2813b6b8..624182d118be 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index cf0a23aeff80..39b2dff69805 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/glue/nomozalloc/Makefile.in b/xpcom/glue/nomozalloc/Makefile.in
index 23aef1816484..7da0f28a1dcc 100644
--- a/xpcom/glue/nomozalloc/Makefile.in
+++ b/xpcom/glue/nomozalloc/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
index 30fe5ede444f..e3f8971bd00f 100644
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in
index 0f21c15504db..014519e69651 100644
--- a/xpcom/glue/standalone/staticruntime/Makefile.in
+++ b/xpcom/glue/standalone/staticruntime/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in
index edd5c3ddf867..95d76f657ef6 100644
--- a/xpcom/glue/staticruntime/Makefile.in
+++ b/xpcom/glue/staticruntime/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
index adeea3da25ff..8c599b15fc85 100644
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index adb02f2f74d3..79ad5ded1fa3 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/Makefile.in b/xpcom/reflect/Makefile.in
index f01f940cda82..34e0c1a4c5de 100644
--- a/xpcom/reflect/Makefile.in
+++ b/xpcom/reflect/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/Makefile.in b/xpcom/reflect/xptcall/Makefile.in
index 722b8a0abc1e..6aedda93f602 100644
--- a/xpcom/reflect/xptcall/Makefile.in
+++ b/xpcom/reflect/xptcall/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/public/Makefile.in b/xpcom/reflect/xptcall/public/Makefile.in
index 7f41854d749b..f5efd1efeab3 100644
--- a/xpcom/reflect/xptcall/public/Makefile.in
+++ b/xpcom/reflect/xptcall/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in
index 0bc891311ef0..6c8221377251 100644
--- a/xpcom/reflect/xptcall/src/Makefile.in
+++ b/xpcom/reflect/xptcall/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/src/md/Makefile.in b/xpcom/reflect/xptcall/src/md/Makefile.in
index 29da627df93c..6ac6601fb1a6 100644
--- a/xpcom/reflect/xptcall/src/md/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
index 2ca1697589c5..da77a41a04b0 100644
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir		= @top_srcdir@
 srcdir			= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/src/md/test/Makefile.in b/xpcom/reflect/xptcall/src/md/test/Makefile.in
index fbcc81eccbc0..b431a963337f 100644
--- a/xpcom/reflect/xptcall/src/md/test/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/test/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 378181e3c510..ae6ed6626252 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
index 495e7f64a803..3191bd926ec6 100644
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in
index 68f82a024eef..7411a163d563 100644
--- a/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptinfo/Makefile.in b/xpcom/reflect/xptinfo/Makefile.in
index 722b8a0abc1e..6aedda93f602 100644
--- a/xpcom/reflect/xptinfo/Makefile.in
+++ b/xpcom/reflect/xptinfo/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptinfo/public/Makefile.in b/xpcom/reflect/xptinfo/public/Makefile.in
index 4bd3bc847c78..dcb0e770d868 100644
--- a/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/xpcom/reflect/xptinfo/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in
index 397858d726ec..e328ba9241fe 100644
--- a/xpcom/reflect/xptinfo/src/Makefile.in
+++ b/xpcom/reflect/xptinfo/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in
index 6194028cbb5e..e95e92dd693b 100644
--- a/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/xpcom/reflect/xptinfo/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in
index 01d8d1bcd78b..b3faa209db1f 100644
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/sample/program/Makefile.in b/xpcom/sample/program/Makefile.in
index 0cf56df9a461..73045a2aa5a9 100644
--- a/xpcom/sample/program/Makefile.in
+++ b/xpcom/sample/program/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/string/Makefile.in b/xpcom/string/Makefile.in
index 259747088b1d..aa6350db5104 100644
--- a/xpcom/string/Makefile.in
+++ b/xpcom/string/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/string/public/Makefile.in b/xpcom/string/public/Makefile.in
index be51f304a0b4..ea28cbeb89fa 100644
--- a/xpcom/string/public/Makefile.in
+++ b/xpcom/string/public/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in
index 03897f5d365c..7d21922eec87 100644
--- a/xpcom/string/src/Makefile.in
+++ b/xpcom/string/src/Makefile.in
@@ -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/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in
index ee57ba48b4f7..517ca70d632d 100644
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/system/Makefile.in b/xpcom/system/Makefile.in
index a4e490c83b73..f7958b9b50c6 100644
--- a/xpcom/system/Makefile.in
+++ b/xpcom/system/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 4886e53c0573..a61549f9ae64 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = xpcom/tests
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in
index 785fa06c0a38..1fd1bf6be2e8 100644
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@@ -5,7 +5,7 @@
 
 # Blatantly copied from xpcom/tests/component.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in
index 4cded47c00ba..9c970edfe570 100644
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in
index 6ad679cc21c4..5488c170cb29 100644
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in
index 15c566cd461b..39884944a3ec 100644
--- a/xpcom/tests/external/Makefile.in
+++ b/xpcom/tests/external/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/xpcom/tests/static-checker/Makefile.in b/xpcom/tests/static-checker/Makefile.in
index 1c2292ec25eb..f78e362ea092 100644
--- a/xpcom/tests/static-checker/Makefile.in
+++ b/xpcom/tests/static-checker/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/xpcom/tests/windows/Makefile.in b/xpcom/tests/windows/Makefile.in
index c8a62a5fdbd5..b4e87f118424 100644
--- a/xpcom/tests/windows/Makefile.in
+++ b/xpcom/tests/windows/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in
index 27744b1366a3..35b4be77e81b 100644
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/Makefile.in b/xpcom/typelib/Makefile.in
index a9d428354e7c..524472aa289a 100644
--- a/xpcom/typelib/Makefile.in
+++ b/xpcom/typelib/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/xpidl/Makefile.in b/xpcom/typelib/xpidl/Makefile.in
index 5c9db3f885d1..32c81ba385a6 100644
--- a/xpcom/typelib/xpidl/Makefile.in
+++ b/xpcom/typelib/xpidl/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/xpt/Makefile.in b/xpcom/typelib/xpt/Makefile.in
index 891a628f7d29..91fdd086fbab 100644
--- a/xpcom/typelib/xpt/Makefile.in
+++ b/xpcom/typelib/xpt/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/xpt/public/Makefile.in b/xpcom/typelib/xpt/public/Makefile.in
index cb80753efecb..729166db85ef 100644
--- a/xpcom/typelib/xpt/public/Makefile.in
+++ b/xpcom/typelib/xpt/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in
index c9cffc5cbeee..582ebaacc052 100644
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in
index 5f10efe22efd..51482551681b 100644
--- a/xpcom/typelib/xpt/tests/Makefile.in
+++ b/xpcom/typelib/xpt/tests/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/typelib/xpt/tools/Makefile.in b/xpcom/typelib/xpt/tools/Makefile.in
index 0df163f9bfbd..783b6abbd5f7 100644
--- a/xpcom/typelib/xpt/tools/Makefile.in
+++ b/xpcom/typelib/xpt/tools/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpcom/windbgdlg/Makefile.in b/xpcom/windbgdlg/Makefile.in
index c48d717db831..66f3b78b2df3 100644
--- a/xpcom/windbgdlg/Makefile.in
+++ b/xpcom/windbgdlg/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpfe/appshell/Makefile.in b/xpfe/appshell/Makefile.in
index eefe7fa991dc..07afc09451eb 100644
--- a/xpfe/appshell/Makefile.in
+++ b/xpfe/appshell/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpfe/appshell/public/Makefile.in b/xpfe/appshell/public/Makefile.in
index 3dba749476f3..80f6eab71137 100644
--- a/xpfe/appshell/public/Makefile.in
+++ b/xpfe/appshell/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		=../../..
+DEPTH		=@DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in
index 57b8c7ec706d..909e3bb20f7d 100644
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 8870259ff0b4..7b7525f825a4 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -60,7 +60,6 @@
 #include "nsIContent.h" // for menus
 
 // For calculating size
-#include "nsIFrame.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 
diff --git a/xpfe/components/Makefile.in b/xpfe/components/Makefile.in
index 5617f2afd6d9..cc5c919a5dca 100644
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH       = ../..
+DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in
index 477da51e6ce6..a4e476bdfb7b 100644
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in
index e0b8479757a4..c51bd1efe9a4 100644
--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xpfe/components/windowds/Makefile.in b/xpfe/components/windowds/Makefile.in
index 3028e8a83cfb..a98192fc0b9b 100644
--- a/xpfe/components/windowds/Makefile.in
+++ b/xpfe/components/windowds/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/Makefile.in b/xulrunner/Makefile.in
index 293ec648b8d7..2da7e77383af 100644
--- a/xulrunner/Makefile.in
+++ b/xulrunner/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index caa3ce42e1c6..737fd3e7eebb 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH = ../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/xulrunner/app/profile/Makefile.in b/xulrunner/app/profile/Makefile.in
index 0bad62df7a36..726462756029 100644
--- a/xulrunner/app/profile/Makefile.in
+++ b/xulrunner/app/profile/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/app/profile/chrome/Makefile.in b/xulrunner/app/profile/chrome/Makefile.in
index d3d6cd90851e..2b98c93898e0 100644
--- a/xulrunner/app/profile/chrome/Makefile.in
+++ b/xulrunner/app/profile/chrome/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/examples/Makefile.in b/xulrunner/examples/Makefile.in
index e2543a2f9321..2211561fcd25 100644
--- a/xulrunner/examples/Makefile.in
+++ b/xulrunner/examples/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/examples/simple/Makefile.in b/xulrunner/examples/simple/Makefile.in
index bdd37bd34fbe..bf2d216fb5da 100644
--- a/xulrunner/examples/simple/Makefile.in
+++ b/xulrunner/examples/simple/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/examples/simple/components/Makefile.in b/xulrunner/examples/simple/components/Makefile.in
index ea4f17698498..77f878c7e6eb 100644
--- a/xulrunner/examples/simple/components/Makefile.in
+++ b/xulrunner/examples/simple/components/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/examples/simple/components/public/Makefile.in b/xulrunner/examples/simple/components/public/Makefile.in
index 44cad3a4bf11..9c5c49dd2e74 100644
--- a/xulrunner/examples/simple/components/public/Makefile.in
+++ b/xulrunner/examples/simple/components/public/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in
index b7d0f7310f33..e49fb42bba50 100644
--- a/xulrunner/examples/simple/components/src/Makefile.in
+++ b/xulrunner/examples/simple/components/src/Makefile.in
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
index 25d72bd8ffd4..4c1254e41c77 100644
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/installer/windows/Makefile.in b/xulrunner/installer/windows/Makefile.in
index de80eb29fd0d..cc538559c4a4 100644
--- a/xulrunner/installer/windows/Makefile.in
+++ b/xulrunner/installer/windows/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH		= ../../..
+DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/xulrunner/setup/Makefile.in b/xulrunner/setup/Makefile.in
index 2dd0e709c52c..f128377fefa7 100644
--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 0615e06c205a..4a489f4fcfaf 100644
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = ../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in
index 69eb40c6317a..c5adedafa722 100644
--- a/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-DEPTH     = ../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@